Forc frequency and status panel updates together to ensure equal time display

pull/4/head
erikkaashoek 6 years ago
parent 0396d068b4
commit 01038cf696

@ -1612,10 +1612,11 @@ draw_all(bool flush)
// STOP_PROFILE // STOP_PROFILE
#endif #endif
} }
if (redraw_request & (REDRAW_CAL_STATUS | REDRAW_FREQUENCY) ) if (redraw_request & (REDRAW_CAL_STATUS | REDRAW_FREQUENCY) ) {
draw_cal_status(); // calculates the actual sweep time, must be before draw_frequencies draw_cal_status(); // calculates the actual sweep time, must be before draw_frequencies
if (redraw_request & REDRAW_FREQUENCY) // if (redraw_request & REDRAW_FREQUENCY)
draw_frequencies(); draw_frequencies();
}
if (redraw_request & REDRAW_BATTERY) if (redraw_request & REDRAW_BATTERY)
draw_battery_status(); draw_battery_status();
redraw_request = 0; redraw_request = 0;

@ -1608,12 +1608,19 @@ again: // Waiting for a trigger jumps back to here
if (MODE_OUTPUT(setting.mode) && setting.additional_step_delay_us < 500) // Minimum wait time to prevent LO from lockup during output frequency sweep if (MODE_OUTPUT(setting.mode) && setting.additional_step_delay_us < 500) // Minimum wait time to prevent LO from lockup during output frequency sweep
setting.additional_step_delay_us = 500; setting.additional_step_delay_us = 500;
if (break_on_operation && MODE_INPUT(setting.mode)) { // during normal operation if (break_on_operation && MODE_INPUT(setting.mode)) { // during normal operation
redraw_request |= REDRAW_CAL_STATUS;
if (FREQ_IS_CW()) { // if zero span mode
update_grid(); // and update grid
redraw_request |= REDRAW_FREQUENCY; // and time at bottom
}
#if 0
draw_cal_status(); // show sweep time estimation draw_cal_status(); // show sweep time estimation
if (FREQ_IS_CW()) { // if zero span mode if (FREQ_IS_CW()) { // if zero span mode
update_grid(); // and update grid update_grid(); // and update grid
//redraw_request |= REDRAW_FREQUENCY; // and time at bottom //redraw_request |= REDRAW_FREQUENCY; // and time at bottom
draw_frequencies(); draw_frequencies();
} }
#endif
} }
} }
uint32_t prev_sweep_time = setting.actual_sweep_time_us; uint32_t prev_sweep_time = setting.actual_sweep_time_us;

Loading…
Cancel
Save

Powered by TurnKey Linux.