Skip to content

Commit 247d5f1

Browse files
earlephilhowerearlephilhower
authored
Merge branch 'master' into stdnothrow
2 parents 3ee6710 + b9db944 commit 247d5f1

File tree

14 files changed

+119
-63
lines changed

14 files changed

+119
-63
lines changed

‎.github/workflows/pull-request.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,16 @@ jobs:
251251
- uses: actions/setup-python@v2
252252
with:
253253
python-version: '3.x'
254+
- name: Cache Linux toolchain
255+
id: cache-linux
256+
uses: actions/cache@v2
257+
with:
258+
path: ./tools/dist
259+
key: key-linux-toolchain
254260
- name: Boards.txt diff
255261
env:
256262
TRAVIS_BUILD_DIR: ${{ github.workspace }}
257263
TRAVIS_TAG: ${{ github.ref }}
258264
run: |
259265
bash ./tests/ci/build_boards.sh
266+
bash ./tests/ci/eboot_test.sh

‎boards.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,18 @@ esp8285.menu.led.15=15
712712
esp8285.menu.led.15.build.led=-DLED_BUILTIN=15
713713
esp8285.menu.led.16=16
714714
esp8285.menu.led.16.build.led=-DLED_BUILTIN=16
715+
esp8285.menu.sdk.nonosdk_190703=nonos-sdk 2.2.1+100 (190703)
716+
esp8285.menu.sdk.nonosdk_190703.build.sdk=NONOSDK22x_190703
717+
esp8285.menu.sdk.nonosdk_191122=nonos-sdk 2.2.1+119 (191122)
718+
esp8285.menu.sdk.nonosdk_191122.build.sdk=NONOSDK22x_191122
719+
esp8285.menu.sdk.nonosdk_191105=nonos-sdk 2.2.1+113 (191105)
720+
esp8285.menu.sdk.nonosdk_191105.build.sdk=NONOSDK22x_191105
721+
esp8285.menu.sdk.nonosdk_191024=nonos-sdk 2.2.1+111 (191024)
722+
esp8285.menu.sdk.nonosdk_191024.build.sdk=NONOSDK22x_191024
723+
esp8285.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
724+
esp8285.menu.sdk.nonosdk221.build.sdk=NONOSDK221
725+
esp8285.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
726+
esp8285.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
715727
esp8285.menu.ip.lm2f=v2 Lower Memory
716728
esp8285.menu.ip.lm2f.build.lwip_include=lwip2/include
717729
esp8285.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat

‎cores/esp8266/Esp.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,7 @@ class EspClass {
127127
return esp_get_cpu_freq_mhz();
128128
}
129129
#else
130-
uint8_t getCpuFreqMHz() const
131-
{
132-
return esp_get_cpu_freq_mhz();
133-
}
130+
uint8_t getCpuFreqMHz() const;
134131
#endif
135132

136133
uint32_t getFlashChipId();

