ENBW correction and menu changes

pull/34/head
erikkaashoek 3 years ago
parent cbc449a78a
commit 397e0035d6

@ -87,7 +87,7 @@ endif
ifeq ($(TARGET),F303)
USE_FPU = hard
USE_PROCESS_STACKSIZE = 0x300
USE_PROCESS_STACKSIZE = 0x380
USE_EXCEPTIONS_STACKSIZE = 0x200
endif

@ -1545,18 +1545,18 @@ static void trace_print_value_string( // Only used at one place
}
const char *format;
if (UNIT_IS_LINEAR(setting.unit))
format = FONT_s"%s %.3F%s%s%s"; // 5 characters incl u, m, etc...
format = FONT_s"%s %.3F%s%s%s%s"; // 5 characters incl u, m, etc...
else
format = FONT_s"%s %.1f%s%s%s";
format = FONT_s"%s %.1f%s%s%s%s";
#ifdef TINYSA4
format++; // Skip small prefix for bold output
#else
if (bold) format++; // Skip small prefix for bold output
#endif
cell_printf(xpos, ypos, format, buf2, v, unit_string[unit_index], (mtype & M_NOISE?"c/Hz":""), (mtype & M_AVER?"/T":""));
cell_printf(xpos, ypos, format, buf2, v, unit_string[unit_index], (mtype & M_DELTA?"c":"") , (mtype & M_NOISE?"/Hz":""), (mtype & M_AVER?"/T":""));
#ifdef __LEVEL_METER__
if (level_text[0] == 0)
plot_printf(level_text, sizeof(level_text), &format[3], v, unit_string[unit_index], (mtype & M_NOISE?"c/Hz":"") ,(mtype & M_AVER?"/T":""));
plot_printf(level_text, sizeof(level_text), &format[3], v, unit_string[unit_index], (mtype & M_DELTA?"c":"") , (mtype & M_NOISE?"/Hz":"") ,(mtype & M_AVER?"/T":""));
#endif
}

@ -1736,7 +1736,7 @@ static const RBW_t RBW_choices[] =
{SI4463_RBW_850kHz, -9,8500, 8},
#else
#define NOISE_BASE_CORRECTION 7
#define NOISE_BASE_CORRECTION 18 // 7
{SI4463_RBW_02kHz, 10,2, NOISE_BASE_CORRECTION + -20}, //
{SI4463_RBW_1kHz, 15,10, NOISE_BASE_CORRECTION + -5},//
{SI4463_RBW_3kHz, 10,30, NOISE_BASE_CORRECTION + -5},//

@ -3104,7 +3104,6 @@ static const menuitem_t menu_settings4[] =
{ MT_KEYPAD, KM_COR_NFM, "COR\nNFM", "Enter NFM modulation correction"},
#endif
// { MT_CALLBACK, 0 , "CLEAR\nCONFIG", menu_clearconfig_cb},
{ MT_ADV_CALLBACK, 0, "LINEAR\nAVERAGING", menu_linear_averaging_acb},
// { MT_SUBMENU, 0, S_RARROW" MORE", menu_settings3},
{ MT_KEYPAD, KM_DIRECT_START, "DSTART\n\b%s", ""},
{ MT_KEYPAD, KM_DIRECT_STOP, "DSTOP\n\b%s", ""},
@ -3120,7 +3119,6 @@ static const menuitem_t menu_settings3[] =
{ MT_ADV_CALLBACK, 0, "ADF OUT", menu_adf_out_acb},
#endif
{ MT_KEYPAD, KM_ULTRA_START,"ULTRASTART\n\b%s", "10G=auto"},
{ MT_ADV_CALLBACK, 0, "ENABLE\nDIRECT", menu_direct_acb},
// { MT_KEYPAD | MT_LOW, KM_IF2, "IF2 FREQ", "Set to zero for no IF2"},
{ MT_KEYPAD, KM_R, "R\n\b%s", "Set R"},
{ MT_KEYPAD, KM_MOD, "MODULO\n\b%s", "Set MODULO"},
@ -3182,6 +3180,8 @@ static const menuitem_t menu_settings[] =
{
#ifdef TINYSA4
{ MT_ADV_CALLBACK,0, "PROGRESS\nBAR", menu_progress_bar_acb},
{ MT_ADV_CALLBACK, 0, "DIRECT\nMODE", menu_direct_acb},
{ MT_ADV_CALLBACK, 0, "LINEAR\nAVERAGING", menu_linear_averaging_acb},
{ MT_KEYPAD, KM_FREQ_CORR, "FREQ CORR\n\b%s", "Enter ppb correction"},
// { MT_SUBMENU, 0, "CALIBRATE\nHARMONIC", menu_calibrate_harmonic},
#endif

Loading…
Cancel
Save

Powered by TurnKey Linux.