Merge pull request #144 from lovyan03/develop

0.4.2

Author: lovyan03

examples/Sprite/MovingCircles/MovingCircles.ino

@@ -1,5 +1,12 @@
+#define LGFX_USE_V1
 #include <LovyanGFX.hpp>
 
+#define LGFX_AUTODETECT
+#include <LGFX_AUTODETECT.hpp>  // クラス"LGFX"を準備します
+// #include <lgfx_user/LGFX_ESP32_sample.hpp> // またはユーザ自身が用意したLGFXクラスを準備します
+
+static LGFX lcd;
+
 static std::uint32_t sec, psec;
 static std::uint32_t fps = 0, frame_count = 0;
 static std::int32_t lcd_width ;
@@ -37,7 +44,6 @@ struct obj_info_t {
 static constexpr std::uint32_t obj_count = 200;
 static obj_info_t objects[obj_count];
 
-static LGFX lcd;
 static LGFX_Sprite sprites[2];
 static int_fast16_t sprite_height;
 
@@ -104,11 +110,7 @@ void loop(void)
       sprites[flip].setTextColor(TFT_WHITE);
       sprites[flip].printf("obj:%d fps:%d", obj_count, fps);
     }
-    std::uint32_t len = sprite_height * lcd_width;
-    if (y + sprite_height > lcd_height) {
-      len = (lcd_height - y) * lcd_width;
-    }
-    lcd.pushPixelsDMA(sprites[flip].getBuffer(), len);
+    sprites[flip].pushSprite(&lcd, 0, y);
   }
 
   ++frame_count;
@@ -117,7 +119,5 @@ void loop(void)
     psec = sec;
     fps = frame_count;
     frame_count = 0;
-    lcd.setAddrWindow(0, 0, lcd.width(), lcd.height());
   }
 }
-

examples/Sprite/MovingIcons/MovingIcons.ino

@@ -1,5 +1,12 @@
+#define LGFX_USE_V1
 #include <LovyanGFX.hpp>
 
+#define LGFX_AUTODETECT
+#include <LGFX_AUTODETECT.hpp>  // クラス"LGFX"を準備します
+// #include <lgfx_user/LGFX_ESP32_sample.hpp> // またはユーザ自身が用意したLGFXクラスを準備します
+
+static LGFX lcd;
+
 extern const unsigned short info[];
 extern const unsigned short alert[];
 extern const unsigned short closeX[];
@@ -63,7 +70,6 @@ struct obj_info_t {
 static constexpr size_t obj_count = 50;
 static obj_info_t objects[obj_count];
 
-static LGFX lcd;
 static LGFX_Sprite sprites[2];
 static LGFX_Sprite icons[3];
 static int_fast16_t sprite_height;
@@ -144,11 +150,7 @@ void loop(void)
       sprites[flip].setTextColor(0xFFFFFFU);
       sprites[flip].printf("obj:%d  fps:%d", obj_count, fps);
     }
-    size_t len = sprite_height * lcd_width;
-    if (y + sprite_height > lcd_height) {
-      len = (lcd_height - y) * lcd_width;
-    }
-    lcd.pushPixelsDMA(sprites[flip].getBuffer(), len);
+    sprites[flip].pushSprite(&lcd, 0, y);
   }
 
   ++frame_count;
@@ -157,7 +159,6 @@ void loop(void)
     psec = sec;
     fps = frame_count;
     frame_count = 0;
-    lcd.setAddrWindow(0, 0, lcd.width(), lcd.height());
   }
 }
 
@@ -261,4 +262,4 @@ constexpr unsigned short closeX[1024] ={
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4800,0xA800,0xB0C3,0xA0A2,0x9800,0x9800,0x9800,0x9800,0xA000,0xA000,0xA000,0x9800,0x9800,0x9800,0xA082,0xB0E3,0xA800,0x4800,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 28, 928 pixels
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x5800,0xA800,0xB0A2,0xA8E3,0xA0A2,0xA041,0x9800,0x9800,0xA041,0xA0A2,0xA8E3,0xB0A2,0xA800,0x5800,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 29, 960 pixels
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x3000,0x6000,0x8800,0xA000,0xA800,0xA800,0xA000,0x8800,0x6000,0x3000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // row 30, 992 pixels
-0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000}; // row 31, 1024 pixels
+0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000}; // row 31, 1024 pixels

library.json

