Merge pull request #31 from ajs256/patch-1

Merge in commit 73375c3 from upstream
adafruit · Mar 26, 2021 · 2c3edb8 · 2c3edb8
2 parents f2a0e60 + 4a7e461
commit 2c3edb8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ load-passthrough:
 	cp passthrough.UF2  $(BOOT_VOLUME)
 
 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:
 	cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME)

diff --git a/arduino/libraries/WiFi/src/WiFiClient.cpp b/arduino/libraries/WiFi/src/WiFiClient.cpp
@@ -177,8 +177,7 @@ void WiFiClient::stop()
 uint8_t WiFiClient::connected()
 {
   if (_socket != -1) {
-    // use peek to update socket state
-    peek();
+    available();
   }
 
   return (_socket != -1);

diff --git a/combine.py b/combine.py
@@ -31,7 +31,7 @@
 # zero terminate the pem file
 outputData[0x10000 + len(certsData)] = 0
 
-outputFilename = "NINA_W102-1.7.1.bin"
+outputFilename = "NINA_W102-1.7.2.bin"
 if (len(sys.argv) > 1):
 	outputFilename = sys.argv[1]
 

diff --git a/main/CommandHandler.cpp b/main/CommandHandler.cpp
@@ -28,7 +28,7 @@
 
 #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
 char CERT_BUF[1300];