From 536c2d68a92b6925dd2890139b069eac4858856e Mon Sep 17 00:00:00 2001 From: sprhawk Date: Mon, 1 Sep 2014 10:13:33 +0800 Subject: added bluetooth macro and pin-reset make target --- Makefile.common | 13 ++++++++++++- Makefile.template | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index 7f8615a..424a4d1 100644 --- a/Makefile.common +++ b/Makefile.common @@ -248,4 +248,15 @@ qc \n\ flash: $(OUTPUT_BINARY_DIRECTORY)/flash.jlink $(JLINK) -CommanderScript $(OUTPUT_BINARY_DIRECTORY)/flash.jlink; [ "$$?" -eq 1 ] -.PHONY: erase_all flash_softdevice flash +$(OUTPUT_BINARY_DIRECTORY)/pinreset.jlink: $(BUILD_DIRECTORIES) + echo "\n\ + r \n\ + h \n\ + w4 4001e504 2 \n\ + w4 40000544 1 \n\ + r \n\ + qc \n\ + " > $(OUTPUT_BINARY_DIRECTORY)/pinreset.jlink + +pin-reset: $(OUTPUT_BINARY_DIRECTORY)/pinreset.jlink + $(JLINK) -CommanderScript $(OUTPUT_BINARY_DIRECTORY)/pinreset.jlink; [ "$$?" -eq 1 ] diff --git a/Makefile.template b/Makefile.template index b473f92..b88a4d7 100644 --- a/Makefile.template +++ b/Makefile.template @@ -14,6 +14,8 @@ SOFTDEVICE_HEX_PATH = $(HOME)Developer/prjs/embeded/nrf/s110_nrf51822_7.0.0/s110 BUILD_SCRIPTS_PATH = $(HOME)Developer/prjs/embeded/prjs/nrf51822/build_scripts/ TEMPLATE_PATH = $(BUILD_SCRIPTS_PATH) +# CFLAGS += _DBLE_STACK_SUPPORT_REQD + C_SOURCE_FILES += main.c # C_SOURCE_FILES += softdevice_handler.c # need custome defined assert_nrf_callback() @@ -29,9 +31,25 @@ C_SOURCE_FILES += main.c # nrf_nvmc # C_SOURCE_FILES += nrf_nvmc.c +# nrf_soc +# C_SOURCE_FILES += nrf_soc.c + +# spi_master +# C_SOURCE_FILES += spi_master.c + +# spi_slave +# C_SOURCE_FILES += spi_slave.c + +# twi_master +# C_SOURCE_FILES += twi_hw_master.c +# C_SOURCE_FILES += twi_sw_master.c + # simple_uart # C_SOURCE_FILES += simple_uart.c +# sd_common +# C_SOURCE_FILES += softdevice_handler.c + # app_common # C_SOURCE_FILES += app_button.c # C_SOURCE_FILES += app_fifo.c -- cgit v1.2.3