Merge pull request #507 from meshtastic/master

update dev-https from master

src/graphics/Screen.cpp

@@ -58,10 +58,6 @@ static char ourId[5];
 static bool heartbeat = false;
 #endif
 
-// We used to use constants for this - now we pull from the device at startup
-//#define SCREEN_WIDTH 128
-//#define SCREEN_HEIGHT 64
-
 static uint16_t displayWidth, displayHeight;
 
 #define SCREEN_WIDTH displayWidth
@@ -85,6 +81,10 @@ static uint16_t displayWidth, displayHeight;
 
 #define getStringCenteredX(s) ((SCREEN_WIDTH - display->getStringWidth(s)) / 2)
 
+#ifndef SCREEN_TRANSITION_MSECS
+#define SCREEN_TRANSITION_MSECS 300
+#endif
+
 static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
     // draw an xbm image.
@@ -627,7 +627,8 @@ void Screen::setup()
     // is never found when probing i2c and therefore we don't call setup and never want to do (invalid) accesses to this device.
     useDisplay = true;
 
-    dispdev.resetOrientation();
+    // I think this is not needed - redundant with ui.init
+    // dispdev.resetOrientation();
 
     // Initialising the UI will init the display too.
     ui.init();
@@ -635,7 +636,8 @@ void Screen::setup()
     displayWidth = dispdev.width();
     displayHeight = dispdev.height();
 
-    ui.setTimePerTransition(300); // msecs
+    ui.setTimePerTransition(SCREEN_TRANSITION_MSECS);  
+
     ui.setIndicatorPosition(BOTTOM);
     // Defines where the first frame is located in the bar.
     ui.setIndicatorDirection(LEFT_RIGHT);
@@ -661,7 +663,9 @@ void Screen::setup()
     // Set up a log buffer with 3 lines, 32 chars each.
     dispdev.setLogBuffer(3, 32);
 
-#ifdef FLIP_SCREEN_VERTICALLY
+#ifdef SCREEN_MIRROR
+    dispdev.mirrorScreen();
+#elif defined(SCREEN_FLIP_VERTICALLY)
     dispdev.flipScreenVertically();
 #endif
 
@@ -874,12 +878,16 @@ void Screen::handleOnPress()
     }
 }
 
+#ifndef SCREEN_TRANSITION_FRAMERATE
+#define SCREEN_TRANSITION_FRAMERATE 30 // fps
+#endif
+
 void Screen::setFastFramerate()
 {
     DEBUG_MSG("Setting fast framerate\n");
 
     // We are about to start a transition so speed up fps
-    targetFramerate = TRANSITION_FRAMERATE;
+    targetFramerate = SCREEN_TRANSITION_FRAMERATE;
     ui.setTargetFPS(targetFramerate);
     setInterval(0); // redraw ASAP
 }

src/graphics/Screen.h

@@ -6,6 +6,8 @@
 
 #ifdef USE_SH1106
 #include <SH1106Wire.h>
+#elif defined(USE_ST7567)
+#include <ST7567Wire.h>
 #else
 #include <SSD1306Wire.h>
 #endif
@@ -19,6 +21,11 @@
 #include "power.h"
 #include <string>
 
+// 0 to 255, though particular variants might define different defaults
+#ifndef BRIGHTNESS_DEFAULT
+#define BRIGHTNESS_DEFAULT 150
+#endif
+
 namespace graphics
 {
 
@@ -97,7 +104,7 @@ class Screen : public concurrency::OSThread
 
     // Implementation to Adjust Brightness
     void adjustBrightness();
-    uint8_t brightness = 150;
+    uint8_t brightness = BRIGHTNESS_DEFAULT;
 
     /// Starts showing the Bluetooth PIN screen.
     //
@@ -250,6 +257,8 @@ class Screen : public concurrency::OSThread
     EInkDisplay dispdev;
 #elif defined(USE_SH1106)
     SH1106Wire dispdev;
+#elif defined(USE_ST7567)
+    ST7567Wire dispdev;
 #else
     SSD1306Wire dispdev;
 #endif

src/graphics/configs.h

@@ -3,7 +3,6 @@
 #include "fonts.h"
 
 // This means the *visible* area (sh1106 can address 132, but shows 128 for example)
-#define TRANSITION_FRAMERATE 30 // fps
 #define IDLE_FRAMERATE 1        // in fps
 #define COMPASS_DIAM 44