Skip to content

Commit df3b174

Browse files
dpgeorgedpgeorge
committed
esp8266: Separate 1-wire timing funcs from Python module to save iRAM.
esponewire.c contains low-level timing-critical functions that go in iRAM. modonewire.c contains Python wrapper code.
1 parent 674bf1b commit df3b174

5 files changed

Lines changed: 144 additions & 70 deletions

File tree

‎esp8266/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ SRC_C = \
6060
lexerstr32.c \
6161
uart.c \
6262
esppwm.c \
63+
esponewire.c \
6364
espneopixel.c \
6465
intr.c \
6566
modpyb.c \

‎esp8266/esp8266.ld‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ SECTIONS
146146
*modutime.o(.literal* .text*)
147147
*modlwip.o(.literal* .text*)
148148
*modsocket.o(.literal* .text*)
149+
*modonewire.o(.literal* .text*)
149150
150151
/* we put as much rodata as possible in this section */
151152
/* note that only rodata accessed as a machine word is allowed here */

‎esp8266/esponewire.c‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2015-2016 Damien P. George
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include <stdint.h>
28+
29+
#include "etshal.h"
30+
#include "user_interface.h"
31+
#include "modpyb.h"
32+
#include "esponewire.h"
33+
34+
#define TIMING_RESET1 (0)
35+
#define TIMING_RESET2 (1)
36+
#define TIMING_RESET3 (2)
37+
#define TIMING_READ1 (3)
38+
#define TIMING_READ2 (4)
39+
#define TIMING_READ3 (5)
40+
#define TIMING_WRITE1 (6)
41+
#define TIMING_WRITE2 (7)
42+
#define TIMING_WRITE3 (8)
43+
44+
uint16_t esp_onewire_timings[9] = {480, 40, 420, 5, 5, 40, 10, 50, 10};
45+
46+
static uint32_t disable_irq(void) {
47+
ets_intr_lock();
48+
return 0;
49+
}
50+
51+
static void enable_irq(uint32_t i) {
52+
ets_intr_unlock();
53+
}
54+
55+
static void mp_hal_delay_us_no_irq(uint32_t us) {
56+
uint32_t start = system_get_time();
57+
while (system_get_time() - start < us) {
58+
}
59+
}
60+
61+
#define DELAY_US mp_hal_delay_us_no_irq
62+
63+
int esp_onewire_reset(uint pin) {
64+
pin_set(pin, 0);
65+
DELAY_US(esp_onewire_timings[TIMING_RESET1]);
66+
uint32_t i = disable_irq();
67+
pin_set(pin, 1);
68+
DELAY_US(esp_onewire_timings[TIMING_RESET2]);
69+
int status = !pin_get(pin);
70+
enable_irq(i);
71+
DELAY_US(esp_onewire_timings[TIMING_RESET3]);
72+
return status;
73+
}
74+
75+
int esp_onewire_readbit(uint pin) {
76+
pin_set(pin, 1);
77+
uint32_t i = disable_irq();
78+
pin_set(pin, 0);
79+
DELAY_US(esp_onewire_timings[TIMING_READ1]);
80+
pin_set(pin, 1);
81+
DELAY_US(esp_onewire_timings[TIMING_READ2]);
82+
int value = pin_get(pin);
83+
enable_irq(i);
84+
DELAY_US(esp_onewire_timings[TIMING_READ3]);
85+
return value;
86+
}
87+
88+
void esp_onewire_writebit(uint pin, int value) {
89+
uint32_t i = disable_irq();
90+
pin_set(pin, 0);
91+
DELAY_US(esp_onewire_timings[TIMING_WRITE1]);
92+
if (value) {
93+
pin_set(pin, 1);
94+
}
95+
DELAY_US(esp_onewire_timings[TIMING_WRITE2]);
96+
pin_set(pin, 1);
97+
DELAY_US(esp_onewire_timings[TIMING_WRITE3]);
98+
enable_irq(i);
99+
}

‎esp8266/esponewire.h‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2016 Damien P. George
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#ifndef __MICROPY_INCLUDED_ESP8266_ESPONEWIRE_H__
28+
#define __MICROPY_INCLUDED_ESP8266_ESPONEWIRE_H__
29+
30+
extern uint16_t esp_onewire_timings[9];
31+
32+
int esp_onewire_reset(uint pin);
33+
int esp_onewire_readbit(uint pin);
34+
void esp_onewire_writebit(uint pin, int value);
35+
36+
#endif // __MICROPY_INCLUDED_ESP8266_ESPONEWIRE_H__

‎esp8266/modonewire.c‎

Lines changed: 7 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -27,106 +27,43 @@
2727
#include <stdio.h>
2828
#include <stdint.h>
2929

