Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cd8dc91

Browse files
authoredOct 23, 2024··
Merge branch 'master' into ADD-Boards
2 parents 3ce8efe + bcc357c commit cd8dc91

File tree

7 files changed

+22
-5
lines changed

7 files changed

+22
-5
lines changed
 

‎.github/workflows/boards.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
name: "espressif:esp32"
4343
4444
strategy:
45+
fail-fast: false
4546
matrix: ${{ fromJson(needs.find-boards.outputs.fqbns) }}
4647

4748
steps:

‎.github/workflows/push.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,20 @@ on:
2121
- 'idf_component.yml'
2222
- 'Kconfig.projbuild'
2323
- 'package.json'
24+
- 'CMakeLists.txt'
2425
- '.github/workflows/push.yml'
2526
- '.github/scripts/**'
2627
- '!.github/scripts/find_*'
2728
- '!.github/scripts/on-release.sh'
2829
- '!.github/scripts/tests_*'
2930
- '!.github/scripts/upload_*'
31+
- "variants/esp32/**/*"
32+
- "variants/esp32s2/**/*"
33+
- "variants/esp32s3/**/*"
34+
- "variants/esp32c2/**/*"
35+
- "variants/esp32c3/**/*"
36+
- "variants/esp32c6/**/*"
37+
- "variants/esp32h2/**/*"
3038

3139
concurrency:
3240
group: build-${{github.event.pull_request.number || github.ref}}
@@ -74,6 +82,12 @@ jobs:
7482
- '!tools/platformio-build.py'
7583
- 'platform.txt'
7684
- 'programmers.txt'
85+
- "variants/esp32/**/*"
86+
- "variants/esp32s2/**/*"
87+
- "variants/esp32s3/**/*"
88+
- "variants/esp32c3/**/*"
89+
- "variants/esp32c6/**/*"
90+
- "variants/esp32h2/**/*"
7791
libraries:
7892
- 'libraries/**/examples/**'
7993
- 'libraries/**/src/**'
@@ -92,6 +106,8 @@ jobs:
92106
idf:
93107
- 'idf_component.yml'
94108
- 'Kconfig.projbuild'
109+
- 'CMakeLists.txt'
110+
- "variants/esp32c2/**/*"
95111
platformio:
96112
- 'package.json'
97113
- '.github/scripts/install-platformio-esp32.sh'

‎libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/Zigbee_Color_Dimmable_Light.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void setup() {
6565
rgbLedWrite(LED_PIN, 0, 0, 0);
6666

6767
// Init button for factory reset
68-
pinMode(BUTTON_PIN, INPUT);
68+
pinMode(BUTTON_PIN, INPUT_PULLUP);
6969

7070
// Set callback function for light change
7171
zbColorLight.onLightChange(setRGBLight);

‎libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/Zigbee_Color_Dimmer_Switch.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void setup() {
5454
}
5555

5656
//Init button switch
57-
pinMode(SWITCH_PIN, INPUT);
57+
pinMode(SWITCH_PIN, INPUT_PULLUP);
5858

5959
//Optional: set Zigbee device name and model
6060
zbSwitch.setManufacturerAndModel("Espressif", "ZigbeeSwitch");

‎libraries/Zigbee/examples/Zigbee_On_Off_Light/Zigbee_On_Off_Light.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void setup() {
5151
digitalWrite(LED_PIN, LOW);
5252

5353
// Init button for factory reset
54-
pinMode(BUTTON_PIN, INPUT);
54+
pinMode(BUTTON_PIN, INPUT_PULLUP);
5555

5656
//Optional: set Zigbee device name and model
5757
zbLight.setManufacturerAndModel("Espressif", "ZBLightBulb");

‎libraries/Zigbee/examples/Zigbee_Temperature_Sensor/Zigbee_Temperature_Sensor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void setup() {
5959
}
6060

6161
// Init button switch
62-
pinMode(BUTTON_PIN, INPUT);
62+
pinMode(BUTTON_PIN, INPUT_PULLUP);
6363

6464
// Optional: set Zigbee device name and model
6565
zbTempSensor.setManufacturerAndModel("Espressif", "ZigbeeTempSensor");

‎libraries/Zigbee/examples/Zigbee_Thermostat/Zigbee_Thermostat.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void setup() {
6565
}
6666

6767
// Init button switch
68-
pinMode(BUTTON_PIN, INPUT);
68+
pinMode(BUTTON_PIN, INPUT_PULLUP);
6969

7070
// Set callback functions for temperature and configuration receive
7171
zbThermostat.onTempRecieve(recieveSensorTemp);

0 commit comments

Comments
 (0)
Please sign in to comment.