kopia lustrzana https://github.com/micropython/micropython
esp8266: Make onewire module and support code usable by other ports.
Damien George
rodzic
e6782428be
commit
c06aa5be00
|
|
@ -24,11 +24,6 @@
|
|||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "etshal.h"
|
||||
#include "user_interface.h"
|
||||
#include "modmachine.h"
|
||||
#include "esponewire.h"
|
||||
|
||||
#define TIMING_RESET1 (0)
|
||||
|
|
@ -43,57 +38,40 @@
|
|||
|
||||
uint16_t esp_onewire_timings[9] = {480, 40, 420, 5, 5, 40, 10, 50, 10};
|
||||
|
||||
static uint32_t disable_irq(void) {
|
||||
ets_intr_lock();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void enable_irq(uint32_t i) {
|
||||
ets_intr_unlock();
|
||||
}
|
||||
|
||||
static void mp_hal_delay_us_no_irq(uint32_t us) {
|
||||
uint32_t start = system_get_time();
|
||||
while (system_get_time() - start < us) {
|
||||
}
|
||||
}
|
||||
|
||||
#define DELAY_US mp_hal_delay_us_no_irq
|
||||
|
||||
int esp_onewire_reset(uint pin) {
|
||||
pin_set(pin, 0);
|
||||
DELAY_US(esp_onewire_timings[TIMING_RESET1]);
|
||||
uint32_t i = disable_irq();
|
||||
pin_set(pin, 1);
|
||||
DELAY_US(esp_onewire_timings[TIMING_RESET2]);
|
||||
int status = !pin_get(pin);
|
||||
enable_irq(i);
|
||||
DELAY_US(esp_onewire_timings[TIMING_RESET3]);
|
||||
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(uint pin) {
|
||||
pin_set(pin, 1);
|
||||
uint32_t i = disable_irq();
|
||||
pin_set(pin, 0);
|
||||
DELAY_US(esp_onewire_timings[TIMING_READ1]);
|
||||
pin_set(pin, 1);
|
||||
DELAY_US(esp_onewire_timings[TIMING_READ2]);
|
||||
int value = pin_get(pin);
|
||||
enable_irq(i);
|
||||
DELAY_US(esp_onewire_timings[TIMING_READ3]);
|
||||
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(uint pin, int value) {
|
||||
uint32_t i = disable_irq();
|
||||
pin_set(pin, 0);
|
||||
DELAY_US(esp_onewire_timings[TIMING_WRITE1]);
|
||||
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) {
|
||||
pin_set(pin, 1);
|
||||
mp_hal_pin_write(pin, 1);
|
||||
}
|
||||
DELAY_US(esp_onewire_timings[TIMING_WRITE2]);
|
||||
pin_set(pin, 1);
|
||||
DELAY_US(esp_onewire_timings[TIMING_WRITE3]);
|
||||
enable_irq(i);
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,10 +27,12 @@
|
|||
#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(uint pin);
|
||||
int esp_onewire_readbit(uint pin);
|
||||
void esp_onewire_writebit(uint pin, int value);
|
||||
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__
|
||||
|
|
|
|||
|
|
@ -43,17 +43,17 @@ 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_obj_get_pin(pin_in)));
|
||||
return mp_obj_new_bool(esp_onewire_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_obj_get_pin(pin_in)));
|
||||
return MP_OBJ_NEW_SMALL_INT(esp_onewire_readbit(mp_hal_get_pin_obj(pin_in)));
|
||||
}
|
||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbit_obj, onewire_readbit);
|
||||
|
||||
STATIC mp_obj_t onewire_readbyte(mp_obj_t pin_in) {
|
||||
uint pin = mp_obj_get_pin(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;
|
||||
|
|
@ -63,13 +63,13 @@ STATIC mp_obj_t onewire_readbyte(mp_obj_t pin_in) {
|
|||
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_obj_get_pin(pin_in), mp_obj_get_int(value_in));
|
||||
esp_onewire_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);
|
||||
|
||||
STATIC mp_obj_t onewire_writebyte(mp_obj_t pin_in, mp_obj_t value_in) {
|
||||
uint pin = mp_obj_get_pin(pin_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);
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue