mchapman/nina-fw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #31 from ajs256/patch-1

Browse Source 
Merge in commit 73375c3 from upstream
This commit is contained in:
Brent Rubell
2021-03-26 16:10:19 -04:00
committed by GitHub
parent f2a0e601b2 4a7e461534
commit 2c3edb8d82
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -28,7 +28,7 @@ load-passthrough:
cp passthrough.UF2 $(BOOT_VOLUME) cp passthrough.UF2 $(BOOT_VOLUME)
load-nina: load-nina:
esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.1.bin esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.2.bin
load-circuitpython: load-circuitpython:
cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME) cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME)

3
arduino/libraries/WiFi/src/WiFiClient.cpp
View File

@@ -177,8 +177,7 @@ void WiFiClient::stop()
uint8_t WiFiClient::connected() uint8_t WiFiClient::connected()
{ {
if (_socket != -1) { if (_socket != -1) {
// use peek to update socket state available();
peek();
} }
return (_socket != -1); return (_socket != -1);

2
combine.py
View File

@@ -31,7 +31,7 @@ for i in range(0, len(certsData)):
# zero terminate the pem file # zero terminate the pem file
outputData[0x10000 + len(certsData)] = 0 outputData[0x10000 + len(certsData)] = 0
outputFilename = "NINA_W102-1.7.1.bin" outputFilename = "NINA_W102-1.7.2.bin"
if (len(sys.argv) > 1): if (len(sys.argv) > 1):
outputFilename = sys.argv[1] outputFilename = sys.argv[1]

2
main/CommandHandler.cpp
View File

@@ -28,7 +28,7 @@
#include "Arduino.h" #include "Arduino.h"
const char FIRMWARE_VERSION[6] = "1.7.1"; const char FIRMWARE_VERSION[6] = "1.7.2";
// Optional, user-defined X.509 certificate // Optional, user-defined X.509 certificate
char CERT_BUF[1300]; char CERT_BUF[1300];