Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 96822d7

Browse filesBrowse files
me-no-devme-no-dev
authored
Update IDF to 3.2-3276a13 and esptool.py to 2.5.0 (espressif#1878)
* TX Flow Control and Code cleanup * Use semaphore instead of delay TX functionality is done. * Use single buffer and empty queue on exit * Fix compile issues because of LwIP code relocation * Add temporary header to fix Azure not compiling * Fix AsyncUDP early init * AsyncUDP Multicast fixes * Add source mac address and rework multicast * Allow redefinition of default pins for Serials 1 and 2 * Update IDF to 3276a13 * Update esptool.py to 2.5.0 * Fix sketches * Fix log level in BluetoothSetial
1 parent 4e96bff commit 96822d7
Copy full SHA for 96822d7

File tree

Expand file treeCollapse file tree

447 files changed

+37909
-10765
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

447 files changed

+37909
-10765
lines changed

‎cores/esp32/HardwareSerial.cpp

Copy file name to clipboardExpand all lines: cores/esp32/HardwareSerial.cpp
+21-4Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,25 @@
33
#include <string.h>
44
#include <inttypes.h>
55

6+
#include "pins_arduino.h"
67
#include "HardwareSerial.h"
78

9+
#ifndef RX1
10+
#define RX1 9
11+
#endif
12+
13+
#ifndef TX1
14+
#define TX1 10
15+
#endif
16+
17+
#ifndef RX2
18+
#define RX2 16
19+
#endif
20+
21+
#ifndef TX2
22+
#define TX2 17
23+
#endif
24+
825
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
926
HardwareSerial Serial(0);
1027
HardwareSerial Serial1(1);
@@ -27,12 +44,12 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
2744
txPin = 1;
2845
}
2946
if(_uart_nr == 1 && rxPin < 0 && txPin < 0) {
30-
rxPin = 9;
31-
txPin = 10;
47+
rxPin = RX1;
48+
txPin = TX1;
3249
}
3350
if(_uart_nr == 2 && rxPin < 0 && txPin < 0) {
34-
rxPin = 16;
35-
txPin = 17;
51+
rxPin = RX2;
52+
txPin = TX2;
3653
}
3754
_uart = uartBegin(_uart_nr, baud, config, rxPin, txPin, 256, invert);
3855
}

‎cores/esp32/apps/sntp/sntp.h

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "lwip/apps/sntp.h"

‎cores/esp32/esp32-hal-log.h

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-log.h
+22Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,38 +79,50 @@ int log_printf(const char *fmt, ...);
7979

8080
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
8181
#define log_v(format, ...) log_printf(ARDUHAL_LOG_FORMAT(V, format), ##__VA_ARGS__)
82+
#define isr_log_v(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(V, format), ##__VA_ARGS__)
8283
#else
8384
#define log_v(format, ...)
85+
#define isr_log_v(format, ...)
8486
#endif
8587

8688
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
8789
#define log_d(format, ...) log_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
90+
#define isr_log_d(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
8891
#else
8992
#define log_d(format, ...)
93+
#define isr_log_d(format, ...)
9094
#endif
9195

9296
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
9397
#define log_i(format, ...) log_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
98+
#define isr_log_i(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
9499
#else
95100
#define log_i(format, ...)
101+
#define isr_log_i(format, ...)
96102
#endif
97103

98104
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN
99105
#define log_w(format, ...) log_printf(ARDUHAL_LOG_FORMAT(W, format), ##__VA_ARGS__)
106+
#define isr_log_w(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(W, format), ##__VA_ARGS__)
100107
#else
101108
#define log_w(format, ...)
109+
#define isr_log_w(format, ...)
102110
#endif
103111

104112
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
105113
#define log_e(format, ...) log_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
114+
#define isr_log_e(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
106115
#else
107116
#define log_e(format, ...)
117+
#define isr_log_e(format, ...)
108118
#endif
109119

110120
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_NONE
111121
#define log_n(format, ...) log_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
122+
#define isr_log_n(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
112123
#else
113124
#define log_n(format, ...)
125+
#define isr_log_n(format, ...)
114126
#endif
115127

116128
#include "esp_log.h"
@@ -121,12 +133,22 @@ int log_printf(const char *fmt, ...);
121133
#undef ESP_LOGI
122134
#undef ESP_LOGD
123135
#undef ESP_LOGV
136+
#undef ESP_EARLY_LOGE
137+
#undef ESP_EARLY_LOGW
138+
#undef ESP_EARLY_LOGI
139+
#undef ESP_EARLY_LOGD
140+
#undef ESP_EARLY_LOGV
124141

125142
#define ESP_LOGE(tag, ...) log_e(__VA_ARGS__)
126143
#define ESP_LOGW(tag, ...) log_w(__VA_ARGS__)
127144
#define ESP_LOGI(tag, ...) log_i(__VA_ARGS__)
128145
#define ESP_LOGD(tag, ...) log_d(__VA_ARGS__)
129146
#define ESP_LOGV(tag, ...) log_v(__VA_ARGS__)
147+
#define ESP_EARLY_LOGE(tag, ...) isr_log_e(__VA_ARGS__)
148+
#define ESP_EARLY_LOGW(tag, ...) isr_log_w(__VA_ARGS__)
149+
#define ESP_EARLY_LOGI(tag, ...) isr_log_i(__VA_ARGS__)
150+
#define ESP_EARLY_LOGD(tag, ...) isr_log_d(__VA_ARGS__)
151+
#define ESP_EARLY_LOGV(tag, ...) isr_log_v(__VA_ARGS__)
130152
#endif
131153

132154
#ifdef __cplusplus

‎cores/esp32/esp32-hal-time.c

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-time.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
#include "esp32-hal.h"
16-
#include "apps/sntp/sntp.h"
16+
#include "lwip/apps/sntp.h"
1717

1818
static void setTimeZone(long offset, int daylight)
1919
{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.