Merge pull request #1 from m5stack/develop

0.0.2

Author: lovyan03

library.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/m5stack/M5GFX"
   },
-  "version": "0.0.1",
+  "version": "0.0.2",
   "framework": "arduino",
   "platforms": "espressif32"
 }

library.properties

@@ -1,5 +1,5 @@
 name=M5GFX
-version=0.0.1
+version=0.0.2
 author=M5Stack
 maintainer=lovyan03<[email protected]>
 sentence=Library for M5Stack All Display

src/M5GFX.cpp

@@ -1,3 +1,5 @@
+#if defined (ESP32) || defined (CONFIG_IDF_TARGET_ESP32) || defined (CONFIG_IDF_TARGET_ESP32S2) || defined (ESP_PLATFORM)
+
 #include "M5GFX.h"
 
 #include "lgfx/v1/panel/Panel_ILI9342.hpp"
@@ -540,6 +542,7 @@ namespace m5gfx
         // AXP192_LDO2 = LCD PWR
         // AXP192_DC3  = LCD BL
         // AXP192_IO4  = LCD RST
+
         if (use_reset) lgfx::i2c::registerWrite8(axp_i2c_port, axp_i2c_addr, 0x96, 0, ~0x02, axp_i2c_freq); // GPIO4 LOW (LCD RST)
         lgfx::i2c::registerWrite8(axp_i2c_port, axp_i2c_addr, 0x28, 0xF0, ~0, axp_i2c_freq);   // set LDO2 3300mv // LCD PWR
         lgfx::i2c::registerWrite8(axp_i2c_port, axp_i2c_addr, 0x12, 0x06, ~0, axp_i2c_freq);   // LDO2 and DC3 enable (DC3 = LCD BL)
@@ -642,3 +645,5 @@ ESP_LOGI("nvs_board","_board:%d", board);
   }
 
 }
+
+#endif

src/M5GFX.h

@@ -9,6 +9,11 @@
 #include <FS.h>
 #endif
 
+/// Use of std::min instead of macro definitions is recommended.
+#ifdef min
+#undef min
+#endif
+
 #ifdef setFont
 #undef setFont
 #endif
@@ -189,5 +194,3 @@ using namespace m5gfx::ili9341_colors;
 using namespace m5gfx::tft_command;
 using M5GFX = m5gfx::M5GFX;
 using M5Canvas = m5gfx::M5Canvas;
-
-#undef LGFX_NS

src/lgfx/utility/lgfx_tjpgd.c

@@ -827,9 +827,14 @@ JRESULT lgfx_jd_prepare (
 	ofs = 2;
 
 	for (;;) {
-		if (infunc(jd, seg, 4) != 4) return JDR_INP;
-		uint_fast16_t len = LDB_WORD(seg + 2) - 2;	/* Length field */
+		if (infunc(jd, seg, 1) != 1) return JDR_INP;
 		if (seg[0] != 0xFF) return JDR_FMT1;	/* Check a JPEG marker */
+		do
+		{
+			if (infunc(jd, &seg[1], 1) != 1) return JDR_INP;
+		} while (seg[1] == 0xFF);
+		if (infunc(jd, &seg[2], 2) != 2) return JDR_INP;
+		uint_fast16_t len = LDB_WORD(seg + 2) - 2;	/* Length field */
 		ofs += 4 + len;	/* Number of bytes loaded */
 
 		switch (seg[1]) {	/* Marker */

src/lgfx/v1/LGFXBase.cpp

@@ -2850,7 +2850,7 @@ namespace lgfx
     static Panel_NULL nullobj;
     _panel = (nullptr == panel)
            ? &nullobj
-           : reinterpret_cast<IPanel*>(panel); 
+           : panel;
   }
 
   bool LGFX_Device::init_impl(bool use_reset, bool use_clear)
@@ -2862,7 +2862,7 @@ namespace lgfx
         setBaseColor(TFT_WHITE);
         setTextColor(TFT_BLACK, TFT_WHITE);
       }
-      if (_panel->init(use_reset))
+      if (getPanel()->init(use_reset))
       {
         startWrite();
         invertDisplay(_panel->getInvert());
@@ -2875,6 +2875,7 @@ namespace lgfx
         setPivot(width()>>1, height()>>1);
         endWrite();
         setBrightness(_brightness);
+        getPanel()->initTouch();
         return true;
       }
     }

src/lgfx/v1/LGFXBase.hpp

@@ -1142,11 +1142,10 @@ namespace lgfx
     inline std::uint8_t getBrightness(void) const { return _brightness; }
 
     inline ITouch* touch(void) const { return _panel ? panel()->touch() : nullptr; }
+    inline void convertRawXY(std::int32_t *x, std::int32_t *y) { panel()->convertRawXY(x, y); }
     std::uint_fast8_t getTouchRaw(touch_point_t *tp, std::uint_fast8_t number = 0) { return panel()->getTouchRaw(tp, number); }
     std::uint_fast8_t getTouch(touch_point_t *tp, std::uint_fast8_t number = 0) { return panel()->getTouch(tp, number); }
-    inline void convertRawXY(std::int32_t *x, std::int32_t *y) { panel()->convertRawXY(x, y); }
-
-    touch_point_t getTouch(std::uint_fast8_t number = 0)
+    touch_point_t getTouch(std::int_fast8_t number = 0)
     {
       touch_point_t res;
       getTouch(&res, number);

src/lgfx/v1/LGFX_Sprite.hpp

@@ -40,7 +40,6 @@ namespace lgfx
 
     void beginTransaction(void) override {}
     void endTransaction(void) override {}
-    bool init(bool use_reset) override { return true; }
     void setInvert(bool invert) override {}
     void setSleep(bool flg_sleep) override {}
     void setPowerSave(bool flg_partial) override {}

src/lgfx/v1/Panel.hpp

@@ -71,7 +71,6 @@ namespace lgfx
 
     virtual void beginTransaction(void) = 0;
     virtual void endTransaction(void) = 0;
-    virtual bool init(bool use_reset) = 0;
 
     virtual void setBrightness(std::uint8_t brightness) {};
 

src/lgfx/v1/panel/Panel_Device.cpp

@@ -63,10 +63,6 @@ namespace lgfx
     {
       _light->init(0);
     }
-    if (_touch)
-    {
-      _touch->init();
-    }
     if (use_reset)
     {
       reset();
@@ -75,6 +71,15 @@ namespace lgfx
     return true;
   }
 
+  bool Panel_Device::initTouch(void)
+  {
+    if (_touch)
+    {
+      return _touch->init();
+    }
+    return false;
+  }
+
   void Panel_Device::initDMA(void)
   {
     _bus->initDMA();