summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2019-10-14 23:38:41 -0400
committerDan Halbert <halbert@halwitz.org>2019-10-14 23:38:41 -0400
commitfdd7ebef2dc89b606aca52ac4cec4dd722a94288 (patch)
tree179de460f0cfb1e10656c24d0a513b8f53f14f54
parentc1ab2486f9e26c5a61c910cdf08c67d81b92f85b (diff)
change calibration from analogin_reset() to analogin_init()
-rw-r--r--ports/nrf/common-hal/analogio/AnalogIn.c2
-rw-r--r--ports/nrf/common-hal/analogio/AnalogIn.h2
-rw-r--r--ports/nrf/supervisor/port.c8
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 030a8dd73..44ebe9b4d 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 95f599e71..a268bb54e 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 68a494865..c69101070 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