Skip to content

Commit 7d79518

Browse files
Jason2866Jason2866
authored
Merge pull request #24 from espressif/master
Update 04112011
2 parents 6b86f97 + 666cd3c commit 7d79518

File tree

331 files changed

+6314
-254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

331 files changed

+6314
-254
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ boards.sloeber.txt
2121

2222
# Ignore docs build (Sphinx)
2323
docs/build
24+
docs/source/_build

Diff for: ‎boards.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4373,7 +4373,7 @@ adafruit_funhouse_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
43734373

43744374
##############################################################
43754375

4376-
adafruit_feather_esp32s2_nopsram.name=Adafruit Feather ESP32-S2 (no PSRAM)
4376+
adafruit_feather_esp32s2_nopsram.name=Adafruit Feather ESP32-S2
43774377
adafruit_feather_esp32s2_nopsram.vid.0=0x239A
43784378
adafruit_feather_esp32s2_nopsram.pid.0=0x80EB
43794379
adafruit_feather_esp32s2_nopsram.vid.1=0x239A
@@ -4398,7 +4398,7 @@ adafruit_feather_esp32s2_nopsram.build.target=esp32s2
43984398
adafruit_feather_esp32s2_nopsram.build.mcu=esp32s2
43994399
adafruit_feather_esp32s2_nopsram.build.core=esp32
44004400
adafruit_feather_esp32s2_nopsram.build.variant=adafruit_feather_esp32s2
4401-
adafruit_feather_esp32s2_nopsram.build.board=ADAFRUIT_FEATHER_ESP32S2_NOPSRAM
4401+
adafruit_feather_esp32s2_nopsram.build.board=ADAFRUIT_FEATHER_ESP32S2
44024402

44034403
adafruit_feather_esp32s2_nopsram.build.cdc_on_boot=0
44044404
adafruit_feather_esp32s2_nopsram.build.msc_on_boot=0
@@ -4426,10 +4426,10 @@ adafruit_feather_esp32s2_nopsram.menu.DFUOnBoot.default.build.dfu_on_boot=0
44264426
adafruit_feather_esp32s2_nopsram.menu.DFUOnBoot.dfu=Enabled
44274427
adafruit_feather_esp32s2_nopsram.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
44284428

4429-
adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled=Disabled
4430-
adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled.build.defines=
44314429
adafruit_feather_esp32s2_nopsram.menu.PSRAM.enabled=Enabled
44324430
adafruit_feather_esp32s2_nopsram.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
4431+
adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled=Disabled
4432+
adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled.build.defines=
44334433

44344434
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
44354435
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default.build.partitions=default

Diff for: ‎cores/esp32/Stream.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ float Stream::parseFloat(char skipChar)
256256
} else if(c >= '0' && c <= '9') { // is c a digit?
257257
value = value * 10 + c - '0';
258258
if(isFraction) {
259-
fraction *= 0.1;
259+
fraction *= 0.1f;
260260
}
261261
}
262262
read(); // consume the character we got with peek

Diff for: ‎cores/esp32/esp32-hal-log.h

+18-18
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ void log_print_buf(const uint8_t *b, size_t len);
9999
#define log_buf_v(b,l) do {ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_VERBOSE);}while(0)
100100
#endif
101101
#else
102-
#define log_v(format, ...)
103-
#define isr_log_v(format, ...)
104-
#define log_buf_v(b,l)
102+
#define log_v(format, ...) do {} while(0)
103+
#define isr_log_v(format, ...) do {} while(0)
104+
#define log_buf_v(b,l) do {} while(0)
105105
#endif
106106

107107
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
@@ -115,9 +115,9 @@ void log_print_buf(const uint8_t *b, size_t len);
115115
#define log_buf_d(b,l) do {ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_DEBUG);}while(0)
116116
#endif
117117
#else
118-
#define log_d(format, ...)
119-
#define isr_log_d(format, ...)
120-
#define log_buf_d(b,l)
118+
#define log_d(format, ...) do {} while(0)
119+
#define isr_log_d(format, ...) do {} while(0)
120+
#define log_buf_d(b,l) do {} while(0)
121121
#endif
122122

