diff --git a/esp8266/Makefile b/esp8266/Makefile
index 3ae6b20729185030ff62c010bce034f8d21e325e..73547a4b7ac1b2ce99e1aaa1f8b8762108b6e278 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -68,7 +68,6 @@ SRC_C = \
lexerstr32.c \
uart.c \
esppwm.c \
- esponewire.c \
espneopixel.c \
espapa102.c \
intr.c \
diff --git a/esp8266/esponewire.c b/esp8266/esponewire.c
deleted file mode 100644
index 897e75dfcd182107d4a14f14050cd283ceae979c..0000000000000000000000000000000000000000
--- a/esp8266/esponewire.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015-2016 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "esponewire.h"
-
-#define TIMING_RESET1 (0)
-#define TIMING_RESET2 (1)
-#define TIMING_RESET3 (2)
-#define TIMING_READ1 (3)
-#define TIMING_READ2 (4)
-#define TIMING_READ3 (5)
-#define TIMING_WRITE1 (6)
-#define TIMING_WRITE2 (7)
-#define TIMING_WRITE3 (8)
-
-uint16_t esp_onewire_timings[9] = {480, 40, 420, 5, 5, 40, 10, 50, 10};
-
-int esp_onewire_reset(mp_hal_pin_obj_t pin) {
- mp_hal_pin_write(pin, 0);
- mp_hal_delay_us(esp_onewire_timings[TIMING_RESET1]);
- uint32_t i = mp_hal_quiet_timing_enter();
- mp_hal_pin_write(pin, 1);
- mp_hal_delay_us_fast(esp_onewire_timings[TIMING_RESET2]);
- int status = !mp_hal_pin_read(pin);
- mp_hal_quiet_timing_exit(i);
- mp_hal_delay_us(esp_onewire_timings[TIMING_RESET3]);
- return status;
-}
-
-int esp_onewire_readbit(mp_hal_pin_obj_t pin) {
- mp_hal_pin_write(pin, 1);
- uint32_t i = mp_hal_quiet_timing_enter();
- mp_hal_pin_write(pin, 0);
- mp_hal_delay_us_fast(esp_onewire_timings[TIMING_READ1]);
- mp_hal_pin_write(pin, 1);
- mp_hal_delay_us_fast(esp_onewire_timings[TIMING_READ2]);
- int value = mp_hal_pin_read(pin);
- mp_hal_quiet_timing_exit(i);
- mp_hal_delay_us_fast(esp_onewire_timings[TIMING_READ3]);
- return value;
-}
-
-void esp_onewire_writebit(mp_hal_pin_obj_t pin, int value) {
- uint32_t i = mp_hal_quiet_timing_enter();
- mp_hal_pin_write(pin, 0);
- mp_hal_delay_us_fast(esp_onewire_timings[TIMING_WRITE1]);
- if (value) {
- mp_hal_pin_write(pin, 1);
- }
- mp_hal_delay_us_fast(esp_onewire_timings[TIMING_WRITE2]);
- mp_hal_pin_write(pin, 1);
- mp_hal_delay_us_fast(esp_onewire_timings[TIMING_WRITE3]);
- mp_hal_quiet_timing_exit(i);
-}
diff --git a/esp8266/esponewire.h b/esp8266/esponewire.h
deleted file mode 100644
index b32a6855446d57c433ef3b3504d2e0767f354b67..0000000000000000000000000000000000000000
--- a/esp8266/esponewire.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef __MICROPY_INCLUDED_ESP8266_ESPONEWIRE_H__
-#define __MICROPY_INCLUDED_ESP8266_ESPONEWIRE_H__
-
-#include "py/mphal.h"
-
-extern uint16_t esp_onewire_timings[9];
-
-int esp_onewire_reset(mp_hal_pin_obj_t pin);
-int esp_onewire_readbit(mp_hal_pin_obj_t pin);
-void esp_onewire_writebit(mp_hal_pin_obj_t pin, int value);
-
-#endif // __MICROPY_INCLUDED_ESP8266_ESPONEWIRE_H__
diff --git a/esp8266/modonewire.c b/esp8266/modonewire.c
index a8b40baaa517369d73b67ccd067df8fbef74f765..9831ae552ac84c77fec981df4f6354eed298082e 100644
--- a/esp8266/modonewire.c
+++ b/esp8266/modonewire.c
@@ -3,7 +3,7 @@
*
* The MIT License (MIT)
*
- * Copyright (c) 2015 Damien P. George
+ * Copyright (c) 2015-2017 Damien P. George
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,62 @@
#include "py/obj.h"
#include "py/mphal.h"
-#include "modmachine.h"
-#include "esponewire.h"
+
+/******************************************************************************/
+// Low-level 1-Wire routines
+
+#define TIMING_RESET1 (0)
+#define TIMING_RESET2 (1)
+#define TIMING_RESET3 (2)
+#define TIMING_READ1 (3)
+#define TIMING_READ2 (4)
+#define TIMING_READ3 (5)
+#define TIMING_WRITE1 (6)
+#define TIMING_WRITE2 (7)
+#define TIMING_WRITE3 (8)
+
+STATIC uint16_t esp_onewire_timings[9] = {480, 40, 420, 5, 5, 40, 10, 50, 10};
+
+STATIC int onewire_bus_reset(mp_hal_pin_obj_t pin) {
+ mp_hal_pin_write(pin, 0);
+ mp_hal_delay_us(esp_onewire_timings[TIMING_RESET1]);
+ uint32_t i = mp_hal_quiet_timing_enter();
+ mp_hal_pin_write(pin, 1);
+ mp_hal_delay_us_fast(esp_onewire_timings[TIMING_RESET2]);
+ int status = !mp_hal_pin_read(pin);
+ mp_hal_quiet_timing_exit(i);
+ mp_hal_delay_us(esp_onewire_timings[TIMING_RESET3]);
+ return status;
+}
+
+STATIC int onewire_bus_readbit(mp_hal_pin_obj_t pin) {
+ mp_hal_pin_write(pin, 1);
+ uint32_t i = mp_hal_quiet_timing_enter();
+ mp_hal_pin_write(pin, 0);
+ mp_hal_delay_us_fast(esp_onewire_timings[TIMING_READ1]);
+ mp_hal_pin_write(pin, 1);
+ mp_hal_delay_us_fast(esp_onewire_timings[TIMING_READ2]);
+ int value = mp_hal_pin_read(pin);
+ mp_hal_quiet_timing_exit(i);
+ mp_hal_delay_us_fast(esp_onewire_timings[TIMING_READ3]);
+ return value;
+}
+
+STATIC void onewire_bus_writebit(mp_hal_pin_obj_t pin, int value) {
+ uint32_t i = mp_hal_quiet_timing_enter();
+ mp_hal_pin_write(pin, 0);
+ mp_hal_delay_us_fast(esp_onewire_timings[TIMING_WRITE1]);
+ if (value) {
+ mp_hal_pin_write(pin, 1);
+ }
+ mp_hal_delay_us_fast(esp_onewire_timings[TIMING_WRITE2]);
+ mp_hal_pin_write(pin, 1);
+ mp_hal_delay_us_fast(esp_onewire_timings[TIMING_WRITE3]);
+ mp_hal_quiet_timing_exit(i);
+}
+
+/******************************************************************************/
+// MicroPython bindings
STATIC mp_obj_t onewire_timings(mp_obj_t timings_in) {
mp_obj_t *items;
@@ -43,12 +97,12 @@ STATIC mp_obj_t onewire_timings(mp_obj_t timings_in) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_timings_obj, onewire_timings);
STATIC mp_obj_t onewire_reset(mp_obj_t pin_in) {
- return mp_obj_new_bool(esp_onewire_reset(mp_hal_get_pin_obj(pin_in)));
+ return mp_obj_new_bool(onewire_bus_reset(mp_hal_get_pin_obj(pin_in)));
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_reset_obj, onewire_reset);
STATIC mp_obj_t onewire_readbit(mp_obj_t pin_in) {
- return MP_OBJ_NEW_SMALL_INT(esp_onewire_readbit(mp_hal_get_pin_obj(pin_in)));
+ return MP_OBJ_NEW_SMALL_INT(onewire_bus_readbit(mp_hal_get_pin_obj(pin_in)));
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbit_obj, onewire_readbit);
@@ -56,14 +110,14 @@ STATIC mp_obj_t onewire_readbyte(mp_obj_t pin_in) {
mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(pin_in);
uint8_t value = 0;
for (int i = 0; i < 8; ++i) {
- value |= esp_onewire_readbit(pin) << i;
+ value |= onewire_bus_readbit(pin) << i;
}
return MP_OBJ_NEW_SMALL_INT(value);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbyte_obj, onewire_readbyte);
STATIC mp_obj_t onewire_writebit(mp_obj_t pin_in, mp_obj_t value_in) {
- esp_onewire_writebit(mp_hal_get_pin_obj(pin_in), mp_obj_get_int(value_in));
+ onewire_bus_writebit(mp_hal_get_pin_obj(pin_in), mp_obj_get_int(value_in));
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(onewire_writebit_obj, onewire_writebit);
@@ -72,7 +126,7 @@ STATIC mp_obj_t onewire_writebyte(mp_obj_t pin_in, mp_obj_t value_in) {
mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(pin_in);
int value = mp_obj_get_int(value_in);
for (int i = 0; i < 8; ++i) {
- esp_onewire_writebit(pin, value & 1);
+ onewire_bus_writebit(pin, value & 1);
value >>= 1;
}
return mp_const_none;