Skip to content

Commit d8066e9

Browse files
dpgeorgedpgeorge
committed
stmhal: Add sleep_{ms,us} and ticks_{ms,us,cpu,diff} to time module.
pyb module still has pyb.delay and pyb.udelay, but these now point to time.sleep_ms and time.sleep_us respectively.
1 parent 504420c commit d8066e9

4 files changed

Lines changed: 78 additions & 37 deletions

File tree

‎stmhal/modpyb.c‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -124,29 +124,6 @@ STATIC mp_obj_t pyb_elapsed_micros(mp_obj_t start) {
124124
}
125125
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_micros_obj, pyb_elapsed_micros);
126126

127-
/// \function delay(ms)
128-
/// Delay for the given number of milliseconds.
129-
STATIC mp_obj_t pyb_delay(mp_obj_t ms_in) {
130-
mp_int_t ms = mp_obj_get_int(ms_in);
131-
if (ms >= 0) {
132-
HAL_Delay(ms);
133-
}
134-
return mp_const_none;
135-
}
136-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_delay_obj, pyb_delay);
137-
138-
/// \function udelay(us)
139-
/// Delay for the given number of microseconds.
140-
STATIC mp_obj_t pyb_udelay(mp_obj_t usec_in) {
141-
mp_int_t usec = mp_obj_get_int(usec_in);
142-
if (usec > 0) {
143-
sys_tick_udelay(usec);
144-
}
145-
return mp_const_none;
146-
}
147-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_udelay_obj, pyb_udelay);
148-
149-
/// \function stop()
150127
/// \function repl_uart(uart)
151128
/// Get or set the UART object that the REPL is repeated on.
152129
STATIC mp_obj_t pyb_repl_uart(mp_uint_t n_args, const mp_obj_t *args) {
@@ -203,8 +180,8 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
203180
{ MP_OBJ_NEW_QSTR(MP_QSTR_elapsed_millis), (mp_obj_t)&pyb_elapsed_millis_obj },
204181
{ MP_OBJ_NEW_QSTR(MP_QSTR_micros), (mp_obj_t)&pyb_micros_obj },
205182
{ MP_OBJ_NEW_QSTR(MP_QSTR_elapsed_micros), (mp_obj_t)&pyb_elapsed_micros_obj },
206-
{ MP_OBJ_NEW_QSTR(MP_QSTR_delay), (mp_obj_t)&pyb_delay_obj },
207-
{ MP_OBJ_NEW_QSTR(MP_QSTR_udelay), (mp_obj_t)&pyb_udelay_obj },
183+
{ MP_OBJ_NEW_QSTR(MP_QSTR_delay), (mp_obj_t)&time_sleep_ms_obj },
184+
{ MP_OBJ_NEW_QSTR(MP_QSTR_udelay), (mp_obj_t)&time_sleep_us_obj },
208185
{ MP_OBJ_NEW_QSTR(MP_QSTR_sync), (mp_obj_t)&mod_os_sync_obj },
209186
{ MP_OBJ_NEW_QSTR(MP_QSTR_mount), (mp_obj_t)&pyb_mount_obj },
210187

‎stmhal/modutime.c‎

Lines changed: 67 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
#include STM32_HAL_H
3030

3131
#include "py/nlr.h"
32+
#include "py/smallint.h"
3233
#include "py/obj.h"
34+
#include "systick.h"
3335
#include "timeutils.h"
3436
#include "portmodules.h"
3537
#include "rtc.h"
@@ -112,6 +114,18 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
112114
}
113115
MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
114116

117+
/// \function time()
118+
/// Returns the number of seconds, as an integer, since 1/1/2000.
119+
STATIC mp_obj_t time_time(void) {
120+
// get date and time
121+
// note: need to call get time then get date to correctly access the registers
122+
RTC_DateTypeDef date;
123+
RTC_TimeTypeDef time;
124+
HAL_RTC_GetTime(&RTCHandle, &time, FORMAT_BIN);
125+
HAL_RTC_GetDate(&RTCHandle, &date, FORMAT_BIN);
126+
return mp_obj_new_int(timeutils_seconds_since_2000(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds));
127+
}
128+
MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
115129

116130
/// \function sleep(seconds)
117131
/// Sleep for the given number of seconds. Seconds can be a floating-point number to
@@ -130,26 +144,67 @@ STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
130144
}
131145
MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);
132146

