Small bugs solved

pull/94/head
erikkaashoek 2 years ago
parent e5dbf7024b
commit 864bb278f9

@ -91,7 +91,7 @@ uint16_t redraw_request = 0; // contains REDRAW_XXX flags
// Version text, displayed in Config->Version menu, also send by info command
const char * const info_about[]={
BOARD_NAME,
"2019-2022 Copyright @Erik Kaashoek",
"2019-2024 Copyright @Erik Kaashoek",
"2016-2020 Copyright @edy555",
"SW licensed under GPL. See: https://github.com/erikkaashoek/tinySA",
"Version: " VERSION,
@ -2894,11 +2894,11 @@ void set_freq_boundaries(void) {
if (max2871) { // must all be harmonics of 30MHz
MAX_LO_FREQ = 6300000000ULL + config.overclock;
MAX_ABOVE_IF_FREQ = 4470000000ULL + config.overclock; // Range to use for below IF
MIN_BELOW_IF_FREQ = 2310000000ULL + config.overclock; // Range to use for below IF
MIN_BELOW_IF_FREQ = 2430000000ULL + config.overclock; // Range to use for below IF
} else {
MAX_LO_FREQ = 4350000000ULL + config.overclock;
MAX_ABOVE_IF_FREQ = 3030000000ULL + config.overclock; // Range to use for below IF
MIN_BELOW_IF_FREQ = 2310000000ULL + config.overclock; // Range to use for below IF
MIN_BELOW_IF_FREQ = 2430000000ULL + config.overclock; // Range to use for below IF
}
set_jump_freq( MAX_ABOVE_IF_FREQ, (config.harmonic_start?config.harmonic_start:ULTRA_MAX_FREQ), MIN_BELOW_IF_FREQ);
}

@ -152,7 +152,7 @@ int max_drive = 18;
#define SL_GENHIGH_LEVEL_MAX drive_dBm[MAX_DRIVE]
#define SL_GENLOW_LEVEL_MIN -124
#define SL_GENLOW_LEVEL_MIN -115
#define SL_GENLOW_LEVEL_MAX -18.5
#ifdef TINYSA4_4
#define MAX_ATTENUATE (setting.extra_lna ? 0 : 31.5)
@ -6250,7 +6250,7 @@ const test_case_t test_case [] =
TEST_CASE_STRUCT(TC_SIGNAL, TP_30MHZ_ULTRA, 30, 1, CAL_LEVEL, 10, -85), // 4 Test Ultra mode
#define TEST_SILENCE 4
TEST_CASE_STRUCT(TC_BELOW, TP_SILENT, 200, 100, -70, 0, 0), // 5 Wide band noise floor low mode
TEST_CASE_STRUCT(TC_ABOVE, TP_30MHZ_DIRECT,990, 10, -90, 0, -90), // 6 Direct path with harmonic
TEST_CASE_STRUCT(TC_ABOVE, TP_30MHZ_DIRECT,900, 10, -90, 0, -90), // 6 Direct path with harmonic
TEST_CASE_STRUCT(TC_SIGNAL, TP_10MHZEXTRA, 30, 14, CAL_LEVEL, 26, -45), // 7 BPF loss and stop band
TEST_CASE_STRUCT(TC_FLAT, TP_10MHZEXTRA, 30, 14, -28, 9, -60), // 8 BPF pass band flatness
TEST_CASE_STRUCT(TC_BELOW, TP_30MHZ, 880, 1, -95, 0, -100), // 9 LPF cutoff

18
ui.c

@ -84,7 +84,7 @@ enum {
#define NUMINPUT_LEN 12
#ifdef FF_USE_LFN
#define TXTINPUT_LEN (FF_MAX_LFN - 4)
#define TXTINPUT_LEN (FF_MAX_LFN - 5)
#else
#define TXTINPUT_LEN (8)
#endif
@ -7917,12 +7917,26 @@ touch_lever_mode_select(int touch_x, int touch_y)
static int
touch_marker_select(int touch_x, int touch_y)
{
#ifdef TINYSA4
int active_markers = 0;
for (int i = 0; i<MARKER_COUNT; i++ ) {
if (markers[i].enabled)
active_markers++;
}
int max_y = (active_markers>>1) * 15 + 15;
#endif
int selected_marker = 0;
#ifdef TINYSA4
if (current_menu_is_form() || touch_x > LCD_WIDTH-MENU_BUTTON_WIDTH || touch_x < 25 || touch_y > max_y)
return FALSE;
selected_marker = (touch_y/15)<<1;
#else
if (current_menu_is_form() || touch_x > LCD_WIDTH-MENU_BUTTON_WIDTH || touch_x < 25 || touch_y > 30)
return FALSE;
if (touch_y > 15)
selected_marker = 2;
selected_marker += (touch_x >150 ? 1 : 0);
#endif
selected_marker += (touch_x >(LCD_WIDTH/2)-10 ? 1 : 0);
for (int i = 0; i < MARKERS_MAX; i++) {
if (markers[i].enabled) {
if (selected_marker == 0) {

Loading…
Cancel
Save

Powered by TurnKey Linux.