Skip to content

Commit 193af35

Browse files
Jason2866me-no-dev
andauthored
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 <hristo@espressif.com>
1 parent 8275b4a commit 193af35

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

.github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ESP32 Arduino solo1 builder
1+
name: ESP32 builder solo1 v4.4.1
22

33
on:
44
workflow_dispatch: # Manually start a workflow

components/fb_gfx/fb_gfx.c

+13-6
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,24 @@ typedef struct { // Data stored for FONT AS A WHOLE:
3838

3939
void fb_gfx_fillRect(fb_data_t *fb, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color)
4040
{
41-
int32_t line_step = (fb->width - w) * 3;
42-
uint8_t *data = fb->data + ((x + (y * fb->width)) * 3);
41+
int32_t line_step = (fb->width - w) * fb->bytes_per_pixel;
42+
uint8_t *data = fb->data + ((x + (y * fb->width)) * fb->bytes_per_pixel);
4343
uint8_t c0 = color >> 16;
4444
uint8_t c1 = color >> 8;
4545
uint8_t c2 = color;
4646
for (int i=0; i<h; i++){
4747
for (int j=0; j<w; j++){
48-
data[0] = c0;
49-
data[1] = c1;
50-
data[2] = c2;
51-
data+=3;
48+
if(fb->bytes_per_pixel == 2){
49+
data[0] = c1;
50+
data[1] = c2;
51+
} else if(fb->bytes_per_pixel == 1){
52+
data[0] = c2;
53+
} else {
54+
data[0] = c0;
55+
data[1] = c1;
56+
data[2] = c2;
57+
}
58+
data+=fb->bytes_per_pixel;
5259
}
5360
data += line_step;
5461
}

components/fb_gfx/include/fb_gfx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ extern "C" {
1919
#endif
2020

2121
typedef enum {
22-
FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565
22+
FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565, FB_GRAY
2323
} fb_format_t;
2424

2525
typedef struct {

configs/defconfig.esp32

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ CONFIG_SPIRAM_BOOT_INIT=y
2727
# CONFIG_SPIRAM_MEMTEST is not set
2828
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
2929
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
30-
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
3130
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
3231
CONFIG_ESP32_XTAL_FREQ_AUTO=y
3332
CONFIG_ETH_SPI_ETHERNET_DM9051=y

tools/config.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then
66
fi
77

88
if [ -z $IDF_BRANCH ]; then
9-
IDF_BRANCH="v4.4_dev"
9+
IDF_BRANCH="v4.4.1"
1010
fi
1111

1212
if [ -z $AR_PR_TARGET_BRANCH ]; then
@@ -118,4 +118,3 @@ function git_create_pr(){ # git_create_pr <branch> <title>
118118
local done_pr=`echo "$git_create_pr_res" | jq -r '.title'`
119119
if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi
120120
}
121-

0 commit comments

Comments
 (0)