Skip to content

Commit 400b987

Browse files
authored
Merge branch 'master' into idf-master
2 parents c61b1a3 + f4f1c89 commit 400b987

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ tools/esptool
66
tools/esptool.exe
77
tools/mkspiffs
88
tools/mklittlefs
9+
tools/mkfatfs.exe
910
.DS_Store
1011

1112
#Ignore files built by Visual Studio/Visual Micro
@@ -17,4 +18,3 @@ __vm/
1718
.vscode/
1819
platform.sloeber.txt
1920
boards.sloeber.txt
20-
tools/mklittlefs

cores/esp32/esp32-hal-adc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ uint16_t __analogRead(uint8_t pin)
161161
} else if ( r == ESP_ERR_INVALID_STATE ) {
162162
log_e("GPIO%u: %s: ADC2 not initialized yet.", pin, esp_err_to_name(r));
163163
} else if ( r == ESP_ERR_TIMEOUT ) {
164-
log_e("GPIO%u: %s: ADC2 is in use by Wi-Fi.", pin, esp_err_to_name(r));
164+
log_e("GPIO%u: %s: ADC2 is in use by Wi-Fi. Please see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/adc.html#adc-limitations for more info", pin, esp_err_to_name(r));
165165
} else {
166166
log_e("GPIO%u: %s", pin, esp_err_to_name(r));
167167
}

cores/esp32/esp32-hal-timer.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#define HWTIMER_LOCK() portENTER_CRITICAL(timer->lock)
4848
#define HWTIMER_UNLOCK() portEXIT_CRITICAL(timer->lock)
4949

50-
typedef struct {
50+
typedef volatile struct {
5151
union {
5252
struct {
5353
uint32_t reserved0: 10;
@@ -272,6 +272,12 @@ void timerEnd(hw_timer_t *timer){
272272
}
273273

274274
void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
275+
#if CONFIG_IDF_TARGET_ESP32
276+
if(edge){
277+
log_w("EDGE timer interrupt does not work properly on ESP32! Setting to LEVEL...");
278+
edge = false;
279+
}
280+
#endif
275281
static bool initialized = false;
276282
static intr_handle_t intr_handle = NULL;
277283
if(intr_handle){

cores/esp32/esp32-hal-uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static void uartDetachRx(uart_t* uart, uint8_t rxPin)
179179
if(uart == NULL) {
180180
return;
181181
}
182-
pinMatrixInDetach(rxPin, false, false);
182+
pinMatrixInDetach(UART_RXD_IDX(uart->num), false, false);
183183
uartDisableInterrupt(uart);
184184
}
185185

0 commit comments

Comments
 (0)