ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2026-01-10 10:30:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move more address constants to nanovna.h

Browse source
This commit is contained in:
DiSlord 2020-02-28 23:52:01 +03:00
parent ccb3693516
commit 153585ff1f
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flash.c
View file

@ -78,7 +78,7 @@ checksum(const void *start, size_t len)
#define FLASH_PAGESIZE 0x800
const uint32_t save_config_area = 0x08018000;
const uint32_t save_config_area = SAVE_CONFIG_ADDR;
int
config_save(void)
@ -120,14 +120,12 @@ config_recall(void)
return 0;
}
#define SAVEAREA_MAX 5
const uint32_t saveareas[SAVEAREA_MAX] = {
SAVE_CONFIG_0_ADDR,
SAVE_CONFIG_1_ADDR,
SAVE_CONFIG_2_ADDR,
SAVE_CONFIG_3_ADDR,
SAVE_CONFIG_4_ADDR };
SAVE_PROP_CONFIG_0_ADDR,
SAVE_PROP_CONFIG_1_ADDR,
SAVE_PROP_CONFIG_2_ADDR,
SAVE_PROP_CONFIG_3_ADDR,
SAVE_PROP_CONFIG_4_ADDR };
int16_t lastsaveid = 0;
@ -212,7 +210,7 @@ caldata_ref(int id)
return src;
}
const uint32_t save_config_prop_area_size = 0x8000;
const uint32_t save_config_prop_area_size = SAVE_CONFIG_AREA_SIZE;
void
clear_all_config_prop_data(void)

16
nanovna.h
View file

@ -92,12 +92,16 @@ extern int8_t sweep_enabled;
* flash.c
*/
#define SAVEAREA_MAX 5
#define SAVE_CONFIG_0_ADDR 0x08018800
#define SAVE_CONFIG_1_ADDR 0x0801a000
#define SAVE_CONFIG_2_ADDR 0x0801b800
#define SAVE_CONFIG_3_ADDR 0x0801d000
#define SAVE_CONFIG_4_ADDR 0x0801e800
// Begin addr 0x08018000
#define SAVE_CONFIG_AREA_SIZE 0x00008000
// config save area
#define SAVE_CONFIG_ADDR 0x08018000
// properties_t save area
#define SAVE_PROP_CONFIG_0_ADDR 0x08018800
#define SAVE_PROP_CONFIG_1_ADDR 0x0801a000
#define SAVE_PROP_CONFIG_2_ADDR 0x0801b800
#define SAVE_PROP_CONFIG_3_ADDR 0x0801d000
#define SAVE_PROP_CONFIG_4_ADDR 0x0801e800
/*
* ui.c