From 044cedb66131a20f9dbf4f7cae964d088a7fbd56 Mon Sep 17 00:00:00 2001 From: Teuniz Date: Sat, 20 Aug 2016 10:56:20 +0200 Subject: [PATCH] Attempt to get the DS2000 series working. --- global.h | 2 +- interface.cpp | 30 +++++++++++++++--------------- mainwindow.cpp | 32 ++++++++++++++++---------------- screen_thread.cpp | 4 ++-- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/global.h b/global.h index f2e523b..ac9ac96 100644 --- a/global.h +++ b/global.h @@ -35,7 +35,7 @@ #define PROGRAM_NAME "DSRemote" -#define PROGRAM_VERSION "0.32_1608042235" +#define PROGRAM_VERSION "0.32_1608201054" #define MAX_PATHLEN 4096 diff --git a/interface.cpp b/interface.cpp index 70d26fb..4a69051 100644 --- a/interface.cpp +++ b/interface.cpp @@ -3310,7 +3310,7 @@ void UI_Mainwindow::toggle_fft() { devparms.math_fft = 0; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { set_cue_cmd(":CALC:MODE OFF"); } @@ -3323,7 +3323,7 @@ void UI_Mainwindow::toggle_fft() } else { - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { set_cue_cmd(":CALC:MODE FFT"); } @@ -3374,7 +3374,7 @@ void UI_Mainwindow::toggle_fft_unit() devparms.math_fft_unit = 0; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { set_cue_cmd(":CALC:FFT:VSM VRMS"); } @@ -3405,7 +3405,7 @@ void UI_Mainwindow::toggle_fft_unit() devparms.math_fft_unit = 1; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { set_cue_cmd(":CALC:FFT:VSM DBVR"); } @@ -3526,7 +3526,7 @@ void UI_Mainwindow::set_fft_hzdiv(double val) devparms.math_fft_hscale = (100.0 / devparms.timebasescale) / val; } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HSP %e", devparms.math_fft_hscale); } @@ -3551,7 +3551,7 @@ void UI_Mainwindow::select_fft_ctr_5() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hscale * 5.0); } @@ -3578,7 +3578,7 @@ void UI_Mainwindow::select_fft_ctr_6() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hscale * 6.0); } @@ -3605,7 +3605,7 @@ void UI_Mainwindow::select_fft_ctr_7() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hscale * 7.0); } @@ -3632,7 +3632,7 @@ void UI_Mainwindow::select_fft_ctr_8() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hscale * 8.0); } @@ -3659,7 +3659,7 @@ void UI_Mainwindow::select_fft_ctr_9() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hscale * 9.0); } @@ -3686,7 +3686,7 @@ void UI_Mainwindow::select_fft_ctr_10() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hscale * 10.0); } @@ -3713,7 +3713,7 @@ void UI_Mainwindow::select_fft_ctr_11() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hscale * 11.0); } @@ -3740,7 +3740,7 @@ void UI_Mainwindow::select_fft_ctr_12() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hscale * 12.0); } @@ -3832,7 +3832,7 @@ void UI_Mainwindow::set_fft_vscale() devparms.fft_voffset = (devparms.fft_vscale * -4.0); } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(devparms.math_fft_unit == 1) { @@ -3949,7 +3949,7 @@ void UI_Mainwindow::set_fft_voffset() { char str[512]; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:VOFF %e", devparms.fft_voffset); diff --git a/mainwindow.cpp b/mainwindow.cpp index f710c21..0de9bdb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1671,7 +1671,7 @@ int UI_Mainwindow::get_device_settings() usleep(TMC_GDS_DELAY); - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(tmc_write(":CALC:FFT:SPL?") != 14) { @@ -1698,7 +1698,7 @@ int UI_Mainwindow::get_device_settings() usleep(TMC_GDS_DELAY); - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(tmc_write(":CALC:MODE?") != 11) { @@ -1766,7 +1766,7 @@ int UI_Mainwindow::get_device_settings() usleep(TMC_GDS_DELAY); - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(tmc_write(":CALC:FFT:VSM?") != 14) { @@ -1808,7 +1808,7 @@ int UI_Mainwindow::get_device_settings() usleep(TMC_GDS_DELAY); - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(tmc_write(":CALC:FFT:SOUR?") != 15) { @@ -1856,7 +1856,7 @@ int UI_Mainwindow::get_device_settings() devparms.current_screen_sf = 100.0 / devparms.timebasescale; - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(tmc_write(":CALC:FFT:HSP?") != 14) { @@ -1917,7 +1917,7 @@ int UI_Mainwindow::get_device_settings() usleep(TMC_GDS_DELAY); - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(tmc_write(":CALC:FFT:HCEN?") != 15) { @@ -1944,7 +1944,7 @@ int UI_Mainwindow::get_device_settings() usleep(TMC_GDS_DELAY); - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(tmc_write(":CALC:FFT:VOFF?") != 15) { @@ -1979,7 +1979,7 @@ int UI_Mainwindow::get_device_settings() usleep(TMC_GDS_DELAY); - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(tmc_write(":CALC:FFT:VSC?") != 14) { @@ -2647,7 +2647,7 @@ void UI_Mainwindow::shift_page_left() devparms.math_fft_hcenter = 0.0; } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hcenter); } @@ -2757,7 +2757,7 @@ void UI_Mainwindow::shift_page_right() devparms.math_fft_hcenter = devparms.current_screen_sf * 0.4; } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HCEN %e", devparms.math_fft_hcenter); } @@ -2883,7 +2883,7 @@ void UI_Mainwindow::zoom_in() devparms.math_fft_hscale = devparms.current_screen_sf / 200.0; } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HSP %e", devparms.math_fft_hscale); } @@ -3054,7 +3054,7 @@ void UI_Mainwindow::zoom_out() devparms.math_fft_hscale = devparms.current_screen_sf / 20.0; } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:HSP %e", devparms.math_fft_hscale); } @@ -3192,7 +3192,7 @@ void UI_Mainwindow::chan_scale_plus() devparms.fft_voffset = (devparms.fft_vscale * -4.0); } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(devparms.math_fft_unit == 1) { @@ -3330,7 +3330,7 @@ void UI_Mainwindow::chan_scale_minus() devparms.fft_voffset = (devparms.fft_vscale * -4.0); } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { if(devparms.math_fft_unit == 1) { @@ -3458,7 +3458,7 @@ void UI_Mainwindow::shift_trace_up() devparms.fft_voffset = nearbyint(devparms.fft_voffset); } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:VOFF %e", devparms.fft_voffset); @@ -3566,7 +3566,7 @@ void UI_Mainwindow::shift_trace_down() } } - if(devparms.modelserie == 6) + if(devparms.modelserie != 1) { sprintf(str, ":CALC:FFT:VOFF %e", devparms.fft_voffset); diff --git a/screen_thread.cpp b/screen_thread.cpp index 87562a8..8da6242 100644 --- a/screen_thread.cpp +++ b/screen_thread.cpp @@ -407,7 +407,7 @@ void screenThread::run() { usleep(TMC_GDS_DELAY * 10); - if(params.modelserie == 6) + if(params.modelserie != 1) { if(tmc_write(":CALC:FFT:HSP?") != 14) { @@ -436,7 +436,7 @@ void screenThread::run() usleep(TMC_GDS_DELAY); - if(params.modelserie == 6) + if(params.modelserie != 1) { if(tmc_write(":CALC:FFT:HCEN?") != 15) {