ble: ancs_client_lib -> ancs_client, example: ancs_client -> ancs_client_demo

doc/manual/update_apis.py

@@ -9,7 +9,7 @@ class State:
 # [file_name, api_title, api_label]
 apis = [ 
     ["src/ble/ad_parser.h", "BLE Advertisements Parser", "advParser"],
-    ["src/ble/ancs_client_lib.h", "BLE ANCS Client", "ancsClient"],
+    ["src/ble/ancs_client.h", "BLE ANCS Client", "ancsClient"],
     ["src/ble/att_db_util.h", "BLE ATT Database", "attDb"],
     ["src/ble/att_server.h", "BLE ATT Server", "attServer"],
     ["src/ble/gatt_client.h", "BLE GATT Client", "gattClient"],

example/embedded/Makefile.inc

@@ -56,7 +56,7 @@ PAN += \
 	pan.c \
 
 EXAMPLES = 					\
-	ancs_client 			\
+	ancs_client_demo		\
 	gap_dedicated_bonding	\
 	gap_inquiry 			\
 	gap_inquiry_and_bond 	\
@@ -75,7 +75,7 @@ EXAMPLES = 					\
     hsp_hs_test             \
 
 EXAMPLES_USING_LE =			\
-	ancs_client 			\
+	ancs_client_demo		\
 	gatt_battery_query      \
 	gatt_browser			\
 	le_counter              \
@@ -101,7 +101,7 @@ ${BTSTACK_ROOT}/src/btstack_version.h:
 # compile .gatt descriptions
 profile.h: profile.gatt
 	python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@ 
-ancs_client.h: ancs_client.gatt
+ancs_client_demo.h: ancs_client_demo.gatt
 	python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@ 
 spp_and_le_counter.h: spp_and_le_counter.gatt
 	python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@ 
@@ -156,8 +156,8 @@ gatt_browser: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_
 gatt_battery_query: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_OBJ} gatt_battery_query.c
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
 