@@ -1,7 +1,7 @@
 {
   "name": "LovyanGFX",
-  "description": "TFT LCD Graphics driver with touch for ESP32 and SAMD51",
-  "keywords": "lcd,tft,gfx,lgfx,esp32,m5stack,m5stackcore2,m5stickc,m5stickcplus,odroid-go,ttgo t-watch,ttgo t-wristband,esp-wrover-kit,wioterminal,wifiboy,makepython,hx8357,ili9163,ili9342,ili9341,ili9486,ili9488,st7735,st7789,st7796,ssd1351",
+  "description": "TFT LCD Graphics driver with touch for ESP32, ESP8266, SAMD21, SAMD51",
+  "keywords": "lcd,tft,gfx,lgfx,esp32,esp8266,samd21,samd51,m5stack,m5stackcore2,m5stickc,m5stickcplus,odroid-go,ttgo t-watch,ttgo t-wristband,esp-wrover-kit,wioterminal,wifiboy,makepython,hx8357,ili9163,ili9342,ili9341,ili9486,ili9488,st7735,st7789,st7796,ssd1351",
   "authors": {
     "name": "lovyan03",
     "url": "https://github.com/lovyan03",
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/lovyan03/LovyanGFX.git"
   },
-  "version": "0.4.1",
+  "version": "0.4.2",
   "frameworks": ["arduino", "espidf"],
   "platforms": ["espressif32", "espressif8266", "atmelsam"],
   "build": {

library.properties

@@ -1,9 +1,9 @@
 name=LovyanGFX
-version=0.4.1
+version=0.4.2
 author=lovyan03
 maintainer=lovyan03
-sentence=TFT LCD Graphics driver with touch for ESP32 and SAMD51
-paragraph=Supports TFT LCD displays using drivers that operate with hardware SPI. ESP32, SAMD51(Seeeduino), M5Stack, M5StackCore2, M5StickC, M5StickCPlus, ODROID-GO, TTGO T-Watch, TTGO T-Wristband, ESP-WROVER-KIT, WioTerminal, WiFiBoy, MakePython, HX8357, ILI9163, ILI9342, ILI9341, ILI9486, ILI9488, ST7735, ST7789, ST7796, SSD1351
+sentence=TFT LCD Graphics driver with touch for ESP32, ESP8266, SAMD21, SAMD51
+paragraph=Supports TFT LCD displays using drivers that operate with hardware SPI. ESP32, ESP8266, SAMD21, SAMD51, M5Stack, M5StackCore2, M5StickC, M5StickCPlus, ODROID-GO, TTGO T-Watch, TTGO T-Wristband, ESP-WROVER-KIT, WioTerminal, WiFiBoy, MakePython, HX8357, ILI9163, ILI9342, ILI9341, ILI9486, ILI9488, ST7735, ST7789, ST7796, SSD1351
 category=Display
 url=https://github.com/lovyan03/LovyanGFX
 includes=LovyanGFX.hpp

src/LGFX_TFT_eSPI.hpp

@@ -24,9 +24,9 @@ Original Source:
 
 #include "LovyanGFX.hpp"
 
-using TFT_eSPI = lgfx::LGFX;
+using TFT_eSPI = LGFX;
 
-class TFT_eSprite : public lgfx::LGFX_Sprite {
+class TFT_eSprite : public LGFX_Sprite {
 public:
   TFT_eSprite() : LGFX_Sprite() { _psram = true; }
   TFT_eSprite(LovyanGFX* parent) : LGFX_Sprite(parent) { _psram = true; }

src/LovyanGFX.hpp

@@ -22,12 +22,6 @@ Original Source:
 #ifndef LOVYANGFX_HPP_
 #define LOVYANGFX_HPP_
 
-#ifdef min
-#undef min
-#endif
-#ifdef max
-#undef max
-#endif
 #ifdef setFont
 #undef setFont
 #endif

src/lgfx/internal/algorithm.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#if defined ( CONFIG_ARCH_BOARD_SPRESENSE )
+  #include <Arduino.h>
+  #include <stdio.h>
+  #include <stdlib.h>
+  #ifdef atof
+  #undef atof
+  #endif
+  #ifdef atoi
+  #undef atoi
+  #endif
+  #ifdef atol
+  #undef atol
+  #endif
+  __attribute__((weak)) float atof(const char* nptr) { return strtod((nptr), NULL); }
+  __attribute__((weak)) int atoi(const char* nptr) { return (int)strtol((nptr), NULL, 10); }
+  __attribute__((weak)) long atol(const char* nptr) { return strtol((nptr), NULL, 10); }
+  __attribute__((weak)) int	mblen(const char*, size_t) { return 0; }
+  __attribute__((weak)) size_t mbstowcs(wchar_t*, const char*, size_t) { return 0; }
+  __attribute__((weak)) int	mbtowc(wchar_t*, const char*, size_t) { return 0; }
+  __attribute__((weak)) size_t wcstombs(char*, const wchar_t*, size_t) { return 0; }
+  __attribute__((weak)) int wctomb(char*, wchar_t) { return 0; }
+
+  #ifdef max
+  #undef max
+  #endif
+
+  #ifdef min
+  #undef min
+  #endif
+
+#endif
+#include <algorithm>

src/lgfx/internal/limits.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#if defined ( CONFIG_ARCH_BOARD_SPRESENSE )
+  #ifdef max
+  #undef max
+  #endif
+
+  #ifdef min
+  #undef min
+  #endif
+
+#endif
+#include <limits>

src/lgfx/internal/memory.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#if defined ( CONFIG_ARCH_BOARD_SPRESENSE )
+  #include <stdint.h>
+  #include <stdio.h>
+  #include <wchar.h>
+  __attribute__((weak)) int vfwscanf(void*, const wchar_t *, ...) { return 0; }
+  __attribute__((weak)) int vswscanf(const wchar_t*, const wchar_t *, ...) { return 0; }
+  __attribute__((weak)) int vwscanf(const wchar_t*, ...) { return 0; }
+
+  #define _GLIBCXX_CSTDINT 1
+#endif
+#include <memory>

src/lgfx/utility/lgfx_tjpgd.c

@@ -131,7 +131,9 @@ static inline int32_t BYTECLIP (
 /* Output 4x4 bayer pattern table              */
 /*---------------------------------------------*/
 
+#if JD_BAYER
 static const int_fast8_t Bayer[16] = { 0, 4, 1, 5,-2, 2,-1, 3, 1, 5, 0, 4,-1, 3,-2, 2};
+#endif
 
 
 /*-----------------------------------------------------------------------*/