Solo1

* Support extern Ethernet (#60)

see espressif/arduino-esp32#6318

* Revert "Support extern Ethernet (#60)" (#61)

This reverts commit 8c5ac76.

* Fix missing BLE 4.2 from ESP32-S3

* Allow selecting Arduino branch based on the current lib-builder branch

* For CI builds get branch from env

* dump env

* Update update-components.sh

* Update update-components.sh

* Add support for CPP exceptions for C3

Fixes: espressif/arduino-esp32#6187

* Script improvements, rainmaker and esp-sr

* Optimized for Tasmota

* Update build.sh

* Update config.sh

* Update install-esp-idf.sh

* AR_BRANCH="master"

* Update push.yml

* Update defconfig.esp32s3

* Update defconfig.esp32s2

* space in path fix

* fix space in path

* Update install-esp-idf.sh

* Update README.md

* esp littlesfs broken going back to commit 4ee58815

* lfn

* lfn

* lfn

* lfn

* use actual littlefs

* esp_littlefs commit 4ee58815093

* Update config.sh

* use latest littlefs

* AR_BRANCH="work"

* IDF branch v4.4_work

* Update push.yml

* Update defconfig.esp32

* Update fb_gfx.h

* Update fb_gfx.c

* IDF_BRANCH="v4.4.1"

* Update push.yml

Co-authored-by: me-no-dev <[email protected]>

Author: Jason2866

.github/workflows/push.yml

@@ -1,4 +1,4 @@
-name: ESP32 Arduino solo1 builder
+name: ESP32 builder solo1 v4.4.1
 
 on:
   workflow_dispatch:  # Manually start a workflow

components/fb_gfx/fb_gfx.c

@@ -38,17 +38,24 @@ typedef struct { // Data stored for FONT AS A WHOLE:
 
 void fb_gfx_fillRect(fb_data_t *fb, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color)
 {
-    int32_t line_step = (fb->width - w) * 3;
-    uint8_t *data = fb->data + ((x + (y * fb->width)) * 3);
+    int32_t line_step = (fb->width - w) * fb->bytes_per_pixel;
+    uint8_t *data = fb->data + ((x + (y * fb->width)) * fb->bytes_per_pixel);
     uint8_t c0 = color >> 16;
     uint8_t c1 = color >> 8;
     uint8_t c2 = color;
     for (int i=0; i<h; i++){
         for (int j=0; j<w; j++){
-            data[0] = c0;
-            data[1] = c1;
-            data[2] = c2;
-            data+=3;
+            if(fb->bytes_per_pixel == 2){
+                data[0] = c1;
+                data[1] = c2;
+            } else if(fb->bytes_per_pixel == 1){
+                data[0] = c2;
+            } else {
+                data[0] = c0;
+                data[1] = c1;
+                data[2] = c2;
+            }
+            data+=fb->bytes_per_pixel;
         }
         data += line_step;
     }

components/fb_gfx/include/fb_gfx.h

@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
     typedef enum {
-        FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565
+        FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565, FB_GRAY
     } fb_format_t;
 
     typedef struct {

configs/defconfig.esp32

@@ -27,7 +27,6 @@ CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_MEMTEST is not set
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
-CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
 CONFIG_ESP32_XTAL_FREQ_AUTO=y
 CONFIG_ETH_SPI_ETHERNET_DM9051=y

tools/config.sh

@@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then
 fi
 
 if [ -z $IDF_BRANCH ]; then
-	IDF_BRANCH="v4.4_dev"
+	IDF_BRANCH="v4.4.1"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
@@ -118,4 +118,3 @@ function git_create_pr(){ # git_create_pr <branch> <title>
 	local done_pr=`echo "$git_create_pr_res" | jq -r '.title'`
 	if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi
 }
-