Skip to content

Commit 71f85c5

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
authored
Merge branch 'master' into NVS_Flash_CI_test
2 parents 887f4d6 + e55a1be commit 71f85c5

File tree

9 files changed

+133
-56
lines changed

9 files changed

+133
-56
lines changed

‎boards.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ esp32s3box.build.flash_mode=dio
10961096
esp32s3box.build.boot=qio
10971097
esp32s3box.build.partitions=default
10981098
esp32s3box.build.defines=-DBOARD_HAS_PSRAM
1099-
esp32s3box.build.memory_type=qspi_opi
1099+
esp32s3box.build.memory_type=qio_opi
11001100
esp32s3box.build.loop_core=-DARDUINO_RUNNING_CORE=1
11011101
esp32s3box.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
11021102

@@ -1207,7 +1207,7 @@ esp32s3usbotg.build.flash_mode=dio
12071207
esp32s3usbotg.build.boot=qio
12081208
esp32s3usbotg.build.partitions=default
12091209
esp32s3usbotg.build.defines=
1210-
esp32s3usbotg.build.memory_type=qspi_qspi
1210+
esp32s3usbotg.build.memory_type=qio_qspi
12111211
esp32s3usbotg.build.loop_core=-DARDUINO_RUNNING_CORE=1
12121212
esp32s3usbotg.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
12131213

@@ -2290,9 +2290,9 @@ tinys3.build.partitions=default
22902290
tinys3.build.defines=
22912291
tinys3.build.loop_core=
22922292
tinys3.build.event_core=
2293-
tinys3.build.flash_type=qspi
2293+
tinys3.build.flash_type=qio
22942294
tinys3.build.psram_type=qspi
2295-
tinys3.build.memory_type=qspi_qspi
2295+
tinys3.build.memory_type=qio_qspi
22962296

22972297
tinys3.menu.LoopCore.1=Core 1
22982298
tinys3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
@@ -2437,9 +2437,9 @@ pros3.build.partitions=default
24372437
pros3.build.defines=
24382438
pros3.build.loop_core=
24392439
pros3.build.event_core=
2440-
pros3.build.flash_type=qspi
2440+
pros3.build.flash_type=qio
24412441
pros3.build.psram_type=qspi
2442-
pros3.build.memory_type=qspi_qspi
2442+
pros3.build.memory_type=qio_qspi
24432443

24442444
pros3.menu.LoopCore.1=Core 1
24452445
pros3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
@@ -2593,9 +2593,9 @@ feathers3.build.partitions=default
25932593
feathers3.build.defines=
25942594
feathers3.build.loop_core=
25952595
feathers3.build.event_core=
2596-
feathers3.build.flash_type=qspi
2596+
feathers3.build.flash_type=qio
25972597
feathers3.build.psram_type=qspi
2598-
feathers3.build.memory_type=qspi_qspi
2598+
feathers3.build.memory_type=qio_qspi
25992599

26002600
feathers3.menu.LoopCore.1=Core 1
26012601
feathers3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
@@ -5903,7 +5903,7 @@ dfrobot_firebeetle2_esp32s3.build.partitions=default
59035903
dfrobot_firebeetle2_esp32s3.build.defines=
59045904
dfrobot_firebeetle2_esp32s3.build.loop_core=
59055905
dfrobot_firebeetle2_esp32s3.build.event_core=
5906-
dfrobot_firebeetle2_esp32s3.build.flash_type=qspi
5906+
dfrobot_firebeetle2_esp32s3.build.flash_type=qio
59075907
dfrobot_firebeetle2_esp32s3.build.psram_type=qspi
59085908
dfrobot_firebeetle2_esp32s3.build.memory_type={build.flash_type}_{build.psram_type}
59095909

