o Lots of improvements, almost a rewrite.

1 files changed, 119 insertions, 119 deletions

diff --git a/Makefile.template b/Makefile.template
index 134dd16..a4d40d5 100644
--- a/Makefile.template
+++ b/Makefile.template
@@ -1,119 +1,119 @@
-TARGET_CHIP := NRF51822_QFAA_CA

-BOARD := BOARD_PCA10001

-

-#Uncomment correct line if you have s110 programmed on the chip.

-DEVICE_VARIANT := xxaa

-#DEVICE_VARIANT := xxab

-

-USE_SOFTDEVICE := S110

-#USE_SOFTDEVICE := S110-v6

-#USE_SOFTDEVICE := S120

-

-HOME = ~

-

-#Not that SDK 5.1.0 does NOT work with SoftDevice 7

-#SDK_PATH = $(HOME)/nRF_SDK_v5.1.0.36092/Nordic/nrf51822

-SDK_PATH = $(HOME)/nRF51_SDK_v6.0.0.43681/Nordic/nrf51822

-BUILD_SCRIPTS_PATH = $(HOME)/nrf51822-posix-build-scripts

-TEMPLATE_PATH = $(BUILD_SCRIPTS_PATH)

-ifeq ($(USE_SOFTDEVICE), S110-v6)

-	SOFTDEVICE_HEX_PATH = /run/media/death/F2FS/s110_nrf51822_6_0_0/s110_nrf51822_6.0.0_softdevice.hex

-else

-	SOFTDEVICE_HEX_PATH = /run/media/death/F2FS/s110_nrf51822_7_0_0/s110_nrf51822_7.0.0_softdevice.hex

-endif

-

-# CFLAGS += -DBLE_STACK_SUPPORT_REQD

-# debug: CFLAGS+=-DENABLE_DEBUG_LOG_SUPPORT

-

-C_SOURCE_FILES += main.c

-ifeq ($(MAKECMDGOALS),debug) # template for conditional rules

-# C_SOURCE_FILES += uart.c

-endif

-

-# C_SOURCE_FILES += softdevice_handler.c # need custome defined assert_nrf_callback()

-

-# nrf_delay

-# C_SOURCE_FILES += nrf_delay.c

-

-# nrf_assert

-# C_SOURCE_FILES += nrf_assert.c

-

-# nrf_ecb

-# C_SOURCE_FILES += nrf_ecb.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

-# C_SOURCE_FILES += app_gpiote.c

-# C_SOURCE_FILES += app_scheduler.c

-# C_SOURCE_FILES += app_timer.c

-# C_SOURCE_FILES += app_trace.c

-# C_SOURCE_FILES += app_uart.c

-# C_SOURCE_FILES += app_uart_fifo.c

-# C_SOURCE_FILES += crc16.c

-# C_SOURCE_FILES += hci_mem_pool.c

-# C_SOURCE_FILES += hci_slip.c

-# C_SOURCE_FILES += hci_transport.c

-# C_SOURCE_FILES += pstorage.c # need pstorage_platform.h

-

-# ble

-# C_SOURCE_FILES += ble_advdata.c

-# C_SOURCE_FILES += ble_advdata_parser.c

-# C_SOURCE_FILES += ble_conn_params.c

-# C_SOURCE_FILES += ble_debug_assert_handler.c

-# C_SOURCE_FILES += ble_dtm.c

-# C_SOURCE_FILES += ble_error_log.c

-# C_SOURCE_FILES += ble_flash.c

-# C_SOURCE_FILES += ble_racp.c

-# C_SOURCE_FILES += ble_radio_notification.c

-# C_SOURCE_FILES += ble_sensorsim.c

-

-# ble/ble_services

-# C_SOURCE_FILES += ble_ans_c.c

-# C_SOURCE_FILES += ble_bas.c

-# C_SOURCE_FILES += ble_bps.c

-# C_SOURCE_FILES += ble_cscs.c

-# C_SOURCE_FILES += ble_dfu.c

-# C_SOURCE_FILES += ble_dis.c

-# C_SOURCE_FILES += ble_gls.c

-# C_SOURCE_FILES += ble_gls_db.c

-# C_SOURCE_FILES += ble_hids.c

-# C_SOURCE_FILES += ble_hrs.c

-# C_SOURCE_FILES += ble_hts.c

-# C_SOURCE_FILES += ble_ias.c

-# C_SOURCE_FILES += ble_ias_c.c

-# C_SOURCE_FILES += ble_lls.c

-# C_SOURCE_FILES += ble_rscs.c

-# C_SOURCE_FILES += ble_sc_ctrlpt.c

-# C_SOURCE_FILES += ble_srv_common.c

-# C_SOURCE_FILES += ble_tps.c

-

-# ble/device_manager/experimental

