Skip to content

Commit d9574d9

Browse files
stickbreakerstickbreaker
authored
Merge pull request #2 from espressif/master
catcup 11/06/17
2 parents dca8013 + 1b994d5 commit d9574d9

File tree

9 files changed

+74
-56
lines changed

9 files changed

+74
-56
lines changed

‎boards.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ nodemcu-32s.serial.disableRTS=true
830830
nodemcu-32s.build.mcu=esp32
831831
nodemcu-32s.build.core=esp32
832832
nodemcu-32s.build.variant=nodemcu-32s
833-
nodemcu-32s.build.board=NodeMCU-32S
833+
nodemcu-32s.build.board=NodeMCU_32S
834834

835835
nodemcu-32s.build.f_cpu=240000000L
836836
nodemcu-32s.build.flash_mode=dio

‎libraries/ArduinoOTA/examples/BasicOTA/BasicOTA.ino

+26-23
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,34 @@ void setup() {
3030
// MD5(admin) = 21232f297a57a5a743894a0e4a801fc3
3131
// ArduinoOTA.setPasswordHash("21232f297a57a5a743894a0e4a801fc3");
3232

33-
ArduinoOTA.onStart([]() {
34-
String type;
35-
if (ArduinoOTA.getCommand() == U_FLASH)
36-
type = "sketch";
37-
else // U_SPIFFS
38-
type = "filesystem";
33+
ArduinoOTA
34+
.onStart([]() {
35+
String type;
36+
if (ArduinoOTA.getCommand() == U_FLASH)
37+
type = "sketch";
38+
else // U_SPIFFS
39+
type = "filesystem";
40+
41+
// NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end()
42+
Serial.println("Start updating " + type);
43+
})
44+
.onEnd([]() {
45+
Serial.println("\nEnd");
46+
})
47+
.onProgress([](unsigned int progress, unsigned int total) {
48+
Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
49+
})
50+
.onError([](ota_error_t error) {
51+
Serial.printf("Error[%u]: ", error);
52+
if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
53+
else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
54+
else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
55+
else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
56+
else if (error == OTA_END_ERROR) Serial.println("End Failed");
57+
});
3958

40-
// NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end()
41-
Serial.println("Start updating " + type);
42-
});
43-
ArduinoOTA.onEnd([]() {
44-
Serial.println("\nEnd");
45-
});
46-
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
47-
Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
48-
});
49-
ArduinoOTA.onError([](ota_error_t error) {
50-
Serial.printf("Error[%u]: ", error);
51-
if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
52-
else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
53-
else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
54-
else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
55-
else if (error == OTA_END_ERROR) Serial.println("End Failed");
56-
});
5759
ArduinoOTA.begin();
60+
5861
Serial.println("Ready");
5962
Serial.print("IP address: ");
6063
Serial.println(WiFi.localIP());

‎libraries/ArduinoOTA/src/ArduinoOTA.cpp

+20-10
Original file line numberDiff line numberDiff line change
@@ -31,60 +31,70 @@ ArduinoOTAClass::~ArduinoOTAClass(){
3131
_udp_ota.stop();
3232
}
3333

