Skip to content

Commit 5cc8f9c

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
committed
Merge remote-tracking branch 'upstream/master' into feat/zigbee-gateway
2 parents f0cb1bb + 1467d87 commit 5cc8f9c

File tree

8 files changed

+613
-45
lines changed

8 files changed

+613
-45
lines changed

‎.github/workflows/build_py_tools.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
find-changed-tools:
1414
name: Check if tools have been changed
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616
outputs:
1717
any_changed: ${{ steps.verify-changed-files.outputs.any_changed }}
1818
all_changed_files: ${{ steps.verify-changed-files.outputs.all_changed_files }}
@@ -55,7 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
os: [windows-latest, macos-latest, ubuntu-20.04, ARM]
58+
os: [windows-latest, macos-latest, ubuntu-latest, ubuntu-24.04-arm]
5959
include:
6060
- os: windows-latest
6161
TARGET: win64
@@ -64,14 +64,12 @@ jobs:
6464
- os: macos-latest
6565
TARGET: macos
6666
SEPARATOR: ":"
67-
- os: ubuntu-20.04
67+
- os: ubuntu-latest
6868
TARGET: linux-amd64
6969
SEPARATOR: ":"
70-
- os: ARM
71-
CONTAINER: python:3.8-bullseye
70+
- os: ubuntu-24.04-arm
7271
TARGET: arm
7372
SEPARATOR: ":"
74-
container: ${{ matrix.CONTAINER }} # use python container on ARM
7573
env:
7674
DISTPATH: pytools-${{ matrix.TARGET }}
7775
PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi"
@@ -96,8 +94,6 @@ jobs:
9694
token: ${{ secrets.TOOLS_UPLOAD_PAT }}
9795
ref: ${{ github.event.pull_request.head.ref }}
9896
- name: Set up Python 3.8
99-
# Skip setting python on ARM because of missing compatibility: https://github.com/actions/setup-python/issues/108
100-
if: matrix.os != 'ARM'
10197
uses: actions/setup-python@master
10298
with:
10399
python-version: 3.8

‎.github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ jobs:
237237
needs.gen-chunks.outputs.build_all == 'true' ||
238238
needs.gen-chunks.outputs.build_libraries == 'true' ||
239239
needs.gen-chunks.outputs.build_idf == 'true'
240-
runs-on: ubuntu-20.04
240+
runs-on: ubuntu-latest
241241
strategy:
242242
fail-fast: false
243243
matrix:

‎boards.txt

+442
Large diffs are not rendered by default.

