Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 044dfea

Browse files
XykonXykon
authored
Merge pull request #507 from pycom/release_1.20.2.r3
Release 1.20.2.r3
2 parents 3a7776d + 5d463a5 commit 044dfea

File tree

14 files changed

+150
-79
lines changed

14 files changed

+150
-79
lines changed

‎esp32/Makefile

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,19 @@ PYGATE_ENABLED ?= 0
3232
# COAP is enabled by default
3333
MOD_COAP_ENABLED ?= 1
3434

35-
# SIGFOX is enabled by default. It will only be built for supported boards.
35+
# LORA is enabled by default for supported boards
36+
ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
37+
MOD_LORA_ENABLED ?= 1
38+
else
39+
MOD_LORA_ENABLED ?= 0
40+
endif
41+
42+
# SIGFOX is enabled by default for supported boards
43+
ifeq ($(BOARD), $(filter $(BOARD), SIPY LOPY4 FIPY))
3644
MOD_SIGFOX_ENABLED ?= 1
45+
else
46+
MOD_SIGFOX_ENABLED ?= 0
47+
endif
3748

3849
# Pybytes disabled by default
3950
PYBYTES_ENABLED ?= 0
@@ -55,6 +66,7 @@ ifeq ($(VARIANT),PYGATE)
5566
endif
5667
PYBYTES_ENABLED=1
5768
PYETH_ENABLED=1
69+
MOD_LORA_ENABLED=0 # ETH and LORA are mutually exclusive
5870
PYGATE_ENABLED=1
5971
endif
6072

@@ -121,6 +133,7 @@ CFLAGS_XTENSA_OPT = -Os
121133
CFLAGS_XTENSA_PSRAM = -mfix-esp32-psram-cache-issue
122134

123135
CFLAGS = $(CFLAGS_XTENSA) $(CFLAGS_XTENSA_PSRAM) $(CFLAGS_XTENSA_OPT) -nostdlib -std=gnu99 -g3 -ggdb -fstrict-volatile-bitfields -Iboards/$(BOARD)
136+
CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
124137
CFLAGS_SIGFOX = $(CFLAGS_XTENSA) -O2 -nostdlib -std=gnu99 -g3 -ggdb -fstrict-volatile-bitfields -Iboards/$(BOARD)
125138

126139
# Configure floating point support
@@ -156,19 +169,21 @@ ifeq ($(MOD_COAP_ENABLED), 1)
156169
CFLAGS += -DMOD_COAP_ENABLED
157170
endif
158171

172+
ifeq ($(MOD_LORA_ENABLED), 1)
173+
$(info LORA Module Enabled)
174+
CFLAGS += -DMOD_LORA_ENABLED
175+
endif
176+
159177
ifeq ($(DIFF_UPDATE_ENABLED), 1)
160178
$(info Differential Update Enabled)
161179
CFLAGS += -DDIFF_UPDATE_ENABLED -DBZ_NO_STDIO
162180
endif
163181

164182
ifeq ($(MOD_SIGFOX_ENABLED), 1)
165183
$(info SIGFOX Module Enabled)
166-
167-
ifeq ($(BOARD), $(filter $(BOARD), SIPY LOPY4 FIPY))
168-
CFLAGS += -DMOD_SIGFOX_ENABLED
169-
LIBS += sigfox/modsigfox_$(BOARD).a -lsigfox
170-
$(BUILD)/application.elf: sigfox/modsigfox_$(BOARD).a
171-
endif
184+
CFLAGS += -DMOD_SIGFOX_ENABLED
185+
LIBS += sigfox/modsigfox_$(BOARD).a -lsigfox
186+
$(BUILD)/application.elf: sigfox/modsigfox_$(BOARD).a
172187
endif
173188

174189
ifeq ($(OPENTHREAD), on)

