Merge branch 'master' into feat/zigbee-gateway · espressif/arduino-esp32@43aef6c (original) (raw)
Navigation Menu
- GitHub Copilot Write better code with AI
- GitHub Models New Manage and compare prompts
- GitHub Advanced Security Find and fix vulnerabilities
- Actions Automate any workflow
- Codespaces Instant dev environments
- Issues Plan and track work
- Code Review Manage code changes
- Discussions Collaborate outside of code
- Code Search Find more, search less
- Explore
- Pricing
Provide feedback
Saved searches
Use saved searches to filter your results more quickly
Appearance settings
Commit 43aef6c
Merge branch 'master' into feat/zigbee-gateway
File tree
21 files changed
lines changed
- libraries/Zigbee/examples
- Zigbee_Analog_Input_Output
- Zigbee_CarbonDioxide_Sensor
- Zigbee_Color_Dimmable_Light
- Zigbee_Color_Dimmer_Switch
- Zigbee_Pressure_Flow_Sensor
- Zigbee_Temp_Hum_Sensor_Sleepy
- Zigbee_Temperature_Sensor
21 files changed
lines changed
Lines changed: 0 additions & 12 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -11,18 +11,6 @@ | ||
| 11 | 11 | #include "driver/uart.h" |
| 12 | 12 | #include "freertos/queue.h" |
| 13 | 13 | |
| 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 | - | |
| 26 | 14 | #if (SOC_UART_LP_NUM >= 1) |
| 27 | 15 | #define UART_HW_FIFO_LEN(uart_num) ((uart_num < SOC_UART_HP_NUM) ? SOC_UART_FIFO_LEN : SOC_LP_UART_FIFO_LEN) |
| 28 | 16 | #else |
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -97,15 +97,27 @@ typedef enum { | ||
| 97 | 97 | } hardwareSerial_error_t; |
| 98 | 98 | |
| 99 | 99 | #ifndef ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE |
| 100 | +#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE | |
| 100 | 101 | #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 | |
| 101 | 105 | #endif |
| 102 | 106 | |
| 103 | 107 | #ifndef ARDUINO_SERIAL_EVENT_TASK_PRIORITY |
| 108 | +#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_PRIORITY | |
| 104 | 109 | #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 | |
| 105 | 113 | #endif |
| 106 | 114 | |
| 107 | 115 | #ifndef ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE |
| 116 | +#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE | |
| 108 | 117 | #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 | |
| 109 | 121 | #endif |
| 110 | 122 | |
| 111 | 123 | // UART0 pins are defined by default by the bootloader. |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 5 | ] |
| 6 | 6 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 5 | ] |
| 6 | 6 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 6 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -34,7 +34,12 @@ | ||
| 34 | 34 | /* Zigbee light bulb configuration */ |
| 35 | 35 | #define USE_CUSTOM_ZIGBEE_CONFIG 1 |
| 36 | 36 | #define ZIGBEE_EXTENDER_ENDPOINT 1 |
| 37 | -uint8_t led = RGB_BUILTIN; | |
| 37 | + | |
| 38 | +#ifndef LED_BUILTIN | |
| 39 | +#define LED_BUILTIN 4 | |
| 40 | +#endif | |
| 41 | + | |
| 42 | +uint8_t led = LED_BUILTIN; | |
| 38 | 43 | uint8_t button = BOOT_PIN; |
| 39 | 44 | |
| 40 | 45 | ZigbeeRangeExtender zbExtender = ZigbeeRangeExtender(ZIGBEE_EXTENDER_ENDPOINT); |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 5 | ] |
| 6 | 6 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 5 | ] |
| 6 | 6 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed", |
| 3 | 3 | "requires": [ |
| 4 | -"CONFIG_SOC_IEEE802154_SUPPORTED=y" | |
| 4 | +"CONFIG_SOC_IEEE802154_SUPPORTED=y", | |
| 5 | +"CONFIG_ZB_ENABLED=y" | |
| 5 | 6 | ] |
| 6 | 7 | } |