Skip to content

Commit 19260a7

Browse files
authored
Merge branch 'master' into CI_unit_tests
2 parents acb6aee + ba6e82c commit 19260a7

File tree

74 files changed

+858
-496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+858
-496
lines changed

Diff for: .github/ISSUE_TEMPLATE/Issue-report.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v2.0.3
4445
- v2.0.2
4546
- v2.0.1
4647
- v2.0.0
@@ -129,4 +130,4 @@ body:
129130
description: You agree to check all the resources above before opening a new issue.
130131
options:
131132
- label: I confirm I have checked existing issues, online documentation and Troubleshooting guide.
132-
required: true
133+
required: true

Diff for: .github/workflows/hil.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
gen_chunks:
1919
if: |
2020
contains(github.event.pull_request.labels.*.name, 'hil_test') ||
21-
github.event_name == 'schedule'
21+
(github.event_name == 'schedule' && github.repository == 'espressif/arduino-esp32')
2222
name: Generate Chunks matrix
2323
runs-on: ubuntu-latest
2424
outputs:
@@ -110,7 +110,9 @@ jobs:
110110

111111
event_file:
112112
name: "Event File"
113-
if: ${{ always() }}
113+
if: |
114+
contains(github.event.pull_request.labels.*.name, 'hil_test') ||
115+
github.event_name == 'schedule'
114116
needs: Test
115117
runs-on: ubuntu-latest
116118
steps:

Diff for: .github/workflows/upload-idf-component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Push components to https://components.espressif.com
22
on:
33
push:
44
tags:
5-
- v*
5+
- *
66
jobs:
77
upload_components:
88
runs-on: ubuntu-latest

Diff for: CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ set(LIBRARY_SRCS
9595
libraries/RainMaker/src/RMakerParam.cpp
9696
libraries/RainMaker/src/RMakerDevice.cpp
9797
libraries/RainMaker/src/RMakerType.cpp
98+
libraries/RainMaker/src/RMakerQR.cpp
99+
libraries/RainMaker/src/RMakerUtils.cpp
98100
libraries/SD_MMC/src/SD_MMC.cpp
99101
libraries/SD/src/SD.cpp
100102
libraries/SD/src/sd_diskio.cpp

Diff for: Kconfig.projbuild

+54-9
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,19 @@ config AUTOSTART_ARDUINO
2121

2222
choice ARDUINO_RUNNING_CORE
2323
bool "Core on which Arduino's setup() and loop() are running"
24-
default ARDUINO_RUN_CORE1
24+
default ARDUINO_RUN_CORE0 if FREERTOS_UNICORE
25+
default ARDUINO_RUN_CORE1 if !FREERTOS_UNICORE
2526
help
2627
Select on which core Arduino's setup() and loop() functions run
2728

2829
config ARDUINO_RUN_CORE0
2930
bool "CORE 0"
3031
config ARDUINO_RUN_CORE1
3132
bool "CORE 1"
33+
depends on !FREERTOS_UNICORE
3234
config ARDUINO_RUN_NO_AFFINITY
3335
bool "BOTH"
36+
depends on !FREERTOS_UNICORE
3437

3538
endchoice
3639

@@ -48,16 +51,19 @@ config ARDUINO_LOOP_STACK_SIZE
4851

4952
choice ARDUINO_EVENT_RUNNING_CORE
5053
bool "Core on which Arduino's event handler is running"
51-
default ARDUINO_EVENT_RUN_CORE1
54+
default ARDUINO_EVENT_RUN_CORE0 if FREERTOS_UNICORE
55+
default ARDUINO_EVENT_RUN_CORE1 if !FREERTOS_UNICORE
5256
help
5357
Select on which core Arduino's WiFi.onEvent() run
5458

5559
config ARDUINO_EVENT_RUN_CORE0
5660
bool "CORE 0"
5761
config ARDUINO_EVENT_RUN_CORE1
5862
bool "CORE 1"
63+
depends on !FREERTOS_UNICORE
5964
config ARDUINO_EVENT_RUN_NO_AFFINITY
6065
bool "BOTH"
66+
depends on !FREERTOS_UNICORE
6167

6268
endchoice
6369

@@ -67,33 +73,71 @@ config ARDUINO_EVENT_RUNNING_CORE
6773
default 1 if ARDUINO_EVENT_RUN_CORE1
6874
default -1 if ARDUINO_EVENT_RUN_NO_AFFINITY
6975

76+
choice ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
77+
bool "Core on which Arduino's Serial Event task is running"
78+
default ARDUINO_SERIAL_EVENT_RUN_CORE0 if FREERTOS_UNICORE
79+
default ARDUINO_SERIAL_EVENT_RUN_NO_AFFINITY if !FREERTOS_UNICORE
80+
help
81+
Select on which core Arduino's Serial Event task run
82+
83+
config ARDUINO_SERIAL_EVENT_RUN_CORE0
84+
bool "CORE 0"
85+
config ARDUINO_SERIAL_EVENT_RUN_CORE1
86+
bool "CORE 1"
87+
depends on !FREERTOS_UNICORE
88+
config ARDUINO_SERIAL_EVENT_RUN_NO_AFFINITY
89+
bool "BOTH"
90+
depends on !FREERTOS_UNICORE
91+
92+
endchoice
93+
94+
config ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
95+
int
96+
default 0 if ARDUINO_SERIAL_EVENT_RUN_CORE0
97+
default 1 if ARDUINO_SERIAL_EVENT_RUN_CORE1
98+
default -1 if ARDUINO_SERIAL_EVENT_RUN_NO_AFFINITY
99+
100+
config ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
101+
int "Serial Event task stack size"
102+
default 2048
103+
help
104+
Amount of stack available for the Serial Event task.
105+
106+
config ARDUINO_SERIAL_EVENT_TASK_PRIORITY
107+
int "Priority of the Serial Event task"
108+
default 24
109+
help
110+
Select at what priority you want the Serial Event task to run.
111+
70112
choice ARDUINO_UDP_RUNNING_CORE
71113
bool "Core on which Arduino's UDP is running"
72-
default ARDUINO_UDP_RUN_CORE1
114+
default ARDUINO_UDP_RUN_CORE0
73115
help
74116
Select on which core Arduino's UDP run
75117

76118
config ARDUINO_UDP_RUN_CORE0
77119
bool "CORE 0"
78120
config ARDUINO_UDP_RUN_CORE1
79121
bool "CORE 1"
122+
depends on !FREERTOS_UNICORE
80123
config ARDUINO_UDP_RUN_NO_AFFINITY
81124
bool "BOTH"
125+
depends on !FREERTOS_UNICORE
82126

83127
endchoice
84128

85-
config ARDUINO_UDP_TASK_PRIORITY
86-
int "Priority of the UDP task"
87-
default 3
88-
help
89-
Select at what priority you want the UDP task to run.
90-
91129
config ARDUINO_UDP_RUNNING_CORE
92130
int
93131
default 0 if ARDUINO_UDP_RUN_CORE0
94132
default 1 if ARDUINO_UDP_RUN_CORE1
95133
default -1 if ARDUINO_UDP_RUN_NO_AFFINITY
96134

135+
config ARDUINO_UDP_TASK_PRIORITY
136+
int "Priority of the UDP task"
137+
default 3
138+
help
139+
Select at what priority you want the UDP task to run.
140+
97141
config ARDUINO_ISR_IRAM
98142
bool "Run interrupts in IRAM"
99143
default "n"
@@ -356,3 +400,4 @@ config ARDUINO_SELECTIVE_Wire
356400

357401

358402
endmenu
403+

0 commit comments

Comments
 (0)