diff --git a/interface.cpp b/interface.cpp index ebc73de..90ff7d7 100644 --- a/interface.cpp +++ b/interface.cpp @@ -1770,13 +1770,31 @@ void UI_Mainwindow::horizontal_delayed_toggle() } else { + stat_timer->stop(); + + scrn_timer->stop(); + devparms.timebasedelayenable = 1; statusLabel->setText("Delayed timebase enabled"); tmcdev_write(device, ":TIM:DEL:ENAB 1"); - devparms.timebasedelayoffset = devparms.timebaseoffset; + tmcdev_write(device, ":TIM:DEL:OFFS?"); + + tmcdev_read(device); + + devparms.timebasedelayoffset = atof(device->buf); + + tmcdev_write(device, ":TIM:DEL:SCAL?"); + + tmcdev_read(device); + + devparms.timebasedelayscale = atof(device->buf); + + stat_timer->start(devparms.status_timer_ival); + + scrn_timer->start(devparms.screen_timer_ival); } } diff --git a/timer_handlers.cpp b/timer_handlers.cpp index c06ec7f..0460144 100644 --- a/timer_handlers.cpp +++ b/timer_handlers.cpp @@ -123,18 +123,6 @@ void UI_Mainwindow::stat_timer_handler() } else { - device->hdrbuf[32] = 0; - printf(" Status error hdrbuf: %s<-\n", device->hdrbuf); - - device->buf[32] = 0; - printf(" Status error buf: %s<-\n", device->buf); - - for(int i=0; i<32; i++) - { - printf(" %i:%02X", i, device->buf[i]); - } - printf("\n"); - line = __LINE__; goto OUT_ERROR; } @@ -226,11 +214,6 @@ void UI_Mainwindow::stat_timer_handler() devparms.counterfreq = atof(device->buf); } -// if(old_stat != devparms.triggerstatus) -// { -// printf("Status change: %i\n", devparms.triggerstatus); -// } - return; OUT_ERROR: