Skip to content

Commit ea730e8

Browse files
committed
Merge pull request #1142 from Marcomissyou/master
modify overrides flash_init/flash powerdown and PinName
2 parents 9747aa0 + 78f373c commit ea730e8

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ typedef enum {
9090
I2C_SDA0 = p22,
9191
I2C_SCL0 = p20,
9292

93-
A0 = p0,
94-
A1 = p1,
95-
A2 = p2,
96-
A3 = p3,
97-
A4 = p4,
98-
A5 = p5,
93+
A0 = p1,
94+
A1 = p2,
95+
A2 = p3,
96+
A3 = p4,
97+
A4 = p5,
98+
A5 = p6,
9999

100100
SWIO = p19,
101101
VERF0 = p0,

libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/mbed_overrides.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define CMD_POWER_UP (0xAB)
2626
#define CMD_POWER_DOWN (0xB9)
2727

28-
void spi_flash_init(void)
28+
void flash_init(void)
2929
{
3030
NRF_GPIO->PIN_CNF[SPIM1_MOSI_PIN] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
3131
| (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
@@ -79,7 +79,7 @@ void spi_flash_init(void)
7979

8080
}
8181

82-
void spi_flash_powerDown(void)
82+
void flash_powerDown(void)
8383
{
8484
NRF_GPIO->OUTCLR = (GPIO_OUTCLR_PIN28_Clear << GPIO_OUTCLR_PIN28_Pos);
8585
//spi.write(CMD_POWER_DOWN);
@@ -115,9 +115,9 @@ void mbed_sdk_init()
115115
{// Do nothing.
116116
}
117117

118-
spi_flash_init();
118+
flash_init();
119119

120120
//nrf_delay_ms(10);
121-
spi_flash_powerDown();
121+
flash_powerDown();
122122

123123
}

0 commit comments

Comments
 (0)