From fdd7ebef2dc89b606aca52ac4cec4dd722a94288 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 14 Oct 2019 23:38:41 -0400
Subject: [PATCH] change calibration from analogin_reset() to analogin_init()

---
 ports/nrf/common-hal/analogio/AnalogIn.c | 2 +-
 ports/nrf/common-hal/analogio/AnalogIn.h | 2 +-
 ports/nrf/supervisor/port.c              | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/nrf/common-hal/analogio/AnalogIn.c b/ports/nrf/common-hal/analogio/AnalogIn.c
index 030a8dd730..44ebe9b4df 100644
--- a/ports/nrf/common-hal/analogio/AnalogIn.c
+++ b/ports/nrf/common-hal/analogio/AnalogIn.c
@@ -34,7 +34,7 @@
 
 #define CHANNEL_NO 0
 
-void analogin_reset(void) {
+void analogin_init(void) {
     // Calibrate the ADC once, on startup.
     nrf_saadc_enable();
     nrf_saadc_event_clear(NRF_SAADC_EVENT_CALIBRATEDONE);
diff --git a/ports/nrf/common-hal/analogio/AnalogIn.h b/ports/nrf/common-hal/analogio/AnalogIn.h
index 95f599e711..a268bb54e4 100644
--- a/ports/nrf/common-hal/analogio/AnalogIn.h
+++ b/ports/nrf/common-hal/analogio/AnalogIn.h
@@ -36,6 +36,6 @@ typedef struct {
     const mcu_pin_obj_t * pin;
 } analogio_analogin_obj_t;
 
-void analogin_reset(void);
+void analogin_init(void);
 
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_ANALOGIO_ANALOGIN_H
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index 68a4948657..c69101070e 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -84,6 +84,10 @@ safe_mode_t port_init(void) {
     // Configure millisecond timer initialization.
     tick_init();
 
+#if CIRCUITPY_ANALOGIO
+    analogin_init();
+#endif
+
     #if CIRCUITPY_RTC
     rtc_init();
     #endif
@@ -103,10 +107,6 @@ void reset_port(void) {
     spi_reset();
     uart_reset();
 
-#if CIRCUITPY_ANALOGIO
-    analogin_reset();
-#endif
-
 #if CIRCUITPY_AUDIOBUSIO
     i2s_reset();
 #endif