8000 esp32: Merge with master up to version 1.9.1.b1. · pycom/pycom-micropython-sigfox@76c6949 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 76c6949

Browse files
author
Daniel Campora
committed
esp32: Merge with master up to version 1.9.1.b1.
1 parent 5a56cfa commit 76c6949

18 files changed

+300
-219
lines changed

‎Jenkinsfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def flashBuild(name) {
119119
sh 'python esp32/tools/resetBoard.py bootloader'
120120
sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 erase_flash'
121121
sh 'python esp32/tools/resetBoard.py bootloader'
122-
sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 write_flash -z --flash_mode qio --flash_freq 40m --flash_size 4MB 0x1000 esp32/build/'+ name +'/release/bootloader/bootloader.bin 0x8000 esp32/build/'+ name +'/release/lib/partitions.bin 0x10000 esp32/build/'+ name +'/release/appimg.bin'
122+
sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 esp32/build/'+ name +'/release/bootloader/bootloader.bin 0x8000 esp32/build/'+ name +'/release/lib/partitions.bin 0x10000 esp32/build/'+ name +'/release/appimg.bin'
123123
sh 'python esp32/tools/resetBoard.py reset'
124124
sh 'python esp32/tools/resetBoard.py releasePins'
125125
}
@@ -140,7 +140,8 @@ def boardBuild(name, name_short, lora_band) {
140140
make TARGET=app -j2 BOARD=''' + name_short + lora_band
141141

142142
sh '''cd esp32/build/'''+ name +'''/release;
143-
mkdir firmware_package;
143+
rm -rf firmware_package;
144+
mkdir -p firmware_package;
144145
cd firmware_package;
145146
cp ../bootloader/bootloader.bin .;
146147
cp ../lib/partitions.bin .;

‎esp32/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ CFLAGS_XTENSA = -DESP_PLATFORM -g3 -Wpointer-arith -Werror -Wno-error=unused-fun
4848
-mlongcalls -Wall -ffunction-sections -fdata-sections -fno-common
4949

5050
ifeq ($(TARGET), app)
51-
CFLAGS_XTENSA += -O2
51+
CFLAGS_XTENSA_OPT = -Os
5252
else
53-
CFLAGS_XTENSA += -Og
53+
CFLAGS_XTENSA_OPT = -Og
5454
endif
5555

5656
ifeq ($(OEM), 1)
5757
CFLAGS_XTENSA += -mfix-esp32-psram-cache-issue
5858
endif
5959

60-
CFLAGS = $(CFLAGS_XTENSA) -nostdlib -std=gnu99 -g3 -fstrict-volatile-bitfields -Iboards/$(BOARD)
60+
CFLAGS = $(CFLAGS_XTENSA) $(CFLAGS_XTENSA_OPT) -nostdlib -std=gnu99 -g3 -fstrict-volatile-bitfields -Iboards/$(BOARD)
6161

6262
LDFLAGS = -nostdlib -Wl,-Map=$(@:.elf=.map) -Wl,--no-check-sections -u call_user_start_cpu0
6363
LDFLAGS += -Wl,-static -Wl,--undefined=uxTopUsedPriority -Wl,--gc-sections

‎esp32/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MicroPython port for the ESP32 based boards from Pycom
22
======================================================
33

44
In order to build this project, a copy of the Espressif IDF is required and it's
5-
path must be specified via the ESP_IDF_PATH variable. See the Makefile for details.
5+
path must be specified via the IDF_PATH variable. See the Makefile for details.
66

77
The modified Espressif IDF that we use to build this port can be found in:
88
https://github.com/pycom/pycom-esp-idf

‎esp32/application.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,9 @@ ifeq ($(BOARD), LOPY)
303303
else
304304
ifeq ($(BOARD), SIPY)
305305
APP_BIN = $(BUILD)/sipy.bin
306+
$(BUILD)/sigfox/radio.o: CFLAGS += -O2
307+
$(BUILD)/sigfox/timer.o: CFLAGS += -O2
308+
$(BUILD)/sigfox/targets/%.o: CFLAGS += -O2
306309
else
307310
APP_BIN = $(BUILD)/wipy.bin
308311
endif

‎esp32/ftp/ftp.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ typedef struct {
114114
union {
115115
DIR dp;
116116
FIL fp;
117-
};
117+
}u;
118118
int32_t lc_sd;
119119
int32_t ld_sd;
120120
int32_t c_sd;
@@ -652,9 +652,9 @@ static void ftp_process_cmd (void) {
652652
fres = FR_NO_PATH;
653653
ftp_pop_param (&bufptr, ftp_scratch_buffer, false);
654654
ftp_open_child (ftp_path, ftp_scratch_buffer);
655-
if ((ftp_path[0] == '/' && ftp_path[1] == '\0') || ((fres = f_opendir (&ftp_data.dp, ftp_path)) == FR_OK)) {
655+
if ((ftp_path[0] == '/' && ftp_path[1] == '\0') || ((fres = f_opendir (&ftp_data.u.dp, ftp_path)) == FR_OK)) {
656656
if (fres == FR_OK) {
657-
f_closedir(&ftp_data.dp);
657+
f_closedir(&ftp_data.u.dp);
658658
}
659659
ftp_send_reply(250, NULL);
660660
} else {
@@ -839,9 +839,9 @@ static void ftp_process_cmd (void) {
839839

840840
static void ftp_close_files (void) {
841841
if (ftp_data.e_open == E_FTP_FILE_OPEN) {
842-
f_close(&ftp_data.fp);
842+
f_close(&ftp_data.u.fp);
843843
} else if (ftp_data.e_open == E_FTP_DIR_OPEN) {
844-
f_closedir(&ftp_data.dp);
844+
f_closedir(&ftp_data.u.dp);
845845
}
846846
ftp_data.e_open = E_FTP_NOTHING_OPEN;
847847
}
@@ -939,7 +939,7 @@ static int ftp_print_eplf_drive (char *dest, uint32_t destsize, char *name) {
939939
}
940940

941941
static bool ftp_open_file (const char *path, int mode) {
942-
FRESULT res = f_open(&ftp_data.fp, path, mode);
942+
FRESULT res = f_open(&ftp_data.u.fp, path, mode);
943943
if (res != FR_OK) {
944944
return false;
945945
}
@@ -949,7 +949,7 @@ static bool ftp_open_file (const char *path, int mode) {
949949

950950
static ftp_result_t ftp_read_file (char *filebuf, uint32_t desiredsize, uint32_t *actualsize) {
951951
ftp_result_t result = E_FTP_RESULT_CONTINUE;
952-
FRESULT res = f_read(&ftp_data.fp, filebuf, desiredsize, (UINT *)actualsize);
952+
FRESULT res = f_read(&ftp_data.u.fp, filebuf, desiredsize, (UINT *)actualsize);
953953
if (res != FR_OK) {
954954
ftp_close_files();
955955
result = E_FTP_RESULT_FAILED;
@@ -964,7 +964,7 @@ static ftp_result_t ftp_read_file (char *filebuf, uint32_t desiredsize, uint32_t
964964
static ftp_result_t ftp_write_file (char *filebuf, uint32_t size) {
965965
ftp_result_t result = E_FTP_RESULT_FAILED;
966966
uint32_t actualsize;
967-
FRESULT res = f_write(&ftp_data.fp, filebuf, size, (UINT *)&actualsize);
967+
FRESULT res = f_write(&ftp_data.u.fp, filebuf, size, (UINT *)&actualsize);
968968
if ((actualsize == size) && (FR_OK == res)) {
969969
result = E_FTP_RESULT_OK;
970970
} else {
@@ -979,7 +979,7 @@ static ftp_result_t ftp_open_dir_for_listing (const char *path) {
979979
ftp_data.listroot = true;
980980
} else {
981981
FRESULT res;
982-
res = f_opendir(&ftp_data.dp, path); /* Open the directory */
982+
res = f_opendir(&ftp_data.u.dp, path); /* Open the directory */
983983
if (res != FR_OK) {
984984
return E_FTP_RESULT_FAILED;
985985
}
@@ -999,7 +999,7 @@ static ftp_result_t ftp_list_dir (char *list, uint32_t maxlistsize, uint32_t *li
999999
// if we are resuming an incomplete list operation, go back to the item we left behind
10001000
if (!ftp_data.listroot) {
10011001
for (int i = 0; i < ftp_last_dir_idx; i++) {
1002-
f_readdir(&ftp_data.dp, &fno);
1002+
f_readdir(&ftp_data.u.dp, &fno);
10031003
}
10041004
}
10051005

@@ -1030,7 +1030,7 @@ static ftp_result_t ftp_list_dir (char *list, uint32_t maxlistsize, uint32_t *li
10301030
ftp_data.volcount++;
10311031
} else {
10321032
// a "normal" directory
1033-
res = f_readdir(&ftp_data.dp, &fno); /* Read a directory item */
1033+
res = f_readdir(&ftp_data.u.dp, &fno); /* Read a directory item */
10341034
if (res != FR_OK || fno.fname[0] == 0) {
10351035
result = E_FTP_RESULT_OK;
10361036
break; /* Break on error or end of dp */

‎esp32/lib/partitions.csv

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Name, Type, SubType, Offset, Size
2-
nvs, data, nvs, 0x9000, 0x6000
3-
phy_init, data, phy, 0xf000, 0x1000
2+
nvs, data, nvs, 0x9000, 0x7000
43
factory, app, factory, 0x10000, 1536K
54
otadata, data, ota, , 4K
65
ota_0, app, ota_0, 0x1a0000, 1536K

0 commit comments

Comments
 (0)
0