‎libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void ZigbeePressureSensor::setMinMaxValue(int16_t min, int16_t max) {
3333
void ZigbeePressureSensor::setTolerance(uint16_t tolerance) {
3434
esp_zb_attribute_list_t *pressure_measure_cluster =
3535
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_PRESSURE_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
36-
esp_zb_temperature_meas_cluster_add_attr(pressure_measure_cluster, ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_TOLERANCE_ID, (void *)&tolerance);
36+
esp_zb_pressure_meas_cluster_add_attr(pressure_measure_cluster, ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_TOLERANCE_ID, (void *)&tolerance);
3737
}
3838

3939
void ZigbeePressureSensor::setReporting(uint16_t min_interval, uint16_t max_interval, uint16_t delta) {
@@ -58,7 +58,7 @@ void ZigbeePressureSensor::setReporting(uint16_t min_interval, uint16_t max_inte
5858

5959
void ZigbeePressureSensor::setPressure(int16_t pressure) {
6060
log_v("Updating pressure sensor value...");
61-
/* Update temperature sensor measured value */
61+
/* Update pressure sensor measured value */
6262
log_d("Setting pressure to %d hPa", pressure);
6363
esp_zb_lock_acquire(portMAX_DELAY);
6464
esp_zb_zcl_set_attribute_val(

‎package/package_esp32_index.template.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{
4343
"packager": "esp32",
4444
"name": "esp32-arduino-libs",
45-
"version": "idf-release_v5.4-e37d33cc-v2"
45+
"version": "idf-release_v5.4-bcb3c32d-v1"
4646
},
4747
{
4848
"packager": "esp32",
@@ -95,63 +95,63 @@
9595
"tools": [
9696
{
9797
"name": "esp32-arduino-libs",
98-
"version": "idf-release_v5.4-e37d33cc-v2",
98+
"version": "idf-release_v5.4-bcb3c32d-v1",
9999
"systems": [
100100
{
101101
"host": "i686-mingw32",
102-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
103-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
104-
"checksum": "SHA-256:815e53a44eb4e0b59335b97cc0f66ad76a48ea61013dff5289db169f0bb8631c",
105-
"size": "339629117"
102+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
103+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
104+
"checksum": "SHA-256:2ab7a8565d4eadd805c1d00c9a1550292d3287dc43efa166d7ad3ba5322344bb",
105+
"size": "345570903"
106106
},
107107
{
108108
"host": "x86_64-mingw32",
109-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
110-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
111-
"checksum": "SHA-256:815e53a44eb4e0b59335b97cc0f66ad76a48ea61013dff5289db169f0bb8631c",
112-
"size": "339629117"
109+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
110+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
111+
"checksum": "SHA-256:2ab7a8565d4eadd805c1d00c9a1550292d3287dc43efa166d7ad3ba5322344bb",
112+
"size": "345570903"
113113
},
114114
{
115115
"host": "arm64-apple-darwin",
116-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
117-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
118-
"checksum": "SHA-256:815e53a44eb4e0b59335b97cc0f66ad76a48ea61013dff5289db169f0bb8631c",
119-
"size": "339629117"
116+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
117+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
118+
"checksum": "SHA-256:2ab7a8565d4eadd805c1d00c9a1550292d3287dc43efa166d7ad3ba5322344bb",
119+
"size": "345570903"
120120
},
121121
{
122122
"host": "x86_64-apple-darwin",
123-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
124-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
125-
"checksum": "SHA-256:815e53a44eb4e0b59335b97cc0f66ad76a48ea61013dff5289db169f0bb8631c",
126-
"size": "339629117"
123+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
124+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
125+
"checksum": "SHA-256:2ab7a8565d4eadd805c1d00c9a1550292d3287dc43efa166d7ad3ba5322344bb",
126+
"size": "345570903"
127127
},
128128
{
129129
"host": "x86_64-pc-linux-gnu",
130-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
131-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
132-
"checksum": "SHA-256:815e53a44eb4e0b59335b97cc0f66ad76a48ea61013dff5289db169f0bb8631c",
133-
"size": "339629117"
130+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
131+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
132+
"checksum": "SHA-256:2ab7a8565d4eadd805c1d00c9a1550292d3287dc43efa166d7ad3ba5322344bb",
133+
"size": "345570903"
134134
},
135135
{
136136
"host": "i686-pc-linux-gnu",
137-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
138-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
139-
"checksum": "SHA-256:815e53a44eb4e0b59335b97cc0f66ad76a48ea61013dff5289db169f0bb8631c",
140-
"size": "339629117"
137+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
138+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
139+
"checksum": "SHA-256:2ab7a8565d4eadd805c1d00c9a1550292d3287dc43efa166d7ad3ba5322344bb",
140+
"size": "345570903"
141141
},
142142
{
143143
"host": "aarch64-linux-gnu",
144-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
145-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
146-
"checksum": "SHA-256:815e53a44eb4e0b59335b97cc0f66ad76a48ea61013dff5289db169f0bb8631c",
147-
"size": "339629117"
144+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
145+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
146+
"checksum": "SHA-256:2ab7a8565d4eadd805c1d00c9a1550292d3287dc43efa166d7ad3ba5322344bb",
147+
"size": "345570903"
148148
},
149149
{
150150
"host": "arm-linux-gnueabihf",
151-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
152-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-e37d33cc-v2.zip",
153-
"checksum": "SHA-256:815e53a44eb4e0b59335b97cc0f66ad76a48ea61013dff5289db169f0bb8631c",
154-
"size": "339629117"
151+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
152+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-bcb3c32d-v1.zip",
153+
"checksum": "SHA-256:2ab7a8565d4eadd805c1d00c9a1550292d3287dc43efa166d7ad3ba5322344bb",
154+
"size": "345570903"
155155
}
156156
]
157157
},

‎variants/Geekble_Nano_ESP32S3/pins_arduino.h

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define USB_VID 0x303a
7+
#define USB_PID 0x82C5
8+
#define USB_MANUFACTURER "Geekble"
9+
#define USB_PRODUCT "Geekble nano ESP32-S3"
10+
#define USB_SERIAL "" // Empty string for MAC address
11+
12+
static const uint8_t D0 = 44; // also RX
13+
static const uint8_t D1 = 43; // also TX
14+
static const uint8_t D2 = 5;
15+
static const uint8_t D3 = 6; // also CTS
16+
static const uint8_t D4 = 7; // also DSR
17+
static const uint8_t D5 = 8;
18+
static const uint8_t D6 = 9;
19+
static const uint8_t D7 = 10;
20+
static const uint8_t D8 = 17;
21+
static const uint8_t D9 = 18;
22+
static const uint8_t D10 = 21; // also SS
23+
static const uint8_t D11 = 38; // also MOSI
24+
static const uint8_t D12 = 47; // also MISO
25+
static const uint8_t D13 = 48; // also SCK, LED_BUILTIN
26+
27+
static const uint8_t A0 = 1; // also DTR
28+
static const uint8_t A1 = 2;
29+
static const uint8_t A2 = 3;
30+
static const uint8_t A3 = 4;
31+
static const uint8_t A4 = 11; // also SDA
32+
static const uint8_t A5 = 12; // also SCL
33+
static const uint8_t A6 = 13;
34+
static const uint8_t A7 = 14;
35+
36+
// alternate pin functions
37+
38+
static const uint8_t LED_BUILTIN = D13;
39+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
40+
#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
41+
42+
static const uint8_t SW_BUILTIN = 0;
43+
44+
static const uint8_t TX = D1;
45+
static const uint8_t RX = D0;
46+
static const uint8_t RTS = 45;
47+
static const uint8_t CTS = D3;
48+
static const uint8_t DTR = A0;
49+
static const uint8_t DSR = D4;
50+
51+
static const uint8_t SS = D10;
52+
static const uint8_t MOSI = D11;
53+
static const uint8_t MISO = D12;
54+
static const uint8_t SCK = D13;
55+
56+
static const uint8_t SDA = A4;
57+
static const uint8_t SCL = A5;
58+
59+
// Touch input capable pins on the header
60+
static const uint8_t T1 = 1;
61+
static const uint8_t T2 = 2;
62+
static const uint8_t T3 = 3;
63+
static const uint8_t T4 = 4;
64+
static const uint8_t T5 = 5;
65+
static const uint8_t T6 = 6;
66+
static const uint8_t T7 = 7;
67+
68+
#define PIN_I2S_SCK D7
69+
#define PIN_I2S_FS D8
70+
#define PIN_I2S_SD D9
71+
#define PIN_I2S_SD_OUT D9 // same as bidir
72+
#define PIN_I2S_SD_IN D10
73+
74+
#endif /* Pins_Arduino_h */

‎variants/cyobot_v2_esp32s3/pins_arduino.h

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define USB_MANUFACTURER "CYOBot"
7+
#define USB_PRODUCT "CYOBrain ESP32S3"
8+
#define USB_SERIAL "" // Empty string for MAC address
9+
10+
static const uint8_t BUTTON0 = 4;
11+
static const uint8_t BUTTON1 = 38;
12+
static const uint8_t LED = 24;
13+
14+
static const uint8_t BAT_MEAS = 6;
15+
static const uint8_t CHAR_DET = 23;
16+
17+
static const uint8_t NEO_BASE = 7;
18+
static const uint8_t NEO_BRAIN = 15;
19+
20+
static const uint8_t I2S0_MCLK = 16;
21+
static const uint8_t I2S0_DSDIN = 8;
22+
static const uint8_t I2S0_SCLK = 9;
23+
static const uint8_t I2S0_LRCK = 45;
24+
25+
static const uint8_t SDA = 17;
26+
static const uint8_t SCL = 18;
27+
28+
static const uint8_t SS = 5;
29+
static const uint8_t MOSI = 2;
30+
static const uint8_t MISO = 42;
31+
static const uint8_t SCK = 41;
32+
33+
static const uint8_t ENCODER1_A = 39;
34+
static const uint8_t ENCODER1_B = 40;
35+
static const uint8_t ENCODER2_B = 19;
36+
static const uint8_t ENCODER2_A = 20;
37+
38+
static const uint8_t UART1_RXD = 3;
39+
static const uint8_t UART1_TXD = 1;
40+
41+
static const uint8_t GPIO46 = 46;
42+
static const uint8_t ESP_IO0 = 0;
43+
44+
static const uint8_t SD_OUT = 10;
45+
static const uint8_t SD_SPI_MOSI = 11;
46+
static const uint8_t SD_SPI_CLK = 12;
47+
static const uint8_t SD_SPI_MISO = 13;
48+
static const uint8_t SD_SPI_CS = 14;
49+
50+
static const uint8_t PA_CTRL = 25;
51+
52+
#endif /* Pins_Arduino_h */

‎variants/um_feathers3/pins_arduino.h

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ static const uint8_t RX = 44;
1616
static const uint8_t SDA = 8;
1717
static const uint8_t SCL = 9;
1818

19+
#define WIRE1_PIN_DEFINED 1 // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin)
20+
static const uint8_t SDA1 = 16;
21+
static const uint8_t SCL1 = 15;
22+
1923
static const uint8_t SS = 5;
2024
static const uint8_t MOSI = 35;
2125
static const uint8_t MISO = 37;

0 commit comments

Comments
 (0)