‎esp32/application.mk

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,13 +388,30 @@ BOOT_SRC_C = $(addprefix bootloader/,\
388388
SFX_OBJ =
389389

390390
OBJ = $(PY_O)
391+
ifeq ($(MOD_LORA_ENABLED), 1)
392+
391393
ifeq ($(BOARD), $(filter $(BOARD), LOPY FIPY))
392394
OBJ += $(addprefix $(BUILD)/, $(APP_LORA_SRC_C:.c=.o) $(APP_LIB_LORA_SRC_C:.c=.o) $(APP_SX1272_SRC_C:.c=.o) $(APP_MODS_LORA_SRC_C:.c=.o))
393395
endif
396+
394397
ifeq ($(BOARD), $(filter $(BOARD), LOPY4))
395398
OBJ += $(addprefix $(BUILD)/, $(APP_LORA_SRC_C:.c=.o) $(APP_LIB_LORA_SRC_C:.c=.o) $(APP_SX1276_SRC_C:.c=.o) $(APP_MODS_LORA_SRC_C:.c=.o))
396399
endif
397400

401+
endif
402+
403+
ifeq ($(MOD_SIGFOX_ENABLED), 1)
404+
405+
ifeq ($(BOARD), $(filter $(BOARD), LOPY FIPY))
406+
OBJ += $(addprefix $(BUILD)/, $(APP_LORA_SRC_C:.c=.o) $(APP_LIB_LORA_SRC_C:.c=.o) $(APP_SX1272_SRC_C:.c=.o) $(APP_MODS_LORA_SRC_C:.c=.o))
407+
endif
408+
409+
ifeq ($(BOARD), $(filter $(BOARD), LOPY4))
410+
OBJ += $(addprefix $(BUILD)/, $(APP_LORA_SRC_C:.c=.o) $(APP_LIB_LORA_SRC_C:.c=.o) $(APP_SX1276_SRC_C:.c=.o) $(APP_MODS_LORA_SRC_C:.c=.o))
411+
endif
412+
413+
endif
414+
398415
ifeq ($(MOD_SIGFOX_ENABLED), 1)
399416
ifeq ($(BOARD), $(filter $(BOARD), SIPY))
400417
OBJ += $(addprefix $(BUILD)/, $(APP_SIGFOX_MOD_SRC_C:.c=.o))
@@ -416,7 +433,7 @@ endif
416433
endif # ifeq ($(OPENTHREAD), on)
417434

418435
OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o))
419-
OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
436+
OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o) $(SRC_MOD:.c=.o))
420437
OBJ += $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_LITTLEFS_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o))
421438
OBJ += $(addprefix $(BUILD)/, $(APP_FTP_SRC_C:.c=.o) $(APP_CAN_SRC_C:.c=.o))
422439
ifeq ($(PYGATE_ENABLED), 1)
@@ -436,7 +453,7 @@ OBJ += $(BUILD)/pins.o
436453
BOOT_OBJ = $(addprefix $(BUILD)/, $(BOOT_SRC_C:.c=.o))
437454

438455
# List of sources for qstr extraction
439-
SRC_QSTR += $(APP_MODS_SRC_C) $(APP_UTIL_SRC_C) $(APP_STM_SRC_C) $(APP_LIB_SRC_C)
456+
SRC_QSTR += $(APP_MODS_SRC_C) $(APP_UTIL_SRC_C) $(APP_STM_SRC_C) $(APP_LIB_SRC_C) $(SRC_MOD)
440457
ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
441458
SRC_QSTR += $(APP_MODS_LORA_SRC_C)
442459
endif
@@ -463,7 +480,7 @@ BOOT_LDFLAGS = $(LDFLAGS) -T esp32.bootloader.ld -T esp32.rom.ld -T esp32.periph
463480

464481
# add the application linker script(s)
465482
APP_LDFLAGS += $(LDFLAGS) -T esp32_out.ld -T esp32.project.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.extram.bss.ld
466-
483+
APP_LDFLAGS += $(LDFLAGS_MOD)
467484
# add the application specific CFLAGS
468485
CFLAGS += $(APP_INC) -DMICROPY_NLR_SETJMP=1 -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM -DFFCONF_H=\"lib/oofatfs/ffconf.h\" -DWITH_POSIX
469486
CFLAGS_SIGFOX += $(APP_INC) -DMICROPY_NLR_SETJMP=1 -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM

