diff options
| author | Fabio Utzig <utzig@utzig.org> | 2016-07-17 21:30:35 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-17 21:30:35 -0300 |
| commit | 569aa39fbad9b47efe45635850f82c040c765318 (patch) | |
| tree | b3f390bbf198388db53ad7490b3d93ee658f1a82 /testhal | |
| parent | bf620a05ed23155fe09111b04ec9915cfd93bf38 (diff) | |
| parent | 194e5ec59ce0d58f82c99d17c026de64ba3f1316 (diff) | |
| download | ChibiOS-Contrib-569aa39fbad9b47efe45635850f82c040c765318.tar.gz ChibiOS-Contrib-569aa39fbad9b47efe45635850f82c040c765318.tar.bz2 ChibiOS-Contrib-569aa39fbad9b47efe45635850f82c040c765318.zip | |
Merge pull request #91 from sdalu/nrf52832
Nrf52832
Diffstat (limited to 'testhal')
| -rw-r--r-- | testhal/NRF51/NRF51822/ADC/mcuconf.h | 2 | ||||
| -rw-r--r-- | testhal/NRF51/NRF51822/GPT/mcuconf.h | 4 | ||||
| -rw-r--r-- | testhal/NRF51/NRF51822/I2C/mcuconf.h | 2 | ||||
| -rw-r--r-- | testhal/NRF51/NRF51822/PWM/mcuconf.h | 12 | ||||
| -rw-r--r-- | testhal/NRF51/NRF51822/RNG/mcuconf.h | 4 | ||||
| -rw-r--r-- | testhal/NRF51/NRF51822/SPI/mcuconf.h | 2 | ||||
| -rw-r--r-- | testhal/NRF51/NRF51822/WDG/main.c | 8 |
7 files changed, 17 insertions, 17 deletions
diff --git a/testhal/NRF51/NRF51822/ADC/mcuconf.h b/testhal/NRF51/NRF51822/ADC/mcuconf.h index 123261a..e43ff4b 100644 --- a/testhal/NRF51/NRF51822/ADC/mcuconf.h +++ b/testhal/NRF51/NRF51822/ADC/mcuconf.h @@ -20,6 +20,6 @@ /*
* NRF51 driver system settings.
*/
-#define NRF51_ADC_USE_ADC1 TRUE
+#define NRF5_ADC_USE_ADC1 TRUE
#endif /* _MCUCONF_H_ */
diff --git a/testhal/NRF51/NRF51822/GPT/mcuconf.h b/testhal/NRF51/NRF51822/GPT/mcuconf.h index 7fd549f..bef0987 100644 --- a/testhal/NRF51/NRF51822/GPT/mcuconf.h +++ b/testhal/NRF51/NRF51822/GPT/mcuconf.h @@ -20,7 +20,7 @@ /*
* NRF51 driver system settings.
*/
-#define NRF51_GPT_USE_TIMER1 TRUE
-#define NRF51_GPT_USE_TIMER2 TRUE
+#define NRF5_GPT_USE_TIMER1 TRUE
+#define NRF5_GPT_USE_TIMER2 TRUE
#endif /* _MCUCONF_H_ */
diff --git a/testhal/NRF51/NRF51822/I2C/mcuconf.h b/testhal/NRF51/NRF51822/I2C/mcuconf.h index e1747ec..fd238a2 100644 --- a/testhal/NRF51/NRF51822/I2C/mcuconf.h +++ b/testhal/NRF51/NRF51822/I2C/mcuconf.h @@ -20,6 +20,6 @@ /*
* HAL driver system settings.
*/
-#define NRF51_I2C_USE_I2C0 TRUE
+#define NRF5_I2C_USE_I2C0 TRUE
#endif /* _MCUCONF_H_ */
diff --git a/testhal/NRF51/NRF51822/PWM/mcuconf.h b/testhal/NRF51/NRF51822/PWM/mcuconf.h index 374340b..fb5b21f 100644 --- a/testhal/NRF51/NRF51822/PWM/mcuconf.h +++ b/testhal/NRF51/NRF51822/PWM/mcuconf.h @@ -20,11 +20,11 @@ /*
* HAL driver system settings.
*/
-#define NRF51_SERIAL_USE_UART0 TRUE
-#define NRF51_ST_USE_RTC0 TRUE
-#define NRF51_ST_USE_RTC1 FALSE
-#define NRF51_ST_USE_TIMER0 FALSE
-#define NRF51_PWM_USE_TIMER0 TRUE
-#define NRF51_PWM_USE_GPIOTE_PPI TRUE
+#define NRF5_SERIAL_USE_UART0 TRUE
+#define NRF5_ST_USE_RTC0 TRUE
+#define NRF5_ST_USE_RTC1 FALSE
+#define NRF5_ST_USE_TIMER0 FALSE
+#define NRF5_PWM_USE_TIMER0 TRUE
+#define NRF5_PWM_USE_GPIOTE_PPI TRUE
#endif /* _MCUCONF_H_ */
diff --git a/testhal/NRF51/NRF51822/RNG/mcuconf.h b/testhal/NRF51/NRF51822/RNG/mcuconf.h index 7977f4b..dfde5a9 100644 --- a/testhal/NRF51/NRF51822/RNG/mcuconf.h +++ b/testhal/NRF51/NRF51822/RNG/mcuconf.h @@ -17,8 +17,8 @@ #ifndef _MCUCONF_H_
#define _MCUCONF_H_
-#define NRF51_RNG_USE_RNG1 TRUE
-#define NRF51_SERIAL_USE_UART0 TRUE
+#define NRF5_RNG_USE_RNG0 TRUE
+#define NRF5_SERIAL_USE_UART0 TRUE
#endif /* _MCUCONF_H_ */
diff --git a/testhal/NRF51/NRF51822/SPI/mcuconf.h b/testhal/NRF51/NRF51822/SPI/mcuconf.h index 64d0639..7567d24 100644 --- a/testhal/NRF51/NRF51822/SPI/mcuconf.h +++ b/testhal/NRF51/NRF51822/SPI/mcuconf.h @@ -20,6 +20,6 @@ /*
* HAL driver system settings.
*/
-#define NRF51_SPI_USE_SPI0 TRUE
+#define NRF5_SPI_USE_SPI0 TRUE
#endif /* _MCUCONF_H_ */
diff --git a/testhal/NRF51/NRF51822/WDG/main.c b/testhal/NRF51/NRF51822/WDG/main.c index cdbf89b..92942b9 100644 --- a/testhal/NRF51/NRF51822/WDG/main.c +++ b/testhal/NRF51/NRF51822/WDG/main.c @@ -40,10 +40,10 @@ int main(void) { palSetPad(IOPORT1, LED1);
WDGConfig WDG_config = {
- .flags.pause_on_sleep = 0,
- .flags.pause_on_halt = 0,
- .timeout_ms = 5000,
- .callback = timeout_callback
+ .pause_on_sleep = 0,
+ .pause_on_halt = 0,
+ .timeout_ms = 5000,
+ .callback = timeout_callback
};
wdgStart(&WDGD1, &WDG_config);
|