34-
void ArduinoOTAClass::onStart(THandlerFunction fn) {
34+
ArduinoOTAClass& ArduinoOTAClass::onStart(THandlerFunction fn) {
3535
_start_callback = fn;
36+
return *this;
3637
}
3738

38-
void ArduinoOTAClass::onEnd(THandlerFunction fn) {
39+
ArduinoOTAClass& ArduinoOTAClass::onEnd(THandlerFunction fn) {
3940
_end_callback = fn;
41+
return *this;
4042
}
4143

42-
void ArduinoOTAClass::onProgress(THandlerFunction_Progress fn) {
44+
ArduinoOTAClass& ArduinoOTAClass::onProgress(THandlerFunction_Progress fn) {
4345
_progress_callback = fn;
46+
return *this;
4447
}
4548

46-
void ArduinoOTAClass::onError(THandlerFunction_Error fn) {
49+
ArduinoOTAClass& ArduinoOTAClass::onError(THandlerFunction_Error fn) {
4750
_error_callback = fn;
51+
return *this;
4852
}
4953

50-
void ArduinoOTAClass::setPort(uint16_t port) {
54+
ArduinoOTAClass& ArduinoOTAClass::setPort(uint16_t port) {
5155
if (!_initialized && !_port && port) {
5256
_port = port;
5357
}
58+
return *this;
5459
}
5560

56-
void ArduinoOTAClass::setHostname(const char * hostname) {
61+
ArduinoOTAClass& ArduinoOTAClass::setHostname(const char * hostname) {
5762
if (!_initialized && !_hostname.length() && hostname) {
5863
_hostname = hostname;
5964
}
65+
return *this;
6066
}
6167

6268
String ArduinoOTAClass::getHostname() {
6369
return _hostname;
6470
}
6571

66-
void ArduinoOTAClass::setPassword(const char * password) {
72+
ArduinoOTAClass& ArduinoOTAClass::setPassword(const char * password) {
6773
if (!_initialized && !_password.length() && password) {
6874
MD5Builder passmd5;
6975
passmd5.begin();
7076
passmd5.add(password);
7177
passmd5.calculate();
7278
_password = passmd5.toString();
7379
}
80+
return *this;
7481
}
7582

76-
void ArduinoOTAClass::setPasswordHash(const char * password) {
83+
ArduinoOTAClass& ArduinoOTAClass::setPasswordHash(const char * password) {
7784
if (!_initialized && !_password.length() && password) {
7885
_password = password;
7986
}
87+
return *this;
8088
}
8189

82-
void ArduinoOTAClass::setRebootOnSuccess(bool reboot){
90+
ArduinoOTAClass& ArduinoOTAClass::setRebootOnSuccess(bool reboot){
8391
_rebootOnSuccess = reboot;
92+
return *this;
8493
}
8594

86-
void ArduinoOTAClass::setMdnsEnabled(bool enabled){
95+
ArduinoOTAClass& ArduinoOTAClass::setMdnsEnabled(bool enabled){
8796
_mdnsEnabled = enabled;
97+
return *this;
8898
}
8999

90100
void ArduinoOTAClass::begin() {

‎libraries/ArduinoOTA/src/ArduinoOTA.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -33,35 +33,35 @@ class ArduinoOTAClass
3333
~ArduinoOTAClass();
3434

3535
//Sets the service port. Default 3232
36-
void setPort(uint16_t port);
36+
ArduinoOTAClass& setPort(uint16_t port);
3737

3838
//Sets the device hostname. Default esp32-xxxxxx
39-
void setHostname(const char *hostname);
39+
ArduinoOTAClass& setHostname(const char *hostname);
4040
String getHostname();
4141

4242
//Sets the password that will be required for OTA. Default NULL
43-
void setPassword(const char *password);
43+
ArduinoOTAClass& setPassword(const char *password);
4444

4545
//Sets the password as above but in the form MD5(password). Default NULL
46-
void setPasswordHash(const char *password);
46+
ArduinoOTAClass& setPasswordHash(const char *password);
4747

4848
//Sets if the device should be rebooted after successful update. Default true
49-
void setRebootOnSuccess(bool reboot);
49+
ArduinoOTAClass& setRebootOnSuccess(bool reboot);
5050

5151
//Sets if the device should advertise itself to Arduino IDE. Default true
52-
void setMdnsEnabled(bool enabled);
52+
ArduinoOTAClass& setMdnsEnabled(bool enabled);
5353

5454
//This callback will be called when OTA connection has begun
55-
void onStart(THandlerFunction fn);
55+
ArduinoOTAClass& onStart(THandlerFunction fn);
5656

5757
//This callback will be called when OTA has finished
58-
void onEnd(THandlerFunction fn);
58+
ArduinoOTAClass& onEnd(THandlerFunction fn);
5959

6060
//This callback will be called when OTA encountered Error
61-
void onError(THandlerFunction_Error fn);
61+
ArduinoOTAClass& onError(THandlerFunction_Error fn);
6262

6363
//This callback will be called when OTA is receiving data
64-
void onProgress(THandlerFunction_Progress fn);
64+
ArduinoOTAClass& onProgress(THandlerFunction_Progress fn);
6565

6666
//Starts the ArduinoOTA service
6767
void begin();

‎libraries/SD/src/SD.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ bool SDFS::begin(uint8_t ssPin, SPIClass &spi, uint32_t frequency, const char *
3636
}
3737

3838
if(!sdcard_mount(_pdrv, mountpoint)){
39+
sdcard_unmount(_pdrv);
3940
sdcard_uninit(_pdrv);
4041
_pdrv = 0xFF;
4142
return false;
@@ -79,7 +80,7 @@ uint64_t SDFS::totalBytes()
7980
FATFS* fsinfo;
8081
DWORD fre_clust;
8182
if(f_getfree("0:",&fre_clust,&fsinfo)!= 0) return 0;
82-
uint64_t size = (fsinfo->csize)*(fsinfo->n_fatent - 2)
83+
uint64_t size = ((uint64_t)(fsinfo->csize))*(fsinfo->n_fatent - 2)
8384
#if _MAX_SS != 512
8485
*(fsinfo->ssize);
8586
#else
@@ -93,7 +94,7 @@ uint64_t SDFS::usedBytes()
9394
FATFS* fsinfo;
9495
DWORD fre_clust;
9596
if(f_getfree("0:",&fre_clust,&fsinfo)!= 0) return 0;
96-
uint64_t size = (fsinfo->csize)*((fsinfo->n_fatent - 2) - (fsinfo->free_clst))
97+
uint64_t size = ((uint64_t)(fsinfo->csize))*((fsinfo->n_fatent - 2) - (fsinfo->free_clst))
9798
#if _MAX_SS != 512
9899
*(fsinfo->ssize);
99100
#else

‎libraries/SD_MMC/src/SD_MMC.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ uint64_t SDMMCFS::totalBytes()
104104
FATFS* fsinfo;
105105
DWORD fre_clust;
106106
if(f_getfree("0:",&fre_clust,&fsinfo)!= 0) return 0;
107-
uint64_t size = (fsinfo->csize)*(fsinfo->n_fatent - 2)
107+
uint64_t size = ((uint64_t)(fsinfo->csize))*(fsinfo->n_fatent - 2)
108108
#if _MAX_SS != 512
109109
*(fsinfo->ssize);
110110
#else
@@ -118,7 +118,7 @@ uint64_t SDMMCFS::usedBytes()
118118
FATFS* fsinfo;
119119
DWORD fre_clust;
120120
if(f_getfree("0:",&fre_clust,&fsinfo)!= 0) return 0;
121-
uint64_t size = (fsinfo->csize)*((fsinfo->n_fatent - 2) - (fsinfo->free_clst))
121+
uint64_t size = ((uint64_t)(fsinfo->csize))*((fsinfo->n_fatent - 2) - (fsinfo->free_clst))
122122
#if _MAX_SS != 512
123123
*(fsinfo->ssize);
124124
#else

‎libraries/WiFiClientSecure/src/ssl_client.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
161161
if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
162162
return handle_error(ret);
163163
}
164+
vTaskDelay(10 / portTICK_PERIOD_MS);
164165
}
165166

166167

‎platform.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ compiler.objcopy.eep.extra_flags=
6161
compiler.elf2hex.extra_flags=
6262

6363
## Compile c files
64-
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
64+
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
6565

6666
## Compile c++ files
67-
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
67+
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
6868

6969
## Compile S files
70-
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
70+
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.S.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
7171

7272
## Create archives
7373
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}"

‎variants/heltec_wifi_lora_32/pins_arduino.h

+8-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

14-
static const uint8_t LED_BUILTIN = 2;
14+
static const uint8_t LED_BUILTIN = 25;
1515
#define BUILTIN_LED LED_BUILTIN // backward compatibility
1616

1717
static const uint8_t KEY_BUILTIN = 0;
@@ -28,11 +28,14 @@ static const uint8_t MISO = 19;
2828
static const uint8_t SCK = 5;
2929

3030
static const uint8_t A0 = 36;
31+
static const uint8_t A1 = 37;
32+
static const uint8_t A2 = 38;
3133
static const uint8_t A3 = 39;
3234
static const uint8_t A4 = 32;
3335
static const uint8_t A5 = 33;
3436
static const uint8_t A6 = 34;
3537
static const uint8_t A7 = 35;
38+
3639
static const uint8_t A10 = 4;
3740
static const uint8_t A11 = 0;
3841
static const uint8_t A12 = 2;
@@ -52,10 +55,10 @@ static const uint8_t T4 = 13;
5255
static const uint8_t T5 = 12;
5356
static const uint8_t T6 = 14;
5457
static const uint8_t T7 = 27;
55-
static const uint8_t T8 = 33;
56-
static const uint8_t T9 = 32;
58+
static const uint8_t T8 = 32;
59+
static const uint8_t T9 = 33;
5760

58-
static const uint8_t DAC1 = 25;
59-
static const uint8_t DAC2 = 26;
61+
static const uint8_t DAC1 = 26;
62+
static const uint8_t DAC2 = 25;
6063

6164
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)