Skip to content

Commit 32fc416

Browse files
hathachhathach
authored
Merge branch 'master' into update-adafruit-boards
2 parents 417f45f + 0efa90d commit 32fc416

Some content is hidden

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

58 files changed

+625
-144
lines changed

Diff for: ‎.github/workflows/hil.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
gen_chunks:
1919
if: |
2020
contains(github.event.pull_request.labels.*.name, 'hil_test') ||
21-
github.event_name == 'schedule'
21+
(github.event_name == 'schedule' && github.repository == 'espressif/arduino-esp32')
2222
name: Generate Chunks matrix
2323
runs-on: ubuntu-latest
2424
outputs:

Diff for: ‎.github/workflows/upload-idf-component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Push components to https://components.espressif.com
22
on:
33
push:
44
tags:
5-
- *
5+
- '*'
66
jobs:
77
upload_components:
88
runs-on: ubuntu-latest

Diff for: ‎boards.txt

+113
Original file line numberDiff line numberDiff line change
@@ -14566,3 +14566,116 @@ SEEED_XIAO_WIFI.menu.DebugLevel.verbose=Verbose
1456614566
SEEED_XIAO_WIFI.menu.DebugLevel.verbose.build.code_debug=5
1456714567

1456814568
##############################################################
14569+
14570+
connaxio_espoir.name=Connaxio's Espoir
14571+
connaxio_espoir.vid.0=0x10C4
14572+
connaxio_espoir.pid.0=0x8D9A
14573+
14574+
connaxio_espoir.bootloader.tool=esptool_py
14575+
connaxio_espoir.bootloader.tool.default=esptool_py
14576+
14577+
connaxio_espoir.upload.tool=esptool_py
14578+
connaxio_espoir.upload.tool.default=esptool_py
14579+
connaxio_espoir.upload.tool.network=esp_ota
14580+
14581+
connaxio_espoir.upload.maximum_size=1310720
14582+
connaxio_espoir.upload.maximum_data_size=327680
14583+
connaxio_espoir.upload.flags=
14584+
connaxio_espoir.upload.extra_flags=
14585+
14586+
connaxio_espoir.serial.disableDTR=true
14587+
connaxio_espoir.serial.disableRTS=true
14588+
14589+
connaxio_espoir.build.tarch=xtensa
14590+
connaxio_espoir.build.bootloader_addr=0x1000
14591+
connaxio_espoir.build.target=esp32
14592+
connaxio_espoir.build.mcu=esp32
14593+
connaxio_espoir.build.core=esp32
14594+
connaxio_espoir.build.variant=connaxio_espoir
14595+
connaxio_espoir.build.board=connaxio_espoir
14596+
14597+
connaxio_espoir.build.f_cpu=240000000L
14598+
connaxio_espoir.build.flash_size=4MB
14599+
connaxio_espoir.build.flash_freq=80m
14600+
connaxio_espoir.build.flash_mode=dio
14601+
connaxio_espoir.build.boot=dio
14602+
connaxio_espoir.build.partitions=default
14603+
connaxio_espoir.build.defines=
14604+
connaxio_espoir.build.loop_core=
14605+
connaxio_espoir.build.event_core=
14606+
14607+
connaxio_espoir.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
14608+
connaxio_espoir.menu.PartitionScheme.default.build.partitions=default
14609+
connaxio_espoir.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
14610+
connaxio_espoir.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
14611+
connaxio_espoir.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
14612+
connaxio_espoir.menu.PartitionScheme.minimal.build.partitions=minimal
14613+
connaxio_espoir.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
14614+
connaxio_espoir.menu.PartitionScheme.no_ota.build.partitions=no_ota
14615+
connaxio_espoir.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
14616+
connaxio_espoir.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
14617+
connaxio_espoir.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
14618+
connaxio_espoir.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
14619+
connaxio_espoir.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
14620+
connaxio_espoir.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
14621+
connaxio_espoir.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
14622+
connaxio_espoir.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
14623+
connaxio_espoir.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
14624+
connaxio_espoir.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
14625+
connaxio_espoir.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
14626+
connaxio_espoir.menu.PartitionScheme.huge_app.build.partitions=huge_app
14627+
connaxio_espoir.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
14628+
connaxio_espoir.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
14629+
connaxio_espoir.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
14630+
connaxio_espoir.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
14631+
connaxio_espoir.menu.PartitionScheme.rainmaker=RainMaker
14632+
connaxio_espoir.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
14633+
connaxio_espoir.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
14634+
14635+
connaxio_espoir.menu.CPUFreq.240=240MHz (WiFi/BT)
14636+
connaxio_espoir.menu.CPUFreq.240.build.f_cpu=240000000L
14637+
connaxio_espoir.menu.CPUFreq.160=160MHz (WiFi/BT)
14638+
connaxio_espoir.menu.CPUFreq.160.build.f_cpu=160000000L
14639+
connaxio_espoir.menu.CPUFreq.80=80MHz (WiFi/BT)
14640+
connaxio_espoir.menu.CPUFreq.80.build.f_cpu=80000000L
14641+
connaxio_espoir.menu.CPUFreq.40=40MHz
14642+
connaxio_espoir.menu.CPUFreq.40.build.f_cpu=40000000L
14643+
connaxio_espoir.menu.CPUFreq.20=20MHz
14644+
connaxio_espoir.menu.CPUFreq.20.build.f_cpu=20000000L
14645+
connaxio_espoir.menu.CPUFreq.10=10MHz
14646+
connaxio_espoir.menu.CPUFreq.10.build.f_cpu=10000000L
14647+
14648+
connaxio_espoir.menu.FlashFreq.80=80MHz
14649+
connaxio_espoir.menu.FlashFreq.80.build.flash_freq=80m
14650+
connaxio_espoir.menu.FlashFreq.40=40MHz
14651+
connaxio_espoir.menu.FlashFreq.40.build.flash_freq=40m
14652+
14653+
connaxio_espoir.menu.UploadSpeed.921600=921600
14654+
connaxio_espoir.menu.UploadSpeed.921600.upload.speed=921600
14655+
connaxio_espoir.menu.UploadSpeed.512000.windows=512000
14656+
connaxio_espoir.menu.UploadSpeed.512000.upload.speed=512000
14657+
connaxio_espoir.menu.UploadSpeed.460800.linux=460800
14658+
connaxio_espoir.menu.UploadSpeed.460800.macosx=460800
14659+
connaxio_espoir.menu.UploadSpeed.460800.upload.speed=460800
14660+
connaxio_espoir.menu.UploadSpeed.256000.windows=256000
14661+
connaxio_espoir.menu.UploadSpeed.256000.upload.speed=256000
14662+
connaxio_espoir.menu.UploadSpeed.230400.windows.upload.speed=256000
14663+
connaxio_espoir.menu.UploadSpeed.230400=230400
14664+
connaxio_espoir.menu.UploadSpeed.230400.upload.speed=230400
14665+
connaxio_espoir.menu.UploadSpeed.115200=115200
14666+
connaxio_espoir.menu.UploadSpeed.115200.upload.speed=115200
14667+
14668+
connaxio_espoir.menu.DebugLevel.none=None
14669+
connaxio_espoir.menu.DebugLevel.none.build.code_debug=0
14670+
connaxio_espoir.menu.DebugLevel.error=Error
14671+
connaxio_espoir.menu.DebugLevel.error.build.code_debug=1
14672+
connaxio_espoir.menu.DebugLevel.warn=Warn
14673+
connaxio_espoir.menu.DebugLevel.warn.build.code_debug=2
14674+
connaxio_espoir.menu.DebugLevel.info=Info
14675+
connaxio_espoir.menu.DebugLevel.info.build.code_debug=3
14676+
connaxio_espoir.menu.DebugLevel.debug=Debug
14677+
connaxio_espoir.menu.DebugLevel.debug.build.code_debug=4
14678+
connaxio_espoir.menu.DebugLevel.verbose=Verbose
14679+
connaxio_espoir.menu.DebugLevel.verbose.build.code_debug=5
14680+
14681+
##############################################################

