Fixed an error when coexisting with M5Stack.h library.

m5stack · May 28, 2021 · 2a936cd · 2a936cd
1 parent b0d7647
commit 2a936cd
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 21 deletions.
diff --git a/src/M5GFX.h b/src/M5GFX.h
@@ -9,6 +9,10 @@
 #include <FS.h>
 #endif
 
+#ifdef setFont
+#undef setFont
+#endif
+
 #define LGFX_USE_V1
 #include "lgfx/v1/gitTagVersion.h"
 #include "lgfx/v1/platforms/device.hpp"
@@ -186,10 +190,4 @@ using namespace m5gfx::tft_command;
 using M5GFX = m5gfx::M5GFX;
 using M5Canvas = m5gfx::M5Canvas;
 
-// For compatibility
-using TFT_eSPI = m5gfx::M5GFX;
-
-// For compatibility
-using TFT_eSprite = m5gfx::M5Canvas;
-
 #undef LGFX_NS
diff --git a/src/lgfx/v1/LGFXBase.cpp b/src/lgfx/v1/LGFXBase.cpp
@@ -2840,6 +2840,11 @@ namespace lgfx
     panel()->initBus();
   };
 
+  void LGFX_Device::releaseBus(void)
+  {
+    panel()->releaseBus();
+  };
+
   void LGFX_Device::setPanel(Panel_Device* panel)
   {
     static Panel_NULL nullobj;

diff --git a/src/lgfx/v1/LGFXBase.hpp b/src/lgfx/v1/LGFXBase.hpp
@@ -1107,6 +1107,7 @@ namespace lgfx
     bool begin(void)              { return init_impl(true , true); };
     bool init_without_reset(void) { return init_impl(false, false); };
     void initBus(void);
+    void releaseBus(void);
     void setPanel(Panel_Device* panel);
 
     void setEpdMode(epd_mode_t epd_mode) { _panel->setEpdMode(epd_mode); }

diff --git a/src/lgfx/v1/panel/Panel_Device.cpp b/src/lgfx/v1/panel/Panel_Device.cpp
@@ -49,6 +49,11 @@ namespace lgfx
     _bus->init();
   }
 
+  void Panel_Device::releaseBus(void)
+  {
+    _bus->release();
+  }
+
   bool Panel_Device::init(bool use_reset)
   {
     _bus->init();

diff --git a/src/lgfx/v1/panel/Panel_Device.hpp b/src/lgfx/v1/panel/Panel_Device.hpp
@@ -108,7 +108,8 @@ namespace lgfx
     const config_t& config(void) const { return _cfg; }
     void config(const config_t& cfg) { _cfg = cfg; }
 
-    void initBus(void);
+    virtual void initBus(void);
+    virtual void releaseBus(void);
     void setBus(IBus* bus);
     void bus(IBus* bus) { setBus(bus); };
     IBus* getBus(void) const { return _bus; }
@@ -203,6 +204,9 @@ namespace lgfx
   {
     Panel_NULL(void) = default;
 
+    void initBus(void) override {}
+    void releaseBus(void) override {}
+
     void beginTransaction(void) override {}
     void endTransaction(void) override {}
     bool init(bool use_reset) override { return false; }

diff --git a/src/lgfx/v1/panel/Panel_SSD1306.cpp b/src/lgfx/v1/panel/Panel_SSD1306.cpp
@@ -92,6 +92,16 @@ namespace lgfx
       return false;
     }
 
+    _bus->beginRead();
+    std::uint8_t buf;
+    bool res = _bus->readBytes(&buf, 1, true);
+    _bus->endTransaction();
+
+    if (!res)
+    {
+      return false;
+    }
+
     startWrite(true);
 
     for (std::size_t i = 0; auto cmds = getInitCommands(i); i++)
@@ -397,20 +407,12 @@ namespace lgfx
       return false;
     }
 
-    _bus->beginRead();
-    std::uint8_t buf;
-    bool res = _bus->readBytes(&buf, 1, true);
-    _bus->endTransaction();
-
-    if (res)
-    {
-      startWrite(true);
-      _bus->writeCommand(CMD_SETMULTIPLEX | (((_cfg.panel_width-1) & 0x7F) << 8), 16);
-      _bus->writeCommand(CMD_SETDISPLAYOFFSET | ((uint8_t)(-_cfg.offset_x) << 8), 16);
-      endWrite();
-    }
+    startWrite(true);
+    _bus->writeCommand(CMD_SETMULTIPLEX | (((_cfg.panel_width-1) & 0x7F) << 8), 16);
+    _bus->writeCommand(CMD_SETDISPLAYOFFSET | ((uint8_t)(-_cfg.offset_x) << 8), 16);
+    endWrite();
 
-    return res;
+    return true;
   }
 
   void Panel_SH110x::beginTransaction(void)

diff --git a/src/lgfx/v1/platforms/esp32/common.cpp b/src/lgfx/v1/platforms/esp32/common.cpp
@@ -487,6 +487,11 @@ namespace lgfx
     {
       if (i2c_port >= I2C_NUM_MAX) { return cpp::fail(error_t::invalid_arg); }
 
+      if (i2c_context[i2c_port].pin_scl >= 0 || i2c_context[i2c_port].pin_sda >= 0)
+      {
+        release(i2c_port);
+      }
+
       i2c_context[i2c_port].pin_scl = (gpio_num_t)pin_scl;
       i2c_context[i2c_port].pin_sda = (gpio_num_t)pin_sda;
       i2c_stop(i2c_port);
@@ -501,6 +506,8 @@ namespace lgfx
       periph_module_disable(i2c_port == 0 ? PERIPH_I2C0_MODULE : PERIPH_I2C1_MODULE);
       pinMode(i2c_context[i2c_port].pin_scl, pin_mode_t::input);
       pinMode(i2c_context[i2c_port].pin_sda, pin_mode_t::input);
+      i2c_context[i2c_port].pin_scl = (gpio_num_t)-1;
+      i2c_context[i2c_port].pin_sda = (gpio_num_t)-1;
 
       return {};
     }
@@ -701,7 +708,8 @@ namespace lgfx
       {
         len = ((length-1) & 63) + 1;
         length -= len;
-        if (!i2c_wait(i2c_port))
+        res = i2c_wait(i2c_port);
+        if (res.has_error())
         {
           ESP_LOGE("LGFX", "i2c read error : ack wait");
           break;