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

Commit d0dc708

Browse files
author
Daniel Campora
committed
esp32: Merge with master up to version 1.17.0.b1.
1 parent 055728a commit d0dc708

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1557
-3199
lines changed

‎esp32/3gpp/lib3GPP.c‎

Lines changed: 0 additions & 1021 deletions
This file was deleted.

‎esp32/3gpp/lib3GPP.h‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎esp32/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ifeq ($(BOARD), $(filter $(BOARD), SIPY))
6969
LIBS += sigfox/modsigfox_sipy.a
7070
endif
7171

72-
B_LIBS = -Lbootloader/lib -Lbootloader -L$(BUILD)/bootloader \
72+
B_LIBS = -Lbootloader/lib -Lbootloader -L$(BUILD)/bootloader -L$(ESP_IDF_COMP_PATH)/esp32/ld \
7373
-L$(ESP_IDF_COMP_PATH)/esp32/lib -llog -lcore -lbootloader_support \
7474
-lspi_flash -lsoc -lmicro-ecc -lgcc -lstdc++ -lgcov
7575

‎esp32/application.mk‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ APP_INC += -Imods
1515
APP_INC += -Itelnet
1616
APP_INC += -Iftp
1717
APP_INC += -Ilora
18+
APP_INC += -Ilte
1819
APP_INC += -Ican
1920
APP_INC += -Ibootloader
2021
APP_INC += -Ifatfs/src/drivers
@@ -137,6 +138,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
137138
modbt.c \
138139
modled.c \
139140
machwdt.c \
141+
machrmt.c \
140142
)
141143

142144
APP_MODS_LORA_SRC_C = $(addprefix mods/,\
@@ -242,8 +244,8 @@ APP_SIGFOX_SPI_SRC_C = $(addprefix lora/,\
242244
gpio-board.c \
243245
)
244246

245-
APP_LTE_SRC_C = $(addprefix 3gpp/,\
246-
lib3GPP.c \
247+
APP_LTE_SRC_C = $(addprefix lte/,\
248+
lteppp.c \
247249
)
248250

249251
APP_MODS_LTE_SRC_C = $(addprefix mods/,\
@@ -366,13 +368,15 @@ ifeq ($(BOARD), LOPY4)
366368
$(BUILD)/sigfox/timer.o: CFLAGS = $(CFLAGS_SIGFOX)
367369
$(BUILD)/sigfox/transmission.o: CFLAGS = $(CFLAGS_SIGFOX)
368370
$(BUILD)/sigfox/targets/%.o: CFLAGS = $(CFLAGS_SIGFOX)
371+
$(BUILD)/lora/spi-board.o: CFLAGS = $(CFLAGS_SIGFOX)
369372
endif
370373
ifeq ($(BOARD), SIPY)
371374
APP_BIN = $(BUILD)/sipy.bin
372375
$(BUILD)/sigfox/radio.o: CFLAGS = $(CFLAGS_SIGFOX)
373376
$(BUILD)/sigfox/timer.o: CFLAGS = $(CFLAGS_SIGFOX)
374377
$(BUILD)/sigfox/transmission.o: CFLAGS = $(CFLAGS_SIGFOX)
375378
$(BUILD)/sigfox/targets/%.o: CFLAGS = $(CFLAGS_SIGFOX)
379+
$(BUILD)/lora/spi-board.o: CFLAGS = $(CFLAGS_SIGFOX)
376380
endif
377381
ifeq ($(BOARD), GPY)
378382
APP_BIN = $(BUILD)/gpy.bin
@@ -383,6 +387,7 @@ ifeq ($(BOARD), FIPY)
383387
$(BUILD)/sigfox/timer.o: CFLAGS = $(CFLAGS_SIGFOX)
384388
$(BUILD)/sigfox/transmission.o: CFLAGS = $(CFLAGS_SIGFOX)
385389
$(BUILD)/sigfox/targets/%.o: CFLAGS = $(CFLAGS_SIGFOX)
390+
$(BUILD)/lora/spi-board.o: CFLAGS = $(CFLAGS_SIGFOX)
386391
endif
387392

388393
APP_IMG = $(BUILD)/appimg.bin

‎esp32/boards/FIPY/mpconfigboard.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
#define MICROPY_LPWAN_DIO_PIN
2020

21-
#define CONFIG_GSM_TX 33
22-
#define CONFIG_GSM_RX 34
21+
#define MICROPY_LTE_TX_PIN (&PIN_MODULE_P20)
22+
#define MICROPY_LTE_RX_PIN (&PIN_MODULE_P18)
23+
#define MICROPY_LTE_RTS_PIN (&PIN_MODULE_P19)
24+
#define MICROPY_LTE_CTS_PIN (&PIN_MODULE_P17)
2325

24-
#define CONFIG_GSM_CTS 35
25-
#define CONFIG_GSM_RTS 32
26+
#define MICROPY_LTE_UART_BAUDRATE 921600
2627

2728
extern uint32_t micropy_hw_flash_size;
2829

29-
extern bool micropy_hw_antenna_diversity;
3030
extern uint32_t micropy_hw_antenna_diversity_pin_num;
3131

3232
extern bool micropy_lpwan_use_reset_pin;

‎esp32/boards/GPY/mpconfigboard.h‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616

1717
#define DEFAULT_AP_SSID "gpy-wlan"
1818

19-
#define CONFIG_GSM_TX 5
20-
#define CONFIG_GSM_RX 23
21-
#define CONFIG_GSM_CTS 18
22-
#define CONFIG_GSM_RTS 19
19+
#define MICROPY_LTE_TX_PIN (&PIN_MODULE_P5)
20+
#define MICROPY_LTE_RX_PIN (&PIN_MODULE_P98)
21+
#define MICROPY_LTE_RTS_PIN (&PIN_MODULE_P7)
22+
#define MICROPY_LTE_CTS_PIN (&PIN_MODULE_P99)
23+
24+
#define MICROPY_LTE_UART_ID 2
25+
#define MICROPY_LTE_UART_BAUDRATE 921600
2326

2427
extern uint32_t micropy_hw_flash_size;
2528

26-
extern bool micropy_hw_antenna_diversity;
2729
extern uint32_t micropy_hw_antenna_diversity_pin_num;
2830

2931
extern bool micropy_lpwan_use_reset_pin;

‎esp32/boards/LOPY/mpconfigboard.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
extern uint32_t micropy_hw_flash_size;
2222

23-
extern bool micropy_hw_antenna_diversity;
2423
extern uint32_t micropy_hw_antenna_diversity_pin_num;
2524

2625
extern bool micropy_lpwan_use_reset_pin;

‎esp32/boards/LOPY4/mpconfigboard.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
extern uint32_t micropy_hw_flash_size;
2222

23-
extern bool micropy_hw_antenna_diversity;
2423
extern uint32_t micropy_hw_antenna_diversity_pin_num;
2524

2625
extern bool micropy_lpwan_use_reset_pin;

‎esp32/boards/SIPY/mpconfigboard.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
extern uint32_t micropy_hw_flash_size;
2222

23-
extern bool micropy_hw_antenna_diversity;
2423
extern uint32_t micropy_hw_antenna_diversity_pin_num;
2524

2625
extern bool micropy_lpwan_use_reset_pin;

‎esp32/boards/WIPY/mpconfigboard.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
extern uint32_t micropy_hw_flash_size;
2222

23-
extern bool micropy_hw_antenna_diversity;
2423
extern uint32_t micropy_hw_antenna_diversity_pin_num;
2524

2625
extern bool micropy_lpwan_use_reset_pin;

0 commit comments

Comments
 (0)