-ancs_client: ancs_client.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_OBJ} ancs_client_lib.c ancs_client.c
-	${CC} $(filter-out ancs_client.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
+ancs_client_demo: ancs_client_demo.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_OBJ} ancs_client.c ancs_client_demo.c
+	${CC} $(filter-out ancs_client_demo.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
 
 led_counter: ${CORE_OBJ} ${COMMON_OBJ} led_counter.c
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
@@ -172,7 +172,7 @@ clean:
 	rm -f ${EXAMPLES}
 	rm -f  *.o *.out *.hex 
 	rm -f  ${BTSTACK_ROOT}/src/btstack_version.h
-	rm -f  ancs_client.h profile.h spp_and_le_counter.h
+	rm -f  ancs_client_demo.h profile.h spp_and_le_counter.h
 	rm -rf *.dSYM
 	rm -rf ${BTSTACK_ROOT}/ble/*.o
 	rm -rf ${BTSTACK_ROOT}/src/*.o

example/embedded/ancs_client_demo.c

@@ -61,15 +61,15 @@
 #include "hci_dump.h"
 #include "l2cap.h"
 
-#include "ble/ancs_client_lib.h"
+#include "ble/ancs_client.h"
 #include "ble/att.h"
 #include "ble/att_server.h"
 #include "ble/gatt_client.h"
 #include "ble/le_device_db.h"
 #include "ble/sm.h"
 
-// ancs client profile
-#include "ancs_client.h"
+// ancs client demo profile
+#include "ancs_client_demo.h"
 
 const uint8_t adv_data[] = {
     // Flags general discoverable

port/arduino/Makefile

@@ -12,7 +12,7 @@ ARCHIVE=btstack-arduino-${VERSION}.zip
 SRC_FILES  = btstack_memory.c btstack_linked_list.c btstack_memory_pool.c run_loop.c 
 SRC_FILES += hci_dump.c hci.c hci_cmd.c  btstack_util.c l2cap.c
 BLE_FILES  =  ad_parser.c att.c att_server.c att_dispatch.c att_db_util.c le_device_db_memory.c gatt_client.c
-BLE_FILES += sm.c ancs_client_lib.h ancs_client_lib.c
+BLE_FILES += sm.c ancs_client.h ancs_client.c
 PORT_FILES = btstack-config.h bsp_arduino_em9301.cpp BTstack.cpp BTstack.h
 EMBEDDED_FILES = btstack_run_loop_embedded.c hci_transport_h4_embedded.c
 

port/arduino/examples/ANCS/ANCS.ino

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include "ble/att_server.h"
 #include "ble/gatt_client.h"
-#include "ancs_client_lib.h"
+#include "ancs_client.h"
 #include "ble/sm.h"
 #include <SPI.h>
 

port/libusb/.gitignore

@@ -1,5 +1,5 @@
-ancs_client
-ancs_client.h
+ancs_client_demo
+ancs_client_demo.h
 ble_central_test
 ble_peripheral_test
 bnep_test

port/posix-cc2564b/.gitignore

@@ -1,5 +1,5 @@
-ancs_client
-ancs_client.h
+ancs_client_demo
+ancs_client_demo.h
 ble_central_test
 ble_peripheral
 ble_peripheral_sm_minimal

port/posix-csr/.gitignore

@@ -1,5 +1,5 @@
-ancs_client
-ancs_client.h
+ancs_client_demo
+ancs_client_demo.h
 ble_central_test
 ble_peripheral
 ble_peripheral_sm_minimal

port/posix-h4/.gitignore

@@ -1,5 +1,5 @@
-ancs_client
-ancs_client.h
+ancs_client_demo
+ancs_client_demo.h
 ble_central_test
 ble_peripheral
 ble_peripheral_sm_minimal

port/posix-stlc2500d/.gitignore

@@ -1,5 +1,5 @@
-ancs_client
-ancs_client.h
+ancs_client_demo
+ancs_client_demo.h
 ble_central_test
 ble_peripheral
 ble_peripheral_sm_minimal

port/posix-tc35661/.gitignore

@@ -1,5 +1,5 @@
-ancs_client
-ancs_client.h
+ancs_client_demo
+ancs_client_demo.h
 ble_central_test
 ble_peripheral
 ble_peripheral_sm_minimal

port/posix-wl183x/.gitignore

@@ -1,5 +1,5 @@
-ancs_client
-ancs_client.h
+ancs_client_demo
+ancs_client_demo.h
 ble_central_test
 ble_peripheral
 ble_peripheral_sm_minimal

src/ble/ancs_client.c

@@ -45,7 +45,7 @@
 #include "btstack_run_loop.h"
 #include "classic/sdp_util.h"
 
-#include "ancs_client_lib.h"
+#include "ancs_client.h"
 
 #include "ble/att.h"
 #include "btstack_debug.h"

src/ble/ancs_client.h

@@ -35,8 +35,8 @@
  *
  */
 
-#ifndef __ANCS_CLIENT_LIB_H
-#define __ANCS_CLIENT_LIB_H
+#ifndef __ANCS_CLIENT_H
+#define __ANCS_CLIENT_H
 
 #if defined __cplusplus
 extern "C" {

tool/update_copyright.py

@@ -46,7 +46,7 @@ copyrighters = ["BlueKitchen", "Matthias Ringwald"]
 
 ignoreFolders = ["cpputest", "test", "msp-exp430f5438-cc2564b", "msp430f5229lp-cc2564b", "ez430-rf2560", "ios", "chipset/cc256x", "docs", "mtk"]
 ignoreFiles = ["ant_cmds.h", "rijndael.c", "btstack-config.h", "btstack_version.h", "profile.h", "bluetoothdrv.h", 
-	"ancs_client.h", "spp_and_le_counter.h", "bluetoothdrv-stub.c", "minimal_peripheral.c", "BTstackDaemonRespawn.c"]
+	"ancs_client_demo.h", "spp_and_le_counter.h", "bluetoothdrv-stub.c", "minimal_peripheral.c", "BTstackDaemonRespawn.c"]
 
 class State:
 	SearchStartComment = 0