aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2017-10-16 15:11:41 -0400
committerScott Shawcroft <scott@tannewt.org>2017-10-16 12:51:55 -0700
commit5f6df7f54a06720ff0633639b0c489696f252102 (patch)
tree8cfaf70cd228edd90d86f205b0f3581b3d953fc0
parent1709fbb65a4ec16dd0b9a8a72514aeb7b0305b9c (diff)
More io capability on non-Express boards, so call *_reset() routines
appropriately to match board capabilities.
-rw-r--r--atmel-samd/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/atmel-samd/main.c b/atmel-samd/main.c
index fe56410c0..79b5604e8 100644
--- a/atmel-samd/main.c
+++ b/atmel-samd/main.c
@@ -59,6 +59,7 @@
#include "common-hal/pulseio/PulseIn.h"
#include "common-hal/pulseio/PulseOut.h"
#include "common-hal/pulseio/PWMOut.h"
+#include "common-hal/touchio/TouchIn.h"
#include "common-hal/usb_hid/__init__.h"
#include "autoreload.h"
@@ -69,7 +70,6 @@
#include "tick.h"
#ifdef EXPRESS_BOARD
-#include "common-hal/touchio/TouchIn.h"
#define INTERNAL_CIRCUITPY_CONFIG_START_ADDR (0x00040000 - 0x100 - CIRCUITPY_INTERNAL_NVM_SIZE)
#else
#define INTERNAL_CIRCUITPY_CONFIG_START_ADDR (0x00040000 - 0x010000 - 0x100 - CIRCUITPY_INTERNAL_NVM_SIZE)
@@ -193,13 +193,13 @@ void reset_samd21(void) {
#ifdef EXPRESS_BOARD
audioout_reset();
+#endif
+
touchin_reset();
pdmin_reset();
pulsein_reset();
pulseout_reset();
pwmout_reset();
-#endif
-
analogin_reset();