Skip to content

Commit

Permalink
project updated for new files name
Browse files Browse the repository at this point in the history
  • Loading branch information
@hnhoan
hnhoan committed Mar 1, 2017
1 parent 75e4c6f commit 5c93879
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 16 deletions.
23 changes: 19 additions & 4 deletions ARM/Nordic/nRF51/EHAL/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<locationURI>PARENT-3-WORKSPACE_LOC/include/base64.h</locationURI>
</link>
<link>
<name>include/ble_periph_app.h</name>
<name>include/ble_app.h</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/include/ble_periph_app.h</locationURI>
<locationURI>PARENT-2-PROJECT_LOC/include/ble_app.h</locationURI>
</link>
<link>
<name>include/blueio_blesrvc.h</name>
Expand All @@ -50,6 +50,11 @@
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/include/blueio_board.h</locationURI>
</link>
<link>
<name>include/bme280.h</name>
<type>1</type>
<locationURI>PARENT-4-PROJECT_LOC/include/bme280.h</locationURI>
</link>
<link>
<name>include/cfifo.h</name>
<type>1</type>
Expand Down Expand Up @@ -100,6 +105,11 @@
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/include/idelay.h</locationURI>
</link>
<link>
<name>include/idevice.h</name>
<type>1</type>
<locationURI>PARENT-4-PROJECT_LOC/include/idevice.h</locationURI>
</link>
<link>
<name>include/intelhex.h</name>
<type>1</type>
Expand Down Expand Up @@ -206,9 +216,14 @@
<locationURI>PARENT-4-PROJECT_LOC/src/base64.c</locationURI>
</link>
<link>
<name>src/ble_periph_app.cpp</name>
<name>src/ble_app.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/src/ble_app.cpp</locationURI>
</link>
<link>
<name>src/ble_app_handler.c</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/src/ble_periph_app.cpp</locationURI>
<locationURI>PARENT-2-PROJECT_LOC/src/ble_app_handler.c</locationURI>
</link>
<link>
<name>src/blueio_blesrvc.c</name>
Expand Down
25 changes: 15 additions & 10 deletions ARM/Nordic/nRF52/EHAL/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<locationURI>PARENT-4-PROJECT_LOC/include/base64.h</locationURI>
</link>
<link>
<name>include/ble_periph_app.h</name>
<name>include/ble_app.h</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/include/ble_periph_app.h</locationURI>
<locationURI>PARENT-2-PROJECT_LOC/include/ble_app.h</locationURI>
</link>
<link>
<name>include/blueio_blesrvc.h</name>
Expand Down Expand Up @@ -216,9 +216,14 @@
<locationURI>PARENT-4-PROJECT_LOC/src/base64.c</locationURI>
</link>
<link>
<name>src/ble_periph_app.cpp</name>
<name>src/ble_app.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/src/ble_periph_app.cpp</locationURI>
<locationURI>PARENT-2-PROJECT_LOC/src/ble_app.cpp</locationURI>
</link>
<link>
<name>src/ble_app_handler.c</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/src/ble_app_handler.c</locationURI>
</link>
<link>
<name>src/blueio_blesrvc.c</name>
Expand Down Expand Up @@ -295,6 +300,11 @@
<type>2</type>
<locationURI>virtual:/virtual</locationURI>
</link>
<link>
<name>src/nrf_log_backend_printf.c</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/src/nrf_log_backend_printf.c</locationURI>
</link>
<link>
<name>src/prbs.c</name>
<type>1</type>
Expand Down Expand Up @@ -600,11 +610,6 @@
<type>2</type>
<locationURI>virtual:/virtual</locationURI>
</link>
<link>
<name>src/nRF5_SDK_12/libraries/sha256</name>
<type>2</type>
<locationURI>virtual:/virtual</locationURI>
</link>
<link>
<name>src/nRF5_SDK_12/libraries/svc</name>
<type>2</type>
Expand Down Expand Up @@ -1033,7 +1038,7 @@
<link>
<name>src/nRF5_SDK_12/libraries/sha256/sha256.c</name>
<type>1</type>
<locationURI>PARENT-5-PROJECT_LOC/external/nRF5_SDK_12/components/libraries/sha256/sha256.c</locationURI>
<locationURI>$%7BPARENT-5-PROJECT_LOC%7D/external/nRF5_SDK_12/components/libraries/sha256/sha256.c</locationURI>
</link>
<link>
<name>src/nRF5_SDK_12/libraries/svc/nrf_svc_handler.c</name>
Expand Down
4 changes: 2 additions & 2 deletions ARM/Nordic/nRF52/EHAL/src/sdk_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3573,7 +3573,7 @@
// <e> NRF_LOG_ENABLED - nrf_log - Logging
//==========================================================
#ifndef NRF_LOG_ENABLED
#define NRF_LOG_ENABLED 1
#define NRF_LOG_ENABLED 0
#endif
#if NRF_LOG_ENABLED
// <e> NRF_LOG_USES_COLORS - If enabled then ANSI escape code for colors is prefixed to every string
Expand Down Expand Up @@ -3650,7 +3650,7 @@
// <i> Log data is buffered and can be processed in idle.
//==========================================================
#ifndef NRF_LOG_DEFERRED
#define NRF_LOG_DEFERRED 1
#define NRF_LOG_DEFERRED 0
#endif
#if NRF_LOG_DEFERRED
// <o> NRF_LOG_DEFERRED_BUFSIZE - Size of the buffer for logs in words.
Expand Down

0 comments on commit 5c93879

Please sign in to comment.