Merge pull request #20 from m5stack/develop

0.0.11

Author: lovyan03

library.json

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

library.properties

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

src/M5AtomDisplay.h

@@ -67,8 +67,19 @@ class M5AtomDisplay : public lgfx::LGFX_Device
     }
 
     {
-      static constexpr int X_SCALE_MAX = 16;
-      static constexpr int Y_SCALE_MAX = 16;
+      static constexpr int SCALE_MAX = 16;
+
+      if (output_width)
+      {
+        if (output_width  > 1920) { output_width  = 1920; }
+        if (logical_width > output_width) { logical_width = output_width; }
+      }
+      if (output_height)
+      {
+        if (output_height > 1920) { output_height = 1920; }
+        if (logical_height > output_height) { logical_height = output_height; }
+      }
+
       if (logical_width == 0)
       {
         if (logical_height == 0)
@@ -91,62 +102,33 @@ class M5AtomDisplay : public lgfx::LGFX_Device
       {
         x_scale = 1;
         y_scale = 1;
-        uint32_t prev_total = 0;
-        float prev_aspect = INT_MAX;
-        for (int ys = 1; ys <= Y_SCALE_MAX; ++ys)
+        for (int scale = 2; scale <= SCALE_MAX; ++scale)
         {
-          uint32_t scale_height = ys * logical_height;
-          if (scale_height > 1920)
-          {
-            break;
-          }
-          for (int xs = 1; xs <= X_SCALE_MAX; ++xs)
-          {
-            uint32_t scale_width = xs * logical_width;
-            if (scale_width > 1920)
-            {
-              break;
-            }
-            uint32_t total = scale_width * scale_height;
-            if (total <= 384000 || total > 1024000) continue;
-            float aspect = fabsf(1.67f - (float)scale_width / scale_height);
-            if (prev_total < total && prev_aspect >= aspect )
-            {
-              prev_total = total;
-              prev_aspect = aspect + 0.001f;
-              x_scale = xs;
-              y_scale = ys;
-            }
-          }
+          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 >= 1024000) { break; }
+          x_scale = scale;
+          y_scale = scale;
         }
         output_width  = x_scale * logical_width;
         output_height = y_scale * logical_height;
       }
       else
       {
-        if (output_width)
-        {
-          if (output_width  > 1920) { output_width  = 1920; }
-          if (logical_width > output_width) { logical_width > output_width; }
-        }
-        if (output_height)
-        {
-          if (output_height > 1920) { output_height = 1920; }
-          if (logical_height > output_height) { logical_height > output_height; }
-        }
-
         if (y_scale == 0)
         {
           y_scale = output_height / logical_height;
         }
-        if (y_scale > Y_SCALE_MAX) { y_scale = Y_SCALE_MAX; }
+        if (y_scale > SCALE_MAX) { y_scale = SCALE_MAX; }
+        while (logical_height * y_scale > output_height) { --y_scale; }
 
         if (x_scale == 0)
         {
           x_scale = output_width  / logical_width;
         }
         uint32_t w = output_width / x_scale;
-        while (x_scale > X_SCALE_MAX || w * x_scale != output_width)
+        while (x_scale > SCALE_MAX || w * x_scale != output_width || logical_width * x_scale > output_width)
         {
           w = output_width / --x_scale;
         }

src/lgfx/v1/gitTagVersion.h

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