code tidy

Author: gfwilliams

targets/nrf5x/jshardware.c

@@ -37,6 +37,7 @@
 #include "nrf_timer.h"
 #include "app_uart.h"
 #include "nrf_drv_uart.h"
+#include "nrf_delay.h"
 
 #ifdef NRF52
 #include "nrf_saadc.h"
@@ -92,29 +93,6 @@ void sys_evt_handler(uint32_t sys_evt) {
   }
 }
 
-
-unsigned int getNRFBaud(int baud) {
-  switch (baud) {
-    case 1200: return UART_BAUDRATE_BAUDRATE_Baud1200;
-    case 2400: return UART_BAUDRATE_BAUDRATE_Baud2400;
-    case 4800: return UART_BAUDRATE_BAUDRATE_Baud4800;
-    case 9600: return UART_BAUDRATE_BAUDRATE_Baud9600;
-    case 14400: return UART_BAUDRATE_BAUDRATE_Baud14400;
-    case 19200: return UART_BAUDRATE_BAUDRATE_Baud19200;
-    case 28800: return UART_BAUDRATE_BAUDRATE_Baud28800;
-    case 38400: return UART_BAUDRATE_BAUDRATE_Baud38400;
-    case 57600: return UART_BAUDRATE_BAUDRATE_Baud57600;
-    case 76800: return UART_BAUDRATE_BAUDRATE_Baud76800;
-    case 115200: return UART_BAUDRATE_BAUDRATE_Baud115200;
-    case 230400: return UART_BAUDRATE_BAUDRATE_Baud230400;
-    case 250000: return UART_BAUDRATE_BAUDRATE_Baud250000;
-    case 460800: return UART_BAUDRATE_BAUDRATE_Baud460800;
-    case 921600: return UART_BAUDRATE_BAUDRATE_Baud921600;
-    case 1000000: return UART_BAUDRATE_BAUDRATE_Baud1M;
-    default: return 0; // error
-  }
-}
-
 static NO_INLINE void jshPinSetFunction_int(JshPinFunction func, uint32_t pin) {
   JshPinFunction fType = func&JSH_MASK_TYPE;
   JshPinFunction fInfo = func&JSH_MASK_INFO;
@@ -272,8 +250,7 @@ void jshDelayMicroseconds(int microsec) {
   if (microsec <= 0) {
     return;
   }
-
-  nrf_utils_delay_us((uint32_t) microsec);
+  nrf_delay_us((uint32_t)microsec);
 }
 
 void jshPinSetValue(Pin pin, bool value) {
@@ -347,7 +324,7 @@ void jshPinSetState(Pin pin, JshPinState state) {
 /** Get the pin state (only accurate for simple IO - won't return JSHPINSTATE_USART_OUT for instance).
  * Note that you should use JSHPINSTATE_MASK as other flags may have been added */
 JshPinState jshPinGetState(Pin pin) {
-  return (JshPinState) nrf_utils_gpio_pin_get_state((uint32_t)pinInfo[pin].pin);
+  return 0; // FIXME need to get able to get pin state!
 }
 
 #ifdef NRF52
@@ -660,7 +637,7 @@ void jshUSARTSetup(IOEventFlags device, JshUSARTInfo *inf) {
   if (device != EV_SERIAL1)
     return;
 
-  int baud = getNRFBaud(inf->baudRate);
+  int baud = nrf_utils_get_baud_enum(inf->baudRate);
   if (baud==0)
     return jsError("Invalid baud rate %d", inf->baudRate);
   if (!jshIsPinValid(inf->pinRX) || !jshIsPinValid(inf->pinTX))

targets/nrf5x/nrf5x_utils.c

@@ -18,21 +18,30 @@
 
 #include "nrf.h"
 #include "nrf_gpio.h"
-#include "nrf_delay.h"
 #include "app_uart.h"
 #include "nrf_error.h"
 #include "nrf_nvmc.h"
 
-uint32_t nrf_utils_gpio_pin_get_state(uint32_t pin)
-{
-	/*uint32_t pin_register;
-	pin_register = NRF_GPIO->PIN_CNF[pin];*/
-    return (uint32_t) 0;
-}
-
-void nrf_utils_delay_us(uint32_t microsec) 
-{
-  nrf_delay_us(microsec);
+unsigned int nrf_utils_get_baud_enum(int baud) {
+  switch (baud) {
+    case 1200: return UART_BAUDRATE_BAUDRATE_Baud1200;
+    case 2400: return UART_BAUDRATE_BAUDRATE_Baud2400;
+    case 4800: return UART_BAUDRATE_BAUDRATE_Baud4800;
+    case 9600: return UART_BAUDRATE_BAUDRATE_Baud9600;
+    case 14400: return UART_BAUDRATE_BAUDRATE_Baud14400;
+    case 19200: return UART_BAUDRATE_BAUDRATE_Baud19200;
+    case 28800: return UART_BAUDRATE_BAUDRATE_Baud28800;
+    case 38400: return UART_BAUDRATE_BAUDRATE_Baud38400;
+    case 57600: return UART_BAUDRATE_BAUDRATE_Baud57600;
+    case 76800: return UART_BAUDRATE_BAUDRATE_Baud76800;
+    case 115200: return UART_BAUDRATE_BAUDRATE_Baud115200;
+    case 230400: return UART_BAUDRATE_BAUDRATE_Baud230400;
+    case 250000: return UART_BAUDRATE_BAUDRATE_Baud250000;
+    case 460800: return UART_BAUDRATE_BAUDRATE_Baud460800;
+    case 921600: return UART_BAUDRATE_BAUDRATE_Baud921600;
+    case 1000000: return UART_BAUDRATE_BAUDRATE_Baud1M;
+    default: return 0; // error
+  }
 }
 
 // Configure the low frequency clock to use the external 32.768 kHz crystal as a source. Start this clock.
@@ -95,16 +104,3 @@ uint8_t nrf_utils_get_random_number()
   return rand_num;
 
 }
-
-void nrf_utils_app_uart_put(uint8_t character) {
-	while (app_uart_put(character) != NRF_SUCCESS);
-}
-
-void print_string_to_terminal(uint8_t * debug_string, uint32_t len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-  {
-	  nrf_utils_app_uart_put((char) debug_string[i]);
-  }
-}

targets/nrf5x/nrf5x_utils.h

@@ -20,21 +20,14 @@
 
 #include <stdint.h>
 
-/// Functions for configuring and setting GPIOS.
-uint32_t nrf_utils_gpio_pin_get_state(uint32_t pin);
-
-void nrf_utils_delay_us(uint32_t microsec);
+unsigned int nrf_utils_get_baud_enum(int baud);
 
 // Configure the low frequency clock to use the external 32.768 kHz crystal as a source & start.
 void nrf_utils_lfclk_config_and_start(void);
 
 int nrf_utils_get_device_id(uint8_t * device_id, int maxChars);
 uint8_t nrf_utils_get_random_number(void);
 
-void nrf_utils_app_uart_put(uint8_t character);
-
-void print_string_to_terminal(uint8_t * debug_string, uint32_t len);
-
 #endif // NRF5X_UTILS_H__
 
 /** @} */