@@ -5922,19 +5922,19 @@ dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.flash_mode=dio
59225922
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.boot=qio
59235923
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.boot_freq=80m
59245924
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.flash_freq=80m
5925-
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.flash_type=qspi
5925+
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio.build.flash_type=qio
59265926
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120=QIO 120MHz
59275927
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
59285928
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.boot=qio
59295929
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.boot_freq=120m
59305930
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
5931-
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.flash_type=qspi
5931+
dfrobot_firebeetle2_esp32s3.menu.FlashMode.qio120.build.flash_type=qio
59325932
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio=DIO 80MHz
59335933
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.flash_mode=dio
59345934
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.boot=dio
59355935
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.boot_freq=80m
59365936
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.flash_freq=80m
5937-
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.flash_type=qspi
5937+
dfrobot_firebeetle2_esp32s3.menu.FlashMode.dio.build.flash_type=qio
59385938
dfrobot_firebeetle2_esp32s3.menu.FlashMode.opi=OPI 80MHz
59395939
dfrobot_firebeetle2_esp32s3.menu.FlashMode.opi.build.flash_mode=dout
59405940
dfrobot_firebeetle2_esp32s3.menu.FlashMode.opi.build.boot=opi
@@ -7712,7 +7712,7 @@ adafruit_feather_esp32s3.build.partitions=default
77127712
adafruit_feather_esp32s3.build.defines=
77137713
adafruit_feather_esp32s3.build.loop_core=
77147714
adafruit_feather_esp32s3.build.event_core=
7715-
adafruit_feather_esp32s3.build.flash_type=qspi
7715+
adafruit_feather_esp32s3.build.flash_type=qio
77167716
adafruit_feather_esp32s3.build.psram_type=qspi
77177717
adafruit_feather_esp32s3.build.memory_type={build.flash_type}_{build.psram_type}
77187718

@@ -7721,19 +7721,19 @@ adafruit_feather_esp32s3.menu.FlashMode.qio.build.flash_mode=dio
77217721
adafruit_feather_esp32s3.menu.FlashMode.qio.build.boot=qio
77227722
adafruit_feather_esp32s3.menu.FlashMode.qio.build.boot_freq=80m
77237723
adafruit_feather_esp32s3.menu.FlashMode.qio.build.flash_freq=80m
7724-
adafruit_feather_esp32s3.menu.FlashMode.qio.build.flash_type=qspi
7724+
adafruit_feather_esp32s3.menu.FlashMode.qio.build.flash_type=qio
77257725
adafruit_feather_esp32s3.menu.FlashMode.qio120=QIO 120MHz
77267726
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
77277727
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.boot=qio
77287728
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.boot_freq=120m
77297729
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
7730-
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.flash_type=qspi
7730+
adafruit_feather_esp32s3.menu.FlashMode.qio120.build.flash_type=qio
77317731
adafruit_feather_esp32s3.menu.FlashMode.dio=DIO 80MHz
77327732
adafruit_feather_esp32s3.menu.FlashMode.dio.build.flash_mode=dio
77337733
adafruit_feather_esp32s3.menu.FlashMode.dio.build.boot=dio
77347734
adafruit_feather_esp32s3.menu.FlashMode.dio.build.boot_freq=80m
77357735
adafruit_feather_esp32s3.menu.FlashMode.dio.build.flash_freq=80m
7736-
adafruit_feather_esp32s3.menu.FlashMode.dio.build.flash_type=qspi
7736+
adafruit_feather_esp32s3.menu.FlashMode.dio.build.flash_type=qio
77377737
adafruit_feather_esp32s3.menu.FlashMode.opi=OPI 80MHz
77387738
adafruit_feather_esp32s3.menu.FlashMode.opi.build.flash_mode=dout
77397739
adafruit_feather_esp32s3.menu.FlashMode.opi.build.boot=opi

‎cores/esp32/esp32-hal-gpio.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ static InterruptHandle_t __pinInterruptHandlers[SOC_GPIO_PIN_COUNT] = {0,};
9191