‎esp32/lte/lteppp.c

Lines changed: 60 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ void lteppp_init(void) {
174174
lteppp_pcb = pppapi_pppos_create(&lteppp_netif, lteppp_output_callback, lteppp_status_cb, NULL);
175175

176176
//wait on connecting modem until it is allowed
177-
lteppp_modem_conn_state = E_LTE_MODEM_DISCONNECTED;
177+
lteppp_set_modem_conn_state(E_LTE_MODEM_DISCONNECTED);
178178

179179
xTaskCreatePinnedToCore(TASK_LTE, "LTE", LTE_TASK_STACK_SIZE / sizeof(StackType_t), NULL, LTE_TASK_PRIORITY, &xLTETaskHndl, 1);
180180

@@ -211,15 +211,26 @@ char* lteppp_get_log_buff(void)
211211
}
212212
#endif
213213

214-
lte_modem_conn_state_t lteppp_modem_state(void)
214+
lte_modem_conn_state_t lteppp_get_modem_conn_state(void)
215215
{
216216
lte_modem_conn_state_t state;
217+
if (!xLTESem){
218+
// lte task hasn't been initialized yet, so we don't need to (and can't) protect this read
219+
return lteppp_modem_conn_state;
220+
}
217221
xSemaphoreTake(xLTESem, portMAX_DELAY);
218222
state = lteppp_modem_conn_state;
219223
xSemaphoreGive(xLTESem);
220224
return state;
221225
}
222226

