Skip to content

Commit 18734d6

Browse files
authored
Merge pull request #147 from sarfata/develop
Release v1.3.6
2 parents f4bb68b + 7905670 commit 18734d6

File tree

7 files changed

+25
-17
lines changed

7 files changed

+25
-17
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ CMakeListsPrivate.txt
4343
# CLion
4444
cmake-build-debug
4545
# User-specific stuff
46+
.idea/vcs.xml
4647
.idea/**/workspace.xml
4748
.idea/**/tasks.xml
4849
.idea/**/usage.statistics.xml

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Because KBox is open-source, you can do a lot more things with it:
6868

6969
### Current software status
7070

71-
As of December 2017, the KBox firmware:
71+
As of September 2018, the KBox firmware:
7272

7373
- General functionality
7474
- Creates a new WiFi network (KBox) or can join an existing network (via simple
@@ -192,6 +192,18 @@ been possible!**
192192

193193
## Changelog
194194

195+
* 2018 09 07 - v1.3.6
196+
* Force ESP board definition to generic module w 1MB flash to avoid build
197+
error.
198+
* Upgrade ESP platform to 1.8.0 to use ESP8266 framework 2.4.2 which improves
199+
stability of the WiFi modules and seems to fix a number of connection
200+
issues for other people. Hopefully will also improve KBox wifi stability.
201+
* Add HTTP CORS header on `/signalk`. This makes KBox compatible with the
202+
amazing [Kip](https://github.com/mxtommy/Kip) to display your boat data in
203+
a browser.
204+
* Fixed a typo in the reboot reasons.
205+
* Add missing dependency `pyserial` in the list of dependencies for
206+
`kbox.py`.
195207
* 2018 07 26 - v1.3.5
196208
* Fix a bug that would cause KBox to crash on NMEA sentences without a checksum
197209
* Fix a bug where RMC sentence without a date would crash KBox

lib/KBoxHardware/src/KBoxHardware.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ String KBoxHardware::rebootReason() {
284284
return "Loss of Lock in PLL Reset";
285285
if (RCM_SRS0 & RCM_SRS0_LVD)
286286
return "Low-voltage Detect Reset";
287-
return "unknwon reset";
287+
return "unknown reset reason";
288288
}
289289

290290
void watchdog_isr() {

platformio.ini

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ build_flags =
5252
-DSERIAL1_RX_BUFFER_SIZE=512 -DSERIAL1_TX_BUFFER_SIZE=512
5353
-DSERIAL2_RX_BUFFER_SIZE=256 -DSERIAL2_TX_BUFFER_SIZE=256
5454
-DSERIAL3_RX_BUFFER_SIZE=256 -DSERIAL3_TX_BUFFER_SIZE=256
55-
platform = teensy
55+
platform = teensy@3.4.0
5656
framework = arduino
5757
board = teensy31
5858
lib_deps =
@@ -73,7 +73,7 @@ extra_scripts = tools/platformio_cfg_gitversion.py
7373
[env:program-esp]
7474
src_filter = +<common/*>, +<program-esp/*>, +<host/esp-programmer/>
7575
build_flags = ${common.build_flags} -Isrc/common
76-
platform = teensy
76+
platform = teensy@3.4.0
7777
framework = arduino
7878
board = teensy31
7979
lib_ldf_mode = deep
@@ -88,10 +88,9 @@ src_filter = +<common/*>,+<esp/*>
8888
build_flags = -Wall -Werror -fno-strict-aliasing
8989
-Isrc/common -Isrc/esp
9090
-DHAVE_STRLCPY -DHAVE_STRLCAT
91-
#platform=espressif8266
92-
platform=https://github.com/platformio/platform-espressif8266.git#feature/stage
91+
9392
framework = arduino
94-
board = esp_wroom_02
93+
board = esp01_1m
9594
upload_speed = 921600
9695
extra_scripts =
9796
tools/platformio_cfg_esp.py
@@ -108,7 +107,7 @@ lib_deps =
108107
[env:mfg]
109108
src_filter = +<common/*>, +<mfg/*>, +<host/drivers/ILI9341GC.cpp>
110109
build_flags = ${common.build_flags} -Isrc/common
111-
platform = teensy
110+
platform = teensy@3.4.0
112111
framework = arduino
113112
board = teensy31
114113
lib_deps =
@@ -165,7 +164,7 @@ build_flags =
165164
-DSERIAL3_RX_BUFFER_SIZE=256 -DSERIAL3_TX_BUFFER_SIZE=256
166165
-DSERIAL4_RX_BUFFER_SIZE=256 -DSERIAL4_TX_BUFFER_SIZE=256
167166
-DSERIAL5_RX_BUFFER_SIZE=256 -DSERIAL5_TX_BUFFER_SIZE=256
168-
platform = teensy
167+
platform = teensy@3.4.0
169168
framework = arduino
170169
board = teensy36
171170
lib_deps =
@@ -177,7 +176,7 @@ extra_scripts = tools/platformio_cfg_gitversion.py
177176
[env:program-esp-teensy36]
178177
src_filter = +<common/*>, +<program-esp/*>, +<host/esp-programmer/>
179178
build_flags = ${common.build_flags} -Isrc/common
180-
platform = teensy
179+
platform = teensy@3.4.0
181180
framework = arduino
182181
board = teensy36
183182
lib_ldf_mode = deep
@@ -189,7 +188,7 @@ lib_ignore = ${common.incompatible_libs_teensy}
189188
[env:mfg-teensy36]
190189
src_filter = +<common/*>, +<mfg/*>, +<host/drivers/ILI9341GC.cpp>
191190
build_flags = ${common.build_flags} -Isrc/common
192-
platform = teensy
191+
platform = teensy@3.4.0
193192
framework = arduino
194193
board = teensy36
195194
lib_deps =

src/esp/net/KBoxWebServer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ void handleRequestSignalK(AsyncWebServerRequest *request) {
158158
serverInfo["version"] = KBOX_VERSION;
159159

160160
root.printTo(*response);
161+
response->addHeader("Access-Control-Allow-Origin","*");
161162
request->send(response);
162163
}
163164
else {

tools/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
termcolor
22
pypng
3+
pyserial

0 commit comments

Comments
 (0)