From 0e0e98b2848d6f7ea804746b2cbca1f7f66e1559 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 4 Dec 2019 11:20:13 +0100 Subject: [PATCH] chipset/cc256x: update initscripts CC256xC to v1.3 --- CHANGELOG.md | 2 +- chipset/cc256x/Makefile.inc | 25 ++++++++++++++++++++++++- port/posix-h4/Makefile | 2 +- port/posix-h4/README.md | 2 +- port/stm32-f4discovery-cc256x/README.md | 2 +- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b4207399..d7d09385f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,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) +- Updated CC256x initscripts (CC256xB v1.8, CC256xC v1.2, CC256xC v1.3) - libusb and posix ports: store bonding information in TLV - Linked List: return bool true if item was removed - btstack_run_loop_remove: return bool true if timer/data source was removed diff --git a/chipset/cc256x/Makefile.inc b/chipset/cc256x/Makefile.inc index bbf5c7392..fdf1e8af7 100644 --- a/chipset/cc256x/Makefile.inc +++ b/chipset/cc256x/Makefile.inc @@ -142,7 +142,7 @@ 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 +# v1.2 - 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 @@ -155,6 +155,19 @@ 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 > $@ +# v1.3 - unversioned files from BlueKitchen website, original: http://www.ti.com/tool/cc256xc-bt-sp +cc256xc_bt_sp_v1.3.zip: + @echo "Downloading $@" + @curl -sS -O $(BLUEKITCHEN_URL)/cc256xc_bt_sp_v1.3.zip + +initscripts-TIInit_6.12.26_v1.3.bts: cc256xc_bt_sp_v1.3.zip + @echo "Extracting $@" + @unzip -q -p cc256xc_bt_sp_v1.3.zip CC256XC_BT_SP/v1.3/initscripts-TIInit_6.12.26.bts > $@ + +initscripts-TIInit_6.12.26_ble_add-on_v1.3.bts: cc256xc_bt_sp_v1.3.zip + @echo "Extracting $@" + @unzip -q -p cc256xc_bt_sp_v1.3.zip CC256XC_BT_SP/v1.3/initscripts-TIInit_6.12.26_ble_add-on.bts > $@ + # Various scripts for WL chipsets # V4.2 from BlueKitchen website, original: http://www.ti.com/tool/wl18xx-bt-sp @@ -258,6 +271,15 @@ bluetooth_init_cc2564C_1.2.c: initscripts-TIInit_6.12.26_v1.2.bts initscripts-TI @echo "Creating $@" @$(CONVERSION_SCRIPT) $^ $@ +bluetooth_init_cc2560C_1.3.c: initscripts-TIInit_6.12.26_v1.3.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + +bluetooth_init_cc2564C_1.3.c: initscripts-TIInit_6.12.26_v1.3.bts initscripts-TIInit_6.12.26_ble_add-on_v1.3.bts + @echo "Creating $@" + @$(CONVERSION_SCRIPT) $^ $@ + + TIInit_11.8.32.c: TIInit_11.8.32.bts @echo "Creating $@" @$(CONVERSION_SCRIPT) $^ $@ @@ -286,6 +308,7 @@ all-scripts: \ bluetooth_init_cc2564C_1.1.c \ bluetooth_init_cc2560C_1.2.c \ bluetooth_init_cc2564C_1.2.c \ + bluetooth_init_cc2564C_1.3.c \ TIInit_11.8.32.c \ TIInit_12.10.28.c \ TIInit_12.8.32.c \ diff --git a/port/posix-h4/Makefile b/port/posix-h4/Makefile index 8561854fc..438e5422b 100644 --- a/port/posix-h4/Makefile +++ b/port/posix-h4/Makefile @@ -20,7 +20,7 @@ CORE += \ wav_util.c \ 0000000_META_hci_patches_v7.c \ # bluetooth_init_cc2564_2.14.c \ - # bluetooth_init_cc2564C_1.0.c \ + # bluetooth_init_cc2564C_1.3.c \ # TI-WL183x requires TIInit_11.8.32.c diff --git a/port/posix-h4/README.md b/port/posix-h4/README.md index 4c51c550d..683853913 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.6_BT_Spec_4.1. -- CC2564C: bluetooth_init_cc2564C_1.0.c +- CC2564C: bluetooth_init_cc2564C_1.3.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/stm32-f4discovery-cc256x/README.md b/port/stm32-f4discovery-cc256x/README.md index dea8ba5b1..58412309d 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.0.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 CC2564B. When using the CC2564C, *bluetooth_init_cc2564C_1.3.c* should be used as cc256x_init_script. ## Software