227+
void lteppp_set_modem_conn_state(lte_modem_conn_state_t state)
228+
{
229+
xSemaphoreTake(xLTESem, portMAX_DELAY);
230+
lteppp_modem_conn_state = state;
231+
xSemaphoreGive(xLTESem);
232+
}
233+
223234
void lteppp_set_state(lte_state_t state) {
224235
xSemaphoreTake(xLTESem, portMAX_DELAY);
225236
lteppp_lte_state = state;
@@ -382,6 +393,10 @@ bool lteppp_wait_at_rsp (const char *expected_rsp, uint32_t timeout, bool from_m
382393

383394
lte_state_t lteppp_get_state(void) {
384395
lte_state_t state;
396+
if (!xLTESem){
397+
// lte task hasn't been initialized yet, so we don't need to (and can't) protect this read
398+
return lteppp_lte_state;
399+
}
385400
xSemaphoreTake(xLTESem, portMAX_DELAY);
386401
state = lteppp_lte_state;
387402
xSemaphoreGive(xLTESem);
@@ -429,6 +444,35 @@ void lteppp_resume(void) {
429444
/******************************************************************************
430445
DEFINE PRIVATE FUNCTIONS
431446
******************************************************************************/
447+
bool trx_is_ok_or_error(){
448+
if (strstr(lteppp_trx_buffer, "ERROR\r\n") != NULL){
449+
// printf("ok\n");
450+
return true;
451+
} else if (strstr(lteppp_trx_buffer, "OK\r\n") != NULL) {
452+
// printf("error\n");
453+
return true;
454+
}
455+
return false;
456+
}
457+
458+
/** check whether modem is responding at 115200
459+
* this means it is in FFH or RECOVYER mode
460+
*/
461+
bool lteppp_check_ffh_mode(){
462+
uart_set_baudrate(LTE_UART_ID, 115200);
463+
uart_set_hw_flow_ctrl(LTE_UART_ID, UART_HW_FLOWCTRL_CTS_RTS, 64);
464+
uart_set_rts(LTE_UART_ID, true);
465+
466+
for ( uint8_t attempt = 0 ; attempt < 3 ; attempt++ ){
467+
lteppp_send_at_cmd("AT", LTE_PPP_BACK_OFF_TIME_MS);
468+
if ( trx_is_ok_or_error() ){
469+
// we could check for AT+SMOD / AT+BMOD to get more details
470+
return true;
471+
}
472+
}
473+
return false;
474+
}
475+
432476
static void TASK_LTE (void *pvParameters) {
433477
MSG("\n");
434478
bool sim_present;
@@ -447,9 +491,7 @@ static void TASK_LTE (void *pvParameters) {
447491
{
448492
MSG("notif\n");
449493
xSemaphoreTake(xLTE_modem_Conn_Sem, portMAX_DELAY);
450-
xSemaphoreTake(xLTESem, portMAX_DELAY);
451-
lteppp_modem_conn_state = E_LTE_MODEM_CONNECTING;
452-
xSemaphoreGive(xLTESem);
494+
lteppp_set_modem_conn_state(E_LTE_MODEM_CONNECTING);
453495
uart_set_rts(LTE_UART_ID, true);
454496
vTaskDelay(500/portTICK_PERIOD_MS);
455497
uart_set_hw_flow_ctrl(LTE_UART_ID, UART_HW_FLOWCTRL_CTS_RTS, 64);
@@ -463,9 +505,7 @@ static void TASK_LTE (void *pvParameters) {
463505
if (at_trials >= LTE_AT_CMD_TRIALS) {
464506
uart_set_hw_flow_ctrl(LTE_UART_ID, UART_HW_FLOWCTRL_DISABLE, 0);
465507
uart_set_rts(LTE_UART_ID, false);
466-
xSemaphoreTake(xLTESem, portMAX_DELAY);
467-
lteppp_modem_conn_state = E_LTE_MODEM_DISCONNECTED;
468-
xSemaphoreGive(xLTESem);
508+
lteppp_set_modem_conn_state(E_LTE_MODEM_DISCONNECTED);
469509
xSemaphoreGive(xLTE_modem_Conn_Sem);
470510
at_trials = 0;
471511
goto modem_init;
@@ -486,9 +526,7 @@ static void TASK_LTE (void *pvParameters) {
486526
if (at_trials >= LTE_AT_CMD_TRIALS) {
487527
uart_set_hw_flow_ctrl(LTE_UART_ID, UART_HW_FLOWCTRL_DISABLE, 0);
488528
uart_set_rts(LTE_UART_ID, false);
489-
xSemaphoreTake(xLTESem, portMAX_DELAY);
490-
lteppp_modem_conn_state = E_LTE_MODEM_DISCONNECTED;
491-
xSemaphoreGive(xLTESem);
529+
lteppp_set_modem_conn_state(E_LTE_MODEM_DISCONNECTED);
492530
xSemaphoreGive(xLTE_modem_Conn_Sem);
493531
at_trials = 0;
494532
goto modem_init;
@@ -501,11 +539,14 @@ static void TASK_LTE (void *pvParameters) {
501539
while(!lteppp_send_at_cmd("AT", LTE_RX_TIMEOUT_MIN_MS))
502540
{
503541
if (at_trials >= LTE_AT_CMD_TRIALS) {
504-
uart_set_hw_flow_ctrl(LTE_UART_ID, UART_HW_FLOWCTRL_DISABLE, 0);
505-
uart_set_rts(LTE_UART_ID, false);
506-
xSemaphoreTake(xLTESem, portMAX_DELAY);
507-
lteppp_modem_conn_state = E_LTE_MODEM_DISCONNECTED;
508-
xSemaphoreGive(xLTESem);
542+
if ( lteppp_check_ffh_mode() ){
543+
lteppp_set_modem_conn_state(E_LTE_MODEM_RECOVERY);
544+
} else {
545+
uart_set_baudrate(LTE_UART_ID, MICROPY_LTE_UART_BAUDRATE);
546+
uart_set_hw_flow_ctrl(LTE_UART_ID, UART_HW_FLOWCTRL_DISABLE, 0);
547+
uart_set_rts(LTE_UART_ID, false);
548+
lteppp_set_modem_conn_state(E_LTE_MODEM_DISCONNECTED);
549+
}
509550
xSemaphoreGive(xLTE_modem_Conn_Sem);
510551
at_trials = 0;
511552
goto modem_init;
@@ -547,22 +588,16 @@ static void TASK_LTE (void *pvParameters) {
547588
{
548589
lteppp_send_at_cmd("AT+SQNIBRCFG=1,100", LTE_RX_TIMEOUT_MAX_MS);
549590
}
550-
xSemaphoreTake(xLTESem, portMAX_DELAY);
551-
lteppp_modem_conn_state = E_LTE_MODEM_CONNECTED;
552-
xSemaphoreGive(xLTESem);
591+
lteppp_set_modem_conn_state(E_LTE_MODEM_CONNECTED);
553592
xSemaphoreGive(xLTE_modem_Conn_Sem);
554593
MSG("forever\n");
555594
lte_state_t state;
556595
for (;;) {
557596
vTaskDelay(LTE_TASK_PERIOD_MS);
558-
xSemaphoreTake(xLTESem, portMAX_DELAY);
559-
if(E_LTE_MODEM_DISCONNECTED == lteppp_modem_conn_state)
560-
{
561-
xSemaphoreGive(xLTESem);
597+
if(lteppp_get_modem_conn_state() == E_LTE_MODEM_DISCONNECTED ){
562598
// restart the task
563599
goto modem_init;
564600
}
565-
xSemaphoreGive(xLTESem);
566601
state = lteppp_get_state();
567602
if (xQueueReceive(xCmdQueue, lteppp_trx_buffer, 0)) {
568603
MSG("cmd\n");
@@ -860,7 +895,7 @@ static void lteppp_print_states(){
860895
if (!xLTESem)
861896
return;
862897
static lte_modem_conn_state_t last_c = 0xff;
863-
lte_modem_conn_state_t c = lteppp_modem_state();
898+
lte_modem_conn_state_t c = lteppp_get_modem_conn_state();
864899
static lte_state_t last_s = 0xff;
865900
lte_state_t s = lteppp_get_state();
866901
static bool last_u = false;

‎esp32/lte/lteppp.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ typedef enum {
6161
typedef enum {
6262
E_LTE_MODEM_CONNECTED = 0,
6363
E_LTE_MODEM_CONNECTING,
64-
E_LTE_MODEM_DISCONNECTED
64+
E_LTE_MODEM_DISCONNECTED,
65+
E_LTE_MODEM_RECOVERY
6566
} lte_modem_conn_state_t;
6667

6768
#ifdef LTE_DEBUG_BUFF
@@ -119,7 +120,8 @@ extern void lteppp_send_at_command (lte_task_cmd_data_t *cmd, lte_task_rsp_data_
119120

120121
extern bool lteppp_wait_at_rsp (const char *expected_rsp, uint32_t timeout, bool from_mp, void* data_rem);
121122

122-
lte_modem_conn_state_t lteppp_modem_state(void);
123+
lte_modem_conn_state_t lteppp_get_modem_conn_state(void);
124+
void lteppp_set_modem_conn_state(lte_modem_conn_state_t state);
123125

124126
extern void connect_lte_uart (void);
125127

‎esp32/mods/modbt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2268,6 +2268,7 @@ STATIC const mp_map_elem_t bt_locals_dict_table[] = {
22682268
{ MP_OBJ_NEW_QSTR(MP_QSTR_CHAR_SUBSCRIBE_EVENT), MP_OBJ_NEW_SMALL_INT(MOD_BT_GATTS_SUBSCRIBE_EVT) },
22692269
// { MP_OBJ_NEW_QSTR(MP_QSTR_CHAR_INDICATE_EVENT), MP_OBJ_NEW_SMALL_INT(MOD_BT_GATTC_INDICATE_EVT) },
22702270

2271+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MAN_ANT), MP_OBJ_NEW_SMALL_INT(ANTENNA_TYPE_MANUAL) },
22712272
{ MP_OBJ_NEW_QSTR(MP_QSTR_INT_ANT), MP_OBJ_NEW_SMALL_INT(ANTENNA_TYPE_INTERNAL) },
22722273
{ MP_OBJ_NEW_QSTR(MP_QSTR_EXT_ANT), MP_OBJ_NEW_SMALL_INT(ANTENNA_TYPE_EXTERNAL) },
22732274

‎esp32/mods/modlte.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ static mp_obj_t lte_init_helper(lte_obj_t *self, const mp_arg_val_t *args) {
454454
//printf("All done since we were already initialised.\n");
455455
return mp_const_none;
456456
}
457-
modem_state = lteppp_modem_state();
457+
modem_state = lteppp_get_modem_conn_state();
458458
switch(modem_state)
459459
{
460460
case E_LTE_MODEM_DISCONNECTED:
@@ -463,24 +463,31 @@ static mp_obj_t lte_init_helper(lte_obj_t *self, const mp_arg_val_t *args) {
463463
MP_THREAD_GIL_EXIT();
464464
xSemaphoreTake(xLTE_modem_Conn_Sem, portMAX_DELAY);
465465
MP_THREAD_GIL_ENTER();
466-
if (E_LTE_MODEM_DISCONNECTED == lteppp_modem_state()) {
466+
lte_modem_conn_state_t modem_state = lteppp_get_modem_conn_state();
467+
if (E_LTE_MODEM_DISCONNECTED == modem_state) {
467468
xSemaphoreGive(xLTE_modem_Conn_Sem);
468-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Couldn't connect to Modem (modem_state=disconnected)"));
469+
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Couldn't start connection to Modem (modem_state=disconnected)"));
470+
} else if (E_LTE_MODEM_RECOVERY == modem_state){
471+
xSemaphoreGive(xLTE_modem_Conn_Sem);
472+
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Couldn't start connection to Modem (modem_state=recovery). Perform a modem firmware update."));
469473
}
470474
break;
471475
case E_LTE_MODEM_CONNECTING:
472476
// Block till modem is connected
473477
xSemaphoreTake(xLTE_modem_Conn_Sem, portMAX_DELAY);
474-
if (E_LTE_MODEM_DISCONNECTED == lteppp_modem_state()) {
478+
if (E_LTE_MODEM_DISCONNECTED == lteppp_get_modem_conn_state()) {
475479
xSemaphoreGive(xLTE_modem_Conn_Sem);
476480
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Couldn't connect to Modem (modem_state=connecting)"));
477481
}
478482
break;
479483
case E_LTE_MODEM_CONNECTED:
480484
//continue
481485
break;
486+
case E_LTE_MODEM_RECOVERY:
487+
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Couldn't connect to Modem (modem_state=recovery). Perform a modem firmware update."));
488+
break;
482489
default:
483-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Couldn't connect to Modem (modem_state=default)"));
490+
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Couldn't connect to Modem (modem_state - default)"));
484491
break;
485492
}
486493
lte_obj.cid = args[1].u_int;

‎esp32/mods/modmachine.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,12 @@ STATIC mp_obj_t machine_sleep (uint n_args, const mp_obj_t *arg) {
405405
bool reconnect = false;
406406

407407
#if defined(FIPY) || defined(GPY)
408-
if (lteppp_modem_state() < E_LTE_MODEM_DISCONNECTED) {
408+
if (lteppp_get_modem_conn_state() < E_LTE_MODEM_DISCONNECTED) {
409409
lteppp_deinit();
410410
}
411411
#endif
412412

413-
#if defined(LOPY) || defined(LOPY4) || defined(FIPY)
413+
#ifdef MOD_LORA_ENABLED
414414
/* Send LoRa module to Sleep Mode */
415415
modlora_sleep_module();
416416
while(!modlora_is_module_sleep())
@@ -466,7 +466,7 @@ STATIC mp_obj_t machine_deepsleep (uint n_args, const mp_obj_t *arg) {
466466
modbt_deinit(false);
467467
wlan_deinit(NULL);
468468
#if defined(FIPY) || defined(GPY)
469-
if (lteppp_modem_state() < E_LTE_MODEM_DISCONNECTED) {
469+
if (lteppp_get_modem_conn_state() < E_LTE_MODEM_DISCONNECTED) {
470470
lteppp_deinit();
471471
}
472472
#endif

0 commit comments

Comments
 (0)