123123
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
@@ -131,9 +131,9 @@ void log_print_buf(const uint8_t *b, size_t len);
131131
#define log_buf_i(b,l) do {ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_INFO);}while(0)
132132
#endif
133133
#else
134-
#define log_i(format, ...)
135-
#define isr_log_i(format, ...)
136-
#define log_buf_i(b,l)
134+
#define log_i(format, ...) do {} while(0)
135+
#define isr_log_i(format, ...) do {} while(0)
136+
#define log_buf_i(b,l) do {} while(0)
137137
#endif
138138

139139
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN
@@ -147,9 +147,9 @@ void log_print_buf(const uint8_t *b, size_t len);
147147
#define log_buf_w(b,l) do {ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_WARN);}while(0)
148148
#endif
149149
#else
150-
#define log_w(format, ...)
151-
#define isr_log_w(format, ...)
152-
#define log_buf_w(b,l)
150+
#define log_w(format, ...) do {} while(0)
151+
#define isr_log_w(format, ...) do {} while(0)
152+
#define log_buf_w(b,l) do {} while(0)
153153
#endif
154154

155155
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
@@ -163,9 +163,9 @@ void log_print_buf(const uint8_t *b, size_t len);
163163
#define log_buf_e(b,l) do {ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_ERROR);}while(0)
164164
#endif
165165
#else
166-
#define log_e(format, ...)
167-
#define isr_log_e(format, ...)
168-
#define log_buf_e(b,l)
166+
#define log_e(format, ...) do {} while(0)
167+
#define isr_log_e(format, ...) do {} while(0)
168+
#define log_buf_e(b,l) do {} while(0)
169169
#endif
170170

171171
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_NONE
@@ -179,9 +179,9 @@ void log_print_buf(const uint8_t *b, size_t len);
179179
#define log_buf_n(b,l) do {ESP_LOG_BUFFER_HEXDUMP(TAG, b, l, ESP_LOG_ERROR);}while(0)
180180
#endif
181181
#else
182-
#define log_n(format, ...)
183-
#define isr_log_n(format, ...)
184-
#define log_buf_n(b,l)
182+
#define log_n(format, ...) do {} while(0)
183+
#define isr_log_n(format, ...) do {} while(0)
184+
#define log_buf_n(b,l) do {} while(0)
185185
#endif
186186

187187
#include "esp_log.h"

Diff for: ‎cores/esp32/esp32-hal-rmt.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -546,16 +546,16 @@ float rmtSetTick(rmt_obj_t* rmt, float tick)
546546
size_t channel = rmt->channel;
547547

548548
#if CONFIG_IDF_TARGET_ESP32C3
549-
int apb_div = _LIMIT(tick/25.0, 256);
550-
float apb_tick = 25.0 * apb_div;
549+
int apb_div = _LIMIT(tick/25.0f, 256);
550+
float apb_tick = 25.0f * apb_div;
551551
RMT.tx_conf[channel].div_cnt = apb_div & 0xFF;
552552
RMT.tx_conf[channel].conf_update = 1;
553553
return apb_tick;
554554
#else
555-
int apb_div = _LIMIT(tick/12.5, 256);
555+
int apb_div = _LIMIT(tick/12.5f, 256);
556556
int ref_div = _LIMIT(tick/1000, 256);
557-
float apb_tick = 12.5 * apb_div;
558-
float ref_tick = 1000.0 * ref_div;
557+
float apb_tick = 12.5f * apb_div;
558+
float ref_tick = 1000.0f * ref_div;
559559
if (_ABS(apb_tick - tick) < _ABS(ref_tick - tick)) {
560560
RMT.conf_ch[channel].conf0.div_cnt = apb_div & 0xFF;
561561
RMT.conf_ch[channel].conf1.ref_always_on = 1;

Diff for: ‎docs/source/_static/arduino_i2c_master.png

78.1 KB
Loading

Diff for: ‎docs/source/_static/arduino_i2c_slave.png

114 KB
Loading

0 commit comments

Comments
 (0)