diff --git a/chipset/cc256x/Makefile.inc b/chipset/cc256x/Makefile.inc index 8c860b907..e5f19851d 100644 --- a/chipset/cc256x/Makefile.inc +++ b/chipset/cc256x/Makefile.inc @@ -188,6 +188,23 @@ initscripts-TIInit_6.12.26_avpr_add-on_v1.4.bts: cc256xc_bt_sp_v1.4.zip @echo "Extracting $@" @unzip -q -p cc256xc_bt_sp_v1.4.zip CC256XC_BT_SP/v1.4/initscripts-TIInit_6.12.26_avpr_add-on.bts > $@ +# v1.5 - unversioned files from BlueKitchen website, original: http://www.ti.com/tool/cc256xc-bt-sp +cc256xc_bt_sp_v1.5.zip: + @echo "Downloading $@" + @curl -sS -O $(BLUEKITCHEN_URL)/cc256xc_bt_sp_v1.5.zip + +initscripts-TIInit_6.12.26_v1.5.bts: cc256xc_bt_sp_v1.5.zip + @echo "Extracting $@" + @unzip -q -p cc256xc_bt_sp_v1.5.zip CC256XC_v1.5/v1.5/initscripts-TIInit_6.12.26.bts > $@ + +initscripts-TIInit_6.12.26_ble_add-on_v1.5.bts: cc256xc_bt_sp_v1.5.zip + @echo "Extracting $@" + @unzip -q -p cc256xc_bt_sp_v1.5.zip CC256XC_v1.5/v1.5/initscripts-TIInit_6.12.26_ble_add-on.bts > $@ + +initscripts-TIInit_6.12.26_avpr_add-on_v1.5.bts: cc256xc_bt_sp_v1.5.zip + @echo "Extracting $@" + @unzip -q -p cc256xc_bt_sp_v1.5.zip CC256XC_v1.5/v1.5/initscripts-TIInit_6.12.26_avpr_add-on.bts > $@ + # Various scripts for WL chipsets from http://www.ti.com/tool/wl18xx-bt-sp TIInit_11.8.32_4.2.bts: @@ -324,6 +341,18 @@ bluetooth_init_cc2564C_1.4.c: initscripts-TIInit_6.12.26_v1.4.bts initscripts-TI @echo "Creating $@" @$(CONVERSION_SCRIPT) $^ $@ +bluetooth_init_cc2560C_1.5.c: initscripts-TIInit_6.12.26_v1.5.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + +bluetooth_init_cc2560C_avpr_1.5.c: initscripts-TIInit_6.12.26_v1.5.bts initscripts-TIInit_6.12.26_avpr_add-on_v1.5.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + +bluetooth_init_cc2564C_1.5.c: initscripts-TIInit_6.12.26_v1.5.bts initscripts-TIInit_6.12.26_ble_add-on_v1.5.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + TIInit_11.8.32_4.2.c: TIInit_11.8.32_4.2.bts @echo "Creating $@" @@ -354,7 +383,10 @@ all-scripts: \ bluetooth_init_cc2560C_1.4.c \ bluetooth_init_cc2560C_avpr_1.4.c \ bluetooth_init_cc2564C_1.4.c \ - TIInit_11.8.32_4.2.c \ + bluetooth_init_cc2560C_1.5.c \ + bluetooth_init_cc2560C_avpr_1.5.c \ + bluetooth_init_cc2564C_1.5.c \ + TIInit_11.8.32_4.2.c \ TIInit_11.8.32_4.6.c \ TIInit_11.8.32_4.7.c \ TIInit_12.10.28.c \ diff --git a/port/posix-h4/Makefile b/port/posix-h4/Makefile index 3df8575cf..0c8d478ee 100644 --- a/port/posix-h4/Makefile +++ b/port/posix-h4/Makefile @@ -2,7 +2,6 @@ BTSTACK_ROOT ?= ../.. CORE += \ - bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c \ btstack_chipset_bcm.c \ btstack_chipset_cc256x.c \ btstack_chipset_csr.c \ @@ -24,8 +23,10 @@ CORE += \ btstack_signal.c \ wav_util.c \ 0000000_META_hci_patches_v7.c \ + bluetooth_init_cc2564C_1.5.c \ + # bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c \ # bluetooth_init_cc2564_2.14.c \ - # bluetooth_init_cc2564C_1.4.c \ + # TI-WL183x requires TIInit_11.8.32.c # examples diff --git a/port/posix-h4/README.md b/port/posix-h4/README.md index f823bc563..24e04dcc8 100644 --- a/port/posix-h4/README.md +++ b/port/posix-h4/README.md @@ -8,7 +8,7 @@ The CC2564x needs the correct init script to start up. The Makfile already has e - CC2560: bluetooth_init_cc2564_2.14.c - CC2564B: bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c -- CC2564C: bluetooth_init_cc2564C_1.4.c +- CC2564C: bluetooth_init_cc2564C_1.5.c Please pick the correct one. The main.c verifies that the correct script is loaded, but the init script is linked to the executable. diff --git a/port/posix-h5/Makefile b/port/posix-h5/Makefile index 4ee1b5945..75393d1f6 100644 --- a/port/posix-h5/Makefile +++ b/port/posix-h5/Makefile @@ -2,7 +2,7 @@ BTSTACK_ROOT ?= ../.. CORE += \ - bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c \ + bbluetooth_init_cc2564C_1.5.c \ btstack_chipset_cc256x.c \ btstack_chipset_csr.c \ btstack_chipset_em9301.c \ diff --git a/port/qt-h4/CMakeLists.txt b/port/qt-h4/CMakeLists.txt index 7ed6ef769..c0791c2f0 100644 --- a/port/qt-h4/CMakeLists.txt +++ b/port/qt-h4/CMakeLists.txt @@ -66,7 +66,7 @@ set(SOURCES_POSIX set(SOURCES_CHIPSET ${BTSTACK_ROOT}/chipset/bcm/btstack_chipset_bcm.c ${BTSTACK_ROOT}/chipset/cc256x/btstack_chipset_cc256x.c - bluetooth_init_cc2564C_1.4.c + bluetooth_init_cc2564C_1.5.c ${BTSTACK_ROOT}/chipset/csr/btstack_chipset_csr.c ) diff --git a/port/qt-h4/README.md b/port/qt-h4/README.md index 7296c322b..5f0de4965 100644 --- a/port/qt-h4/README.md +++ b/port/qt-h4/README.md @@ -14,7 +14,7 @@ The CC2564x needs the correct init script to start up. The Makfile already has e - CC2560: bluetooth_init_cc2564_2.14.c - CC2564B: bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c -- CC2564C: bluetooth_init_cc2564C_1.4.c +- CC2564C: bluetooth_init_cc2564C_1.5.c Please pick the correct one. The main.c verifies that the correct script is loaded, but the init script is linked to the executable. diff --git a/port/renesas-tb-s1ja-cc256x/create_examples.py b/port/renesas-tb-s1ja-cc256x/create_examples.py index d163be79b..8f0f178c7 100755 --- a/port/renesas-tb-s1ja-cc256x/create_examples.py +++ b/port/renesas-tb-s1ja-cc256x/create_examples.py @@ -12,7 +12,7 @@ import subprocess # init_script = 'bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c' # use for CC2564C -init_script = 'bluetooth_init_cc2564C_1.4.c' +init_script = 'bluetooth_init_cc2564C_1.5.c' gatt_update_bat_template = '''python.exe BTSTACK_ROOT\\tool\\compile_gatt.py BTSTACK_ROOT\\example\\EXAMPLE.gatt PROJECT_SRC\\EXAMPLE.h ''' diff --git a/port/stm32-f4discovery-cc256x/Makefile b/port/stm32-f4discovery-cc256x/Makefile index 2aa6c6a3d..47ff1acc7 100644 --- a/port/stm32-f4discovery-cc256x/Makefile +++ b/port/stm32-f4discovery-cc256x/Makefile @@ -154,7 +154,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.8_BT_Spec_4.1.c \ +bluetooth_init_cc2564C_1.5.c \ bsp/audio.c \ bsp/cs43l22.c \ bsp/stm32f4_discovery.c \ diff --git a/port/stm32-f4discovery-cc256x/README.md b/port/stm32-f4discovery-cc256x/README.md index 7fe4b2971..ca2e77d7a 100644 --- a/port/stm32-f4discovery-cc256x/README.md +++ b/port/stm32-f4discovery-cc256x/README.md @@ -13,7 +13,7 @@ CC256x Bluetooth module: - [CC2564B Dual-mode Bluetooth® Controller Evaluation Module](https://store.ti.com/cc2564modnem.aspx) - [CC2564C Dual-mode Bluetooth® Controller Evaluation Module](https://store.ti.com/CC256XCQFN-EM-CC2564C-Dual-Mode-Bluetooth-Controller-Evaluation-Module-P51277.aspx) -The module with the older CC2564B is around USD 20, while the one with the new CC2564C costs around USD 60. The projects are configured for the CC2564B. When using the CC2564C, *bluetooth_init_cc2564C_1.4.c* should be used as cc256x_init_script. +The module with the older CC2564B is around USD 20, while the one with the new CC2564C costs around USD 60. The projects are configured for the CC2564C. When using the CC2564B, *bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c* should be used as cc256x_init_script. ## Software diff --git a/port/windows-h4/Makefile b/port/windows-h4/Makefile index 650f90865..761bb60ac 100644 --- a/port/windows-h4/Makefile +++ b/port/windows-h4/Makefile @@ -9,7 +9,7 @@ COMMON += \ btstack_uart_block_windows.c \ le_device_db_tlv.c \ btstack_link_key_db_tlv.c \ - bluetooth_init_cc2564B_1.8_BT_Spec_4.1.c \ + bluetooth_init_cc2564C_1.5.c \ btstack_chipset_cc256x.c \ btstack_chipset_csr.c \ btstack_chipset_em9301.c \