diff --git a/CHANGELOG.md b/CHANGELOG.md index 26cea7dc2..acf0c351f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Changed - Bluetooth and BTstack Error Codes and Events: collect status codes in bluetooth.h and events in btstack_defines.h - bluetooth.h: extract internal defintitions to respective protocol layers +- Updated CC256x initscripts (CC256xB v1.8, CC256xC v1.2) ## Changes August 2019 diff --git a/chipset/cc256x/Makefile.inc b/chipset/cc256x/Makefile.inc index 424767a30..bbf5c7392 100644 --- a/chipset/cc256x/Makefile.inc +++ b/chipset/cc256x/Makefile.inc @@ -96,6 +96,23 @@ cc256xb_bt_sp_v1.6/initscripts-TIInit_6.7.16_ble_add-on.bts: cc256xb_bt_sp_v1.6. @mkdir -p cc256xb_bt_sp_v1.6 @unzip -q -j -o cc256xb_bt_sp_v1.6.zip -d cc256xb_bt_sp_v1.6 CC256XB_BT_SP/v1.6/initscripts-TIInit_6.7.16_ble_add-on.bts +# v1.7 - not available, please use v1.8 or newer + +# v1.8 - unversioned files from BlueKitchen website, original: http://www.ti.com/tool/cc256xb-bt-sp +cc256xb_bt_sp_v1.8.zip: + echo "Downloading $@" + @curl -sS -O $(BLUEKITCHEN_URL)/cc256xb_bt_sp_v1.8.zip + +cc256xb_bt_sp_v1.8/initscripts-TIInit_6.7.16_bt_spec_4.1.bts: cc256xb_bt_sp_v1.8.zip + @echo "Extracting $@" + @mkdir -p cc256xb_bt_sp_v1.8 + @unzip -q -j -o cc256xb_bt_sp_v1.8.zip -d cc256xb_bt_sp_v1.8 CC256XB_BT_SP/v1.8/initscripts-TIInit_6.7.16_bt_spec_4.1.bts + +cc256xb_bt_sp_v1.8/initscripts-TIInit_6.7.16_ble_add-on.bts: cc256xb_bt_sp_v1.8.zip + @echo "Extracting $@" + @mkdir -p cc256xb_bt_sp_v1.8 + @unzip -q -j -o cc256xb_bt_sp_v1.8.zip -d cc256xb_bt_sp_v1.8 CC256XB_BT_SP/v1.8/initscripts-TIInit_6.7.16_ble_add-on.bts + # Fourth generation CC256xC - TIInit_6.12.26.bts @@ -125,6 +142,18 @@ initscripts-TIInit_6.12.26_ble_add-on_v1.1.bts: cc256xc_bt_sp_v1.1.zip @echo "Extracting $@" @unzip -q -p cc256xc_bt_sp_v1.1.zip CC256XC_BT_SP/v1.1/initscripts-TIInit_6.12.26_ble_add-on.bts > $@ +# v1.1 - unversioned files from BlueKitchen website, original: http://www.ti.com/tool/cc256xc-bt-sp +cc256xc_bt_sp_v1.2.zip: + @echo "Downloading $@" + @curl -sS -O $(BLUEKITCHEN_URL)/cc256xc_bt_sp_v1.2.zip + +initscripts-TIInit_6.12.26_v1.2.bts: cc256xc_bt_sp_v1.2.zip + @echo "Extracting $@" + @unzip -q -p cc256xc_bt_sp_v1.2.zip CC256XC_BT_SP/v1.2/initscripts-TIInit_6.12.26.bts > $@ + +initscripts-TIInit_6.12.26_ble_add-on_v1.2.bts: cc256xc_bt_sp_v1.2.zip + @echo "Extracting $@" + @unzip -q -p cc256xc_bt_sp_v1.2.zip CC256XC_BT_SP/v1.2/initscripts-TIInit_6.12.26_ble_add-on.bts > $@ # Various scripts for WL chipsets @@ -197,6 +226,14 @@ bluetooth_init_cc2564B_1.6_BT_Spec_4.1.c: cc256xb_bt_sp_v1.6/initscripts-TIInit_ @echo "Creating $@" @$(CONVERSION_SCRIPT) $^ $@ +bluetooth_init_cc2560B_1.8_BT_Spec_4.1.c: cc256xb_bt_sp_v1.8/initscripts-TIInit_6.7.16_bt_spec_4.1.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + +bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c: cc256xb_bt_sp_v1.8/initscripts-TIInit_6.7.16_bt_spec_4.1.bts cc256xb_bt_sp_v1.8/initscripts-TIInit_6.7.16_ble_add-on.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + bluetooth_init_cc2560C_1.0.c: initscripts-TIInit_6.12.26_v1.0.bts @echo "Creating $@" @$(CONVERSION_SCRIPT) $^ $@ @@ -213,6 +250,14 @@ bluetooth_init_cc2564C_1.1.c: initscripts-TIInit_6.12.26_v1.1.bts initscripts-TI @echo "Creating $@" @$(CONVERSION_SCRIPT) $^ $@ +bluetooth_init_cc2560C_1.2.c: initscripts-TIInit_6.12.26_v1.2.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + +bluetooth_init_cc2564C_1.2.c: initscripts-TIInit_6.12.26_v1.2.bts initscripts-TIInit_6.12.26_ble_add-on_v1.2.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + TIInit_11.8.32.c: TIInit_11.8.32.bts @echo "Creating $@" @$(CONVERSION_SCRIPT) $^ $@ @@ -233,10 +278,14 @@ all-scripts: \ bluetooth_init_cc2564B_1.4_BT_Spec_4.1.c \ bluetooth_init_cc2560B_1.5_BT_Spec_4.1.c \ bluetooth_init_cc2564B_1.5_BT_Spec_4.1.c \ + bluetooth_init_cc2564B_1.6_BT_Spec_4.1.c \ + bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c \ bluetooth_init_cc2560C_1.0.c \ - bluetooth_init_cc2560C_1.1.c \ bluetooth_init_cc2564C_1.0.c \ + bluetooth_init_cc2560C_1.1.c \ bluetooth_init_cc2564C_1.1.c \ + bluetooth_init_cc2560C_1.2.c \ + bluetooth_init_cc2564C_1.2.c \ TIInit_11.8.32.c \ TIInit_12.10.28.c \ TIInit_12.8.32.c \ diff --git a/port/max32630-fthr/example/template/Makefile b/port/max32630-fthr/example/template/Makefile index 792931971..c9abd8041 100644 --- a/port/max32630-fthr/example/template/Makefile +++ b/port/max32630-fthr/example/template/Makefile @@ -50,7 +50,7 @@ CPPFLAGS+=-g3 -ggdb -DDEBUG TARGET_UC:=$(shell echo $(TARGET) | tr a-z A-Z) TARGET_LC:=$(shell echo $(TARGET) | tr A-Z a-z) -CC2564B = bluetooth_init_cc2564B_1.6_BT_Spec_4.1.o +CC2564B = bluetooth_init_cc2564B_1.8_BT_Spec_4.1.o # Select 'GCC' or 'IAR' compiler COMPILER=GCC diff --git a/port/msp-exp430f5438-cc2564b/Makefile b/port/msp-exp430f5438-cc2564b/Makefile index 8274ce4c6..218d48d04 100644 --- a/port/msp-exp430f5438-cc2564b/Makefile +++ b/port/msp-exp430f5438-cc2564b/Makefile @@ -4,8 +4,8 @@ # # init scripts -CC2560B = bluetooth_init_cc2560B_1.6_BT_Spec_4.1.o -CC2564B = bluetooth_init_cc2564B_1.6_BT_Spec_4.1.o +CC2560B = bluetooth_init_cc2560B_1.8_BT_Spec_4.1.o +CC2564B = bluetooth_init_cc2564B_1.8_BT_Spec_4.1.o CC2567 = CC256x_BT_Service_Pack_2.8_ANT_1.16.o BTSTACK_ROOT ?= ../.. diff --git a/port/msp430f5229lp-cc2564b/Makefile b/port/msp430f5229lp-cc2564b/Makefile index 4965471d8..0b0230526 100644 --- a/port/msp430f5229lp-cc2564b/Makefile +++ b/port/msp430f5229lp-cc2564b/Makefile @@ -4,8 +4,8 @@ # # init scripts -CC2560B = bluetooth_init_cc2560B_1.6_BT_Spec_4.1.o -CC2564B = bluetooth_init_cc2564B_1.6_BT_Spec_4.1.o +CC2560B = bluetooth_init_cc2560B_1.8_BT_Spec_4.1.o +CC2564B = bluetooth_init_cc2564B_1.8_BT_Spec_4.1.o CC2567 = CC256x_BT_Service_Pack_2.8_ANT_1.16.o BTSTACK_ROOT ?= ../.. diff --git a/port/posix-h4/Makefile b/port/posix-h4/Makefile index f609f1462..88ae15c73 100644 --- a/port/posix-h4/Makefile +++ b/port/posix-h4/Makefile @@ -2,7 +2,7 @@ BTSTACK_ROOT ?= ../.. CORE += \ - bluetooth_init_cc2564B_1.6_BT_Spec_4.1.c \ + bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c \ btstack_chipset_bcm.c \ btstack_chipset_cc256x.c \ btstack_chipset_csr.c \ diff --git a/port/posix-h5/Makefile b/port/posix-h5/Makefile index debff5bb2..a4653901a 100644 --- a/port/posix-h5/Makefile +++ b/port/posix-h5/Makefile @@ -2,7 +2,7 @@ BTSTACK_ROOT ?= ../.. CORE += \ - bluetooth_init_cc2564B_1.6_BT_Spec_4.1.c \ + bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c \ btstack_chipset_cc256x.c \ btstack_chipset_csr.c \ btstack_chipset_em9301.c \ diff --git a/port/stm32-f4discovery-cc256x/Makefile b/port/stm32-f4discovery-cc256x/Makefile index b52f2fd75..a32ca24ea 100644 --- a/port/stm32-f4discovery-cc256x/Makefile +++ b/port/stm32-f4discovery-cc256x/Makefile @@ -148,7 +148,7 @@ ${BTSTACK_ROOT}/3rd-party/lwip/core/src/apps/http/httpd.c \ ${BTSTACK_ROOT}/3rd-party/lwip/dhcp-server/dhserver.c \ ${BTSTACK_ROOT}/platform/lwip/port/sys_arch.c \ ${BTSTACK_ROOT}/platform/lwip/bnep_lwip.c \ -bluetooth_init_cc2564B_1.6_BT_Spec_4.1.c \ +bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c \ bsp/audio.c \ bsp/cs43l22.c \ bsp/stm32f4_discovery.c \