ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: add reserved room in properties and config

Browse source
This commit is contained in:
TT 2020-01-18 12:34:59 +09:00
parent fcb0be6def
commit c4495b6d58
2 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
main.c
View file

@ -591,17 +591,6 @@ static void cmd_sample(BaseSequentialStream *chp, int argc, char *argv[])
chprintf(chp, "usage: sample {gamma|ampl|ref}\r\n"); chprintf(chp, "usage: sample {gamma|ampl|ref}\r\n");
} }
#if 0
int32_t frequency0 = 1000000;
int32_t frequency1 = 300000000;
int16_t sweep_points = 101;
uint32_t frequencies[101];
uint16_t cal_status;
float cal_data[5][101][2];
#endif
config_t config = { config_t config = {
.magic = CONFIG_MAGIC, .magic = CONFIG_MAGIC,
.dac_value = 1922, .dac_value = 1922,
@ -612,33 +601,24 @@ config_t config = {
// .touch_cal = { 693, 605, 124, 171 }, // 2.4 inch LCD panel // .touch_cal = { 693, 605, 124, 171 }, // 2.4 inch LCD panel
.touch_cal = { 338, 522, 153, 192 }, // 2.8 inch LCD panel .touch_cal = { 338, 522, 153, 192 }, // 2.8 inch LCD panel
.default_loadcal = 0, .default_loadcal = 0,
.harmonic_freq_threshold = 300000000, .harmonic_freq_threshold = 300000000
.checksum = 0
}; };
properties_t current_props = { properties_t current_props = {
/* magic */ CONFIG_MAGIC, .magic = CONFIG_MAGIC,
/* frequency0 */ 50000, // start = 50kHz ._frequency0 = 50000, // start = 50kHz
/* frequency1 */ 900000000, // end = 900MHz ._frequency1 = 900000000, // end = 900MHz
/* sweep_points */ 101, ._sweep_points = 101,
/* cal_status */ 0, ._trace = {/*enable, type, channel, polar, scale, refpos*/
/* frequencies */ {},
/* cal_data */ {},
/* electrical_delay */ 0,
/* trace[4] */
{/*enable, type, channel, polar, scale, refpos*/
{ 1, TRC_LOGMAG, 0, 0, 1.0, 7.0 }, { 1, TRC_LOGMAG, 0, 0, 1.0, 7.0 },
{ 1, TRC_LOGMAG, 1, 0, 1.0, 7.0 }, { 1, TRC_LOGMAG, 1, 0, 1.0, 7.0 },
{ 1, TRC_SMITH, 0, 1, 1.0, 0.0 }, { 1, TRC_SMITH, 0, 1, 1.0, 0.0 },
{ 1, TRC_PHASE, 1, 0, 1.0, 4.0 } { 1, TRC_PHASE, 1, 0, 1.0, 4.0 }
}, },
/* markers[4] */ { ._markers = {
{ 1, 30, 0 }, { 0, 40, 0 }, { 0, 60, 0 }, { 0, 80, 0 } { 1, 30, 0 }, { 0, 40, 0 }, { 0, 60, 0 }, { 0, 80, 0 }
}, },
/* active_marker */ 0, ._velocity_factor = 70,
/* domain_mode */ 0,
/* velocity_factor */ 70,
/* checksum */ 0
}; };
properties_t *active_props = &current_props; properties_t *active_props = &current_props;

3
nanovna.h
View file

@ -189,6 +189,8 @@ typedef struct {
int16_t touch_cal[4]; int16_t touch_cal[4];
int8_t default_loadcal; int8_t default_loadcal;
uint32_t harmonic_freq_threshold; uint32_t harmonic_freq_threshold;
uint8_t _reserved[24];
int32_t checksum; int32_t checksum;
} config_t; } config_t;
@ -308,6 +310,7 @@ typedef struct {
uint8_t _domain_mode; /* 0bxxxxxffm : where ff: TD_FUNC m: DOMAIN_MODE */ uint8_t _domain_mode; /* 0bxxxxxffm : where ff: TD_FUNC m: DOMAIN_MODE */
uint8_t _velocity_factor; // % uint8_t _velocity_factor; // %
uint8_t _reserved[54];
int32_t checksum; int32_t checksum;
} properties_t; } properties_t;