Merge branch 's3_lcd' into s3_color_implementation

examples/mpd_status/dependencies.lock

@@ -9,7 +9,7 @@ dependencies:
     component_hash: null
     source:
       type: idf
-    version: 5.0.0
-manifest_hash: 9d4dcd3c8f27cde5e52f2fba13d202ee2deaa3855572295835aeeb508b8b2c24
-target: esp32
+    version: 5.1.1
+manifest_hash: 21c5347826a179bf9c93a91c1012b3240455cc051b9fd4ac05364a0a2dedac7f
+target: esp32s3
 version: 1.0.0

examples/mpd_status/main/main.c

@@ -50,6 +50,8 @@ const int album_cover_y = 100;
 const int queue_x_end = 1500;
 const int queue_y_start = 100;
 
+#define MPD_IP "192.168.69.90"
+
 EpdiyHighlevelState hl;
 
 static bool got_ip = false;
@@ -110,7 +112,7 @@ void handle_error(struct mpd_connection** c) {
 }
 
 void epd_task() {
-    epd_init(&DEMO_BOARD, &ED097TC2, EPD_LUT_1K);
+    epd_init(&DEMO_BOARD, &ED097TC2, EPD_OPTIONS_DEFAULT);
     // Set VCOM for boards that allow to set this in software (in mV).
     // This will print an error if unsupported. In this case,
     // set VCOM using the hardware potentiometer and delete this line.
@@ -179,7 +181,7 @@ void epd_task() {
     while (true) {
         // connect / reconnect
         if (mpd_conn == NULL) {
-            mpd_conn = mpd_connection_new("192.168.42.50", 6600, 3000);
+            mpd_conn = mpd_connection_new(MPD_IP, 6600, 3000);
             handle_error(&mpd_conn);
             int i;
             printf("mpd server version: ");

examples/mpd_status/partitions.csv

@@ -0,0 +1,5 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 1950K,

examples/mpd_status/sdkconfig.defaults.esp32

@@ -124,11 +124,11 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # Partition Table
 #
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
+# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
-# CONFIG_PARTITION_TABLE_CUSTOM is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp_large.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

examples/mpd_status/sdkconfig.defaults.esp32s3

@@ -134,11 +134,11 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # Partition Table
 #
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
+# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
-# CONFIG_PARTITION_TABLE_CUSTOM is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp_large.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

examples/terminal/main/main.c

@@ -18,7 +18,6 @@
 #include "freertos/task.h"
 
 #include "epdiy.h"
-#include "soc/clk_tree_defs.h"
 #include "st.h"
 
 // choose the default demo board depending on the architecture

examples/terminal/main/st.c

@@ -2767,8 +2767,7 @@ static void draw_mask(EpdRect area, uint8_t* mask, bool* dirtyness) {
     enum EpdDrawMode mode = MODE_PACKING_8PPB | MODE_EPDIY_MONOCHROME | PREVIOUSLY_WHITE;
 
     enum EpdDrawError err = epd_draw_base(
-        epd_full_screen(), mask, area, mode,
-        temperature, dirtyness, EPD_BUILTIN_WAVEFORM
+        epd_full_screen(), mask, area, mode, temperature, dirtyness, EPD_BUILTIN_WAVEFORM
     );
     if (err != EPD_DRAW_SUCCESS) {
         die("EPD draw error: %X\n", err);
@@ -2853,7 +2852,6 @@ void epd_render(void) {
         term.dirty[y] = 0;
     }
 
-
     // wait for rendering completion
     for (int li = 0; li < drawn_lines; li++) {
         xSemaphoreTake(render_lines_done_smphr, portMAX_DELAY);

examples/weather/main/main.ino

@@ -0,0 +1,2 @@
+// weather.cpp is the actual main file,
+// this is just for Arduino to recognize this as a project.

examples/weather/main/weather.cpp

@@ -226,7 +226,7 @@ boolean SetupTime() {
     );                          //(gmtOffset_sec, daylightOffset_sec, ntpServer)
     setenv("TZ", Timezone, 1);  // setenv()adds the "TZ" variable to the environment with a value
                                 // TimeZone, only used if set to 1, 0 means no change
-    tzset();  // Set the TZ environment variable
+    tzset();                    // Set the TZ environment variable
     delay(100);
     bool TimeStatus = UpdateLocalTime();
     return TimeStatus;
@@ -276,8 +276,30 @@ void loop() {
 }
 
 void setup() {
+
+    ESP_LOGW("main", "Hello World!\n");
+
+    heap_caps_print_heap_info(MALLOC_CAP_INTERNAL);
+    heap_caps_print_heap_info(MALLOC_CAP_SPIRAM);
+
+    epd_init(&DEMO_BOARD, &ED097TC2, EPD_LUT_64K);
+    // Set VCOM for boards that allow to set this in software (in mV).
+    // This will print an error if unsupported. In this case,
+    // set VCOM using the hardware potentiometer and delete this line.
+    epd_set_vcom(1560);
+
+    EpdiyHighlevelState hl;
+
+    hl = epd_hl_init(EPD_BUILTIN_WAVEFORM);
+
+    ESP_LOGW("main", "allocating...\n");
+
+    fb = epd_hl_get_framebuffer(&hl);
+
     StartTime = millis();
+
     Serial.begin(115200);
+
     if (StartWiFi() == WL_CONNECTED && SetupTime() == true) {
         // if ((CurrentHour >= WakeupTime && CurrentHour <= SleepTime)) {
         byte Attempts = 1;
@@ -307,57 +329,42 @@ void setup() {
             // drawImage(client);
             DisplayWeather();
             // DisplayTime();
+            //
+            printf("Buffer is prepared.\n");
 
             t1 = Millis();
             int temperature = epd_ambient_temperature();
             if (temperature <= 0)
                 temperature = 25;
-            enum EpdDrawMode mode =
-                (enum EpdDrawMode)(MODE_GC16 | MODE_PACKING_2PPB | PREVIOUSLY_WHITE);
-            epd_draw_base(
-                epd_full_screen(), fb, epd_full_screen(), mode, temperature, NULL,
-                EPD_BUILTIN_WAVEFORM
-            );
+
+            enum EpdDrawError err = epd_hl_update_screen(&hl, MODE_GC16, temperature);
             t2 = Millis();
             epd_poweroff();
 
+            if (err != EPD_DRAW_SUCCESS) {
+                printf("EPD Draw error %X!\n", err);
+            }
+
             // display.display(false); // Full screen update mode
         }
         //}
     }
     BeginSleep();
 }
 
-void epd_task(void* pvParameters) {
-    epd_init(&DEMO_BOARD, &ED097TC2, EPD_LUT_1K);
-    // Set VCOM for boards that allow to set this in software (in mV).
-    // This will print an error if unsupported. In this case,
-    // set VCOM using the hardware potentiometer and delete this line.
-    epd_set_vcom(1560);
-
-    ESP_LOGW("main", "allocating...\n");
-
-    fb = (uint8_t*)heap_caps_malloc(epd_width() * epd_height() / 2, MALLOC_CAP_SPIRAM);
-    memset(fb, 0xFF, epd_width() * epd_height() / 2);
-
-    while (1) {
-        loop();
-    };
-}
-
+#ifndef ARDUINO
 extern "C" {
 void app_main() {
-    ESP_LOGW("main", "Hello World!\n");
-
-    heap_caps_print_heap_info(MALLOC_CAP_INTERNAL);
-    heap_caps_print_heap_info(MALLOC_CAP_SPIRAM);
-
-    xTaskCreatePinnedToCore(&epd_task, "epd task", 10000, NULL, 2, NULL, 1);
 
     initArduino();
     setup();
+
+    while (1) {
+        loop();
+    };
 }
 }
+#endif
 
 void drawImage(WiFiClient& client) {
     getRandomImage(client);

examples/www-image/README.md

@@ -46,7 +46,7 @@ Do not forget to update your WiFi credentials and point it to a proper URL that
 #define ESP_WIFI_SSID     "WIFI NAME"
 #define ESP_WIFI_PASSWORD ""
 // www URL of the JPG image. As default:
-#define IMG_URL ("https://loremflickr.com/"STR(EPD_WIDTH)"/"STR(EPD_HEIGHT))
+#define IMG_URL ("https://loremflickr.com/800/600")
 ```
 
 Progressive JPG images are not supported.

examples/www-image/main/jpgdec-render.cpp

@@ -470,7 +470,7 @@ void wifi_init_sta(void) {
 void app_main() {
     enum EpdInitOptions init_options = EPD_LUT_64K;
 
-    epd_init(&epd_board_v7, &GDEW101C01, EPD_LUT_64K);
+    epd_init(&epd_board_v7, &GDEW101C01, init_options);
     // Set VCOM for boards that allow to set this in software (in mV).
     // This will print an error if unsupported. In this case,
     // set VCOM using the hardware potentiometer and delete this line.

src/displays.c

@@ -76,7 +76,7 @@ const EpdDisplay_t GDEW101C01 = {
     .width = 2232,
     .height = 1680,
     .bus_width = 16,
-    .bus_speed = 8,
+    .bus_speed = 10,
     .default_waveform = &epdiy_GDEW101C01,
     .display_type = DISPLAY_TYPE_GENERIC,
 };

src/epdiy.h

@@ -198,6 +198,11 @@ typedef struct {
   enum EpdFontFlags flags;
 } EpdFontProperties;
 
+#include "epd_board.h"
+#include "epd_display.h"
+#include "epd_highlevel.h"
+#include "epd_board_specific.h"
+
 /** Initialize the ePaper display */
 void epd_init(const EpdBoardDefinition* board, const EpdDisplay_t* display, enum EpdInitOptions options);