Merge branch 'dev' into epr-pinecil-og

source/Core/Drivers/OLED.cpp

@@ -25,7 +25,7 @@ bool               OLED::initDone = false;
 uint8_t            OLED::displayOffset;
 uint8_t            OLED::screenBuffer[16 + (OLED_WIDTH * 2) + 10]; // The data buffer
 uint8_t            OLED::secondFrameBuffer[OLED_WIDTH * 2];
-
+uint32_t           OLED::displayChecksum;
 /*Setup params for the OLED screen*/
 /*http://www.displayfuture.com/Display/datasheet/controller/SSD1307.pdf*/
 /*All commands are prefixed with 0x80*/
@@ -222,7 +222,7 @@ void OLED::maskScrollIndicatorOnOLED() {
   // it from the screen buffer which is updated by `OLED::setRotation`.
   uint8_t rightmostColumn = screenBuffer[7];
   uint8_t maskCommands[]  = {
-      // Set column address:
+       // Set column address:
       //  A[6:0] - Column start address = rightmost column
       //  B[6:0] - Column end address = rightmost column
       0x80,

source/Core/Drivers/OLED.hpp

@@ -10,10 +10,12 @@
 #ifndef OLED_HPP_
 #define OLED_HPP_
 #include "Font.h"
+#include "cmsis_os.h"
 #include "configuration.h"
 #include <BSP.h>
 #include <stdbool.h>
 #include <string.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -47,16 +49,29 @@ public:
 
   static void initialize(); // Startup the I2C coms (brings screen out of reset etc)
   static bool isInitDone();
-  // Draw the buffer out to the LCD using the DMA Channel
+  // Draw the buffer out to the LCD if any content has changed.
   static void refresh() {
-    I2C_CLASS::Transmit(DEVICEADDR_OLED, screenBuffer, FRAMEBUFFER_START + (OLED_WIDTH * 2));
-    // DMA tx time is ~ 20mS Ensure after calling this you delay for at least 25ms
-    // or we need to goto double buffering
+    uint32_t  hash = 0;
+    const int len  = FRAMEBUFFER_START + (OLED_WIDTH * 2);
+    for (int i = 0; i < len; i++) {
+      hash += (i * screenBuffer[i]);
+    }
+    if (hash != displayChecksum) {
+      displayChecksum = hash;
+      I2C_CLASS::Transmit(DEVICEADDR_OLED, screenBuffer, len);
+      // DMA tx time is ~ 20mS Ensure after calling this you delay for at least 25ms
+      // or we need to goto double buffering
+    }
   }
 
   static void setDisplayState(DisplayState state) {
-    displayState    = state;
-    screenBuffer[1] = (state == ON) ? 0xAF : 0xAE;
+    if (state != displayState) {
+      displayState    = state;
+      screenBuffer[1] = (state == ON) ? 0xAF : 0xAE;
+      // Dump the screen state change out _now_
+      I2C_CLASS::Transmit(DEVICEADDR_OLED, screenBuffer, FRAMEBUFFER_START - 1);
+      osDelay(TICKS_10MS);
+    }
   }
 
   static void setRotation(bool leftHanded); // Set the rotation for the screen
@@ -112,6 +127,7 @@ private:
   static DisplayState displayState;
   static int16_t      cursor_x, cursor_y;
   static uint8_t      displayOffset;
+  static uint32_t     displayChecksum;
   static uint8_t      screenBuffer[16 + (OLED_WIDTH * 2) + 10]; // The data buffer
   static uint8_t      secondFrameBuffer[OLED_WIDTH * 2];
 };

source/Core/Inc/Translation.h

@@ -36,39 +36,39 @@ extern const char *PowerSourceNames[];
 
 enum class SettingsItemIndex : uint8_t {
   DCInCutoff,
+  MinVolCell,
+  QCMaxVoltage,
+  PDNegTimeout,
+  BoostTemperature,
+  AutoStart,
+  TempChangeShortStep,
+  TempChangeLongStep,
+  LockingMode,
+  MotionSensitivity,
   SleepTemperature,
   SleepTimeout,
   ShutdownTimeout,
-  MotionSensitivity,
-  TemperatureUnit,
-  AdvancedIdle,
-  DisplayRotation,
-  BoostTemperature,
-  AutoStart,
-  CooldownBlink,
-  CalibrateCJC,
-  SettingsReset,
-  VoltageCalibration,
-  AdvancedSoldering,
-  ScrollingSpeed,
-  QCMaxVoltage,
-  PDNegTimeout,
-  PowerLimit,
-  ReverseButtonTempChange,
-  TempChangeShortStep,
-  TempChangeLongStep,
-  PowerPulsePower,
   HallEffSensitivity,
-  LockingMode,
-  MinVolCell,
-  AnimLoop,
+  TemperatureUnit,
+  DisplayRotation,
+  CooldownBlink,
+  ScrollingSpeed,
+  ReverseButtonTempChange,
   AnimSpeed,
-  PowerPulseWait,
-  PowerPulseDuration,
-  LanguageSwitch,
+  AnimLoop,
   Brightness,
   ColourInversion,
   LOGOTime,
+  AdvancedIdle,
+  AdvancedSoldering,
+  PowerLimit,
+  CalibrateCJC,
+  VoltageCalibration,
+  PowerPulsePower,
+  PowerPulseWait,
+  PowerPulseDuration,
+  SettingsReset,
+  LanguageSwitch,
   NUM_ITEMS,
 };