KB8PMY
/
tinySA
mirror of https://github.com/erikkaashoek/tinySA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small UI changes

Browse Source
tinySA-v0.2
erikkaashoek 6 years ago
parent d7763cec48
commit 6c272d1f75
7 changed files with 35 additions and 60 deletions
Show Stats Download Patch File Download Diff File

9
flash.c
Unescape View File

@ -180,15 +180,15 @@ caldata_recall(int id)
void *dst = &setting; void *dst = &setting;
if (id < 0 || id >= SAVEAREA_MAX) if (id < 0 || id >= SAVEAREA_MAX)
goto load_default; return -1;
// point to saved area on the flash memory // point to saved area on the flash memory
src = (setting_t*)saveareas[id]; src = (setting_t*)saveareas[id];
if (src->magic != CONFIG_MAGIC) if (src->magic != CONFIG_MAGIC)
goto load_default; return -1;
if (checksum(src, sizeof *src - sizeof src->checksum) != src->checksum) if (checksum(src, sizeof *src - sizeof src->checksum) != src->checksum)
goto load_default; return -1;
/* active configuration points to save data on flash memory */ /* active configuration points to save data on flash memory */
// active_props = src; // active_props = src;
@ -200,9 +200,6 @@ caldata_recall(int id)
set_scale(setting.scale); set_scale(setting.scale);
set_reflevel(setting.reflevel); set_reflevel(setting.reflevel);
return 0; return 0;
load_default:
load_default_properties();
return -1;
} }
#if 0 #if 0
const setting_t * const setting_t *

3
main.c
Unescape View File

@ -2294,7 +2294,7 @@ VNA_SHELL_FUNCTION(cmd_o)
uint32_t value = my_atoi(argv[0]); uint32_t value = my_atoi(argv[0]);
// if (VFO == 0) // if (VFO == 0)
// setting.frequency_IF = value; // setting.frequency_IF = value;
setFreq(VFO, value); set_freq(VFO, value);
} }
VNA_SHELL_FUNCTION(cmd_d) VNA_SHELL_FUNCTION(cmd_d)
@ -2785,6 +2785,7 @@ int main(void)
if (caldata_recall(0) == -1 || setting.mode == -1) { if (caldata_recall(0) == -1 || setting.mode == -1) {
setting.mode = -1; // must be done to setup the scanning stuff setting.mode = -1; // must be done to setup the scanning stuff
setting.refer = -1; setting.refer = -1;
load_default_properties();
} }
/* restore frequencies and calibration 0 slot properties from flash memory */ /* restore frequencies and calibration 0 slot properties from flash memory */
#ifdef __VNA__ #ifdef __VNA__

1
nanovna.h
Unescape View File

@ -706,6 +706,7 @@ void SI4432_SetReference(int freq);
// Speed profile definition // Speed profile definition
#define START_PROFILE systime_t time = chVTGetSystemTimeX(); #define START_PROFILE systime_t time = chVTGetSystemTimeX();
#define RESTART_PROFILE time = chVTGetSystemTimeX();
#define STOP_PROFILE {char string_buf[12];plot_printf(string_buf, sizeof string_buf, "T:%06d", chVTGetSystemTimeX() - time);ili9341_drawstringV(string_buf, 1, 180);} #define STOP_PROFILE {char string_buf[12];plot_printf(string_buf, sizeof string_buf, "T:%06d", chVTGetSystemTimeX() - time);ili9341_drawstringV(string_buf, 1, 180);}
// Macros for convert define value to string // Macros for convert define value to string
#define STR1(x) #x #define STR1(x) #x

2
plot.c
Unescape View File

@ -1642,7 +1642,7 @@ request_to_draw_cells_behind_menu(void)
if (current_menu_is_form()) if (current_menu_is_form())
invalidate_rect(25, 0, 319, 239); invalidate_rect(25, 0, 319, 239);
else else
invalidate_rect(320-60, 0, 319, 239); invalidate_rect(320-60 - 25, 0, 319, 239);
redraw_request |= REDRAW_CELLS; redraw_request |= REDRAW_CELLS;
} }

65
sa_core.c
Unescape View File

