update to v1.1.4 and include app compatible advertising

Jewelbots · Apr 19, 2017 · fe2a0b9 · fe2a0b9
1 parent d4504a6
commit fe2a0b9
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/jewelbots_firmware_update_v110/JWB_update_1_10b.zip b/jewelbots_firmware_update_v110/JWB_update_1_10b.zip
diff --git a/jewelbots_firmware_update_v110/.DS_Store → jewelbots_firmware_update_v114/.DS_Store b/jewelbots_firmware_update_v110/.DS_Store → jewelbots_firmware_update_v114/.DS_Store
diff --git a/jewelbots_firmware_update_v110/JWBLoader.exe → jewelbots_firmware_update_v114/JWBLoader.exe b/jewelbots_firmware_update_v110/JWBLoader.exe → jewelbots_firmware_update_v114/JWBLoader.exe
diff --git a/...bots_firmware_update_v110/JWBLoader_linux → ...bots_firmware_update_v114/JWBLoader_linux b/...bots_firmware_update_v110/JWBLoader_linux → ...bots_firmware_update_v114/JWBLoader_linux
diff --git a/jewelbots_firmware_update_v110/JWBLoader_osx → jewelbots_firmware_update_v114/JWBLoader_osx b/jewelbots_firmware_update_v110/JWBLoader_osx → jewelbots_firmware_update_v114/JWBLoader_osx
diff --git a/..._firmware_update_v110/JWB_Update_linux.sh → ..._firmware_update_v114/JWB_Update_linux.sh b/..._firmware_update_v110/JWB_Update_linux.sh → ..._firmware_update_v114/JWB_Update_linux.sh
@@ -2,6 +2,6 @@
 
 PATH="$1"
 PORT="$2"
-$PATH/JWBLoader_linux --verbose dfu serial --package=$PATH/JWB_update_1_10a.zip --port=$PORT --baudrate=38400
+$PATH/JWBLoader_linux --verbose dfu serial --package=$PATH/JWB_update_1_1_4a.zip --port=$PORT --baudrate=38400
 /bin/sleep 1s
-$PATH/JWBLoader_linux --verbose dfu serial --package=$PATH/JWB_update_1_10b.zip --port=$PORT --baudrate=38400
+$PATH/JWBLoader_linux --verbose dfu serial --package=$PATH/JWB_update_1_1_4b.zip --port=$PORT --baudrate=38400
diff --git a/...ts_firmware_update_v110/JWB_Update_mac.sh → ...ts_firmware_update_v114/JWB_Update_mac.sh b/...ts_firmware_update_v110/JWB_Update_mac.sh → ...ts_firmware_update_v114/JWB_Update_mac.sh
@@ -2,5 +2,5 @@
 
 PATH="$1"
 PORT="$2"
-$PATH/JWBLoader_osx --verbose dfu serial --package=$PATH/JWB_update_1_10a.zip --port=$PORT --baudrate=38400
-$PATH/JWBLoader_osx --verbose dfu serial --package=$PATH/JWB_update_1_10b.zip --port=$PORT --baudrate=38400
+$PATH/JWBLoader_osx --verbose dfu serial --package=$PATH/JWB_update_1_1_4a.zip --port=$PORT --baudrate=38400
+$PATH/JWBLoader_osx --verbose dfu serial --package=$PATH/JWB_update_1_1_4b.zip --port=$PORT --baudrate=38400
diff --git a/...s_firmware_update_v110/JWB_Update_win.bat → ...s_firmware_update_v114/JWB_Update_win.bat b/...s_firmware_update_v110/JWB_Update_win.bat → ...s_firmware_update_v114/JWB_Update_win.bat
@@ -6,6 +6,6 @@ set PATH=%1
 set PORT=%2
 
 
-%PATH%/JWBLoader.exe --verbose dfu serial --package=%PATH%/JWB_update_1_10a.zip --port=%PORT% --baudrate=38400
+%PATH%/JWBLoader.exe --verbose dfu serial --package=%PATH%/JWB_update_1_1_4a.zip --port=%PORT% --baudrate=38400
 
-%PATH%/JWBLoader.exe --verbose dfu serial --package=%PATH%/JWB_update_1_10b.zip --port=%PORT% --baudrate=38400
+%PATH%/JWBLoader.exe --verbose dfu serial --package=%PATH%/JWB_update_1_1_4b.zip --port=%PORT% --baudrate=38400
diff --git a/...firmware_update_v110/JWB_update_1_10a.zip → ...irmware_update_v114/JWB_update_1_1_4a.zip b/...firmware_update_v110/JWB_update_1_10a.zip → ...irmware_update_v114/JWB_update_1_1_4a.zip
diff --git a/jewelbots_firmware_update_v114/JWB_update_1_1_4b.zip b/jewelbots_firmware_update_v114/JWB_update_1_1_4b.zip
diff --git a/jewelbots_firmware_update_v110/boards.txt → jewelbots_firmware_update_v114/boards.txt b/jewelbots_firmware_update_v110/boards.txt → jewelbots_firmware_update_v114/boards.txt
diff --git a/...e_update_v110/cores/Jewelbot_v1/Arduino.h → ...e_update_v114/cores/Jewelbot_v1/Arduino.h b/...e_update_v110/cores/Jewelbot_v1/Arduino.h → ...e_update_v114/cores/Jewelbot_v1/Arduino.h
diff --git a/...110/cores/Jewelbot_v1/JWB_startup_nrf51.S → ...114/cores/Jewelbot_v1/JWB_startup_nrf51.S b/...110/cores/Jewelbot_v1/JWB_startup_nrf51.S → ...114/cores/Jewelbot_v1/JWB_startup_nrf51.S
diff --git a/...re_update_v110/cores/Jewelbot_v1/main.cpp → ...re_update_v114/cores/Jewelbot_v1/main.cpp b/...re_update_v110/cores/Jewelbot_v1/main.cpp → ...re_update_v114/cores/Jewelbot_v1/main.cpp
diff --git a/jewelbots_firmware_update_v110/platform.txt → jewelbots_firmware_update_v114/platform.txt b/jewelbots_firmware_update_v110/platform.txt → jewelbots_firmware_update_v114/platform.txt
diff --git a/...bots_firmware_update_v110/programmers.txt → ...bots_firmware_update_v114/programmers.txt b/...bots_firmware_update_v110/programmers.txt → ...bots_firmware_update_v114/programmers.txt
diff --git a/...bot_v1/linker_scripts/gcc/JWB_nRF51822.ld → ...bot_v1/linker_scripts/gcc/JWB_nRF51822.ld b/...bot_v1/linker_scripts/gcc/JWB_nRF51822.ld → ...bot_v1/linker_scripts/gcc/JWB_nRF51822.ld