Mirrors/esp-link
2
0
Fork 0
mirror of https://github.com/jeelabs/esp-link.git synced 2026-03-09 18:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

small flash config improvement plus more comments

Browse Source
This commit is contained in:
Thorsten von Eicken
2015-08-19 19:30:59 -07:00
parent dcadb70df8
commit cd0754071b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
user/config.c
View File

@@ -17,6 +17,7 @@ FlashConfig flashDefault = {
"esp-link\0 ", // hostname
0, 0x00ffffff, 0, // static ip, netmask, gateway
0, // log mode
0, // swap uart (don't by default)
};
typedef union {
@@ -46,7 +47,6 @@ static void memDump(void *addr, int len) {
#endif
bool ICACHE_FLASH_ATTR configSave(void) {
FlashFull ff;
memset(&ff, 0, sizeof(ff));
memcpy(&ff, &flashConfig, sizeof(FlashConfig));
@@ -54,7 +54,7 @@ bool ICACHE_FLASH_ATTR configSave(void) {
// erase secondary
uint32_t addr = FLASH_ADDR + (1-flash_pri)*FLASH_SECT;
if (spi_flash_erase_sector(addr>>12) != SPI_FLASH_RESULT_OK)
return false; // no harm done, give up
goto fail; // no harm done, give up
// calculate CRC
ff.fc.seq = seq;
ff.fc.magic = FLASH_MAGIC;
@@ -66,11 +66,11 @@ bool ICACHE_FLASH_ATTR configSave(void) {
// write primary with incorrect seq
ff.fc.seq = 0xffffffff;
if (spi_flash_write(addr, (void *)&ff, sizeof(ff)) != SPI_FLASH_RESULT_OK)
return false; // no harm done, give up
goto fail; // no harm done, give up
// fill in correct seq
ff.fc.seq = seq;
if (spi_flash_write(addr, (void *)&ff, sizeof(uint32_t)) != SPI_FLASH_RESULT_OK)
return false; // most likely failed, but no harm if successful
goto fail; // most likely failed, but no harm if successful
// now that we have safely written the new version, erase old primary
addr = FLASH_ADDR + flash_pri*FLASH_SECT;
flash_pri = 1-flash_pri;
@@ -83,6 +83,9 @@ bool ICACHE_FLASH_ATTR configSave(void) {
ff.fc.seq = seq;
spi_flash_write(addr, (void *)&ff, sizeof(uint32_t));
return true;
fail:
os_printf("*** Failed to save config ***\n");
return false;
}
void ICACHE_FLASH_ATTR configWipe(void) {

4
user/config.h
View File

@@ -1,6 +1,10 @@
#ifndef CONFIG_H
#define CONFIG_H
// Flash configuration settings. When adding new items always add them at the end and formulate
// them such that a value of zero is an appropriate default or backwards compatible. Existing
// modules that are upgraded will have zero in the new fields. This ensures that an upgrade does
// not wipe out the old settings.
typedef struct {
uint32_t seq; // flash write sequence number
uint16_t magic, crc;