djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build error

Browse Source
This commit is contained in:
microDev 2020-09-24 15:01:36 +05:30 committed by Scott Shawcroft
parent 4d8ffdca8d
commit da449723df
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
9 changed files with 15 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
locale/circuitpython.pot
View File

@ -17,6 +17,13 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: main.c
msgid ""
"\n"
"\n"
"------ soft reboot ------\n"
msgstr ""
#: main.c
msgid ""
"\n"
@ -3303,7 +3310,7 @@ msgstr ""
msgid "size is defined for ndarrays only"
msgstr ""
#: shared-bindings/time/__init__.c
#: shared-bindings/alarm_time/__init__.c shared-bindings/time/__init__.c
msgid "sleep length must be non-negative"
msgstr ""
@ -3319,10 +3326,6 @@ msgstr ""
msgid "small int overflow"
msgstr ""
#: main.c
msgid "soft reboot\n"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "sort argument must be an ndarray"
msgstr ""

38
ports/esp32s2/common-hal/alarm/__init__.c
View File

@ -25,28 +25,11 @@
* THE SOFTWARE.
*/
#include <sys/time.h>
#include "common-hal/alarm/__init__.h"
#include "shared-bindings/alarm/__init__.h"
#include "shared-bindings/alarm_io/__init__.h"
#include "shared-bindings/alarm_time/__init__.h"
#include "esp_sleep.h"
#include "soc/rtc_periph.h"
#include "driver/rtc_io.h"
static RTC_DATA_ATTR struct timeval sleep_enter_time;
static RTC_DATA_ATTR struct timeval sleep_exit_time;
static RTC_DATA_ATTR uint8_t wake_io;
int common_hal_alarm_get_sleep_time(void) {
return (sleep_exit_time.tv_sec - sleep_enter_time.tv_sec) * 1000 + (sleep_exit_time.tv_usec - sleep_enter_time.tv_usec) / 1000;
}
void RTC_IRAM_ATTR esp_wake_deep_sleep(void) {
esp_default_wake_deep_sleep();
wake_io = rtc_gpio_get_level(6);
gettimeofday(&sleep_exit_time, NULL);
}
mp_obj_t common_hal_alarm_get_wake_alarm(void) {
switch (esp_sleep_get_wakeup_cause()) {
@ -57,23 +40,12 @@ mp_obj_t common_hal_alarm_get_wake_alarm(void) {
return timer;
case ESP_SLEEP_WAKEUP_EXT0: ;
//Wake up from GPIO
/*alarm_io_obj_t *ext0 = m_new_obj(alarm_io_obj_t);
alarm_io_obj_t *ext0 = m_new_obj(alarm_io_obj_t);
ext0->base.type = &alarm_io_type;
return ext0;*/
return mp_obj_new_int(wake_io);
case ESP_SLEEP_WAKEUP_EXT1:
//Wake up from GPIO, returns -> esp_sleep_get_ext1_wakeup_status()
/*uint64_t wakeup_pin_mask = esp_sleep_get_ext1_wakeup_status();
if (wakeup_pin_mask != 0) {
int pin = __builtin_ffsll(wakeup_pin_mask) - 1;
printf("Wake up from GPIO %d\n", pin);
} else {
printf("Wake up from GPIO\n");
}*/
break;
return ext0;
case ESP_SLEEP_WAKEUP_TOUCHPAD:
//TODO: implement TouchIO
//Wake up from touch on pad, returns -> esp_sleep_get_touchpad_wakeup_status()
//Wake up from touch on pad, esp_sleep_get_touchpad_wakeup_status()
break;
case ESP_SLEEP_WAKEUP_UNDEFINED:
default:

6
ports/esp32s2/common-hal/alarm/__init__.h
View File

@ -1,6 +0,0 @@
#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H
#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H
extern void esp_wake_deep_sleep(void);
#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_MICROCONTROLLER_ALARM_H

5
ports/esp32s2/supervisor/port.c
View File

@ -34,7 +34,6 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "common-hal/alarm/__init__.h"
#include "common-hal/analogio/AnalogOut.h"
#include "common-hal/busio/I2C.h"
#include "common-hal/busio/SPI.h"
@ -87,9 +86,7 @@ safe_mode_t port_init(void) {
if (heap == NULL) {
return NO_HEAP;
}
esp_wake_deep_sleep();
return NO_SAFE_MODE;
}

2
py/circuitpy_defns.mk
View File

@ -309,7 +309,7 @@ SRC_COMMON_HAL_ALL = \
_pew/__init__.c \
alarm/__init__.c \
alarm_io/__init__.c \
alarm_time/__init__.c \
alarm_time/__init__.c \
analogio/AnalogIn.c \
analogio/AnalogOut.c \
analogio/__init__.c \

14
shared-bindings/alarm/__init__.c
View File

@ -1,26 +1,12 @@
#include "shared-bindings/alarm/__init__.h"
//| def getWakeAlarm() -> None:
//| """This returns the alarm that triggered wakeup,
//| also returns alarm specific parameters`.
//|
STATIC mp_obj_t alarm_get_wake_alarm(void) {
return common_hal_alarm_get_wake_alarm();
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_get_wake_alarm_obj, alarm_get_wake_alarm);
//| def getSleepTime() -> None:
//| """This returns the period of time in ms,
//| in which the board was in deep sleep`.
//|
STATIC mp_obj_t alarm_get_sleep_time(void) {
return mp_obj_new_int(common_hal_alarm_get_sleep_time());
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(alarm_get_sleep_time_obj, alarm_get_sleep_time);
STATIC const mp_rom_map_elem_t alarm_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm) },
{ MP_ROM_QSTR(MP_QSTR_getSleepTime), MP_ROM_PTR(&alarm_get_sleep_time_obj) },
{ MP_ROM_QSTR(MP_QSTR_getWakeAlarm), MP_ROM_PTR(&alarm_get_wake_alarm_obj) },
};

4
shared-bindings/alarm/__init__.h
View File

@ -3,10 +3,6 @@
#include "py/obj.h"
#include "shared-bindings/alarm_io/__init__.h"
#include "shared-bindings/alarm_time/__init__.h"
extern int common_hal_alarm_get_sleep_time(void);
extern mp_obj_t common_hal_alarm_get_wake_alarm(void);
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_ALARM___INIT___H

5
shared-bindings/alarm_io/__init__.c
View File

@ -3,8 +3,6 @@
#include "shared-bindings/alarm_io/__init__.h"
#include "shared-bindings/microcontroller/Pin.h"
//| Set Pin Wakeup
//|
STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum { ARG_level, ARG_pull };
static const mp_arg_t allowed_args[] = {
@ -27,9 +25,6 @@ STATIC mp_obj_t alarm_io_pin_state(size_t n_args, const mp_obj_t *pos_args, mp_m
}
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(alarm_io_pin_state_obj, 1, alarm_io_pin_state);
//| Disable Pin Wakeup
//|
STATIC mp_obj_t alarm_io_disable(void) {
common_hal_alarm_io_disable();
return mp_const_none;

4
shared-bindings/alarm_time/__init__.c
View File

@ -1,8 +1,6 @@
#include "py/obj.h"
#include "shared-bindings/alarm_time/__init__.h"
//| Set Timer Wakeup
//|
STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) {
#if MICROPY_PY_BUILTINS_FLOAT
mp_float_t seconds = mp_obj_get_float(seconds_o);
@ -24,8 +22,6 @@ STATIC mp_obj_t alarm_time_duration(mp_obj_t seconds_o) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(alarm_time_duration_obj, alarm_time_duration);
//| Disable Timer Wakeup
//|
STATIC mp_obj_t alarm_time_disable(void) {
common_hal_alarm_time_disable();
return mp_const_none;