Skip to content

Commit 704c5ee

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into release/v3.3.x
2 parents 30255d7 + 7575fa0 commit 704c5ee

File tree

37 files changed

+404
-41
lines changed

37 files changed

+404
-41
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ set(ARDUINO_LIBRARY_Zigbee_SRCS
297297
libraries/Zigbee/src/ep/ZigbeeVibrationSensor.cpp
298298
libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
299299
libraries/Zigbee/src/ep/ZigbeeRangeExtender.cpp
300+
libraries/Zigbee/src/ep/ZigbeeGateway.cpp
300301
)
301302

302303
set(ARDUINO_LIBRARY_BLE_SRCS

‎boards.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,9 @@ esp32s3.menu.PartitionScheme.esp_sr_16.build.partitions=esp_sr_16
11581158
esp32s3.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
11591159
esp32s3.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
11601160
esp32s3.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
1161+
esp32s3.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
1162+
esp32s3.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
1163+
esp32s3.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
11611164
esp32s3.menu.PartitionScheme.custom=Custom
11621165
esp32s3.menu.PartitionScheme.custom.build.partitions=
11631166
esp32s3.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -1319,6 +1322,9 @@ esp32c3.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
13191322
esp32c3.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
13201323
esp32c3.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
13211324
esp32c3.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
1325+
esp32c3.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
1326+
esp32c3.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
1327+
esp32c3.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
13221328
esp32c3.menu.PartitionScheme.custom=Custom
13231329
esp32c3.menu.PartitionScheme.custom.build.partitions=
13241330
esp32c3.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -1524,6 +1530,9 @@ esp32s2.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
15241530
esp32s2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
15251531
esp32s2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
15261532
esp32s2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
1533+
esp32s2.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
1534+
esp32s2.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
1535+
esp32s2.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
15271536
esp32s2.menu.PartitionScheme.custom=Custom
15281537
esp32s2.menu.PartitionScheme.custom.build.partitions=
15291538
esp32s2.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -1704,6 +1713,9 @@ esp32.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
17041713
esp32.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
17051714
esp32.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
17061715
esp32.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
1716+
esp32.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
1717+
esp32.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
1718+
esp32.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
17071719
esp32.menu.PartitionScheme.custom=Custom
17081720
esp32.menu.PartitionScheme.custom.build.partitions=
17091721
esp32.menu.PartitionScheme.custom.upload.maximum_size=16777216

‎cores/esp32/HardwareSerial.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@
1111
#include "driver/uart.h"
1212
#include "freertos/queue.h"
1313

14-
#ifndef ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
15-
#define ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE 2048
16-
#endif
17-
18-
#ifndef ARDUINO_SERIAL_EVENT_TASK_PRIORITY
19-
#define ARDUINO_SERIAL_EVENT_TASK_PRIORITY (configMAX_PRIORITIES - 1)
20-
#endif
21-
22-
#ifndef ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
23-
#define ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE -1
24-
#endif
25-
2614
#if (SOC_UART_LP_NUM >= 1)
2715
#define UART_HW_FIFO_LEN(uart_num) ((uart_num < SOC_UART_HP_NUM) ? SOC_UART_FIFO_LEN : SOC_LP_UART_FIFO_LEN)
2816
#else

‎cores/esp32/HardwareSerial.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,27 @@ typedef enum {
9797
} hardwareSerial_error_t;
9898

9999
#ifndef ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
100+
#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
100101
#define ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE 2048
102+
#else
103+
#define ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE CONFIG_ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
104+
#endif
101105
#endif
102106

103107
#ifndef ARDUINO_SERIAL_EVENT_TASK_PRIORITY
108+
#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_PRIORITY
104109
#define ARDUINO_SERIAL_EVENT_TASK_PRIORITY (configMAX_PRIORITIES - 1)
110+
#else
111+
#define ARDUINO_SERIAL_EVENT_TASK_PRIORITY CONFIG_ARDUINO_SERIAL_EVENT_TASK_PRIORITY
112+
#endif
105113
#endif
106114

107115
#ifndef ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
116+
#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
108117
#define ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE -1
118+
#else
119+
#define ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE CONFIG_ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
120+
#endif
109121
#endif
110122

111123
// UART0 pins are defined by default by the bootloader.

‎libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
33
"requires": [
4-
"CONFIG_SOC_IEEE802154_SUPPORTED=y"
4+
"CONFIG_SOC_IEEE802154_SUPPORTED=y",
5+
"CONFIG_ZB_ENABLED=y"
56
]
67
}

‎libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
33
"requires": [
4-
"CONFIG_SOC_IEEE802154_SUPPORTED=y"
4+
"CONFIG_SOC_IEEE802154_SUPPORTED=y",
5+
"CONFIG_ZB_ENABLED=y"
56
]
67
}

‎libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
33
"requires": [
4-
"CONFIG_SOC_IEEE802154_SUPPORTED=y"
4+
"CONFIG_SOC_IEEE802154_SUPPORTED=y",
5+
"CONFIG_ZB_ENABLED=y"
56
]
67
}

‎libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
33
"requires": [
4-
"CONFIG_SOC_IEEE802154_SUPPORTED=y"
4+
"CONFIG_ZB_ENABLED=y"
55
]
66
}

‎libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
33
"requires": [
4-
"CONFIG_SOC_IEEE802154_SUPPORTED=y"
4+
"CONFIG_SOC_IEEE802154_SUPPORTED=y",
5+
"CONFIG_ZB_ENABLED=y"
56
]
67
}

‎libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
33
"requires": [
4-
"CONFIG_SOC_IEEE802154_SUPPORTED=y"
4+
"CONFIG_SOC_IEEE802154_SUPPORTED=y",
5+
"CONFIG_ZB_ENABLED=y"
56
]
67
}

0 commit comments

Comments
 (0)