-# C_SOURCE_FILES += device_manager_central.c

-

-OUTPUT_FILENAME := main

-

-include $(TEMPLATE_PATH)/Makefile.common

-

+TARGET_CHIP := NRF51822_QFAA_CA
+BOARD := BOARD_PCA10001
+
+#Uncomment correct line if you have s110 programmed on the chip.
+DEVICE_VARIANT := xxaa
+#DEVICE_VARIANT := xxab
+
+USE_SOFTDEVICE := S110
+#USE_SOFTDEVICE := S110-v6
+#USE_SOFTDEVICE := S120
+
+HOME = ~
+
+#Not that SDK 5.1.0 does NOT work with SoftDevice 7
+#SDK_PATH = $(HOME)/nRF_SDK_v5.1.0.36092/Nordic/nrf51822
+SDK_PATH = $(HOME)/nRF51_SDK_v6.0.0.43681/Nordic/nrf51822
+BUILD_SCRIPTS_PATH = $(HOME)/nrf51822-posix-build-scripts
+TEMPLATE_PATH = $(BUILD_SCRIPTS_PATH)
+ifeq ($(USE_SOFTDEVICE), S110-v6)
+	SOFTDEVICE_HEX_PATH = /run/media/death/F2FS/s110_nrf51822_6_0_0/s110_nrf51822_6.0.0_softdevice.hex
+else
+	SOFTDEVICE_HEX_PATH = /run/media/death/F2FS/s110_nrf51822_7_0_0/s110_nrf51822_7.0.0_softdevice.hex
+endif
+
+# CFLAGS += -DBLE_STACK_SUPPORT_REQD
+# debug: CFLAGS+=-DENABLE_DEBUG_LOG_SUPPORT
+
+C_SOURCE_FILES += main.c
+ifeq ($(MAKECMDGOALS),debug) # template for conditional rules
+# C_SOURCE_FILES += uart.c
+endif
+
+# C_SOURCE_FILES += softdevice_handler.c # need custome defined assert_nrf_callback()
+
+# nrf_delay
+# C_SOURCE_FILES += nrf_delay.c
+
+# nrf_assert
+# C_SOURCE_FILES += nrf_assert.c
+
+# nrf_ecb
+# C_SOURCE_FILES += nrf_ecb.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
+# C_SOURCE_FILES += app_gpiote.c
+# C_SOURCE_FILES += app_scheduler.c
+# C_SOURCE_FILES += app_timer.c
+# C_SOURCE_FILES += app_trace.c
+# C_SOURCE_FILES += app_uart.c
+# C_SOURCE_FILES += app_uart_fifo.c
+# C_SOURCE_FILES += crc16.c
+# C_SOURCE_FILES += hci_mem_pool.c
+# C_SOURCE_FILES += hci_slip.c
+# C_SOURCE_FILES += hci_transport.c
+# C_SOURCE_FILES += pstorage.c # need pstorage_platform.h
+
+# ble
+# C_SOURCE_FILES += ble_advdata.c
+# C_SOURCE_FILES += ble_advdata_parser.c
+# C_SOURCE_FILES += ble_conn_params.c
+# C_SOURCE_FILES += ble_debug_assert_handler.c
+# C_SOURCE_FILES += ble_dtm.c
+# C_SOURCE_FILES += ble_error_log.c
+# C_SOURCE_FILES += ble_flash.c
+# C_SOURCE_FILES += ble_racp.c
+# C_SOURCE_FILES += ble_radio_notification.c
+# C_SOURCE_FILES += ble_sensorsim.c
+
+# ble/ble_services
+# C_SOURCE_FILES += ble_ans_c.c
+# C_SOURCE_FILES += ble_bas.c
+# C_SOURCE_FILES += ble_bps.c
+# C_SOURCE_FILES += ble_cscs.c
+# C_SOURCE_FILES += ble_dfu.c
+# C_SOURCE_FILES += ble_dis.c
+# C_SOURCE_FILES += ble_gls.c
+# C_SOURCE_FILES += ble_gls_db.c
+# C_SOURCE_FILES += ble_hids.c
+# C_SOURCE_FILES += ble_hrs.c
+# C_SOURCE_FILES += ble_hts.c
+# C_SOURCE_FILES += ble_ias.c
+# C_SOURCE_FILES += ble_ias_c.c
+# C_SOURCE_FILES += ble_lls.c
+# C_SOURCE_FILES += ble_rscs.c
+# C_SOURCE_FILES += ble_sc_ctrlpt.c
+# C_SOURCE_FILES += ble_srv_common.c
+# C_SOURCE_FILES += ble_tps.c
+
+# ble/device_manager/experimental
+# C_SOURCE_FILES += device_manager_central.c
+
+OUTPUT_FILENAME := main
+
+include $(TEMPLATE_PATH)/Makefile.common
+