diff --git a/doc/manual/docs/examples/intro.md b/doc/manual/docs/examples/intro.md index cda2ec72f..d246e471f 100644 --- a/doc/manual/docs/examples/intro.md +++ b/doc/manual/docs/examples/intro.md @@ -1,6 +1,6 @@ In this section, we will describe a number of examples from the -*example/embedded* folder. To allow code-reuse with different platforms +*example* folder. To allow code-reuse with different platforms as well as with new ports, the low-level initialization of BTstack and the hardware configuration has been extracted to the various *platforms/PLATFORM/main.c* files. The examples only contain the diff --git a/doc/manual/update_listings.py b/doc/manual/update_listings.py index 148081bc3..314eebbd6 100755 --- a/doc/manual/update_listings.py +++ b/doc/manual/update_listings.py @@ -304,7 +304,7 @@ def main(argv): btstackfolder = "../../" docsfolder = "docs/" - inputfolder = btstackfolder + "example/embedded/" + inputfolder = btstackfolder + "example/" introfile = docsfolder + "examples/intro.md" outputfile = docsfolder + "examples/examples.md" diff --git a/example/embedded/Makefile.inc b/example/Makefile.inc similarity index 99% rename from example/embedded/Makefile.inc rename to example/Makefile.inc index 112a854a1..b6c134230 100644 --- a/example/embedded/Makefile.inc +++ b/example/Makefile.inc @@ -1,7 +1,7 @@ VPATH += ${BTSTACK_ROOT}/src VPATH += ${BTSTACK_ROOT}/src/ble VPATH += ${BTSTACK_ROOT}/src/classic -VPATH += ${BTSTACK_ROOT}/example/embedded +VPATH += ${BTSTACK_ROOT}/example CFLAGS += -I. CFLAGS += -I${BTSTACK_ROOT}/src/ble diff --git a/example/embedded/ancs_client_demo.c b/example/ancs_client_demo.c similarity index 100% rename from example/embedded/ancs_client_demo.c rename to example/ancs_client_demo.c diff --git a/example/embedded/ancs_client_demo.gatt b/example/ancs_client_demo.gatt similarity index 100% rename from example/embedded/ancs_client_demo.gatt rename to example/ancs_client_demo.gatt diff --git a/example/embedded/gap_dedicated_bonding.c b/example/gap_dedicated_bonding.c similarity index 100% rename from example/embedded/gap_dedicated_bonding.c rename to example/gap_dedicated_bonding.c diff --git a/example/embedded/gap_inquiry.c b/example/gap_inquiry.c similarity index 100% rename from example/embedded/gap_inquiry.c rename to example/gap_inquiry.c diff --git a/example/embedded/gap_inquiry_and_bond.c b/example/gap_inquiry_and_bond.c similarity index 100% rename from example/embedded/gap_inquiry_and_bond.c rename to example/gap_inquiry_and_bond.c diff --git a/example/embedded/gap_le_advertisements.c b/example/gap_le_advertisements.c similarity index 100% rename from example/embedded/gap_le_advertisements.c rename to example/gap_le_advertisements.c diff --git a/example/embedded/gatt_battery_query.c b/example/gatt_battery_query.c similarity index 100% rename from example/embedded/gatt_battery_query.c rename to example/gatt_battery_query.c diff --git a/example/embedded/gatt_browser.c b/example/gatt_browser.c similarity index 100% rename from example/embedded/gatt_browser.c rename to example/gatt_browser.c diff --git a/example/embedded/hsp_hs_test.c b/example/hsp_hs_test.c similarity index 100% rename from example/embedded/hsp_hs_test.c rename to example/hsp_hs_test.c diff --git a/example/embedded/le_counter.c b/example/le_counter.c similarity index 100% rename from example/embedded/le_counter.c rename to example/le_counter.c diff --git a/example/embedded/le_counter.gatt b/example/le_counter.gatt similarity index 100% rename from example/embedded/le_counter.gatt rename to example/le_counter.gatt diff --git a/example/embedded/le_streamer.c b/example/le_streamer.c similarity index 100% rename from example/embedded/le_streamer.c rename to example/le_streamer.c diff --git a/example/embedded/le_streamer.gatt b/example/le_streamer.gatt similarity index 100% rename from example/embedded/le_streamer.gatt rename to example/le_streamer.gatt diff --git a/example/embedded/led_counter.c b/example/led_counter.c similarity index 100% rename from example/embedded/led_counter.c rename to example/led_counter.c diff --git a/example/embedded/panu_demo.c b/example/panu_demo.c similarity index 100% rename from example/embedded/panu_demo.c rename to example/panu_demo.c diff --git a/example/embedded/profile.gatt b/example/profile.gatt similarity index 100% rename from example/embedded/profile.gatt rename to example/profile.gatt diff --git a/example/embedded/sdp_bnep_query.c b/example/sdp_bnep_query.c similarity index 100% rename from example/embedded/sdp_bnep_query.c rename to example/sdp_bnep_query.c diff --git a/example/embedded/sdp_general_query.c b/example/sdp_general_query.c similarity index 100% rename from example/embedded/sdp_general_query.c rename to example/sdp_general_query.c diff --git a/example/embedded/sdp_rfcomm_query.c b/example/sdp_rfcomm_query.c similarity index 100% rename from example/embedded/sdp_rfcomm_query.c rename to example/sdp_rfcomm_query.c diff --git a/example/embedded/spp_and_le_counter.c b/example/spp_and_le_counter.c similarity index 100% rename from example/embedded/spp_and_le_counter.c rename to example/spp_and_le_counter.c diff --git a/example/embedded/spp_and_le_counter.gatt b/example/spp_and_le_counter.gatt similarity index 100% rename from example/embedded/spp_and_le_counter.gatt rename to example/spp_and_le_counter.gatt diff --git a/example/embedded/spp_counter.c b/example/spp_counter.c similarity index 100% rename from example/embedded/spp_counter.c rename to example/spp_counter.c diff --git a/example/embedded/spp_flowcontrol.c b/example/spp_flowcontrol.c similarity index 100% rename from example/embedded/spp_flowcontrol.c rename to example/spp_flowcontrol.c diff --git a/example/embedded/spp_streamer.c b/example/spp_streamer.c similarity index 100% rename from example/embedded/spp_streamer.c rename to example/spp_streamer.c diff --git a/port/ez430-rf2560/Makefile b/port/ez430-rf2560/Makefile index c5e8ba320..2a98f17a1 100644 --- a/port/ez430-rf2560/Makefile +++ b/port/ez430-rf2560/Makefile @@ -18,7 +18,7 @@ VPATH += $(BTSTACK_ROOT)/src/ble VPATH += $(BTSTACK_ROOT)/src/classic VPATH += $(BTSTACK_ROOT)/chipset/cc256x VPATH += $(BTSTACK_ROOT)/platform/embedded -VPATH += $(BTSTACK_ROOT)/example/embedded +VPATH += $(BTSTACK_ROOT)/example CC = msp430-gcc CFLAGS = -mmcu=msp430f5438a -Os -Wall -fno-toplevel-reorder diff --git a/port/libusb/Makefile b/port/libusb/Makefile index 972b50548..a56e8c3a9 100644 --- a/port/libusb/Makefile +++ b/port/libusb/Makefile @@ -5,7 +5,7 @@ CORE += main.c stdin_support.c COMMON += hci_transport_h2_libusb.c btstack_run_loop_posix.c btstack_link_key_db_fs.c -include ${BTSTACK_ROOT}/example/embedded/Makefile.inc +include ${BTSTACK_ROOT}/example/Makefile.inc # CC = gcc-fsf-4.9 CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror diff --git a/port/msp-exp430f5438-cc2564b/Makefile b/port/msp-exp430f5438-cc2564b/Makefile index a63e5e10a..e6049f537 100644 --- a/port/msp-exp430f5438-cc2564b/Makefile +++ b/port/msp-exp430f5438-cc2564b/Makefile @@ -18,7 +18,7 @@ VPATH += $(BTSTACK_ROOT)/src/classic VPATH += $(BTSTACK_ROOT)/chipset/cc256x VPATH += ${BTSTACK_ROOT}/platform/msp430 VPATH += ${BTSTACK_ROOT}/platform/embedded -VPATH += $(BTSTACK_ROOT)/example/embedded +VPATH += $(BTSTACK_ROOT)/example CC = msp430-gcc CFLAGS = -mmcu=msp430f5438a -Os -Wall -fno-toplevel-reorder diff --git a/port/msp430f5229lp-cc2564b/Makefile b/port/msp430f5229lp-cc2564b/Makefile index ef94fb1de..1bb978cf9 100644 --- a/port/msp430f5229lp-cc2564b/Makefile +++ b/port/msp430f5229lp-cc2564b/Makefile @@ -18,7 +18,7 @@ VPATH += $(BTSTACK_ROOT)/src/ble VPATH += $(BTSTACK_ROOT)/src/classic VPATH += $(BTSTACK_ROOT)/chipset/cc256x VPATH += $(BTSTACK_ROOT)/platform/embedded -VPATH += $(BTSTACK_ROOT)/example/embedded +VPATH += $(BTSTACK_ROOT)/example MCU = msp430f5529 diff --git a/port/pic32-harmony/app.X/nbproject/Makefile-default.mk b/port/pic32-harmony/app.X/nbproject/Makefile-default.mk index 21773f47c..ef8e378e0 100644 --- a/port/pic32-harmony/app.X/nbproject/Makefile-default.mk +++ b/port/pic32-harmony/app.X/nbproject/Makefile-default.mk @@ -45,7 +45,7 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE} # Source Files Quoted if spaced -SOURCEFILES_QUOTED_IF_SPACED=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_embedded.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_run_loop_embedded.c ../../../src/sdp_server.c ../../../src/sdp_client.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_util.c ../../../src/btstack_util.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/btstack_chipset_csr.c ../../../ble/ad_parser.c ../../../ble/att_db.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c +SOURCEFILES_QUOTED_IF_SPACED=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_embedded.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_run_loop_embedded.c ../../../src/sdp_server.c ../../../src/sdp_client.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_util.c ../../../src/btstack_util.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/btstack_chipset_csr.c ../../../ble/ad_parser.c ../../../ble/att_db.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/spp_and_le_counter.c # Object Files Quoted if spaced OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/1386528437/bnep.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmd.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/hci_transport_h4_dma.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/linked_list.o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ${OBJECTDIR}/_ext/1386528437/pan.o ${OBJECTDIR}/_ext/1386528437/remote_device_db_memory.o ${OBJECTDIR}/_ext/1386528437/rfcomm.o ${OBJECTDIR}/_ext/1386528437/run_loop.o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o ${OBJECTDIR}/_ext/1386528437/sdp.o ${OBJECTDIR}/_ext/1386528437/sdp_client.o ${OBJECTDIR}/_ext/1386528437/sdp_query_rfcomm.o ${OBJECTDIR}/_ext/1386528437/sdp_util.o ${OBJECTDIR}/_ext/1386528437/utils.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o ${OBJECTDIR}/_ext/1768124388/btstack_chipset_csr.o ${OBJECTDIR}/_ext/1386511916/ad_parser.o ${OBJECTDIR}/_ext/1386511916/att.o ${OBJECTDIR}/_ext/1386511916/att_dispatch.o ${OBJECTDIR}/_ext/1386511916/att_server.o ${OBJECTDIR}/_ext/1386511916/le_device_db_memory.o ${OBJECTDIR}/_ext/1386511916/sm.o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o @@ -55,7 +55,7 @@ POSSIBLE_DEPFILES=${OBJECTDIR}/_ext/2048875307/system_init.o.d ${OBJECTDIR}/_ext OBJECTFILES=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/1386528437/bnep.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmd.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/hci_transport_h4_dma.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/linked_list.o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ${OBJECTDIR}/_ext/1386528437/pan.o ${OBJECTDIR}/_ext/1386528437/remote_device_db_memory.o ${OBJECTDIR}/_ext/1386528437/rfcomm.o ${OBJECTDIR}/_ext/1386528437/run_loop.o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o ${OBJECTDIR}/_ext/1386528437/sdp.o ${OBJECTDIR}/_ext/1386528437/sdp_client.o ${OBJECTDIR}/_ext/1386528437/sdp_query_rfcomm.o ${OBJECTDIR}/_ext/1386528437/sdp_util.o ${OBJECTDIR}/_ext/1386528437/utils.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o ${OBJECTDIR}/_ext/1768124388/btstack_chipset_csr.o ${OBJECTDIR}/_ext/1386511916/ad_parser.o ${OBJECTDIR}/_ext/1386511916/att.o ${OBJECTDIR}/_ext/1386511916/att_dispatch.o ${OBJECTDIR}/_ext/1386511916/att_server.o ${OBJECTDIR}/_ext/1386511916/le_device_db_memory.o ${OBJECTDIR}/_ext/1386511916/sm.o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o # Source Files -SOURCEFILES=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_embedded.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_run_loop_embedded.c ../../../src/sdp_server.c ../../../src/sdp_client.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_util.c ../../../src/btstack_util.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/btstack_chipset_csr.c ../../../ble/ad_parser.c ../../../ble/att_db.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c +SOURCEFILES=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_embedded.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_run_loop_embedded.c ../../../src/sdp_server.c ../../../src/sdp_client.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_util.c ../../../src/btstack_util.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/btstack_chipset_csr.c ../../../ble/ad_parser.c ../../../ble/att_db.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/spp_and_le_counter.c CFLAGS= @@ -334,11 +334,11 @@ ${OBJECTDIR}/_ext/1386511916/sm.o: ../../../ble/sm.c nbproject/Makefile-${CND_C @${RM} ${OBJECTDIR}/_ext/1386511916/sm.o @${FIXDEPS} "${OBJECTDIR}/_ext/1386511916/sm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386511916/sm.o.d" -o ${OBJECTDIR}/_ext/1386511916/sm.o ../../../ble/sm.c -${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o: ../../../example/embedded/spp_and_le_counter.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o: ../../../example/spp_and_le_counter.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/350421922" @${RM} ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d @${RM} ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o - @${FIXDEPS} "${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d" -o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o ../../../example/embedded/spp_and_le_counter.c + @${FIXDEPS} "${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d" -o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o ../../../example/spp_and_le_counter.c else ${OBJECTDIR}/_ext/2048875307/system_init.o: ../src/system_config/bk-audio-dk/system_init.c nbproject/Makefile-${CND_CONF}.mk @@ -581,11 +581,11 @@ ${OBJECTDIR}/_ext/1386511916/sm.o: ../../../ble/sm.c nbproject/Makefile-${CND_C @${RM} ${OBJECTDIR}/_ext/1386511916/sm.o @${FIXDEPS} "${OBJECTDIR}/_ext/1386511916/sm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386511916/sm.o.d" -o ${OBJECTDIR}/_ext/1386511916/sm.o ../../../ble/sm.c -${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o: ../../../example/embedded/spp_and_le_counter.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o: ../../../example/spp_and_le_counter.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/350421922" @${RM} ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d @${RM} ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o - @${FIXDEPS} "${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d" -o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o ../../../example/embedded/spp_and_le_counter.c + @${FIXDEPS} "${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o.d" -o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o ../../../example/spp_and_le_counter.c endif diff --git a/port/pic32-harmony/app.X/nbproject/configurations.xml b/port/pic32-harmony/app.X/nbproject/configurations.xml index d14b8e8be..c6274a30d 100644 --- a/port/pic32-harmony/app.X/nbproject/configurations.xml +++ b/port/pic32-harmony/app.X/nbproject/configurations.xml @@ -103,7 +103,7 @@ ../src/app_debug.c ../src/app.c ../src/main.c - ../../../example/embedded/spp_and_le_counter.c + ../../../example/spp_and_le_counter.c @@ -189,7 +189,7 @@ ../../../src ../../../ble ../../../chipset/csr - ../../../example/embedded + ../../../example Makefile diff --git a/port/pic32-harmony/src/spp_and_le_counter.h b/port/pic32-harmony/src/spp_and_le_counter.h index b1d42035f..07a2e9b6d 100644 --- a/port/pic32-harmony/src/spp_and_le_counter.h +++ b/port/pic32-harmony/src/spp_and_le_counter.h @@ -1,5 +1,5 @@ -// spp_and_le_counter.h generated from ../../example/embedded/spp_and_le_counter.gatt for BTstack +// spp_and_le_counter.h generated from ../../example/spp_and_le_counter.gatt for BTstack // binary representation // attribute size in bytes (16), flags(16), handle (16), uuid (16/128), value(...) diff --git a/port/posix-h4/Makefile b/port/posix-h4/Makefile index e068cc4c0..2823fa27f 100644 --- a/port/posix-h4/Makefile +++ b/port/posix-h4/Makefile @@ -20,7 +20,7 @@ CORE += \ # TI-WL183x requires TIInit_11.8.32.c # examples -include ${BTSTACK_ROOT}/example/embedded/Makefile.inc +include ${BTSTACK_ROOT}/example/Makefile.inc # fetch and convert TI init scripts include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc diff --git a/port/stm32-f103rb-nucleo/Makefile b/port/stm32-f103rb-nucleo/Makefile index e2bee2d45..f0deb87aa 100644 --- a/port/stm32-f103rb-nucleo/Makefile +++ b/port/stm32-f103rb-nucleo/Makefile @@ -8,7 +8,7 @@ OPENCM3_DIR = libopencm3 LDSCRIPT = stm32f1-nucleo.ld BTSTACK_ROOT = ../.. -VPATH = $(BTSTACK_ROOT)/example/embedded +VPATH = $(BTSTACK_ROOT)/example VPATH += $(BTSTACK_ROOT)/src VPATH += $(BTSTACK_ROOT)/src/ble VPATH += $(BTSTACK_ROOT)/src/classic diff --git a/port/wiced/create_examples.py b/port/wiced/create_examples.py index 1a4d3c413..949cca3d0 100755 --- a/port/wiced/create_examples.py +++ b/port/wiced/create_examples.py @@ -18,7 +18,7 @@ NAME := EXAMPLE GLOBAL_INCLUDES += . -$(NAME)_SOURCES := ../../../libraries/btstack/example/embedded/EXAMPLE.c +$(NAME)_SOURCES := ../../../libraries/btstack/example/EXAMPLE.c $(NAME)_COMPONENTS += btstack/port/wiced ''' @@ -26,7 +26,7 @@ gatt_update_template = '''#!/bin/sh DIR=`dirname $0` BTSTACK_ROOT=$DIR/../../../libraries/btstack echo "Creating EXAMPLE.h from EXAMPLE.gatt" -$BTSTACK_ROOT/tool/compile-gatt.py $BTSTACK_ROOT/example/embedded/EXAMPLE.gatt $DIR/EXAMPLE.h +$BTSTACK_ROOT/tool/compile-gatt.py $BTSTACK_ROOT/example/EXAMPLE.gatt $DIR/EXAMPLE.h ''' # get script path @@ -48,7 +48,7 @@ if not "WICED Version" in wiced_version: print("Found %s" % wiced_version) # path to examples -examples_embedded = script_path + "/../../example/embedded/" +examples_embedded = script_path + "/../../example/" # path to WICED/apps/btstack apps_btstack = wiced_root + "/apps/btstack/" diff --git a/test/att_db/le_counter.h b/test/att_db/le_counter.h index cb5e34fdc..1b64f625e 100644 --- a/test/att_db/le_counter.h +++ b/test/att_db/le_counter.h @@ -1,5 +1,5 @@ -// le_counter.h generated from ../../example/embedded/le_counter.gatt for BTstack +// le_counter.h generated from ../../example/le_counter.gatt for BTstack // binary representation // attribute size in bytes (16), flags(16), handle (16), uuid (16/128), value(...) diff --git a/test/hfp/Makefile b/test/hfp/Makefile index 54e440f65..da55b293a 100644 --- a/test/hfp/Makefile +++ b/test/hfp/Makefile @@ -5,7 +5,7 @@ BTSTACK_ROOT = ../.. POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest -include ${BTSTACK_ROOT}/example/embedded/Makefile.inc +include ${BTSTACK_ROOT}/example/Makefile.inc COMMON = \ sdp_server.c \ diff --git a/test/pts/Makefile b/test/pts/Makefile index 5718d87e9..49c98c602 100644 --- a/test/pts/Makefile +++ b/test/pts/Makefile @@ -5,7 +5,7 @@ CORE += main.c stdin_support.c COMMON += hci_transport_h2_libusb.c btstack_run_loop_posix.c btstack_link_key_db_fs.c -include ${BTSTACK_ROOT}/example/embedded/Makefile.inc +include ${BTSTACK_ROOT}/example/Makefile.inc CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror \ -I${BTSTACK_ROOT}/platform/posix \ diff --git a/tool/update_copyright.py b/tool/update_copyright.py index f491d729d..b1a7f6cd0 100644 --- a/tool/update_copyright.py +++ b/tool/update_copyright.py @@ -138,9 +138,9 @@ def requiresCopyrightUpdate(file_name): return False -# if requiresCopyrightUpdate("../example/embedded/panu_demo.c"): +# if requiresCopyrightUpdate("../example/panu_demo.c"): # print "UPdate" -# updateCopyright("../example/embedded", "panu_demo.c") +# updateCopyright("../example", "panu_demo.c") for root, dirs, files in os.walk('../', topdown=True):