remove json, delete toolchain list in target.py because NNN40 is inherit from NRF51822, add SWIO default setting in system_nrf51822.c and SWIO,VERF pin in PinName.h

pull/866/head
Marcomissyou 2015-01-29 13:46:58 +08:00
parent e7c32aff0f
commit 04937dc38b
5 changed files with 15 additions and 18 deletions

View File

@ -83,6 +83,17 @@ void SystemInit(void)
while (NRF_CLOCK->EVENTS_LFCLKSTARTED == 0) {
// Do nothing.
}
// Default SWIO setting, pull SWIO(p19) to low for turning antenna switch to BLE radiated path.
#ifdef TARGET_DELTA_DFCM_NNN40
NRF_GPIO->PIN_CNF[19] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
| (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
| (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos)
| (GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos)
| (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos);
NRF_GPIO->OUTCLR = (GPIO_OUTCLR_PIN19_Clear << GPIO_OUTCLR_PIN19_Pos);
#endif
}
static bool is_manual_peripheral_setup_needed(void)

View File

@ -50,7 +50,7 @@ typedef enum {
p16 = 16,
p17 = 17,
p18 = NC,
p19 = NC,
p19 = 19,
p20 = 20,
p21 = 21,
p22 = 22,
@ -97,6 +97,8 @@ typedef enum {
A4 = p4,
A5 = p5,
SWIO = p19,
VERF0 = p0,
// Not connected
CTS_PIN_NUMBER = NC,

View File

@ -1,8 +0,0 @@
{
"1" : {
"mcu": "DELTA_DFCM_NNN40",
"port":"COM56",
"disk":"F:\\",
"peripherals": ["24LC256"]
}
}

View File

@ -849,15 +849,12 @@ class DELTA_DFCM_NNN40(NRF51822):
self.core = "Cortex-M0"
self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K']
self.macros = ['TARGET_NRF51822']
self.supported_toolchains = "GCC_ARM"
class DELTA_DFCM_NNN40_OTA(NRF51822):
def __init__(self):
NRF51822.__init__(self)
self.core = "Cortex-M0"
self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'DELTA_DFCM_NNN40']
self.macros = ['TARGET_NRF51822', 'TARGET_DELTA_DFCM_NNN40','TARGET_OTA_ENABLED']
self.supported_toolchains = "GCC_ARM"
self.MERGE_SOFT_DEVICE = False

View File

@ -1,5 +0,0 @@
{
"targets": {
"DELTA_DFCM_NNN40" : ["GCC_ARM"]
}
}