30-
#include "etshal.h"
31-
#include "user_interface.h"
3230
#include "py/obj.h"
3331
#include "py/mphal.h"
3432
#include "modpyb.h"
35-
36-
STATIC uint32_t disable_irq(void) {
37-
ets_intr_lock();
38-
return 0;
39-
}
40-
41-
STATIC void enable_irq(uint32_t i) {
42-
ets_intr_unlock();
43-
}
44-
45-
STATIC void mp_hal_delay_us_no_irq(uint32_t us) {
46-
uint32_t start = system_get_time();
47-
while (system_get_time() - start < us) {
48-
}
49-
}
50-
51-
#define DELAY_US mp_hal_delay_us_no_irq
52-
53-
#define TIMING_RESET1 (0)
54-
#define TIMING_RESET2 (1)
55-
#define TIMING_RESET3 (2)
56-
#define TIMING_READ1 (3)
57-
#define TIMING_READ2 (4)
58-
#define TIMING_READ3 (5)
59-
#define TIMING_WRITE1 (6)
60-
#define TIMING_WRITE2 (7)
61-
#define TIMING_WRITE3 (8)
62-
63-
static int timings[] = {480, 40, 420, 5, 5, 40, 10, 50, 10};
33+
#include "esponewire.h"
6434

6535
STATIC mp_obj_t onewire_timings(mp_obj_t timings_in) {
6636
mp_obj_t *items;
6737
mp_obj_get_array_fixed_n(timings_in, 9, &items);
6838
for (int i = 0; i < 9; ++i) {
69-
timings[i] = mp_obj_get_int(items[i]);
39+
esp_onewire_timings[i] = mp_obj_get_int(items[i]);
7040
}
7141
return mp_const_none;
7242
}
7343
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_timings_obj, onewire_timings);
7444

7545
STATIC mp_obj_t onewire_reset(mp_obj_t pin_in) {
76-
uint pin = mp_obj_get_pin(pin_in);
77-
pin_set(pin, 0);
78-
DELAY_US(timings[TIMING_RESET1]);
79-
uint32_t i = disable_irq();
80-
pin_set(pin, 1);
81-
DELAY_US(timings[TIMING_RESET2]);
82-
int status = !pin_get(pin);
83-
enable_irq(i);
84-
DELAY_US(timings[TIMING_RESET3]);
85-
return mp_obj_new_bool(status);
46+
return mp_obj_new_bool(esp_onewire_reset(mp_obj_get_pin(pin_in)));
8647
}
8748
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_reset_obj, onewire_reset);
8849

89-
STATIC int _onewire_readbit(uint pin) {
90-
pin_set(pin, 1);
91-
uint32_t i = disable_irq();
92-
pin_set(pin, 0);
93-
DELAY_US(timings[TIMING_READ1]);
94-
pin_set(pin, 1);
95-
DELAY_US(timings[TIMING_READ2]);
96-
int value = pin_get(pin);
97-
enable_irq(i);
98-
DELAY_US(timings[TIMING_READ3]);
99-
return value;
100-
}
101-
10250
STATIC mp_obj_t onewire_readbit(mp_obj_t pin_in) {
103-
return MP_OBJ_NEW_SMALL_INT(_onewire_readbit(mp_obj_get_pin(pin_in)));
51+
return MP_OBJ_NEW_SMALL_INT(esp_onewire_readbit(mp_obj_get_pin(pin_in)));
10452
}
10553
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbit_obj, onewire_readbit);
10654

10755
STATIC mp_obj_t onewire_readbyte(mp_obj_t pin_in) {
10856
uint pin = mp_obj_get_pin(pin_in);
10957
uint8_t value = 0;
11058
for (int i = 0; i < 8; ++i) {
111-
value |= _onewire_readbit(pin) << i;
59+
value |= esp_onewire_readbit(pin) << i;
11260
}
11361
return MP_OBJ_NEW_SMALL_INT(value);
11462
}
11563
STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewire_readbyte_obj, onewire_readbyte);
11664

117-
STATIC void _onewire_writebit(uint pin, int value) {
118-
uint32_t i = disable_irq();
119-
pin_set(pin, 0);
120-
DELAY_US(timings[TIMING_WRITE1]);
121-
pin_set(pin, value);
122-
DELAY_US(timings[TIMING_WRITE2]);
123-
pin_set(pin, 1);
124-
DELAY_US(timings[TIMING_WRITE3]);
125-
enable_irq(i);
126-
}
127-
12865
STATIC mp_obj_t onewire_writebit(mp_obj_t pin_in, mp_obj_t value_in) {
129-
_onewire_writebit(mp_obj_get_pin(pin_in), mp_obj_get_int(value_in));
66+
esp_onewire_writebit(mp_obj_get_pin(pin_in), mp_obj_get_int(value_in));
13067
return mp_const_none;
13168
}
13269
STATIC MP_DEFINE_CONST_FUN_OBJ_2(onewire_writebit_obj, onewire_writebit);
@@ -135,7 +72,7 @@ STATIC mp_obj_t onewire_writebyte(mp_obj_t pin_in, mp_obj_t value_in) {
13572
uint pin = mp_obj_get_pin(pin_in);
13673
int value = mp_obj_get_int(value_in);
13774
for (int i = 0; i < 8; ++i) {
138-
_onewire_writebit(pin, value & 1);
75+
esp_onewire_writebit(pin, value & 1);
13976
value >>= 1;
14077
}
14178
return mp_const_none;

0 commit comments

Comments
 (0)