From 5259158d1727f3703bc90f88d50938eada316f67 Mon Sep 17 00:00:00 2001
From: Stephane D'Alu <sdalu@sdalu.com>
Date: Sun, 10 Jul 2016 10:48:04 +0200
Subject: renamed NRF51_* to NRF5_*

---
 testhal/NRF51/NRF51822/ADC/mcuconf.h |  2 +-
 testhal/NRF51/NRF51822/GPT/mcuconf.h |  4 ++--
 testhal/NRF51/NRF51822/I2C/mcuconf.h |  2 +-
 testhal/NRF51/NRF51822/PWM/mcuconf.h | 12 ++++++------
 testhal/NRF51/NRF51822/RNG/mcuconf.h |  4 ++--
 testhal/NRF51/NRF51822/SPI/mcuconf.h |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'testhal')

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..11ebce1 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_RNG1 		   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_ */
-- 
cgit v1.2.3


From 6423c3dabeba4e4ed9217d71873653bc8af9ae4e Mon Sep 17 00:00:00 2001
From: Stephane D'Alu <sdalu@sdalu.com>
Date: Sun, 10 Jul 2016 12:04:39 +0200
Subject: moved rng to LLD directory. removed rng power control (doesn't exist
 in nrf52, wasn't documented in nrf51) renamed peripheral to start at 0

---
 testhal/NRF51/NRF51822/RNG/mcuconf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testhal')

diff --git a/testhal/NRF51/NRF51822/RNG/mcuconf.h b/testhal/NRF51/NRF51822/RNG/mcuconf.h
index 11ebce1..dfde5a9 100644
--- a/testhal/NRF51/NRF51822/RNG/mcuconf.h
+++ b/testhal/NRF51/NRF51822/RNG/mcuconf.h
@@ -17,7 +17,7 @@
 #ifndef _MCUCONF_H_
 #define _MCUCONF_H_
 
-#define NRF5_RNG_USE_RNG1 		   TRUE
+#define NRF5_RNG_USE_RNG0 		   TRUE
 #define NRF5_SERIAL_USE_UART0              TRUE
 
 
-- 
cgit v1.2.3


From 9cf4f9dfc7f6bcd1c46c96d9e388bf677e7148f1 Mon Sep 17 00:00:00 2001
From: Stephane D'Alu <sdalu@sdalu.com>
Date: Sun, 10 Jul 2016 13:35:31 +0200
Subject: moved wdg to LLD

---
 testhal/NRF51/NRF51822/WDG/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'testhal')

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);
-- 
cgit v1.2.3