From bf70b5b941b2176a2880d211295463010752cd54 Mon Sep 17 00:00:00 2001 From: Thomas Sarlandie Date: Thu, 6 Sep 2018 18:53:45 +0200 Subject: [PATCH 1/6] fix: typo in reboot reasons list --- lib/KBoxHardware/src/KBoxHardware.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/KBoxHardware/src/KBoxHardware.cpp b/lib/KBoxHardware/src/KBoxHardware.cpp index 3895e233..02b22117 100644 --- a/lib/KBoxHardware/src/KBoxHardware.cpp +++ b/lib/KBoxHardware/src/KBoxHardware.cpp @@ -284,7 +284,7 @@ String KBoxHardware::rebootReason() { return "Loss of Lock in PLL Reset"; if (RCM_SRS0 & RCM_SRS0_LVD) return "Low-voltage Detect Reset"; - return "unknwon reset"; + return "unknown reset reason"; } void watchdog_isr() { From 34ca303e19fd102fb166946c02707ae51ece952b Mon Sep 17 00:00:00 2001 From: Thomas Sarlandie Date: Thu, 6 Sep 2018 18:56:18 +0200 Subject: [PATCH 2/6] chore: add pyserial to required libraries for kbox.py --- tools/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/requirements.txt b/tools/requirements.txt index ccee134a..78874237 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,2 +1,3 @@ termcolor pypng +pyserial From 35ed41388fc6ccd14b7fc8ae958ae117cbdbc830 Mon Sep 17 00:00:00 2001 From: Thomas Sarlandie Date: Thu, 6 Sep 2018 18:59:11 +0200 Subject: [PATCH 3/6] feature: add CORS header on http requests to /signalk This enables compatibility with Web based data viewer like KIP. --- src/esp/net/KBoxWebServer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/esp/net/KBoxWebServer.cpp b/src/esp/net/KBoxWebServer.cpp index c1ef92b1..50b61182 100644 --- a/src/esp/net/KBoxWebServer.cpp +++ b/src/esp/net/KBoxWebServer.cpp @@ -158,6 +158,7 @@ void handleRequestSignalK(AsyncWebServerRequest *request) { serverInfo["version"] = KBOX_VERSION; root.printTo(*response); + response->addHeader("Access-Control-Allow-Origin","*"); request->send(response); } else { From dab99680b8dfbe03784cf8c82519ec36cba1f7de Mon Sep 17 00:00:00 2001 From: Thomas Sarlandie Date: Fri, 7 Sep 2018 13:30:26 +0200 Subject: [PATCH 4/6] fix: esp build error by setting board type - Set board type to generic 1m flash - Force all frameworks versions to avoid this type of issue due to framework changing on us in the future. --- platformio.ini | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/platformio.ini b/platformio.ini index 956d7126..22918278 100644 --- a/platformio.ini +++ b/platformio.ini @@ -52,7 +52,7 @@ build_flags = -DSERIAL1_RX_BUFFER_SIZE=512 -DSERIAL1_TX_BUFFER_SIZE=512 -DSERIAL2_RX_BUFFER_SIZE=256 -DSERIAL2_TX_BUFFER_SIZE=256 -DSERIAL3_RX_BUFFER_SIZE=256 -DSERIAL3_TX_BUFFER_SIZE=256 -platform = teensy +platform = teensy@3.4.0 framework = arduino board = teensy31 lib_deps = @@ -73,7 +73,7 @@ extra_scripts = tools/platformio_cfg_gitversion.py [env:program-esp] src_filter = +, +, + build_flags = ${common.build_flags} -Isrc/common -platform = teensy +platform = teensy@3.4.0 framework = arduino board = teensy31 lib_ldf_mode = deep @@ -88,10 +88,9 @@ src_filter = +,+ build_flags = -Wall -Werror -fno-strict-aliasing -Isrc/common -Isrc/esp -DHAVE_STRLCPY -DHAVE_STRLCAT -#platform=espressif8266 -platform=https://github.com/platformio/platform-espressif8266.git#feature/stage +platform=espressif8266@1.8.0 framework = arduino -board = esp_wroom_02 +board = esp01_1m upload_speed = 921600 extra_scripts = tools/platformio_cfg_esp.py @@ -108,7 +107,7 @@ lib_deps = [env:mfg] src_filter = +, +, + build_flags = ${common.build_flags} -Isrc/common -platform = teensy +platform = teensy@3.4.0 framework = arduino board = teensy31 lib_deps = @@ -165,7 +164,7 @@ build_flags = -DSERIAL3_RX_BUFFER_SIZE=256 -DSERIAL3_TX_BUFFER_SIZE=256 -DSERIAL4_RX_BUFFER_SIZE=256 -DSERIAL4_TX_BUFFER_SIZE=256 -DSERIAL5_RX_BUFFER_SIZE=256 -DSERIAL5_TX_BUFFER_SIZE=256 -platform = teensy +platform = teensy@3.4.0 framework = arduino board = teensy36 lib_deps = @@ -177,7 +176,7 @@ extra_scripts = tools/platformio_cfg_gitversion.py [env:program-esp-teensy36] src_filter = +, +, + build_flags = ${common.build_flags} -Isrc/common -platform = teensy +platform = teensy@3.4.0 framework = arduino board = teensy36 lib_ldf_mode = deep @@ -189,7 +188,7 @@ lib_ignore = ${common.incompatible_libs_teensy} [env:mfg-teensy36] src_filter = +, +, + build_flags = ${common.build_flags} -Isrc/common -platform = teensy +platform = teensy@3.4.0 framework = arduino board = teensy36 lib_deps = From b0c7c82a34219c2d919a410c945f275665999712 Mon Sep 17 00:00:00 2001 From: Thomas Sarlandie Date: Fri, 7 Sep 2018 13:31:53 +0200 Subject: [PATCH 5/6] doc: changelog for v1.3.6 --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7148ea4d..da7fd809 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ Because KBox is open-source, you can do a lot more things with it: ### Current software status -As of December 2017, the KBox firmware: +As of September 2018, the KBox firmware: - General functionality - Creates a new WiFi network (KBox) or can join an existing network (via simple @@ -192,6 +192,18 @@ been possible!** ## Changelog + * 2018 09 07 - v1.3.6 + * Force ESP board definition to generic module w 1MB flash to avoid build + error. + * Upgrade ESP platform to 1.8.0 to use ESP8266 framework 2.4.2 which improves + stability of the WiFi modules and seems to fix a number of connection + issues for other people. Hopefully will also improve KBox wifi stability. + * Add HTTP CORS header on `/signalk`. This makes KBox compatible with the + amazing [Kip](https://github.com/mxtommy/Kip) to display your boat data in + a browser. + * Fixed a typo in the reboot reasons. + * Add missing dependency `pyserial` in the list of dependencies for + `kbox.py`. * 2018 07 26 - v1.3.5 * Fix a bug that would cause KBox to crash on NMEA sentences without a checksum * Fix a bug where RMC sentence without a date would crash KBox From 7905670229ce495c13b58a81f8651765927170ef Mon Sep 17 00:00:00 2001 From: Thomas Sarlandie Date: Fri, 7 Sep 2018 13:37:45 +0200 Subject: [PATCH 6/6] chore: remove .idea/vcs.xml from git --- .gitignore | 1 + .idea/vcs.xml | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 2db1b99e..c66946f3 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ CMakeListsPrivate.txt # CLion cmake-build-debug # User-specific stuff +.idea/vcs.xml .idea/**/workspace.xml .idea/**/tasks.xml .idea/**/usage.statistics.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file