Merge pull request adafruit#969 from arturo182/nrf_more_commonhal

tannewt · web-flow · commit 007155276ac4 · 2018-06-28T14:00:45.000-07:00
nrf: Rewrite more common-hal with nrfx and sync with atsamd port
diff --git a/ports/nrf/common-hal/board/__init__.c b/ports/nrf/common-hal/board/__init__.c
@@ -24,11 +24,5 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
-
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "common-hal/microcontroller/Pin.h"
-
 // Pins aren't actually defined here. They are in the board specific directory
-// such as boards/arduino_zero/pins.c.
+// such as boards/feather52832/pins.csv
diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nrf/common-hal/microcontroller/__init__.c
@@ -27,14 +27,15 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/microcontroller/Processor.h"
 
-
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/Processor.h"
 
-// TODO porting common_hal_mcu
+#include "supervisor/filesystem.h"
+#include "nrfx_glue.h"
+
 void common_hal_mcu_delay_us(uint32_t delay) {
-//    os_delay_us(delay);
+    NRFX_DELAY_US(delay);
 }
 
 void common_hal_mcu_disable_interrupts() {
@@ -48,7 +49,8 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
 }
 
 void common_hal_mcu_reset(void) {
-    // TODO: see atmel-samd for functionality
+    filesystem_flush();
+    NVIC_SystemReset();
 }
 
 // The singleton microcontroller.Processor object, bound to microcontroller.cpu
diff --git a/ports/nrf/common-hal/storage/__init__.c b/ports/nrf/common-hal/storage/__init__.c
@@ -28,16 +28,19 @@
 
 #include "py/mperrno.h"
 #include "py/runtime.h"
+#include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/storage/__init__.h"
+#include "supervisor/filesystem.h"
 
 extern volatile bool mp_msc_enabled;
 
-void common_hal_storage_remount(const char* mount_path, bool readonly) {
-    if (strcmp(mount_path, "/") != 0) {
+void common_hal_storage_remount(const char *mount_path, bool readonly) {
+    if (strcmp(mount_path, "/") != 0)
         mp_raise_OSError(MP_EINVAL);
-    }
 }
 
-void common_hal_storage_erase_filesystem() {
-    mp_raise_NotImplementedError("");
+void common_hal_storage_erase_filesystem(void) {
+    filesystem_init(false, true); // Force a re-format.
+    common_hal_mcu_reset();
+    // We won't actually get here, since we're resetting.
 }
diff --git a/ports/nrf/common-hal/time/__init__.c b/ports/nrf/common-hal/time/__init__.c
@@ -29,10 +29,12 @@
 #include "shared-bindings/time/__init__.h"
 #include "tick.h"
 
-inline uint64_t common_hal_time_monotonic() {
-  return ticks_ms;
+#include "nrfx_glue.h"
+
+inline uint64_t common_hal_time_monotonic(void) {
+    return ticks_ms;
 }
 
 void common_hal_time_delay_ms(uint32_t delay) {
-    mp_hal_delay_ms(delay);
+    NRFX_DELAY_US(delay);
 }
diff --git a/ports/nrf/nrfx_glue.h b/ports/nrf/nrfx_glue.h
@@ -45,6 +45,8 @@
 extern "C" {
 #endif
 
+#include <drivers/nrfx_common.h>
+
 /**
  * @defgroup nrfx_glue nrfx_glue.h
  * @{

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,12 @@`
`29`	`29`	`#include "shared-bindings/time/__init__.h"`
`30`	`30`	`#include "tick.h"`
`31`	`31`
`32`		`-inline uint64_t common_hal_time_monotonic() {`
`33`		`- return ticks_ms;`
	`32`	`+#include "nrfx_glue.h"`
	`33`	`+`
	`34`	`+inline uint64_t common_hal_time_monotonic(void) {`
	`35`	`+ return ticks_ms;`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`void common_hal_time_delay_ms(uint32_t delay) {`
`37`		`- mp_hal_delay_ms(delay);`
	`39`	`+ NRFX_DELAY_US(delay);`
`38`	`40`	`}`