Merge pull request #27 from m5stack/develop

0.0.17

Author: lovyan03

library.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/m5stack/M5GFX.git"
   },
-  "version": "0.0.16",
+  "version": "0.0.17",
   "frameworks": "arduino",
   "platforms": "espressif32",
   "headers": "M5GFX.h"

library.properties

@@ -1,5 +1,5 @@
 name=M5GFX
-version=0.0.16
+version=0.0.17
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack All Display

src/lgfx/boards.hpp

@@ -24,6 +24,7 @@ namespace lgfx // これはm5gfxに変更してはならない;
     , board_M5TimerCam
     , board_M5StampPico
     , board_M5StampC3
+    , board_M5StampC3U
 
 /// external displays
     , board_M5AtomDisplay

src/lgfx/v1/gitTagVersion.h

@@ -1,4 +1,4 @@
 #define LGFX_VERSION_MAJOR 1
 #define LGFX_VERSION_MINOR 0
-#define LGFX_VERSION_PATCH 11
+#define LGFX_VERSION_PATCH 12
 #define LOVYANGFX_VERSION F( LGFX_VERSION_MAJOR "." LGFX_VERSION_MINOR "." LGFX_VERSION_PATCH )

src/lgfx/v1/panel/Panel_SSD1306.cpp

@@ -290,20 +290,6 @@ namespace lgfx
 
 //----------------------------------------------------------------------------
 
-  bool Panel_SH110x::init(bool use_reset)
-  {
-    if (!Panel_1bitOLED::init(use_reset))
-    {
-      return false;
-    }
-
-    startWrite(true);
-    _bus->writeCommand(CMD_SETMULTIPLEX | (((_cfg.panel_width-1) & 0x7F) << 8), 16);
-    endWrite();
-
-    return true;
-  }
-
   void Panel_SH110x::setBrightness(uint8_t brightness)
   {
     startWrite();

src/lgfx/v1/panel/Panel_SSD1306.hpp

@@ -135,8 +135,6 @@ namespace lgfx
       _auto_display = true;
     }
 
-    bool init(bool use_reset) override;
-
     void setBrightness(uint8_t brightness) override;
 
     void display(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h) override;
@@ -170,6 +168,7 @@ namespace lgfx
         CMD_PAGEADDRESSINGMODE ,
         CMD_SETDISPSTARTLINE   , 0x00,
         CMD_SETDISPLAYCLOCKDIV , 0x50,
+        CMD_SETMULTIPLEX       , 0x7F,
         CMD_SETDISPLAYOFFSET   , 0x00,
         CMD_DCDC               , 0x8B,
         CMD_SEGREMAP           ,