Merge pull request #27 from czietz/V4.3-cherries

Fix for issues #25 and #26
pull/29/head
erikkaashoek 4 years ago committed by GitHub
commit 4dc4e5f146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1 +1 @@
Subproject commit 669d4bbc8da1ee0e4ccdf93a472b06d183922320 Subproject commit e6ca465e45b11e80f422b900144efd51f320e496

@ -957,7 +957,7 @@ menu_invoke(int item)
if (menu->data <= KM_CW) { // One of the frequency input keypads if (menu->data <= KM_CW) { // One of the frequency input keypads
if (MODE_LOW(setting.mode)) if (MODE_LOW(setting.mode))
kp_help_text = VARIANT("0..350MHz",range_text); kp_help_text = VARIANT("0..350MHz",range_text);
else if (menu->data <= KM_SPAN) else if (menu->data == KM_SPAN)
kp_help_text = VARIANT("0..720Mhz",range_text); kp_help_text = VARIANT("0..720Mhz",range_text);
else else
kp_help_text = VARIANT("240..960Mhz",range_text); kp_help_text = VARIANT("240..960Mhz",range_text);

@ -2666,7 +2666,7 @@ static const menuitem_t menu_sweep_speed[] =
#ifdef TINYSA4 #ifdef TINYSA4
{ MT_KEYPAD, KM_FAST_SPEEDUP,"SPEEDUP\n\b%s", "2..20, 0=disable"}, { MT_KEYPAD, KM_FAST_SPEEDUP,"SPEEDUP\n\b%s", "2..20, 0=disable"},
#else #else
{ MT_KEYPAD | MT_LOW,KM_FAST_SPEEDUP,"PEEDUP\n\b%s", "2..20, 0=disable"}, { MT_KEYPAD | MT_LOW,KM_FAST_SPEEDUP,"SPEEDUP\n\b%s", "2..20, 0=disable"},
#endif #endif
{ MT_NONE, 0, NULL, menu_back} // next-> menu_back { MT_NONE, 0, NULL, menu_back} // next-> menu_back
}; };
@ -3200,6 +3200,10 @@ static void fetch_numeric_target(uint8_t mode)
else else
plot_printf(uistat.text, sizeof uistat.text, "AUTO"); plot_printf(uistat.text, sizeof uistat.text, "AUTO");
break; break;
case KM_FAST_SPEEDUP:
uistat.value = setting.fast_speedup;
plot_printf(uistat.text, sizeof uistat.text, "%d", ((int32_t)uistat.value));
break;
case KM_REPEAT: case KM_REPEAT:
uistat.value = setting.repeat; uistat.value = setting.repeat;
plot_printf(uistat.text, sizeof uistat.text, "%d", ((int32_t)uistat.value)); plot_printf(uistat.text, sizeof uistat.text, "%d", ((int32_t)uistat.value));

Loading…
Cancel
Save

Powered by TurnKey Linux.