9292
extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
9393
{
94-
#ifdef BOARD_HAS_NEOPIXEL
95-
if (pin == LED_BUILTIN){
96-
__pinMode(LED_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
94+
#ifdef RGB_BUILTIN
95+
if (pin == RGB_BUILTIN){
96+
__pinMode(RGB_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
9797
return;
9898
}
9999
#endif
@@ -134,11 +134,11 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
134134

135135
extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
136136
{
137-
#ifdef BOARD_HAS_NEOPIXEL
138-
if(pin == LED_BUILTIN){
137+
#ifdef RGB_BUILTIN
138+
if(pin == RGB_BUILTIN){
139139
//use RMT to set all channels on/off
140-
const uint8_t comm_val = val != 0 ? LED_BRIGHTNESS : 0;
141-
neopixelWrite(LED_BUILTIN, comm_val, comm_val, comm_val);
140+
const uint8_t comm_val = val != 0 ? RGB_BRIGHTNESS : 0;
141+
neopixelWrite(RGB_BUILTIN, comm_val, comm_val, comm_val);
142142
return;
143143
}
144144
#endif

‎cores/esp32/esp32-hal-rgb-led.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue
77
static bool initialized = false;
88

99
uint8_t _pin = pin;
10-
#ifdef BOARD_HAS_NEOPIXEL
11-
if(pin == LED_BUILTIN){
12-
_pin = LED_BUILTIN-SOC_GPIO_PIN_COUNT;
10+
#ifdef RGB_BUILTIN
11+
if(pin == RGB_BUILTIN){
12+
_pin = RGB_BUILTIN-SOC_GPIO_PIN_COUNT;
1313
}
1414
#endif
1515

‎cores/esp32/esp32-hal-rgb-led.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ extern "C" {
77

88
#include "esp32-hal.h"
99

10-
#ifndef LED_BRIGHTNESS
11-
#define LED_BRIGHTNESS 64
10+
#ifndef RGB_BRIGHTNESS
11+
#define RGB_BRIGHTNESS 64
1212
#endif
1313

1414
void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);

‎libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp

Lines changed: 90 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static ra_filter_t *ra_filter_init(ra_filter_t *filter, size_t sample_size)
148148
return filter;
149149
}
150150

151-
/* unused function triggers error
151+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
152152
static int ra_filter_run(ra_filter_t *filter, int value)
153153
{
154154
if (!filter->values)
@@ -166,7 +166,7 @@ static int ra_filter_run(ra_filter_t *filter, int value)
166166
}
167167
return filter->sum / filter->count;
168168
}
169-
*/
169+
#endif
170170

171171
#if CONFIG_ESP_FACE_DETECT_ENABLED
172172
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
@@ -1210,67 +1210,144 @@ void startCameraServer()
12101210
.uri = "/",
12111211
.method = HTTP_GET,
12121212
.handler = index_handler,
1213-
.user_ctx = NULL};
1213+
.user_ctx = NULL
1214+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1215+
,
1216+
.is_websocket = true,
1217+
.handle_ws_control_frames = false,
1218+
.supported_subprotocol = NULL
1219+
#endif
1220+
};
12141221

12151222
httpd_uri_t status_uri = {
12161223
.uri = "/status",
12171224
.method = HTTP_GET,
12181225
.handler = status_handler,
1219-
.user_ctx = NULL};
1226+
.user_ctx = NULL
1227+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1228+
,
1229+
.is_websocket = true,
1230+
.handle_ws_control_frames = false,
1231+
.supported_subprotocol = NULL
1232+
#endif
1233+
};
12201234

12211235
httpd_uri_t cmd_uri = {
12221236
.uri = "/control",
12231237
.method = HTTP_GET,
12241238
.handler = cmd_handler,
1225-
.user_ctx = NULL};
1239+
.user_ctx = NULL
1240+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1241+
,
1242+
.is_websocket = true,
1243+
.handle_ws_control_frames = false,
1244+
.supported_subprotocol = NULL
1245+
#endif
1246+
};
12261247

12271248
httpd_uri_t capture_uri = {
12281249
.uri = "/capture",
12291250
.method = HTTP_GET,
12301251
.handler = capture_handler,
1231-
.user_ctx = NULL};
1252+
.user_ctx = NULL
1253+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1254+
,
1255+
.is_websocket = true,
1256+
.handle_ws_control_frames = false,
1257+
.supported_subprotocol = NULL
1258+
#endif
1259+
};
12321260

12331261
httpd_uri_t stream_uri = {
12341262
.uri = "/stream",
12351263
.method = HTTP_GET,
12361264
.handler = stream_handler,
1237-
.user_ctx = NULL};
1265+
.user_ctx = NULL
1266+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1267+
,
1268+
.is_websocket = true,
1269+
.handle_ws_control_frames = false,
1270+
.supported_subprotocol = NULL
1271+
#endif
1272+
};
12381273

12391274
httpd_uri_t bmp_uri = {
12401275
.uri = "/bmp",
12411276
.method = HTTP_GET,
12421277
.handler = bmp_handler,
1243-
.user_ctx = NULL};
1278+
.user_ctx = NULL
1279+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1280+
,
1281+
.is_websocket = true,
1282+
.handle_ws_control_frames = false,
1283+
.supported_subprotocol = NULL
1284+
#endif
1285+
};
12441286

12451287
httpd_uri_t xclk_uri = {
12461288
.uri = "/xclk",
12471289
.method = HTTP_GET,
12481290
.handler = xclk_handler,
1249-
.user_ctx = NULL};
1291+
.user_ctx = NULL
1292+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1293+
,
1294+
.is_websocket = true,
1295+
.handle_ws_control_frames = false,
1296+
.supported_subprotocol = NULL
1297+
#endif
1298+
};
12501299

