From c22c1ab3eb561132660debefab4b0d50075035d9 Mon Sep 17 00:00:00 2001 From: Rida Jichi Date: Tue, 1 Nov 2016 09:00:34 +0000 Subject: [PATCH] Replaced p{0..30} with P0_{0..30} in the NRF51822 api's Change-Id: I0e080a30717ee0bcfa2db3f134acb08be851d767 --- .../TARGET_MCU_NRF51822/analogin_api.c | 16 ++--- .../TARGET_MCU_NRF51822/pwmout_api.c | 58 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c index 77b1ddcd38..2406bde585 100644 --- a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c +++ b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c @@ -23,15 +23,15 @@ #define ADC_RANGE ADC_10BIT_RANGE static const PinMap PinMap_ADC[] = { - {p1, ADC0_0, 4}, - {p2, ADC0_0, 8}, - {p3, ADC0_0, 16}, - {p4, ADC0_0, 32}, - {p5, ADC0_0, 64}, - {p6, ADC0_0, 128}, + {P0_1, ADC0_0, 4}, + {P0_2, ADC0_0, 8}, + {P0_3, ADC0_0, 16}, + {P0_4, ADC0_0, 32}, + {P0_5, ADC0_0, 64}, + {P0_6, ADC0_0, 128}, #ifndef TARGET_NRF51_DONGLE - {p26, ADC0_0, 1}, - {p27, ADC0_0, 2}, + {P0_26, ADC0_0, 1}, + {P0_27, ADC0_0, 2}, #endif {NC, NC, 0} }; diff --git a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c index 1ebe182dd5..eb2c73103b 100644 --- a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c +++ b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c @@ -23,35 +23,35 @@ #define TIMER_PRECISION 4 //4us ticks #define TIMER_PRESCALER 6 //4us ticks = 16Mhz/(2**6) static const PinMap PinMap_PWM[] = { - {p0, PWM_1, 1}, - {p1, PWM_1, 1}, - {p2, PWM_1, 1}, - {p3, PWM_1, 1}, - {p4, PWM_1, 1}, - {p5, PWM_1, 1}, - {p6, PWM_1, 1}, - {p7, PWM_1, 1}, - {p8, PWM_1, 1}, - {p9, PWM_1, 1}, - {p10, PWM_1, 1}, - {p11, PWM_1, 1}, - {p12, PWM_1, 1}, - {p13, PWM_1, 1}, - {p14, PWM_1, 1}, - {p15, PWM_1, 1}, - {p16, PWM_1, 1}, - {p17, PWM_1, 1}, - {p18, PWM_1, 1}, - {p19, PWM_1, 1}, - {p20, PWM_1, 1}, - {p21, PWM_1, 1}, - {p22, PWM_1, 1}, - {p23, PWM_1, 1}, - {p24, PWM_1, 1}, - {p25, PWM_1, 1}, - {p28, PWM_1, 1}, - {p29, PWM_1, 1}, - {p30, PWM_1, 1}, + {P0_0, PWM_1, 1}, + {P0_1, PWM_1, 1}, + {P0_2, PWM_1, 1}, + {P0_3, PWM_1, 1}, + {P0_4, PWM_1, 1}, + {P0_5, PWM_1, 1}, + {P0_6, PWM_1, 1}, + {P0_7, PWM_1, 1}, + {P0_8, PWM_1, 1}, + {P0_9, PWM_1, 1}, + {P0_10, PWM_1, 1}, + {P0_11, PWM_1, 1}, + {P0_12, PWM_1, 1}, + {P0_13, PWM_1, 1}, + {P0_14, PWM_1, 1}, + {P0_15, PWM_1, 1}, + {P0_16, PWM_1, 1}, + {P0_17, PWM_1, 1}, + {P0_18, PWM_1, 1}, + {P0_19, PWM_1, 1}, + {P0_20, PWM_1, 1}, + {P0_21, PWM_1, 1}, + {P0_22, PWM_1, 1}, + {P0_23, PWM_1, 1}, + {P0_24, PWM_1, 1}, + {P0_25, PWM_1, 1}, + {P0_28, PWM_1, 1}, + {P0_29, PWM_1, 1}, + {P0_30, PWM_1, 1}, {NC, NC, 0} };