Commit d76abf29 authored by magho's avatar magho

Merge remote-tracking branch 'origin/master' into magho_dev

parents 014e4903 c0c27bd9

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This diff is collapsed.
......@@ -2,7 +2,7 @@ PROJECT_NAME := ble_app_blinky_pca10040_s132
TARGETS := nrf52832_xxaa
OUTPUT_DIRECTORY := _build
SDK_ROOT := ../../../../../..
SDK_ROOT := ../../../src_files
PROJ_DIR := ../../..
$(OUTPUT_DIRECTORY)/nrf52832_xxaa.out: \
......
......@@ -439,7 +439,7 @@
// <e> BLE_NUS_ENABLED - ble_nus - Nordic UART Service
//==========================================================
#ifndef BLE_NUS_ENABLED
#define BLE_NUS_ENABLED 0
#define BLE_NUS_ENABLED 1
#endif
// <e> BLE_NUS_CONFIG_LOG_ENABLED - Enables logging in the module.
//==========================================================
......@@ -7509,7 +7509,7 @@
// <e> NRF_LOG_BACKEND_UART_ENABLED - nrf_log_backend_uart - Log UART backend
//==========================================================
#ifndef NRF_LOG_BACKEND_UART_ENABLED
#define NRF_LOG_BACKEND_UART_ENABLED 1
#define NRF_LOG_BACKEND_UART_ENABLED 0
#endif
// <o> NRF_LOG_BACKEND_UART_TX_PIN - UART TX pin
#ifndef NRF_LOG_BACKEND_UART_TX_PIN
......
Output/ble_app_blinky_pca10040_s132\ Release/Obj/SEGGER_RTT.o: \
/home/bruk/nRF5_SDK_15.3.0_59ac345/external/segger_rtt/SEGGER_RTT.c \
/home/bruk/nRF5_SDK_15.3.0_59ac345/external/segger_rtt/SEGGER_RTT.h \
/home/bruk/nRF5_SDK_15.3.0_59ac345/external/segger_rtt/SEGGER_RTT_Conf.h \
C:\nRF5_SDK_15.3.0_59ac345\nRF5_SDK_15.3.0_59ac345\external\segger_rtt\SEGGER_RTT.c \
C:\nRF5_SDK_15.3.0_59ac345\nRF5_SDK_15.3.0_59ac345\external\segger_rtt\SEGGER_RTT.h \
C:\nRF5_SDK_15.3.0_59ac345\nRF5_SDK_15.3.0_59ac345\external\segger_rtt\SEGGER_RTT_Conf.h \
../../../../../../components/libraries/util/nordic_common.h \
../../../../../../components/libraries/util/app_util_platform.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/stdint.h \
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/stdint.h \
../../../../../../modules/nrfx/mdk/compiler_abstraction.h \
../../../../../../modules/nrfx/mdk/nrf.h \
../../../../../../modules/nrfx/mdk/nrf52.h \
......@@ -25,12 +25,12 @@ Output/ble_app_blinky_pca10040_s132\ Release/Obj/SEGGER_RTT.o: \
../../../../../../components/softdevice/s132/headers/nrf_nvic.h \
../../../../../../components/libraries/util/nrf_assert.h \
../../../../../../components/libraries/util/app_error.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/stdio.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/__crossworks.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/stdbool.h \
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/stdio.h \
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/__crossworks.h \
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/stdbool.h \
../../../../../../components/libraries/util/sdk_errors.h \
../../../../../../components/softdevice/s132/headers/nrf_error.h \
../../../../../../components/libraries/util/nordic_common.h \
../../../../../../components/libraries/util/app_error_weak.h \
../config/sdk_config.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/string.h
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/string.h
Output/ble_app_blinky_pca10040_s132\ Release/Obj/SEGGER_RTT_Syscalls_SES.o: \
/home/bruk/nRF5_SDK_15.3.0_59ac345/external/segger_rtt/SEGGER_RTT_Syscalls_SES.c \
C:\nRF5_SDK_15.3.0_59ac345\nRF5_SDK_15.3.0_59ac345\external\segger_rtt\SEGGER_RTT_Syscalls_SES.c \
../config/sdk_config.h \
/home/bruk/nRF5_SDK_15.3.0_59ac345/external/segger_rtt/SEGGER_RTT.h \
/home/bruk/nRF5_SDK_15.3.0_59ac345/external/segger_rtt/SEGGER_RTT_Conf.h \
C:\nRF5_SDK_15.3.0_59ac345\nRF5_SDK_15.3.0_59ac345\external\segger_rtt\SEGGER_RTT.h \
C:\nRF5_SDK_15.3.0_59ac345\nRF5_SDK_15.3.0_59ac345\external\segger_rtt\SEGGER_RTT_Conf.h \
../../../../../../components/libraries/util/nordic_common.h \
../../../../../../components/libraries/util/app_util_platform.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/stdint.h \
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/stdint.h \
../../../../../../modules/nrfx/mdk/compiler_abstraction.h \
../../../../../../modules/nrfx/mdk/nrf.h \
../../../../../../modules/nrfx/mdk/nrf52.h \
......@@ -26,15 +26,15 @@ Output/ble_app_blinky_pca10040_s132\ Release/Obj/SEGGER_RTT_Syscalls_SES.o: \
../../../../../../components/softdevice/s132/headers/nrf_nvic.h \
../../../../../../components/libraries/util/nrf_assert.h \
../../../../../../components/libraries/util/app_error.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/stdio.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/__crossworks.h \
/home/bruk/Programs/arm_segger_embedded_studio_v414_linux_x64_nordic/include/stdbool.h \
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/stdio.h \
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/__crossworks.h \
C:/Program\ Files/SEGGER/SEGGER\ Embedded\ Studio\ for\ ARM\ 4.18/include/stdbool.h \
../../../../../../components/libraries/util/sdk_errors.h \
../../../../../../components/softdevice/s132/headers/nrf_error.h \
../../../../../../components/libraries/util/nordic_common.h \
../../../../../../components/libraries/util/app_error_weak.h \