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

fix: merge conflict

Browse source
This commit is contained in:
Dennis Real (DL9CAT) 2019-10-06 19:04:25 +02:00
parent 5fd72994ce
commit 281bfaf0d3
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
main.c
View file

@ -37,9 +37,6 @@
static void apply_error_term_at(int i); static void apply_error_term_at(int i);
static void apply_edelay_at(int i); static void apply_edelay_at(int i);
static void cal_interpolate(int s); static void cal_interpolate(int s);
void update_frequencies(void);
void set_frequencies(uint32_t start, uint32_t stop, int16_t points);
static void set_frequencies(uint32_t start, uint32_t stop, int16_t points); static void set_frequencies(uint32_t start, uint32_t stop, int16_t points);
static void update_frequencies(void); static void update_frequencies(void);
@ -608,17 +605,17 @@ float cal_data[5][101][2];
#endif #endif
config_t config = { config_t config = {
/* magic */ CONFIG_MAGIC, .magic = CONFIG_MAGIC,
/* dac_value */ 1922, .dac_value = 1922,
/* grid_color */ 0x1084, .grid_color = 0x1084,
/* menu_normal_color */ 0xffff, .menu_normal_color = 0xffff,
/* menu_active_color */ 0x7777, .menu_active_color = 0x7777,
/* trace_color[4] */ { RGB_565(255,255,0), RGB_565(0,40,255), RGB_565(0,255,0), RGB_565(255,200,20) }, /* .trace_color = { RGB565(0,255,255), RGB565(255,0,40), RGB565(0,0,255), RGB565(50,255,0) }, */
/* trace_colors[4] */ // { RGB565(0,255,255), RGB565(255,0,40), RGB565(0,0,255), RGB565(50,255,0) }, .trace_color = { RGB_565(255,255,0), RGB_565(0,40,255), RGB_565(0,255,0), RGB_565(255,200,20) },
/* touch_cal[4] */ { 411, 592, 151, 189 }, .touch_cal = { 411, 592, 151, 189 }, //{ 620, 600, 160, 190 },
/* default_loadcal */ 0, .default_loadcal = 0,
/* harmonic_freq_threshold */ 300000000, .harmonic_freq_threshold = 300000000,
/* checksum */ 0 .checksum = 0
}; };
properties_t current_props = { properties_t current_props = {