133-
/// \function time()
134-
/// Returns the number of seconds, as an integer, since 1/1/2000.
135-
STATIC mp_obj_t time_time(void) {
136-
// get date and time
137-
// note: need to call get time then get date to correctly access the registers
138-
RTC_DateTypeDef date;
139-
RTC_TimeTypeDef time;
140-
HAL_RTC_GetTime(&RTCHandle, &time, FORMAT_BIN);
141-
HAL_RTC_GetDate(&RTCHandle, &date, FORMAT_BIN);
142-
return mp_obj_new_int(timeutils_seconds_since_2000(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds));
147+
STATIC mp_obj_t time_sleep_ms(mp_obj_t ms_in) {
148+
mp_int_t ms = mp_obj_get_int(ms_in);
149+
if (ms > 0) {
150+
HAL_Delay(ms);
151+
}
152+
return mp_const_none;
143153
}
144-
MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
154+
MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_ms_obj, time_sleep_ms);
155+
156+
STATIC mp_obj_t time_sleep_us(mp_obj_t usec_in) {
157+
mp_int_t usec = mp_obj_get_int(usec_in);
158+
if (usec > 0) {
159+
sys_tick_udelay(usec);
160+
}
161+
return mp_const_none;
162+
}
163+
MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_us_obj, time_sleep_us);
164+
165+
STATIC mp_obj_t time_ticks_ms(void) {
166+
return MP_OBJ_NEW_SMALL_INT(HAL_GetTick() & MP_SMALL_INT_POSITIVE_MASK);
167+
}
168+
STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_ticks_ms_obj, time_ticks_ms);
169+
170+
STATIC mp_obj_t time_ticks_us(void) {
171+
return MP_OBJ_NEW_SMALL_INT(sys_tick_get_microseconds() & MP_SMALL_INT_POSITIVE_MASK);
172+
}
173+
STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_ticks_us_obj, time_ticks_us);
174+
175+
STATIC mp_obj_t time_ticks_cpu(void) {
176+
static bool enabled = false;
177+
if (!enabled) {
178+
CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
179+
DWT->CYCCNT = 0;
180+
DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
181+
enabled = true;
182+
}
183+
return MP_OBJ_NEW_SMALL_INT(DWT->CYCCNT & MP_SMALL_INT_POSITIVE_MASK);
184+
}
185+
STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_ticks_cpu_obj, time_ticks_cpu);
186+
187+
STATIC mp_obj_t time_ticks_diff(mp_obj_t start_in, mp_obj_t end_in) {
188+
// we assume that the arguments come from ticks_xx so are small ints
189+
uint32_t start = MP_OBJ_SMALL_INT_VALUE(start_in);
190+
uint32_t end = MP_OBJ_SMALL_INT_VALUE(end_in);
191+
return MP_OBJ_NEW_SMALL_INT((end - start) & MP_SMALL_INT_POSITIVE_MASK);
192+
}
193+
STATIC MP_DEFINE_CONST_FUN_OBJ_2(time_ticks_diff_obj, time_ticks_diff);
145194

146195
STATIC const mp_map_elem_t time_module_globals_table[] = {
147196
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_utime) },
148197

149198
{ MP_OBJ_NEW_QSTR(MP_QSTR_localtime), (mp_obj_t)&time_localtime_obj },
150199
{ MP_OBJ_NEW_QSTR(MP_QSTR_mktime), (mp_obj_t)&time_mktime_obj },
151-
{ MP_OBJ_NEW_QSTR(MP_QSTR_sleep), (mp_obj_t)&time_sleep_obj },
152200
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&time_time_obj },
201+
{ MP_OBJ_NEW_QSTR(MP_QSTR_sleep), (mp_obj_t)&time_sleep_obj },
202+
{ MP_OBJ_NEW_QSTR(MP_QSTR_sleep_ms), (mp_obj_t)&time_sleep_ms_obj },
203+
{ MP_OBJ_NEW_QSTR(MP_QSTR_sleep_us), (mp_obj_t)&time_sleep_us_obj },
204+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_ms), (mp_obj_t)&time_ticks_ms_obj },
205+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_us), (mp_obj_t)&time_ticks_us_obj },
206+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_cpu), (mp_obj_t)&time_ticks_cpu_obj },
207+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_diff), (mp_obj_t)&time_ticks_diff_obj },
153208
};
154209

155210
STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);

‎stmhal/portmodules.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ extern const mp_obj_module_t mp_module_usocket;
3333

3434
// additional helper functions exported by the modules
3535

36+
MP_DECLARE_CONST_FUN_OBJ(time_sleep_ms_obj);
37+
MP_DECLARE_CONST_FUN_OBJ(time_sleep_us_obj);
38+
3639
MP_DECLARE_CONST_FUN_OBJ(mod_os_sync_obj);

‎stmhal/qstrdefsport.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,12 @@ Q(time)
407407
Q(localtime)
408408
Q(mktime)
409409
Q(sleep)
410+
Q(sleep_ms)
411+
Q(sleep_us)
412+
Q(ticks_ms)
413+
Q(ticks_us)
414+
Q(ticks_cpu)
415+
Q(ticks_diff)
410416

411417
// for select module
412418
Q(uselect)

0 commit comments

Comments
 (0)