Merge pull request #22 from m5stack/develop

0.0.13

Author: lovyan03

examples/Basic/AnalogMeter/AnalogMeter.ino

@@ -13,7 +13,8 @@ M5GFX display;
 //M5UnitLCD display  ( 21, 22, 400000 ); // SDA, SCL, FREQ
 
 //#include <M5AtomDisplay.h>
-//M5AtomDisplay display;
+//M5AtomDisplay display;  // default setting
+//M5AtomDisplay display ( 320, 180 ); // width, height
 
 
 static constexpr float deg_to_rad = 0.017453292519943295769236907684886;
@@ -178,11 +179,10 @@ void setup(void)
 
 void loop(void)
 {
-  if (updateTime <= millis())
+  auto msec = millis();
+  if (updateTime <= msec)
   {
-    updateTime = millis() + LOOP_PERIOD;
-
-    d += 4; if (d >= 360) d = 0;
+    d = (msec >> 3) % 360;
 
     // Create a Sine wave for testing
     value[0] = 50 + roundf(50 * sinf((d +   0) * deg_to_rad));
@@ -196,6 +196,7 @@ void loop(void)
 
     if (!display.displayBusy())
     {
+      updateTime = msec + LOOP_PERIOD;
     //unsigned long t = millis();
       display.startWrite();
       plotPointer();

examples/Basic/SpinTile/SpinTile.ino

@@ -10,8 +10,9 @@ M5GFX display;
 //M5UnitLCD display;  // default setting
 //M5UnitLCD display  ( 21, 22, 400000 ); // SDA, SCL, FREQ
 
-// #include <M5AtomDisplay.h>
-// M5AtomDisplay display;
+//#include <M5AtomDisplay.h>
+//M5AtomDisplay display;  // default setting
+//M5AtomDisplay display ( 320, 180 ); // width, height
 
 static constexpr const int qsintab[256]={
     0x8000,0x80c9,0x8192,0x825b,0x8324,0x83ee,0x84b7,0x8580,
@@ -189,4 +190,3 @@ void loop(void)
   p_dyx = dyx;
   p_dyy = dyy;
 }
-

examples/Basic/TextLogScroll/TextLogScroll.ino

@@ -11,9 +11,8 @@ M5GFX display;
 //M5UnitLCD display  ( 21, 22, 400000 ); // SDA, SCL, FREQ
 
 //#include <M5AtomDisplay.h>
-//M5AtomDisplay display;
-
-M5Canvas canvas(&display);
+//M5AtomDisplay display;  // default setting
+//M5AtomDisplay display ( 320, 180 ); // width, height
 
 static constexpr char text0[] = "hello world";
 static constexpr char text1[] = "this";
@@ -25,6 +24,9 @@ static constexpr char text6[] = "scroll";
 static constexpr char text7[] = "sample";
 static constexpr const char* text[] = { text0, text1, text2, text3, text4, text5, text6, text7 };
 
+//*
+/// Example of using canvas
+M5Canvas canvas(&display);
 void setup(void)
 {
   display.begin();
@@ -54,3 +56,34 @@ void loop(void)
   canvas.pushSprite(0, 0);
   ++count;
 }
+
+/*/
+
+/// Example without canvas
+void setup(void)
+{
+  display.begin();
+
+  if (display.isEPD())
+  {
+    display.setEpdMode(epd_mode_t::epd_fastest);
+    display.invertDisplay(true);
+    display.clear(TFT_BLACK);
+  }
+  if (display.width() < display.height())
+  {
+    display.setRotation(display.getRotation() ^ 1);
+  }
+
+  display.setTextSize((float)display.width() / 160);
+  display.setTextScroll(true);
+}
+
+void loop(void)
+{
+  static int count = 0;
+
+  display.printf("%04d:%s\r\n", count, text[count & 7]);
+  ++count;
+}
+//*/

library.json

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

library.properties

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

src/M5AtomDisplay.h

@@ -7,21 +7,21 @@
 // #include <SPIFFS.h>
 // #include <HTTPClient.h>
 
+#include "lgfx/v1/panel/Panel_M5HDMI.hpp"
+#include "M5GFX.h"
+
 #include <sdkconfig.h>
 #include <esp_efuse.h>
 #include <soc/efuse_reg.h>
 
-#include "M5GFX.h"
-#include "lgfx/v1/panel/Panel_M5HDMI.hpp"
-
 #ifndef M5ATOMDISPLAY_LOGICAL_WIDTH
 #define M5ATOMDISPLAY_LOGICAL_WIDTH 1280
 #endif
 #ifndef M5ATOMDISPLAY_LOGICAL_HEIGHT
 #define M5ATOMDISPLAY_LOGICAL_HEIGHT 720
 #endif
 #ifndef M5ATOMDISPLAY_REFRESH_RATE
-#define M5ATOMDISPLAY_REFRESH_RATE 60.0f
+#define M5ATOMDISPLAY_REFRESH_RATE 0.0f
 #endif
 #ifndef M5ATOMDISPLAY_OUTPUT_WIDTH
 #define M5ATOMDISPLAY_OUTPUT_WIDTH 0
@@ -43,8 +43,6 @@ class M5AtomDisplay : public lgfx::LGFX_Device
 
 public:
 
-  m5gfx::board_t getBoard(void) const { return m5gfx::board_t::board_M5AtomDisplay; }
-
   M5AtomDisplay( uint16_t logical_width  = M5ATOMDISPLAY_LOGICAL_WIDTH
                , uint16_t logical_height = M5ATOMDISPLAY_LOGICAL_HEIGHT
                , float refresh_rate      = M5ATOMDISPLAY_REFRESH_RATE
@@ -54,8 +52,7 @@ class M5AtomDisplay : public lgfx::LGFX_Device
                , uint_fast8_t scale_h    = M5ATOMDISPLAY_SCALE_H
                )
   {
-#if defined (CONFIG_IDF_TARGET_ESP32)
-
+#if !defined (CONFIG_IDF_TARGET) || defined (CONFIG_IDF_TARGET_ESP32)
     static constexpr int i2c_port =  1;
     static constexpr int i2c_sda  = 25;
     static constexpr int i2c_scl  = 21;
@@ -67,6 +64,7 @@ class M5AtomDisplay : public lgfx::LGFX_Device
                  ? 23  // for ATOM Lite / Matrix
                  : 5   // for ATOM PSRAM
                  ;
+
     {
       auto cfg = _bus_instance.config();
       cfg.freq_write = 80000000;
@@ -99,99 +97,45 @@ class M5AtomDisplay : public lgfx::LGFX_Device
     }
 
     {
-      static constexpr int SCALE_MAX = 16;
-      static constexpr int RANGE_MAX = 2048;
-
-      if (refresh_rate < 8.0f) { refresh_rate = 8.0f; }
-      if (refresh_rate > 256.0f) { refresh_rate = 256.0f; }
-
-      if (output_width)
-      {
-        if (output_width  > RANGE_MAX) { output_width  = RANGE_MAX; }
-        if (logical_width > output_width) { logical_width = output_width; }
-      }
-      if (output_height)
-      {
-        if (output_height > RANGE_MAX) { output_height = RANGE_MAX; }
-        if (logical_height > output_height) { logical_height = output_height; }
-      }
-
-      if (logical_width == 0)
-      {
-        if (logical_height == 0)
-        {
-          logical_width  = 1280;
-          logical_height = 720;
-        }
-        else
-        {
-          logical_width = (logical_height << 4) / 9;
-        }
-      }
-      else
-      if (logical_height == 0)
-      {
-        logical_height = (logical_width * 9) >> 4;
-      }
-      if (logical_width  > RANGE_MAX) { logical_width  = RANGE_MAX; }
-      if (logical_height > RANGE_MAX) { logical_height = RANGE_MAX; }
-
-      int limit = 55296000 / refresh_rate;
-
-      if (output_width == 0 && output_height == 0 && scale_w == 0 && scale_h == 0)
-      {
-        scale_w = 1;
-        scale_h = 1;
-        for (int scale = 2; scale <= SCALE_MAX; ++scale)
-        {
-          uint32_t scale_height = scale * logical_height;
-          uint32_t scale_width = scale * logical_width;
-          uint32_t total = scale_width * scale_height;
-          if (scale_width > 1920 || scale_height > 1920 || total > limit) { break; }
-          scale_w = scale;
-          scale_h = scale;
-        }
-        output_width  = scale_w * logical_width;
-        output_height = scale_h * logical_height;
-        if (output_height & 1) { output_height++; }
-        if ((output_width & 1) && (scale_w & 1)) { output_width += scale_w; }
-      }
-      else
-      {
-        if (scale_h == 0)
-        {
-          scale_h = output_height / logical_height;
-        }
-        if (scale_h > SCALE_MAX) { scale_h = SCALE_MAX; }
-        while (logical_height * scale_h > output_height) { --scale_h; }
-
-        if (scale_w == 0)
-        {
-          scale_w = output_width  / logical_width;
-        }
-        uint32_t w = output_width / scale_w;
-        while (scale_w > SCALE_MAX || w * scale_w != output_width || logical_width * scale_w > output_width)
-        {
-          w = output_width / --scale_w;
-        }
-      }
-
       auto cfg = _panel_instance.config();
-      cfg.memory_width     = output_width  ;
-      cfg.memory_height    = output_height ;
-      cfg.panel_width      = logical_width ;
-      cfg.panel_height     = logical_height;
-      cfg.offset_x         = (output_width  / scale_w - logical_width ) >> 1;
-      cfg.offset_y         = (output_height / scale_h - logical_height) >> 1;
-      cfg.offset_rotation  = 0;
-      cfg.pin_cs       = spi_cs;
+      cfg.pin_cs     = spi_cs;
       cfg.readable   = false;
       cfg.bus_shared = false;
-
-      _panel_instance.config(cfg, scale_w, scale_h, refresh_rate);
+      _panel_instance.config(cfg);
     }
-    setPanel(&_panel_instance);
 #endif
+    lgfx::Panel_M5HDMI::config_resolution_t cfg_reso;
+    cfg_reso.logical_width  = logical_width;
+    cfg_reso.logical_height = logical_height;
+    cfg_reso.refresh_rate   = refresh_rate;
+    cfg_reso.output_width   = output_width;
+    cfg_reso.output_height  = output_height;
+    cfg_reso.scale_w        = scale_w;
+    cfg_reso.scale_h        = scale_h;
+    _panel_instance.config_resolution(cfg_reso);
+
+    setPanel(&_panel_instance);
+    _board = lgfx::board_t::board_M5AtomDisplay;
+  }
+
+  bool setResolution( uint16_t logical_width  = M5ATOMDISPLAY_LOGICAL_WIDTH
+                    , uint16_t logical_height = M5ATOMDISPLAY_LOGICAL_HEIGHT
+                    , float refresh_rate      = M5ATOMDISPLAY_REFRESH_RATE
+                    , uint16_t output_width   = M5ATOMDISPLAY_OUTPUT_WIDTH
+                    , uint16_t output_height  = M5ATOMDISPLAY_OUTPUT_HEIGHT
+                    , uint_fast8_t scale_w    = M5ATOMDISPLAY_SCALE_W
+                    , uint_fast8_t scale_h    = M5ATOMDISPLAY_SCALE_H
+                    )
+  {
+    return _panel_instance.setResolution
+      ( logical_width
+      , logical_height
+      , refresh_rate
+      , output_width
+      , output_height
+      , scale_w
+      , scale_h
+      );
   }
 };
 

src/M5GFX.h

@@ -132,37 +132,6 @@ namespace m5gfx
     static constexpr int TFT_SLPOUT  = 0x11;
   }
 
-  namespace boards
-  {
-    enum board_t
-    { board_unknown
-    , board_Non_Panel
-    , board_M5Stack
-    , board_M5StackCore2
-    , board_M5StickC
-    , board_M5StickCPlus
-    , board_M5StackCoreInk
-    , board_M5Paper
-    , board_M5Tough
-    , board_M5Station
-
-/// non display boards 
-    , board_M5Atom
-    , board_M5ATOM = board_M5Atom
-    , board_M5Camera
-    , board_M5TimerCam
-    , board_M5StampPico
-    , board_M5StampC3
-
-/// external displays
-    , board_M5AtomDisplay
-    , board_M5ATOMDisplay = board_M5AtomDisplay
-    , board_M5UnitLCD
-    , board_M5UnitOLED
-    };
-  }
-  using board_t = boards::board_t;
-
   class M5GFX : public lgfx::LGFX_Device
   {
   friend m5::M5Unified;
@@ -181,7 +150,6 @@ namespace m5gfx
     lgfx::Panel_Device* _panel_last;
     lgfx::ILight* _light_last;
     lgfx::ITouch* _touch_last;
-    board_t _board;
     std::vector<DisplayState> _displayStateStack;
 
     bool init_impl(bool use_reset, bool use_clear) override;
@@ -200,8 +168,6 @@ namespace m5gfx
 
     static M5GFX* getInstance(void) { return _instance; }
 
-    inline board_t getBoard(void) const { return _board; }
-
     void clearDisplay(int32_t color = TFT_BLACK) { fillScreen(color); }
     void progressBar(int x, int y, int w, int h, uint8_t val);
     void pushState(void);
@@ -218,6 +184,32 @@ namespace m5gfx
     {
       pushImage(x, y, w, h, (const rgb565_t*)data, transparent);
     }
+
+    bool setResolution( uint16_t logical_width  = 0
+                      , uint16_t logical_height = 0
+                      , float refresh_rate      = 0
+                      , uint16_t output_width   = 0
+                      , uint16_t output_height  = 0
+                      , uint_fast8_t scale_w    = 0
+                      , uint_fast8_t scale_h    = 0
+                      )
+    {
+#ifdef __M5GFX_M5ATOMDISPLAY__
+      if (getBoard() == board_t::board_M5AtomDisplay)
+      {
+        return ((Panel_M5HDMI*)panel())->setResolution
+          ( logical_width
+          , logical_height
+          , refresh_rate
+          , output_width
+          , output_height
+          , scale_w
+          , scale_h
+          );
+      }
+#endif
+      return false;
+    }
   };