Skip to content

Commit 16681ff

Browse files
authored
Merge branch 'master' into ci/label
2 parents 75d8390 + 4677ea6 commit 16681ff

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

Diff for: cores/esp32/esp32-hal-gpio.c

+6-8
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) {
173173
if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL) {
174174
gpio_set_level((gpio_num_t)pin, val);
175175
} else {
176-
log_e("IO %i is not set as GPIO.", pin);
176+
log_e("IO %i is not set as GPIO. Execute digitalMode(%i, OUTPUT) first.", pin, pin);
177177
}
178178
}
179179

@@ -182,14 +182,12 @@ extern int ARDUINO_ISR_ATTR __digitalRead(uint8_t pin) {
182182
if (pin == RGB_BUILTIN) {
183183
return RGB_BUILTIN_storage;
184184
}
185-
#endif
186-
187-
if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL) {
188-
return gpio_get_level((gpio_num_t)pin);
189-
} else {
190-
log_e("IO %i is not set as GPIO.", pin);
191-
return 0;
185+
#endif // RGB_BUILTIN
186+
// This work when the pin is set as GPIO and in INPUT mode. For all other pin functions, it may return inconsistent response
187+
if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL) {
188+
log_w("IO %i is not set as GPIO. digitalRead() may return an inconsistent value.");
192189
}
190+
return gpio_get_level((gpio_num_t)pin);
193191
}
194192

195193
static void ARDUINO_ISR_ATTR __onPinInterrupt(void *arg) {

Diff for: idf_component.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,24 @@ dependencies:
6969
espressif/network_provisioning:
7070
version: "1.0.2"
7171
espressif/esp_rainmaker:
72-
version: "1.5.0"
72+
version: "1.5.2"
7373
rules:
7474
- if: "target not in [esp32c2, esp32p4]"
7575
espressif/rmaker_common:
7676
version: "1.4.6"
7777
rules:
7878
- if: "target not in [esp32c2, esp32p4]"
7979
espressif/esp_insights:
80-
version: "1.0.1"
80+
version: "1.2.2"
8181
rules:
8282
- if: "target not in [esp32c2, esp32p4]"
8383
# New version breaks esp_insights 1.0.1
8484
espressif/esp_diag_data_store:
85-
version: "1.0.1"
85+
version: "1.0.2"
8686
rules:
8787
- if: "target not in [esp32c2, esp32p4]"
8888
espressif/esp_diagnostics:
89-
version: "1.0.2"
89+
version: "1.2.1"
9090
rules:
9191
- if: "target not in [esp32c2, esp32p4]"
9292
espressif/cbor:

Diff for: libraries/Zigbee/src/ep/ZigbeeAnalog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void ZigbeeAnalog::setAnalogInputReporting(uint16_t min_interval, uint16_t max_i
105105
memset(&reporting_info, 0, sizeof(esp_zb_zcl_reporting_info_t));
106106
reporting_info.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV;
107107
reporting_info.ep = _endpoint;
108-
reporting_info.cluster_id = ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT;
108+
reporting_info.cluster_id = ESP_ZB_ZCL_CLUSTER_ID_ANALOG_INPUT;
109109
reporting_info.cluster_role = ESP_ZB_ZCL_CLUSTER_SERVER_ROLE;
110110
reporting_info.attr_id = ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID;
111111
reporting_info.u.send_info.min_interval = min_interval;

0 commit comments

Comments
 (0)