From eefd946e60aba3ac61c7bfbd0272d07be289e3f3 Mon Sep 17 00:00:00 2001 From: robert-hh Date: Thu, 27 Oct 2022 17:12:45 +0200 Subject: [PATCH] esp32/modmachine: Move dht_readinto() to the machine module. --- ports/esp32/modesp.c | 3 --- ports/esp32/modmachine.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c index 0c6429be7..f125b614b 100644 --- a/ports/esp32/modesp.c +++ b/ports/esp32/modesp.c @@ -35,7 +35,6 @@ #include "py/runtime.h" #include "py/mperrno.h" #include "py/mphal.h" -#include "drivers/dht/dht.h" STATIC mp_obj_t esp_osdebug(size_t n_args, const mp_obj_t *args) { esp_log_level_t level = LOG_LOCAL_LEVEL; @@ -125,8 +124,6 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_gpio_matrix_in), MP_ROM_PTR(&esp_gpio_matrix_in_obj) }, { MP_ROM_QSTR(MP_QSTR_gpio_matrix_out), MP_ROM_PTR(&esp_gpio_matrix_out_obj) }, - { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) }, - // Constants for second arg of osdebug() { MP_ROM_QSTR(MP_QSTR_LOG_NONE), MP_ROM_INT((mp_uint_t)ESP_LOG_NONE)}, { MP_ROM_QSTR(MP_QSTR_LOG_ERROR), MP_ROM_INT((mp_uint_t)ESP_LOG_ERROR)}, diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c index e24afd040..624e4d320 100644 --- a/ports/esp32/modmachine.c +++ b/ports/esp32/modmachine.c @@ -49,6 +49,7 @@ #include "py/obj.h" #include "py/runtime.h" #include "shared/runtime/pyexec.h" +#include "drivers/dht/dht.h" #include "extmod/machine_bitstream.h" #include "extmod/machine_mem.h" #include "extmod/machine_signal.h" @@ -295,6 +296,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = { #if MICROPY_PY_MACHINE_PULSE { MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) }, #endif + { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) }, { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&machine_timer_type) }, { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },