Skip to content

Commit e3cc290

Browse files
authored
Merge branch 'master' into feature/idf_component_ci_and_ver_check
2 parents b65b956 + ae7173d commit e3cc290

File tree

346 files changed

+6424
-327
lines changed

Some content is hidden

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

346 files changed

+6424
-327
lines changed

.github/stale.yml

Lines changed: 26 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,26 @@
1-
# Configuration for probot-stale - https://github.com/probot/stale
2-
3-
# Number of days of inactivity before an Issue or Pull Request becomes stale
4-
daysUntilStale: 60
5-
6-
# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
7-
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
8-
daysUntilClose: 14
9-
10-
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
11-
onlyLabels: []
12-
13-
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
14-
exemptLabels:
15-
- "Type: For reference"
16-
- "Type: To be implemented"
17-
- "Type: Feature request"
18-
19-
# Set to true to ignore issues in a project (defaults to false)
20-
exemptProjects: false
21-
22-
# Set to true to ignore issues in a milestone (defaults to false)
23-
exemptMilestones: false
24-
25-
# Set to true to ignore issues with an assignee (defaults to false)
26-
exemptAssignees: false
27-
28-
# Label to use when marking as stale
29-
staleLabel: "Status: Stale"
30-
31-
# Comment to post when marking as stale. Set to `false` to disable
32-
markComment: >
33-
[STALE_SET] This issue has been automatically marked as stale because it has not had
34-
recent activity. It will be closed in 14 days if no further activity occurs. Thank you
35-
for your contributions.
36-
37-
# Comment to post when removing the stale label.
38-
unmarkComment: >
39-
[STALE_CLR] This issue has been removed from the stale queue. Please ensure activity to keep it openin the future.
40-
41-
# Comment to post when closing a stale Issue or Pull Request.
42-
closeComment: >
43-
[STALE_DEL] This stale issue has been automatically closed. Thank you for your contributions.
44-
45-
# Limit the number of actions per hour, from 1-30. Default is 30
46-
limitPerRun: 30
47-
48-
# Limit to only `issues` or `pulls`
49-
only: issues
50-
51-
# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
52-
# pulls:
53-
# daysUntilStale: 30
54-
# markComment: >
55-
# This pull request has been automatically marked as stale because it has not had
56-
# recent activity. It will be closed if no further activity occurs. Thank you
57-
# for your contributions.
58-
59-
# issues:
60-
# exemptLabels:
61-
# - confirmed
1+
# This workflow firstly warns and then closes issues that have had no activity for a specified amount of time.
2+
#
3+
# You can adjust the behavior by modifying this file.
4+
# For more information can be found here: https://github.com/actions/stale
5+
6+
name: Mark stale issues
7+
on:
8+
schedule:
9+
- cron: '30 9 * * *'
10+
11+
jobs:
12+
stale:
13+
14+
runs-on: ubuntu-latest
15+
permissions:
16+
issues: write
17+
18+
steps:
19+
- uses: actions/stale@v3
20+
with:
21+
repo-token: ${{ secrets.GITHUB_TOKEN }}
22+
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed in 14 days if no further activity occurs. Thank you for your contributions.'
23+
days-before-stale: 60
24+
days-before-close: 14
25+
exempt-issue-labels: 'Type: For reference,Type: To be implemented,Type: Feature request'
26+
stale-issue-label: 'Status: Stale'

.gitignore

Lines changed: 1 addition & 0 deletions
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

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ set(LIBRARY_SRCS
7979
libraries/DNSServer/src/DNSServer.cpp
8080
libraries/EEPROM/src/EEPROM.cpp
8181
libraries/ESPmDNS/src/ESPmDNS.cpp
82+
libraries/Ethernet/src/ETH.cpp
8283
libraries/FFat/src/FFat.cpp
8384
libraries/FS/src/FS.cpp
8485
libraries/FS/src/vfs_api.cpp
@@ -115,7 +116,6 @@ set(LIBRARY_SRCS
115116
libraries/WebServer/src/detail/mimetable.cpp
116117
libraries/WiFiClientSecure/src/ssl_client.cpp
117118
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
118-
libraries/WiFi/src/ETH.cpp
119119
libraries/WiFi/src/WiFiAP.cpp
120120
libraries/WiFi/src/WiFiClient.cpp
121121
libraries/WiFi/src/WiFi.cpp

boards.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,6 +2571,9 @@ esp32micromod.upload.extra_flags=
25712571
esp32micromod.serial.disableDTR=true
25722572
esp32micromod.serial.disableRTS=true
25732573

2574+
esp32micromod.build.tarch=xtensa
2575+
esp32micromod.build.bootloader_addr=0x1000
2576+
esp32micromod.build.target=esp32
25742577
esp32micromod.build.mcu=esp32
25752578
esp32micromod.build.core=esp32
25762579
esp32micromod.build.variant=esp32micromod

cores/esp32/Stream.cpp

Lines changed: 1 addition & 1 deletion
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

cores/esp32/esp32-hal-ledc.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "freertos/task.h"
1818
#include "freertos/semphr.h"
1919
#include "esp32-hal-matrix.h"
20+
#include "soc/soc_caps.h"
2021
#include "soc/ledc_reg.h"
2122
#include "soc/ledc_struct.h"
2223
#include "driver/periph_ctrl.h"
@@ -331,3 +332,21 @@ double ledcChangeFrequency(uint8_t chan, double freq, uint8_t bit_num)
331332
double res_freq = _ledcSetupTimerFreq(chan, freq, bit_num);
332333
return res_freq;
333334
}
335+
336+
static int8_t pin_to_channel[SOC_GPIO_PIN_COUNT] = { 0 };
337+
static int cnt_channel = SOC_LEDC_CHANNEL_NUM;
338+
void analogWrite(uint8_t pin, int value) {
339+
// Use ledc hardware for internal pins
340+
if (pin < SOC_GPIO_PIN_COUNT) {
341+
if (pin_to_channel[pin] == 0) {
342+
if (!cnt_channel) {
343+
log_e("No more analogWrite channels available! You can have maximum %u", SOC_LEDC_CHANNEL_NUM);
344+
return;
345+
}
346+
pin_to_channel[pin] = cnt_channel--;
347+
ledcAttachPin(pin, cnt_channel);
348+
ledcSetup(cnt_channel, 1000, 8);
349+
}
350+
ledcWrite(pin_to_channel[pin] - 1, value);
351+
}
352+
}

cores/esp32/esp32-hal-log.h

Lines changed: 18 additions & 18 deletions
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"

cores/esp32/esp32-hal-rmt.c

Lines changed: 5 additions & 5 deletions
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;

cores/esp32/esp32-hal.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ void yield(void);
9090
#include "esp32-hal-psram.h"
9191
#include "esp32-hal-cpu.h"
9292

93+
void analogWrite(uint8_t pin, int value);
94+
9395
//returns chip temperature in Celsius
9496
float temperatureRead();
9597

78.1 KB
Loading
114 KB
Loading

0 commit comments

Comments
 (0)