Diff for: ‎cores/esp32/Tone.cpp

+9-2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ void setToneChannel(uint8_t channel){
9595
if(tone_init()){
9696
tone_msg_t tone_msg = {
9797
.tone_cmd = TONE_SET_CHANNEL,
98+
.pin = 0, // Ignored
99+
.frequency = 0, // Ignored
100+
.duration = 0, // Ignored
98101
.channel = channel
99102
};
100103
xQueueSend(_tone_queue, &tone_msg, portMAX_DELAY);
@@ -106,7 +109,10 @@ void noTone(uint8_t _pin){
106109
if(tone_init()){
107110
tone_msg_t tone_msg = {
108111
.tone_cmd = TONE_END,
109-
.pin = _pin
112+
.pin = _pin,
113+
.frequency = 0, // Ignored
114+
.duration = 0, // Ignored
115+
.channel = 0 // Ignored
110116
};
111117
xQueueSend(_tone_queue, &tone_msg, portMAX_DELAY);
112118
}
@@ -124,7 +130,8 @@ void tone(uint8_t _pin, unsigned int frequency, unsigned long duration){
124130
.tone_cmd = TONE_START,
125131
.pin = _pin,
126132
.frequency = frequency,
127-
.duration = duration
133+
.duration = duration,
134+
.channel = 0 // Ignored
128135
};
129136
xQueueSend(_tone_queue, &tone_msg, portMAX_DELAY);
130137
}

Diff for: ‎cores/esp32/WString.cpp

+43
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,24 @@ String::String(double value, unsigned int decimalPlaces) {
137137
}
138138
}
139139

140+
String::String(long long value, unsigned char base) {
141+
init();
142+
char buf[2 + 8 * sizeof(long long)];
143+
if (base==10) {
144+
sprintf(buf, "%lld", value); // NOT SURE - NewLib Nano ... does it support %lld?
145+
} else {
146+
lltoa(value, buf, base);
147+
}
148+
*this = buf;
149+
}
150+
151+
String::String(unsigned long long value, unsigned char base) {
152+
init();
153+
char buf[1 + 8 * sizeof(unsigned long long)];
154+
ulltoa(value, buf, base);
155+
*this = buf;
156+
}
157+
140158
String::~String() {
141159
invalidate();
142160
}
@@ -408,6 +426,17 @@ unsigned char String::concat(double num) {
408426
return concat(string, strlen(string));
409427
}
410428

429+
unsigned char String::concat(long long num) {
430+
char buf[2 + 3 * sizeof(long long)];
431+
return concat(buf, sprintf(buf, "%lld", num)); // NOT SURE - NewLib Nano ... does it support %lld?
432+
}
433+
434+
unsigned char String::concat(unsigned long long num) {
435+
char buf[1 + 3 * sizeof(unsigned long long)];
436+
ulltoa(num, buf, 10);
437+
return concat(buf, strlen(buf));
438+
}
439+
411440
unsigned char String::concat(const __FlashStringHelper * str) {
412441
if (!str) return 0;
413442
int length = strlen_P((PGM_P)str);
@@ -493,6 +522,20 @@ StringSumHelper & operator +(const StringSumHelper &lhs, double num) {
493522
return a;
494523
}
495524

525+
StringSumHelper & operator +(const StringSumHelper &lhs, long long num) {
526+
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
527+
if(!a.concat(num))
528+
a.invalidate();
529+
return a;
530+
}
531+
532+
StringSumHelper & operator +(const StringSumHelper &lhs, unsigned long long num) {
533+
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
534+
if(!a.concat(num))
535+
a.invalidate();
536+
return a;
537+
}
538+
496539
StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs)
497540
{
498541
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);

Diff for: ‎cores/esp32/WString.h

+20
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ class String {
7373
explicit String(unsigned long, unsigned char base = 10);
7474
explicit String(float, unsigned int decimalPlaces = 2);
7575
explicit String(double, unsigned int decimalPlaces = 2);
76+
explicit String(long long, unsigned char base = 10);
77+
explicit String(unsigned long long, unsigned char base = 10);
7678
~String(void);
7779

7880
// memory management
@@ -122,6 +124,8 @@ class String {
122124
unsigned char concat(unsigned long num);
123125
unsigned char concat(float num);
124126
unsigned char concat(double num);
127+
unsigned char concat(long long num);
128+
unsigned char concat(unsigned long long num);
125129
unsigned char concat(const __FlashStringHelper * str);
126130

127131
// if there's not enough memory for the concatenated value, the string
@@ -166,6 +170,14 @@ class String {
166170
concat(num);
167171
return (*this);
168172
}
173+
String & operator +=(long long num) {
174+
concat(num);
175+
return (*this);
176+
}
177+
String & operator +=(unsigned long long num) {
178+
concat(num);
179+
return (*this);
180+
}
169181
String & operator += (const __FlashStringHelper *str){
170182
concat(str);
171183
return (*this);
@@ -182,6 +194,8 @@ class String {
182194
friend StringSumHelper & operator +(const StringSumHelper &lhs, float num);
183195
friend StringSumHelper & operator +(const StringSumHelper &lhs, double num);
184196
friend StringSumHelper & operator +(const StringSumHelper &lhs, const __FlashStringHelper *rhs);
197+
friend StringSumHelper & operator +(const StringSumHelper &lhs, long long num);
198+
friend StringSumHelper & operator +(const StringSumHelper &lhs, unsigned long long num);
185199

186200
// comparison (only works w/ Strings and "strings")
187201
operator StringIfHelperType() const {
@@ -373,6 +387,12 @@ class StringSumHelper: public String {
373387
StringSumHelper(double num) :
374388
String(num) {
375389
}
390+
StringSumHelper(long long num) :
391+
String(num) {
392+
}
393+
StringSumHelper(unsigned long long num) :
394+
String(num) {
395+
}
376396
};
377397

378398
extern const String emptyString;

0 commit comments

Comments
 (0)