From d2726992d8fd7e28bf7dd050e45c23888872afa0 Mon Sep 17 00:00:00 2001 From: ajs256 <67526318+ajs256@users.noreply.github.com> Date: Thu, 4 Mar 2021 17:32:51 -0800 Subject: [PATCH 1/4] Merge in commit 73375c3 from upstream Replace `peek()` with `available()` during connection status check to avoid losing messages. Closes adafruit#22. --- arduino/libraries/WiFi/src/WiFiClient.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arduino/libraries/WiFi/src/WiFiClient.cpp b/arduino/libraries/WiFi/src/WiFiClient.cpp index 9dc06bed..683f8289 100644 --- 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); From 516f3feb9e066786d636ddbc2562ffd5def59a95 Mon Sep 17 00:00:00 2001 From: ajs256 <67526318+ajs256@users.noreply.github.com> Date: Wed, 17 Mar 2021 15:45:27 -0700 Subject: [PATCH 2/4] Update version numbers, part 1 --- combine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/combine.py b/combine.py index fcc41adb..56dc55fb 100644 --- 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] From 197c50ffe54facb627df69f6bbee729c2f01cb81 Mon Sep 17 00:00:00 2001 From: ajs256 <67526318+ajs256@users.noreply.github.com> Date: Wed, 17 Mar 2021 15:45:53 -0700 Subject: [PATCH 3/4] Update version number, part 2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a89ef8e6..83a947f6 100644 --- 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) From 4a7e461534be9c2c4f6c93610fcbd02b2ad38c81 Mon Sep 17 00:00:00 2001 From: ajs256 <67526318+ajs256@users.noreply.github.com> Date: Wed, 17 Mar 2021 15:46:19 -0700 Subject: [PATCH 4/4] Update version number, part 3 --- main/CommandHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/CommandHandler.cpp b/main/CommandHandler.cpp index 7e253855..a14af438 100644 --- 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];