Skip to content

Commit 8f537a6

Browse files
committed
Honoring @cujomalainey's request, flipping preproc. conditional, see: #124 (review)
1 parent 309712b commit 8f537a6

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

src/boards/feather_nrf52840_express_s340/board.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,6 @@
4848
#define BUTTON_2 _PINNUM(0, 10)
4949
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
5050

51-
/*------------------------------------------------------------------*/
52-
/* UART (only used by nRF52832)
53-
*------------------------------------------------------------------*/
54-
#define RX_PIN_NUMBER 8
55-
#define TX_PIN_NUMBER 6
56-
#define CTS_PIN_NUMBER 0
57-
#define RTS_PIN_NUMBER 0
58-
#define HWFC false
59-
6051
//--------------------------------------------------------------------+
6152
// BLE OTA
6253
//--------------------------------------------------------------------+

src/linker/nrf52840_s340_v6.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ MEMORY
3131
DBL_RESET (rwx) : ORIGIN = 0x20007F7C, LENGTH = 0x04
3232

3333
/** Location of non initialized RAM. Non initialized RAM is used for exchanging bond information
34-
* from application to bootloader when using buttonluss DFU OTA. */
34+
* from application to bootloader when using buttonless DFU OTA. */
3535
NOINIT (rwx) : ORIGIN = 0x20007F80, LENGTH = 0x80
3636

3737

src/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,10 @@ static uint32_t softdev_init(bool init_softdevice)
328328
.accuracy = NRF_CLOCK_LF_ACCURACY_250_PPM
329329
};
330330

331-
#ifndef ANT_LICENSE_KEY
332-
APP_ERROR_CHECK( sd_softdevice_enable(&clock_cfg, app_error_fault_handler) );
333-
#else
331+
#ifdef ANT_LICENSE_KEY
334332
APP_ERROR_CHECK( sd_softdevice_enable(&clock_cfg, app_error_fault_handler, ANT_LICENSE_KEY) );
333+
#else
334+
APP_ERROR_CHECK( sd_softdevice_enable(&clock_cfg, app_error_fault_handler) );
335335
#endif
336336

337337
sd_nvic_EnableIRQ(SD_EVT_IRQn);

0 commit comments

Comments
 (0)