From 347a78e2e708c7073297dfbbb514541d1cd8285c Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 4 Mar 2016 11:37:15 +0100 Subject: [PATCH 1/7] docs: add new upload scripts --- docs/manual/mirror_file_sftp.sh | 21 +++++++++++++++++++++ docs/manual/mirror_folder_sftp.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100755 docs/manual/mirror_file_sftp.sh create mode 100755 docs/manual/mirror_folder_sftp.sh diff --git a/docs/manual/mirror_file_sftp.sh b/docs/manual/mirror_file_sftp.sh new file mode 100755 index 000000000..105d09c73 --- /dev/null +++ b/docs/manual/mirror_file_sftp.sh @@ -0,0 +1,21 @@ +#!/bin/bash +USAGE="Usage: mirror_file_sftp.sh user@host local_path remote_path" + +# command line checks, bash +if [ $# -ne 3 ]; then + echo ${USAGE} + exit 0 +fi +user_host=$1 +local_path=$2 +remote_path=$3 + +echo Mirroring file ${local_path} to ${user_host}:${remote_path} + +# SFTP is very peculiar: recursive put only works for a single directory +# note: does not work with sftp of OS X 10.11 +sftp ${user_host} << EOF + put ${local_path} ${remote_path} + quit +EOF +rm -rf tmp/${folder} diff --git a/docs/manual/mirror_folder_sftp.sh b/docs/manual/mirror_folder_sftp.sh new file mode 100755 index 000000000..e71970cc2 --- /dev/null +++ b/docs/manual/mirror_folder_sftp.sh @@ -0,0 +1,27 @@ +#!/bin/bash +USAGE="Usage: mirror_folder_sftp.sh user@host local_path remote_path" + +# command line checks, bash +if [ $# -ne 3 ]; then + echo ${USAGE} + exit 0 +fi +user_host=$1 +local_path=$2 +remote_path=$3 + +echo Mirroring folder ${local_path} to ${user_host}:${remote_path} + +# SFTP is very peculiar: recursive put only works for a single directory +# note: does not work with sftp of OS X 10.11 +folder=`basename ${remote_path}` +path=`dirname ${remote_path}` +rm -rf tmp +mkdir tmp +cp -r ${local_path} tmp/${folder} +sftp ${user_host} << EOF + mkdir ${remote_path} + put -r tmp/${folder} ${path} + quit +EOF +rm -rf tmp/${folder} From 8d3dd4c5b39e37e3603553abbce9eeebab251bf1 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 4 Mar 2016 11:51:53 +0100 Subject: [PATCH 2/7] fix test compile --- test/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index 7c64dfdf5..52ff0caf0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -12,13 +12,17 @@ SUBDIRS = \ sdp_client \ security_manager \ -subdirs: + +subdirs: ../include/btstack/version.h echo Building all tests @set -e; \ for dir in $(SUBDIRS); do \ $(MAKE) -C $$dir; \ done +../include/btstack/version.h: + ../tools/get_version.sh + clean: echo Clean all test @set -e; \ @@ -26,7 +30,7 @@ clean: $(MAKE) -C $$dir clean; \ done -test: +test: ../include/btstack/version.h echo Run all test @set -e; \ for dir in $(SUBDIRS); do \ From 1cd4c7600587f37222156fc8e8311ea6533b5f73 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 4 Mar 2016 15:36:27 +0100 Subject: [PATCH 3/7] update builder names --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d0909a9b8..86af9d13d 100644 --- a/README.md +++ b/README.md @@ -62,12 +62,12 @@ Status | Platform #### Other Platforms: Status | Platform -------------- | ------ -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-posix-stlc2500d)| posix: Unix-based system talking to Bluetooth module via serial port -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-libusb)| libusb: Unix-based system talking via USB Bluetooth dongle -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-daemon)| daemon: TCP and Unix domain named socket client-server architecture supporting multiple clients -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=java)| java: Java wrapper for daemon -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-ios)| iOS: daemon for iOS jailbreak devices, C client-server API -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-mtk)| mtk: daemon for rooted Android devices, based on Mediatek MT65xx processor, Java and C client-server API +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-posix-stlc2500d-master)| posix: Unix-based system talking to Bluetooth module via serial port +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-libusb-master)| libusb: Unix-based system talking via USB Bluetooth dongle +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-daemon-master)| daemon: TCP and Unix domain named socket client-server architecture supporting multiple clients +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=java-master)| java: Java wrapper for daemon +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-ios-master)| iOS: daemon for iOS jailbreak devices, C client-server API +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-mtk-master)| mtk: daemon for rooted Android devices, based on Mediatek MT65xx processor, Java and C client-server API ## Supported Chipsets From 64782ac847381416d16cc6412241d6b6b1f9c254 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 4 Mar 2016 15:37:11 +0100 Subject: [PATCH 4/7] update builder names --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 86af9d13d..205f6c293 100644 --- a/README.md +++ b/README.md @@ -52,11 +52,11 @@ Coming next: HID, HOGP, A2DP, and more. #### Embedded Platforms: Status | Platform -------------- | ------ -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-ez430-rf2560) | [EZ430-RF256x Bluetooth Evaluation Tool for MSP430](http://www.ti.com/tool/ez430-rf256x) -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-msp-exp430f5438-cc2564b) | [MSP430F5438 Experimenter Board for MSP430](http://www.ti.com/tool/msp-exp430f5438) with [Bluetooth CC2564 Module Evaluation Board](http://www.ti.com/tool/cc2564modnem) -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-msp430f5229lp-cc2564b) | [MSP-EXP430F5529LP LaunchPad](http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html#tabs) with [Bluetooth CC2564 Module Evaluation Board](http://www.ti.com/tool/cc2564modnem) and [EM Adapter BoosterPack](http://www.ti.com/tool/boost-ccemadapter) with additional 32768Hz quartz oscillator -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-stm32-f103rb-nucleo) | [STM32 Nucleo development board NUCLEO-F103RB](http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1847/PF259875) with [Bluetooth CC2564 Module Evaluation Board](http://www.ti.com/tool/cc2564modnem) and [EM Adapter BoosterPack](http://www.ti.com/tool/boost-ccemadapter) with additional 32768Hz quartz oscillator -![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-pic32-harmony) | [Microchip's PIC32 Bluetooth Audio Development Kit](http://www.microchip.com/Developmenttools/ProductDetails.aspx?PartNO=DV320032) +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-ez430-rf2560-master) | [EZ430-RF256x Bluetooth Evaluation Tool for MSP430](http://www.ti.com/tool/ez430-rf256x) +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-msp-exp430f5438-cc2564b-master) | [MSP430F5438 Experimenter Board for MSP430](http://www.ti.com/tool/msp-exp430f5438) with [Bluetooth CC2564 Module Evaluation Board](http://www.ti.com/tool/cc2564modnem) +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-msp430f5229lp-cc2564b-master) | [MSP-EXP430F5529LP LaunchPad](http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html#tabs) with [Bluetooth CC2564 Module Evaluation Board](http://www.ti.com/tool/cc2564modnem) and [EM Adapter BoosterPack](http://www.ti.com/tool/boost-ccemadapter) with additional 32768Hz quartz oscillator +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-stm32-f103rb-nucleo-master) | [STM32 Nucleo development board NUCLEO-F103RB](http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1847/PF259875) with [Bluetooth CC2564 Module Evaluation Board](http://www.ti.com/tool/cc2564modnem) and [EM Adapter BoosterPack](http://www.ti.com/tool/boost-ccemadapter) with additional 32768Hz quartz oscillator +![buildstatus](http://buildbot.bluekitchen-gmbh.com/btstack/badge.png?builder=platform-pic32-harmony-master) | [Microchip's PIC32 Bluetooth Audio Development Kit](http://www.microchip.com/Developmenttools/ProductDetails.aspx?PartNO=DV320032) #### Other Platforms: From 373afbfa571cda53ba4c9f2c9addd833a4f4969c Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 4 Mar 2016 17:15:27 +0100 Subject: [PATCH 5/7] java: fix generator --- tools/java_binding.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/java_binding.py b/tools/java_binding.py index 2dae48c5b..3dbcc0faf 100755 --- a/tools/java_binding.py +++ b/tools/java_binding.py @@ -245,7 +245,10 @@ def mark_define_as_used(term): def java_define_string(key): global defines - return ' public static final int %s = %s;\n' % (key, defines[key]) + if key in defines: + return ' public static final int %s = %s;\n' % (key, defines[key]) + else: + return ' // defines[%s] not set\n' % key def java_defines_string(keys): return '\n'.join( map(java_define_string, sorted(keys))) From 71abbf6e0bdf464c87cc45e5738cec6a8070db23 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 7 Mar 2016 17:31:07 +0100 Subject: [PATCH 6/7] msp540f5438: disable sdp_general_query as 20 bit is required --- platforms/msp-exp430f5438-cc2564b/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platforms/msp-exp430f5438-cc2564b/Makefile b/platforms/msp-exp430f5438-cc2564b/Makefile index ae34fe923..fce80e00c 100644 --- a/platforms/msp-exp430f5438-cc2564b/Makefile +++ b/platforms/msp-exp430f5438-cc2564b/Makefile @@ -93,7 +93,7 @@ LCD_OBJ = $(LCD:.c=.o) # create firmware image from common objects and example source file -all: led_counter.hex gap_inquiry.hex sdp_general_query.hex +all: led_counter.hex gap_inquiry.hex # fetch and convert init scripts include ${BTSTACK_ROOT}/chipset-cc256x/Makefile.inc @@ -106,6 +106,7 @@ include ${BTSTACK_ROOT}/chipset-cc256x/Makefile.inc # spp_counter.hex # spp_flowcontrol.hex # sdp_rfcomm_query.hex +# sdp_general_query.hex # compiling ant-test requires special ant init script # ant-test.hex From 33d8dfb4d8bb069410af60eb99c3fac603c62567 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 7 Mar 2016 20:34:38 +0100 Subject: [PATCH 7/7] pic32: remove have_ehcill --- platforms/pic32-harmony/src/btstack-config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/platforms/pic32-harmony/src/btstack-config.h b/platforms/pic32-harmony/src/btstack-config.h index 6d4fe27a0..4b73c3343 100644 --- a/platforms/pic32-harmony/src/btstack-config.h +++ b/platforms/pic32-harmony/src/btstack-config.h @@ -9,8 +9,6 @@ #define HAVE_BZERO #define HAVE_TICK -#define HAVE_EHCILL - #define ENABLE_LOG_INFO #define ENABLE_LOG_ERROR