summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobert-hh <robert@hammelrath.com>2023-06-26 14:16:47 +0200
committerDamien George <damien@micropython.org>2023-06-27 14:58:07 +1000
commit057f3b00204cc88d31a66f7d5999fc3c29b92fe4 (patch)
treee48fd07ced7508986edbdd2ccdbbed77bc8bdd5a
parent5ef7ce5116dd419b3f217fac5ab0cbf3634a028d (diff)
samd/mpconfigport: Enable DHT and onewire drivers on all MCUs/boards.
And move the setting to the samd-generic files, now that both samd21 and samd51 support it. Signed-off-by: robert-hh <robert@hammelrath.com>
-rw-r--r--ports/samd/Makefile1
-rw-r--r--ports/samd/mcu/samd51/mpconfigmcu.h2
-rw-r--r--ports/samd/mcu/samd51/mpconfigmcu.mk1
-rw-r--r--ports/samd/mpconfigport.h2
4 files changed, 3 insertions, 3 deletions
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 7e5c334e6..6dd71bd93 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -119,6 +119,7 @@ SRC_C += \
tusb_port.c \
SHARED_SRC_C += \
+ drivers/dht/dht.c \
shared/runtime/mpirq.c \
shared/libc/printf.c \
shared/libc/string0.c \
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 1569e5624..399b48c04 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -25,8 +25,6 @@
#define MICROPY_PY_CMATH (0)
#endif
-#define MICROPY_PY_MACHINE_DHT_READINTO (1)
-#define MICROPY_PY_ONEWIRE (1)
#define MICROPY_PY_OS_SYNC (1)
#define MICROPY_PY_OS_URANDOM (1)
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32())
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index 0e662a170..c706331ac 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -12,4 +12,3 @@ SRC_S += shared/runtime/gchelper_thumb2.s
SRC_C += \
fatfs_port.c \
- drivers/dht/dht.c \
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 7bf4acb84..f3fe38d76 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -127,6 +127,8 @@
#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE "ports/samd/machine_pwm.c"
#endif
#define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
+#define MICROPY_PY_MACHINE_DHT_READINTO (1)
+#define MICROPY_PY_ONEWIRE (1)
#define MP_STATE_PORT MP_STATE_VM