Merge pull request #164 from m5stack/develop

0.2.17

Author: lovyan03

examples/Basic/AnalogMeter/AnalogMeter.ino

@@ -165,7 +165,7 @@ void setup(void)
   needle_y = (meter_height*2 + display.width()) / 3;
   osx = needle_x;
   osy = needle_y;
-  liner_count = std::min(6, display.width() / 40);
+  liner_count = std::min<int>(6, display.width() / 40);
 
   analogMeter(); // Draw analogue meter
   int w = display.width() / liner_count;

library.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/m5stack/M5GFX.git"
   },
-  "version": "0.2.16",
+  "version": "0.2.17",
   "frameworks": ["arduino", "espidf", "*"],
   "platforms": ["espressif32", "native"],
   "headers": "M5GFX.h"

library.properties

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

src/lgfx/v1/gitTagVersion.h

@@ -1,4 +1,4 @@
 #define LGFX_VERSION_MAJOR 1
 #define LGFX_VERSION_MINOR 2
-#define LGFX_VERSION_PATCH 16
+#define LGFX_VERSION_PATCH 17
 #define LOVYANGFX_VERSION F( LGFX_VERSION_MAJOR "." LGFX_VERSION_MINOR "." LGFX_VERSION_PATCH )

src/lgfx/v1/platforms/esp32/Bus_EPD.cpp

@@ -131,6 +131,11 @@ bool Bus_EPD::init(void)
   bus_config.bus_width = _config.bus_width;
   for (int i = 0; i < _config.bus_width; ++i) {
     bus_config.data_gpio_nums[i] = _config.pin_data[i];
+    // starting from ESP-IDF v5.4, esp_lcd_new_i80_bus removed `gpio_set_direction` call on all pins include these data pins,
+    // for somehow unknown reason, some of data pin like GPIO11, GPIO12 are Open-Drain mode when bootup and remains OD after
+    // `esp_lcd_new_i80_bus`, which will cause screen not works as expected.
+    // but on older IDF, those pins will disable OD in `gpio_set_direction`, so set these pin output and disable OD before `esp_lcd_new_i80_bus`
+    lgfx::pinMode(_config.pin_data[i], lgfx::pin_mode_t::output);
   }
   if (ESP_OK != esp_lcd_new_i80_bus(&bus_config, &_i80_bus_handle))
   { return false; }

src/lgfx/v1/platforms/esp32/common.cpp

@@ -1057,6 +1057,10 @@ namespace lgfx
 #endif
       }
 
+#if defined ( ARDUINO ) && __has_include (<Wire.h>)
+#elif __has_include(<driver/i2c_master.h>)
+      i2c_master_bus_handle_t i2c_bus_handle = nullptr;
+#endif
     private:
       uint32_t _reg_store[22];
     };
@@ -1276,6 +1280,12 @@ namespace lgfx
     #endif
   #endif
  #endif
+#elif __has_include(<driver/i2c_master.h>)
+        auto bus_handle = i2c_context[i2c_port].i2c_bus_handle;
+        if (bus_handle) {
+          i2c_context[i2c_port].i2c_bus_handle = nullptr;
+          i2c_del_master_bus(bus_handle);
+        }
 #else
         i2c_periph_disable(i2c_port);
 #endif
@@ -1370,6 +1380,20 @@ namespace lgfx
  #else
       twowire->begin((int)pin_sda, (int)pin_scl);
  #endif
+#elif __has_include(<driver/i2c_master.h>)
+      i2c_master_bus_handle_t bus_handle = nullptr;
+      i2c_master_bus_config_t bus_config;
+      memset(&bus_config, 0, sizeof(i2c_master_bus_config_t));
+      bus_config.i2c_port = i2c_port;
+      bus_config.sda_io_num = pin_sda;
+      bus_config.scl_io_num = pin_scl;
+      bus_config.clk_source = I2C_CLK_SRC_DEFAULT;
+      bus_config.glitch_ignore_cnt = 7;
+      bus_config.flags.enable_internal_pullup = true;
+      bus_config.intr_priority = 1;
+
+      i2c_new_master_bus(&bus_config, &bus_handle);
+      i2c_context[i2c_port].i2c_bus_handle = bus_handle;
 #else
       i2c_periph_enable(i2c_port);
 #endif