12511300
httpd_uri_t reg_uri = {
12521301
.uri = "/reg",
12531302
.method = HTTP_GET,
12541303
.handler = reg_handler,
1255-
.user_ctx = NULL};
1304+
.user_ctx = NULL
1305+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1306+
,
1307+
.is_websocket = true,
1308+
.handle_ws_control_frames = false,
1309+
.supported_subprotocol = NULL
1310+
#endif
1311+
};
12561312

12571313
httpd_uri_t greg_uri = {
12581314
.uri = "/greg",
12591315
.method = HTTP_GET,
12601316
.handler = greg_handler,
1261-
.user_ctx = NULL};
1317+
.user_ctx = NULL
1318+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1319+
,
1320+
.is_websocket = true,
1321+
.handle_ws_control_frames = false,
1322+
.supported_subprotocol = NULL
1323+
#endif
1324+
};
12621325

12631326
httpd_uri_t pll_uri = {
12641327
.uri = "/pll",
12651328
.method = HTTP_GET,
12661329
.handler = pll_handler,
1267-
.user_ctx = NULL};
1330+
.user_ctx = NULL
1331+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1332+
,
1333+
.is_websocket = true,
1334+
.handle_ws_control_frames = false,
1335+
.supported_subprotocol = NULL
1336+
#endif
1337+
};
12681338

12691339
httpd_uri_t win_uri = {
12701340
.uri = "/resolution",
12711341
.method = HTTP_GET,
12721342
.handler = win_handler,
1273-
.user_ctx = NULL};
1343+
.user_ctx = NULL
1344+
#ifdef CONFIG_HTTPD_WS_SUPPORT
1345+
,
1346+
.is_websocket = true,
1347+
.handle_ws_control_frames = false,
1348+
.supported_subprotocol = NULL
1349+
#endif
1350+
};
12741351

12751352
ra_filter_init(&ra_filter, 20);
12761353

‎libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
44
Demonstrates usage of onboard RGB LED on some ESP dev boards.
55
6-
Calling digitalWrite(LED_BUILTIN, HIGH) will use hidden RGB driver.
6+
Calling digitalWrite(RGB_BUILTIN, HIGH) will use hidden RGB driver.
77
88
RGBLedWrite demonstrates controll of each channel:
99
void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
1010
1111
WARNING: After using digitalWrite to drive RGB LED it will be impossible to drive the same pin
1212
with normal HIGH/LOW level
1313
*/
14-
//#define LED_BRIGHTNESS 64 // Change white brightness (max 255)
14+
//#define RGB_BRIGHTNESS 64 // Change white brightness (max 255)
1515

1616
// the setup function runs once when you press reset or power the board
1717

@@ -21,19 +21,19 @@ void setup() {
2121

2222
// the loop function runs over and over again forever
2323
void loop() {
24-
#ifdef BOARD_HAS_NEOPIXEL
25-
digitalWrite(LED_BUILTIN, HIGH); // Turn the RGB LED white
24+
#ifdef RGB_BUILTIN
25+
digitalWrite(RGB_BUILTIN, HIGH); // Turn the RGB LED white
2626
delay(1000);
27-
digitalWrite(LED_BUILTIN, LOW); // Turn the RGB LED off
27+
digitalWrite(RGB_BUILTIN, LOW); // Turn the RGB LED off
2828
delay(1000);
2929

30-
neopixelWrite(LED_BUILTIN,LED_BRIGHTNESS,0,0); // Red
30+
neopixelWrite(RGB_BUILTIN,RGB_BRIGHTNESS,0,0); // Red
3131
delay(1000);
32-
neopixelWrite(LED_BUILTIN,0,LED_BRIGHTNESS,0); // Green
32+
neopixelWrite(RGB_BUILTIN,0,RGB_BRIGHTNESS,0); // Green
3333
delay(1000);
34-
neopixelWrite(LED_BUILTIN,0,0,LED_BRIGHTNESS); // Blue
34+
neopixelWrite(RGB_BUILTIN,0,0,RGB_BRIGHTNESS); // Blue
3535
delay(1000);
36-
neopixelWrite(LED_BUILTIN,0,0,0); // Off / black
36+
neopixelWrite(RGB_BUILTIN,0,0,0); // Off / black
3737
delay(1000);
3838
#endif
3939
}

0 commit comments

Comments
 (0)