Merge pull request #18 from m5stack/develop

0.0.9

Author: lovyan03

CMakeLists.txt

@@ -0,0 +1,20 @@
+set(COMPONENT_ADD_INCLUDEDIRS
+    src
+    )
+file(GLOB SRCS
+     src/*.cpp
+     src/lgfx/Fonts/efont/*.c
+     src/lgfx/Fonts/IPA/*.c
+     src/lgfx/utility/*.c
+     src/lgfx/v1/*.cpp
+     src/lgfx/v1/misc/*.cpp
+     src/lgfx/v1/panel/*.cpp
+     src/lgfx/v1/platforms/esp32/*.cpp
+     src/lgfx/v1/platforms/esp32c3/*.cpp
+     src/lgfx/v1/touch/*.cpp
+     )
+set(COMPONENT_SRCS ${SRCS})
+set(COMPONENT_REQUIRES nvs_flash efuse)
+
+register_component()
+

README.md

@@ -2,6 +2,12 @@
 
 Graphics library for M5Stack series  
 
+Support framework  
+----------------
+- ESP-IDF
+- Arduino for ESP32
+
+
 Support device  
 ----------------
 - M5Stack ( Basic / Gray / GO / Fire )
@@ -11,9 +17,10 @@ Support device
 - M5Stick C Plus
 - M5Paper
 - M5Tough
-
-- M5UnitOLED
-- M5UnitLCD
+- M5Station
+- UnitOLED
+- UnitLCD
+- [AtomDisplay](docs/ATOMDisplay.md)
 
 
 License

component.mk

@@ -0,0 +1,7 @@
+#
+# Main Makefile. This is basically the same as a component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
+
+COMPONENT_SRCDIRS := src 
+COMPONENT_ADD_INCLUDEDIRS := src

docs/ATOMDisplay.md

@@ -0,0 +1,122 @@
+# ATOM Display library
+
+
+![M5Stack ATOM Display](https://static-cdn.m5stack.com/resource/docs/static/assets/img/product_pics/atom_base/atom_display/atom_display_01.webp "ATOM Display")
+
+
+### Notes.
+- The HDMI output resolution is fixed at 1280x720 60Hz.  
+- If the image does not appear, reinsert the USB cable and wait a few seconds.  
+- Audio output function is not included.  
+- When inserting or removing the USB cable, please hold the ATOM itself. Repeatedly inserting and removing the USB cable while holding the docking base side may cause stress on the pin headers and result in poor contact.  
+
+### 注意事項  
+- HDMIの出力解像度は 1280x720 60Hz 固定です。  
+- 音声出力機能は含まれません。  
+- 画像が表示されない場合はUSBケーブルを挿し直し、数秒待機してください。  
+- USBケーブルを挿抜する際はATOM本体を保持してください。ドッキングベース側を保持した状態でUSB挿抜を行うと、ピンヘッダに応力が掛かり接触不良を引き起こす可能性があります。  
+
+
+Sample Code:
+```
+#include <M5AtomDisplay.h>
+
+// Create an instance of M5AtomDisplay
+// Set the resolution in the argument (width, height).  default : 1280, 720.
+// M5AtomDisplay のインスタンスを用意
+// 引数で解像度(幅,高さ)を設定できます。 省略時は 1280, 720
+
+M5AtomDisplay display ( 640, 360 );
+
+// ※ By lowering the resolution, you can enlarge the image.
+//    If the resolution after enlargement is less than 1280x720
+//    , there will be a gap around the periphery.
+// ※ 解像度を下げることで、拡大表示することができます。
+//    拡大後の解像度が1280x720に満たない場合は外周に隙間が生じます。
+// width scale:
+// ~ 1280 = x1
+// ~ 640  = x2
+// ~ 320  = x4
+// ~ 256  = x5
+// ~ 160  = x8
+
+// height scale:
+// ~ 720 = x1
+// ~ 360 = x2
+// ~ 240 = x3
+// ~ 180 = x4
+// ~ 144 = x5
+// ~ 120 = x6
+// ~ 102 = x7
+// ~  90 = x8
+
+
+void setup(void)
+{
+// initialize
+// 初期化
+  display.init();
+
+// Set the display orientation
+// ディスプレイの向きを設定
+// 0 = normal / 1 = 90 deg / 2 = 180 deg / 3 = 270 deg / 4~7 = upside down
+  display.setRotation(0);
+
+// Set the color depth ( bpp )
+// 色深度を設定
+  display.setColorDepth(24);  // 24bit per pixel color setting
+//display.setColorDepth(16);  // 16bit per pixel color setting ( default )
+//display.setColorDepth( 8);  //  8bit per pixel color setting
+
+  display.startWrite();
+  for (int y = 0; y < display.height(); ++y)
+  {
+    for (int x = 0; x < display.width(); ++x)
+    {
+      display.writePixel(x, y, display.color888(x, x+y, y));
+    }
+  }
+  display.endWrite();
+
+  for (int i = 0; i < 16; ++i)
+  {
+    int x = rand() % display.width();
+    int y = rand() % display.height();
+    display.drawCircle(x, y, 16, rand());
+  }
+}
+
+void loop(void)
+{
+  display.startWrite();
+
+  static constexpr const char hello_str[] = "Hello ATOM Display !";
+  display.setFont(&fonts::Orbitron_Light_32);
+  for (int i = -display.textWidth(hello_str); i < display.width(); ++i)
+  {
+    display.drawString(hello_str, i, (display.height() - display.fontHeight()) >> 1);
+  }
+
+  display.endWrite();
+}
+```
+
+
+#### Is PSRAM required ?  can I use it with ATOM Lite or ATOM Matrix?  
+- PSRAM is NOT required. it will work with ATOM Lite and ATOM Matrix. The label on the product that says "FOR ATOM PSRAM ONLY" is incorrect.  
+- In fact, in the early stages of development, we assumed that we would build a 1280x720 frame buffer in the ESP32's PSRAM and output the images. As the development progressed, the frame buffer was placed on the FPGA side, and in the final product, there was no need to have a frame buffer on the ESP32 side.  
+
+#### What is the difference between ATOM Lite and ATOM PSRAM?  
+- ATOM Lite has ESP32 PICO-D4,  ATOM PSRAM has ESP32 PICO-V3-02.  
+- Some of the pins on the back are different. The ATOM PSRAM has a G5 pin where the ATOM Lite had a G23 pin, but the G23 pin is gone.  
+
+
+
+#### PSRAMは必須ですか？ATOM LiteやATOM Matrixで使えますか？  
+- PSRAMは必須ではありません。ATOM LiteやATOM Matrixでも動作します。製品のラベルに記載されている "FOR ATOM PSRAM ONLY" という表記は誤りです。  
+- 実は開発初期段階では、ESP32のPSRAMに1280x720のフレームバッファを構築して画像を出力する想定でした。開発が進むにつれ、フレームバッファはFPGA側に持つようになり、最終製品ではにESP32側でフレームバッファを持つ必要がなくなりました。  
+
+#### ATOM LiteとATOM PSRAMの違いは？  
+- ATOM Liteには ESP32 PICO D4が搭載されています。ATOM PSRAMには ESP32 PICO V3-02 が搭載されています。 
+- 背面のピンが一部違います。ATOM Liteの G23 が配置されていた箇所には、 ATOM PSRAM では G5 が配置されています。G23は無くなっているため、注意が必要です。  
+

examples/Basic/AnalogMeter/AnalogMeter.ino

@@ -12,6 +12,9 @@ M5GFX display;
 //M5UnitLCD display;  // default setting
 //M5UnitLCD display  ( 21, 22, 400000 ); // SDA, SCL, FREQ
 
+//#include <M5AtomDisplay.h>
+//M5AtomDisplay display;
+
 
 static constexpr float deg_to_rad = 0.017453292519943295769236907684886;
 static constexpr int TFT_GREY = 0x5AEB;

examples/Basic/BarGraph/BarGraph.ino

@@ -0,0 +1,99 @@
+
+#include <M5GFX.h>
+M5GFX display;
+
+//#include <M5UnitOLED.h>
+//M5UnitOLED display; // default setting
+//M5UnitOLED display ( 21, 22, 400000 ); // SDA, SCL, FREQ
+
+//#include <M5UnitLCD.h>
+//M5UnitLCD display;  // default setting
+//M5UnitLCD display  ( 21, 22, 400000 ); // SDA, SCL, FREQ
+
+// #include <M5AtomDisplay.h>
+// M5AtomDisplay display;
+
+static constexpr size_t BAR_COUNT = 64;
+static int max_y[BAR_COUNT];
+static int prev_y[BAR_COUNT];
+static uint32_t colors[BAR_COUNT];
+
+void setup(void)
+{
+  display.init();
+  display.startWrite();
+  display.fillScreen(TFT_BLACK);
+
+  if (display.isEPD())
+  {
+    display.setEpdMode(epd_mode_t::epd_fastest);
+  }
+  if (display.width() < display.height())
+  {
+    display.setRotation(display.getRotation() ^ 1);
+  }
+
+  for (int x = 0; x < BAR_COUNT; ++x)
+  {
+    prev_y[x] = display.height();
+    max_y[x] = display.height();
+    int r=0,g=0,b=0;
+    switch (x >> 4)
+    {
+    case 0:
+      b = 255;
+      g = x*0x11;
+      break;
+    case 1:
+      b = 255 - (x&15)*0x11;
+      g = 255;
+      break;
+    case 2:
+      g = 255;
+      r = (x&15)*0x11;
+      break;
+    case 3:
+      r = 255;
+      g = 255 - (x&15)*0x11;
+      break;
+    }
+    colors[x] = display.color888(r,g,b);
+  }
+}
+
+void loop(void)
+{
+  int h = display.height();
+
+  static int i;
+  ++i;
+  display.waitDisplay();
+  for (int x = 0; x < BAR_COUNT; ++x)
+  {
+    int y = (h>>1) - (sinf((float)((x-24)*i) / 3210.0f) + sinf((float)((x-40)*i) / 1234.0f)) * (h>>2);
+
+    int xpos = x * display.width() / BAR_COUNT;
+    int w = ((x+1) * display.width() / BAR_COUNT) - xpos - 1;
+    if (max_y[x]+1 >= y) { max_y[x] = y-1; }
+    else
+    {
+      if ((i & 3) ==0 )
+      {
+        display.fillRect(xpos, max_y[x]-3, w, 1, TFT_BLACK);
+        max_y[x]++;
+      }
+    }
+    display.fillRect(xpos, max_y[x]-3, w, 3, TFT_WHITE);
+    if (prev_y[x] < y)
+    {
+      display.fillRect(xpos, prev_y[x], w, y - prev_y[x], TFT_BLACK);
+    }
+    else
+    {
+      display.fillRect(xpos, y, w, prev_y[x] - y, colors[x]);
+    }
+    prev_y[x] = y;
+  }
+  display.display();
+}
+

examples/Basic/GameOfLife/GameOfLife.ino

@@ -15,11 +15,15 @@ M5GFX display;
 //M5UnitLCD display;  // default setting
 //M5UnitLCD display  ( 21, 22, 400000 ); // SDA, SCL, FREQ
 
+//#include <M5AtomDisplay.h>
+//M5AtomDisplay display;
+
 M5Canvas canvas[2];
 
 void setup(void)
 {
   display.begin();
+  display.setColorDepth(8);
   display.setEpdMode(epd_mode_t::epd_fastest);
 
   if (display.width() < display.height())
@@ -28,10 +32,24 @@ void setup(void)
     display.setPivot(display.width() /2 -0.5, display.height() /2 - 0.5);
   }
 
+  int z = 0;
+  int width;
+  do
+  {
+    width = display.width() / ++z;
+  } while (width > 192);
+
+  z = 0;
+  int height;
+  do
+  {
+    height = display.height() / ++z;
+  } while (height > 160);
+
   for (int i = 0; i < 2; i++)
   {
     canvas[i].setColorDepth(8);
-    canvas[i].createSprite(std::min(192, display.width()>>1), std::min(160, display.height()>>1));
+    canvas[i].createSprite(width, height);
     canvas[i].createPalette();
     canvas[i].setPaletteColor(1, TFT_WHITE);
     canvas[i].setPivot(canvas[i].width() /2 -0.5, canvas[i].height() /2 - 0.5);
@@ -42,14 +60,17 @@ void setup(void)
   canvas[0].setTextDatum(textdatum_t::top_center);
   canvas[0].drawString("Game of Life", canvas[0].width() >> 1, canvas[0].height() >> 1);
   canvas[0].pushRotateZoom(&display, 0,  (float)display.width() / canvas[0].width(), (float)display.height() / canvas[0].height());
-  delay(1000);
+  delay(2000);
+  display.clear();
 }
 
 void loop(void)
 {
   bool flip = false;
   int width = canvas[flip].width();
   int height = canvas[flip].height();
+  int xz = display.width() / width;
+  int yz = display.height() / height;
 
   int y = 1;
   do
@@ -62,6 +83,7 @@ void loop(void)
   } while (++y < height - 1);
 
   int diff;
+  display.startWrite();
   do
   {
     flip = !flip;
@@ -101,12 +123,15 @@ void loop(void)
         bool flg = (neighbors == 3) || (neighbors == 2 && old_buf[idx]);
         if (flg != new_buf[idx])
         {
+          display.fillRect(x * xz, y * yz, xz, yz, flg ? TFT_WHITE : TFT_BLACK);
           new_buf[idx] = flg;
           ++diff;
         }
       } while (nx);
     } while (ny);
 
-    canvas[flip].pushRotateZoom(&display, 0,  (float)display.width() / width, (float)display.height() / height);
+    display.display();
+    // canvas[flip].pushRotateZoom(&display, 0,  (float)display.width() / width, (float)display.height() / height);
   } while (diff);
+  display.endWrite();
 }