Stuff 'n' things

Author: TaraHoleInIt

examples/adafruit_st7789/adafruit_st7789.ino

@@ -0,0 +1,62 @@
+// Copyright (c) 2020 Tara Keeling
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+#include <Arduino.h>
+#include <SPI.h>
+#include <Adafruit_GFX.h>
+#include <Adafruit_ST7789.h>
+
+#include <subpixie.h>
+
+// Uncomment the line below if your display uses a BGR subpixel order.
+// A good way of telling is if the text looks awful.
+// #include <subpixie_bgr.h>
+
+static const int Pin_CS = -1;
+static const int Pin_DC = PD3;
+static const int Pin_RST = PD2;
+
+Adafruit_ST7789 LCD = Adafruit_ST7789( Pin_CS, Pin_DC, Pin_RST );
+
+// Wrapper around Adafruit's setAddrWindow
+void Adafruit_SetAddressWindow( int x0, int y0, int x1, int y1 ) {
+  // Since Adafruit's setAddrWindow expects a width and height for the 3rd and 4th parameter
+  // calculate it from the screen space coordinates given by subpixie.
+  LCD.setAddrWindow( x0, y0, ( x1 - x0 ), ( y1 - y0 ) );
+}
+
+// Wrapper around Adafruit's writePixels
+void Adafruit_WritePixels( uint16_t* Buffer, size_t Count ) {
+  LCD.startWrite( );
+    LCD.writePixels( Buffer, Count, true, false );
+  LCD.endWrite( );
+}
+
+Subpixie Sub = Subpixie( 240, 240, &Font_8x8, true, Adafruit_SetAddressWindow, Adafruit_WritePixels );
+
+void setup( void ) {
+  SPI.begin( );
+  LCD.init( 240, 240, 3 );
+}
+
+void loop( void ) {
+  LCD.fillScreen( 0 );
+  LCD.setTextColor( 0xFFFF );
+
+  LCD.println( "Adafruit 6x8" );
+  Sub.println( );
+  Sub.println( "Subpixie 8x8(W)" );
+
+  Sub.SetFont( &Font_8x8, false );
+  Sub.println( "Subpixie 8x8" );
+
+  Sub.SetFont( &Font_6x8, true );
+  Sub.println( "Subpixie 6x8(W)" );
+
+  Sub.SetFont( &Font_6x8, false );
+  Sub.println( "Subpixie 6x8" );
+
+  while ( true ) {
+  }
+}

subpixie.cpp

@@ -48,9 +48,9 @@ const uint8_t* Subpixie::GetGlyphPtr( const uint8_t Char ) {
     return Ptr + ( ( c * RoundedWidth * _Font->Height ) );
 }
 
-void Subpixie::DrawGlyph( const uint8_t Char, int x, int y ) {
+void Subpixie::DrawGlyph( const uint8_t Char, int x, int y, bool Inverse ) {
     if ( Char != CachedGlyph ) {
-        _Font->Decode( GetGlyphPtr( Char ), GlyphCache, _Wide, _Inverse );
+        _Font->Decode( GetGlyphPtr( Char ), GlyphCache, _Wide, Inverse );
         CachedGlyph = Char;
     }
 
@@ -89,7 +89,7 @@ size_t Subpixie::write( const uint8_t Data ) {
             break;
         }
         default: {
-            DrawGlyph( Data, PrintX, PrintY );
+            DrawGlyph( Data, PrintX, PrintY, _Inverse );
 
             PrintX+= GlyphWidth;
             break;

subpixie.h

@@ -17,6 +17,8 @@
 
 #define RGB565( r, g, b ) ( uint16_t ) ( ( r << 11 ) | ( g << 5 ) | ( b ) )
 
+#define Glyph_Cache_Buffer_Size 8 * 8
+
 /**
  * @brief Procedure to set the render window of the target LCD
  * 
@@ -54,8 +56,16 @@ typedef struct {
 } Subpixie_Fontdef;
 
 class Subpixie : public Print {
+protected:
+    int _DisplayWidth = 0; /**< Width of target display */
+    int _DisplayHeight = 0; /**< Height of target display */
+
+    int GlyphSize = 0; /**< Size in bytes of decoded character glyphs */
+    int GlyphWidth = 0; /**< Width in pixels of decoded subpixel font */
+    int GlyphHeight = 0; /**< Height of characters in font */
+
 private:
-    uint16_t GlyphCache[ 6 * 8 ]; /**< Space for decoded glyph data */
+    uint16_t GlyphCache[ Glyph_Cache_Buffer_Size ]; /**< Space for decoded glyph data */
 
     SetAddressWindowProc _SetAddressWindow; /**< Callback to function to set the render window of the target LCD */
     WritePixelsProc _WritePixels; /**< Callback to function to write pixels to the target LCD */
@@ -64,13 +74,6 @@ class Subpixie : public Print {
 
     uint8_t CachedGlyph; /**< Value of last decoded character */
 
-    int _DisplayWidth = 0; /**< Width of target display */
-    int _DisplayHeight = 0; /**< Height of target display */
-
-    int GlyphSize = 0; /**< Size in bytes of decoded character glyphs */
-    int GlyphWidth = 0; /**< Width in pixels of decoded subpixel font */
-    int GlyphHeight = 0; /**< Height of characters in font */
-
     bool _Inverse; /**< If true, render fonts with the colour inverted */
     bool _Wide; /**< If true, render fonts twice as wide */
 
@@ -135,8 +138,9 @@ class Subpixie : public Print {
      * @param Char Character to draw
      * @param x x
      * @param y y
+     * @param Inverse Draw character with the colours inverted
      */
-    void DrawGlyph( const uint8_t Char, int x, int y );
+    void DrawGlyph( const uint8_t Char, int x, int y, bool Inverse );
 
     void SetInverse( bool Inverse );