@ -175,7 +175,7 @@ void set_modulation(int m)
void set_repeat(int r) void set_repeat(int r)
{ {
if (r > 0 && r < 50) { if (r > 0 && r <= 1000) {
setting.repeat = r; setting.repeat = r;
dirty = true; dirty = true;
} }
@ -521,7 +521,7 @@ void setupSA(void)
static unsigned long old_freq[4] = { 0, 0, 0, 0 }; static unsigned long old_freq[4] = { 0, 0, 0, 0 };
void setFreq(int V, unsigned long freq) void set_freq(int V, unsigned long freq)
{ {
if (old_freq[V] != freq) { if (old_freq[V] != freq) {
if (V <= 1) { if (V <= 1) {
@ -746,7 +746,7 @@ static const unsigned int spur_IF = 433800000;
static const unsigned int spur_alternate_IF = 434000000; static const unsigned int spur_alternate_IF = 434000000;
static const int spur_table[] = static const int spur_table[] =
{ {
580000, 580000, // 433.8 MHz table
961000, 961000,
1600000, 1600000,
1837000, // Real signal 1837000, // Real signal
@ -767,40 +767,8 @@ static const int spur_table[] =
28960000, 28960000,
29800000, 29800000,
49500000, 49500000,
/*
0.52
6.96
1.84
2.77
4934
4960
8928
7371
870000,
970000,
1460000,
1610000,
1840000,
2840000,
2890000,
2970000,
4780000,
4810000,
4850000,
4880000,
8100000,
8140000,
10870000,
14880000,
*/
#ifdef IF_AT_4339 #ifdef IF_AT_4339
780000, 780000, // 433.9MHz table
830000, 830000,
880000, 880000,
949000, 949000,
@ -892,10 +860,11 @@ float perform(bool break_on_operation, int i, uint32_t f, int tracking)
if (MODE_OUTPUT(setting.mode) && setting.modulation == MO_AM) { if (MODE_OUTPUT(setting.mode) && setting.modulation == MO_AM) {
int p = setting.attenuate * 2 + modulation_counter; int p = setting.attenuate * 2 + modulation_counter;
PE4302_Write_Byte(p); PE4302_Write_Byte(p);
if (modulation_counter == 3) if (modulation_counter == 10) {
modulation_counter = 0; modulation_counter = 0;
else } else {
modulation_counter++; modulation_counter++;
}
chThdSleepMicroseconds(250); chThdSleepMicroseconds(250);
} else if (MODE_OUTPUT(setting.mode) && (setting.modulation == MO_NFM || setting.modulation == MO_WFM )) { } else if (MODE_OUTPUT(setting.mode) && (setting.modulation == MO_NFM || setting.modulation == MO_WFM )) {
SI4432_Sel = 1; SI4432_Sel = 1;
@ -928,7 +897,7 @@ float perform(bool break_on_operation, int i, uint32_t f, int tracking)
again: again:
#endif #endif
if (setting.mode == M_LOW && tracking) { if (setting.mode == M_LOW && tracking) {
setFreq (0, setting.frequency_IF + lf - reffer_freq[setting.refer]); // Offset so fundamental of reffer is visible set_freq (0, setting.frequency_IF + lf - reffer_freq[setting.refer]); // Offset so fundamental of reffer is visible
local_IF = setting.frequency_IF ; local_IF = setting.frequency_IF ;
} else if (MODE_LOW(setting.mode)) { } else if (MODE_LOW(setting.mode)) {
if (setting.mode == M_LOW && !in_selftest && avoid_spur(f)) { if (setting.mode == M_LOW && !in_selftest && avoid_spur(f)) {
@ -942,11 +911,11 @@ again:
} }
if (setting.mode == M_GENLOW && setting.modulation == MO_EXTERNAL) if (setting.mode == M_GENLOW && setting.modulation == MO_EXTERNAL)
local_IF += lf; local_IF += lf;
setFreq (0, local_IF); set_freq (0, local_IF);
#ifdef __ULTRA__ #ifdef __ULTRA__
} else if (setting.mode == M_ULTRA) { } else if (setting.mode == M_ULTRA) {
local_IF = setting.frequency_IF + (int)(actual_rbw < 350.0 ? setting.spur*300000 : 0 ); local_IF = setting.frequency_IF + (int)(actual_rbw < 350.0 ? setting.spur*300000 : 0 );
setFreq (0, local_IF); set_freq (0, local_IF);
// local_IF = setting.frequency_IF + (int)(actual_rbw < 300.0?setting.spur * 1000 * actual_rbw:0); // local_IF = setting.frequency_IF + (int)(actual_rbw < 300.0?setting.spur * 1000 * actual_rbw:0);
#endif #endif
} else } else
@ -963,10 +932,10 @@ again:
// setFreq (1, local_IF/5 + lf/5); // setFreq (1, local_IF/5 + lf/5);
// else // else
if (lf > 2446000000 ) if (lf > 2446000000 )
setFreq (1, local_IF/5 + lf/5); set_freq (1, local_IF/5 + lf/5);
else else
// if (lf > 1486000000) // if (lf > 1486000000)
setFreq (1, local_IF/3 + lf/3); set_freq (1, local_IF/3 + lf/3);
// else // else
// setFreq (1, local_IF/2 + lf/2); // setFreq (1, local_IF/2 + lf/2);
} else } else
@ -976,14 +945,14 @@ again:
//#define IF_1 2550000000 //#define IF_1 2550000000
#define IF_2 2025000000 #define IF_2 2025000000
setFreq (3, IF_2 - 433800000); set_freq (3, IF_2 - 433800000);
setFreq (2, IF_2 + lf); set_freq (2, IF_2 + lf);
setFreq (1, 433800000); set_freq (1, 433800000);
#else #else
if (setting.mode == M_LOW && !setting.tracking && setting.below_IF) if (setting.mode == M_LOW && !setting.tracking && setting.below_IF)
setFreq (1, local_IF-lf); set_freq (1, local_IF-lf);
else else
setFreq (1, local_IF+lf); set_freq (1, local_IF+lf);
#endif #endif
} }
if (MODE_OUTPUT(setting.mode)) // No substepping in output mode if (MODE_OUTPUT(setting.mode)) // No substepping in output mode

2
si4432.c
Unescape View File

@ -367,7 +367,7 @@ int actualStepDelay = 1500;
float SI4432_RSSI(uint32_t i, int s) float SI4432_RSSI(uint32_t i, int s)
{ {
(void) i; (void) i;
int RSSI_RAW; int32_t RSSI_RAW;
(void) i; (void) i;
// SEE DATASHEET PAGE 61 // SEE DATASHEET PAGE 61
#ifdef USE_SI4463 #ifdef USE_SI4463

13
ui_sa.c
Unescape View File

@ -515,7 +515,14 @@ extern const menuitem_t menu_topultra[];
void menu_load_preset_cb(int item, uint8_t data) void menu_load_preset_cb(int item, uint8_t data)
{ {
(void)item; (void)item;
caldata_recall(data); if (caldata_recall(data) == -1) {
if (data == 0)
reset_settings(setting.mode); // Restore all defaults
else {
draw_menu();
return;
}
}
menu_move_back(); menu_move_back();
ui_mode_normal(); ui_mode_normal();
} }
@ -977,7 +984,7 @@ static const menuitem_t menu_store_preset_high[] =
{ MT_CALLBACK, 6, "STORE 6" , menu_store_preset_cb}, { MT_CALLBACK, 6, "STORE 6" , menu_store_preset_cb},
{ MT_CALLBACK, 7, "STORE 7" , menu_store_preset_cb}, { MT_CALLBACK, 7, "STORE 7" , menu_store_preset_cb},
{ MT_CALLBACK, 8, "STORE 8" , menu_store_preset_cb}, { MT_CALLBACK, 8, "STORE 8" , menu_store_preset_cb},
{ MT_CALLBACK, 100, "\2ERASE\0STARTUP",menu_store_preset_cb}, { MT_CALLBACK, 100, "\2FACTORY\0DEFAULTS",menu_store_preset_cb},
{ MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_CANCEL, 255, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };
@ -1001,7 +1008,7 @@ static const menuitem_t menu_store_preset[] =
{ MT_CALLBACK, 2, "STORE 2" , menu_store_preset_cb}, { MT_CALLBACK, 2, "STORE 2" , menu_store_preset_cb},
{ MT_CALLBACK, 3, "STORE 3" , menu_store_preset_cb}, { MT_CALLBACK, 3, "STORE 3" , menu_store_preset_cb},
{ MT_CALLBACK, 4, "STORE 4" , menu_store_preset_cb}, { MT_CALLBACK, 4, "STORE 4" , menu_store_preset_cb},
{ MT_CALLBACK, 100, "\2ERASE\0STARTUP",menu_store_preset_cb}, { MT_CALLBACK, 100, "\2FACTORY\0DEFAULTS",menu_store_preset_cb},
{ MT_CANCEL, 255, S_LARROW" BACK", NULL }, { MT_CANCEL, 255, S_LARROW" BACK", NULL },
{ MT_NONE, 0, NULL, NULL } // sentinel { MT_NONE, 0, NULL, NULL } // sentinel
}; };

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.