‎cores/esp8266/Stream.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ float Stream::parseFloat(char skipChar) {
173173
boolean isFraction = false;
174174
long value = 0;
175175
int c;
176-
float fraction = 1.0;
176+
float fraction = 1.0f;
177177

178178
c = peekNextDigit();
179179
// ignore non numeric leading characters
@@ -190,7 +190,7 @@ float Stream::parseFloat(char skipChar) {
190190
else if(c >= '0' && c <= '9') { // is c a digit?
191191
value = value * 10 + c - '0';
192192
if(isFraction)
193-
fraction *= 0.1;
193+
fraction *= 0.1f;
194194
}
195195
read(); // consume the character we got with peek
196196
c = timedPeek();

‎libraries/ArduinoOTA/ArduinoOTA.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,6 @@ extern "C" {
3131
#endif
3232

3333
ArduinoOTAClass::ArduinoOTAClass()
34-
: _port(0)
35-
, _udp_ota(0)
36-
, _initialized(false)
37-
, _rebootOnSuccess(true)
38-
, _useMDNS(true)
39-
, _state(OTA_IDLE)
40-
, _size(0)
41-
, _cmd(0)
42-
, _ota_port(0)
43-
, _start_callback(NULL)
44-
, _end_callback(NULL)
45-
, _error_callback(NULL)
46-
, _progress_callback(NULL)
4734
{
4835
}
4936

‎libraries/ArduinoOTA/ArduinoOTA.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,31 +69,31 @@ class ArduinoOTAClass
6969
int getCommand();
7070

7171
private:
72-
int _port;
72+
void _runUpdate(void);
73+
void _onRx(void);
74+
int parseInt(void);
75+
String readStringUntil(char end);
76+
77+
int _port = 0;
7378
String _password;
7479
String _hostname;
7580
String _nonce;
76-
UdpContext *_udp_ota;
77-
bool _initialized;
78-
bool _rebootOnSuccess;
79-
bool _useMDNS;
80-
ota_state_t _state;
81-
int _size;
82-
int _cmd;
83-
uint16_t _ota_port;
84-
uint16_t _ota_udp_port;
81+
UdpContext *_udp_ota = nullptr;
82+
bool _initialized = false;
83+
bool _rebootOnSuccess = true;
84+
bool _useMDNS = true;
85+
ota_state_t _state = OTA_IDLE;
86+
int _size = 0;
87+
int _cmd = 0;
88+
uint16_t _ota_port = 0;
89+
uint16_t _ota_udp_port = 0;
8590
IPAddress _ota_ip;
8691
String _md5;
8792

88-
THandlerFunction _start_callback;
89-
THandlerFunction _end_callback;
90-
THandlerFunction_Error _error_callback;
91-
THandlerFunction_Progress _progress_callback;
92-
93-
void _runUpdate(void);
94-
void _onRx(void);
95-
int parseInt(void);
96-
String readStringUntil(char end);
93+
THandlerFunction _start_callback = nullptr;
94+
THandlerFunction _end_callback = nullptr;
95+
THandlerFunction_Error _error_callback = nullptr;
96+
THandlerFunction_Progress _progress_callback = nullptr;
9797
};
9898

9999
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_ARDUINOOTA)

‎libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,10 @@ WiFiPhyMode_t ESP8266WiFiGenericClass::getPhyMode() {
369369
*/
370370
void ESP8266WiFiGenericClass::setOutputPower(float dBm) {
371371

372-
if(dBm > 20.5) {
373-
dBm = 20.5;
374-
} else if(dBm < 0) {
375-
dBm = 0;
372+
if(dBm > 20.5f) {
373+
dBm = 20.5f;
374+
} else if(dBm < 0.0f) {
375+
dBm = 0.0f;
376376
}
377377

378378
uint8_t val = (dBm*4.0f);

‎libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ extern "C" uint32_t _FS_start;
3030
extern "C" uint32_t _FS_end;
3131

3232
ESP8266HTTPUpdate::ESP8266HTTPUpdate(void)
33-
: _httpClientTimeout(8000), _followRedirects(HTTPC_DISABLE_FOLLOW_REDIRECTS), _ledPin(-1)
33+
: _httpClientTimeout(8000)
3434
{
3535
}
3636

3737
ESP8266HTTPUpdate::ESP8266HTTPUpdate(int httpClientTimeout)
38-
: _httpClientTimeout(httpClientTimeout), _followRedirects(HTTPC_DISABLE_FOLLOW_REDIRECTS), _ledPin(-1)
38+
: _httpClientTimeout(httpClientTimeout)
3939
{
4040
}
4141

‎libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,15 @@ class ESP8266HTTPUpdate
184184

185185
private:
186186
int _httpClientTimeout;
187-
followRedirects_t _followRedirects;
187+
followRedirects_t _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
188188

189189
// Callbacks
190190
HTTPUpdateStartCB _cbStart;
191191
HTTPUpdateEndCB _cbEnd;
192192
HTTPUpdateErrorCB _cbError;
193193
HTTPUpdateProgressCB _cbProgress;
194194

195-
int _ledPin;
195+
int _ledPin = -1;
196196
uint8_t _ledOn;
197197
};
198198

‎tests/ci/eboot_test.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
READELF="$TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf/bin/xtensa-lx106-elf-readelf"
4+
5+
set -ev
6+
7+
cd $TRAVIS_BUILD_DIR/tools
8+
python3 get.py -q
9+
10+
cd $TRAVIS_BUILD_DIR/bootloaders/eboot
11+
12+
"$READELF" -x .data -x .text eboot.elf > git.txt
13+
make clean
14+
make
15+
"$READELF" -x .data -x .text eboot.elf > build.txt
16+
diff git.txt build.txt
17+
if [ $? -ne 0 ]; then
18+
echo ERROR: eboot.elf in repo does not match output from compile.
19+
echo ERROR: Need to rebuild and check in updated eboot.
20+
exit 1
21+
fi

0 commit comments

Comments
 (0)