real roll mode for slow sample rates

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>

Author: Ho-Ro

openhantek/src/OH_BUILD.h

@@ -1,2 +1,2 @@
 // Do not edit, will be re-created at each commit!
-#define OH_BUILD "20200623 build 709"
+#define OH_BUILD "20200626 build 709"

openhantek/src/OH_VERSION.h

@@ -1,7 +1,7 @@
 // define the version that is shown on top of the program
 // if undefined (for development commits) the build will be shown by OpenHantek
 
-#define OH_VERSION "3.1.1-rc2"
+#define OH_VERSION "3.1.1-rc3"
 
 #ifdef OH_VERSION
 #undef VERSION

openhantek/src/dsowidget.cpp

@@ -616,7 +616,7 @@ void DsoWidget::updateTriggerDetails() {
         int dutyCyle = int( 0.5 + ( 100.0 * pulseWidth1 ) / ( pulseWidth1 + pulseWidth2 ) );
         pulseWidthString += " (" + QString::number( dutyCyle ) + "%)";
     }
-    if ( scope->trigger.mode != Dso::TriggerMode::NONE ) {
+    if ( scope->trigger.mode != Dso::TriggerMode::ROLL ) {
         settingsTriggerLabel->setText( tr( "%1  %2  %3  %4  %5" )
                                            .arg( scope->voltage[ scope->trigger.source ].name,
                                                  Dso::slopeString( scope->trigger.slope ), levelString, pretriggerString,
@@ -797,7 +797,7 @@ void DsoWidget::showNew( std::shared_ptr< PPresult > analysedData ) {
     zoomScope->showData( analysedData );
 
     QPalette triggerLabelPalette = palette();
-    if ( scope->trigger.mode == Dso::TriggerMode::NONE ) {
+    if ( scope->trigger.mode == Dso::TriggerMode::ROLL ) {
         triggerLabelPalette.setColor( QPalette::WindowText, view->colors->background );
         triggerLabelPalette.setColor( QPalette::Background, view->colors->background );
     } else {

openhantek/src/hantekdso/capturing.cpp

@@ -8,9 +8,6 @@
 #include <cmath>
 
 
-// static std::vector< QString > controlNames = {"SETGAIN_CH1",    "SETGAIN_CH2", "SETSAMPLERATE", "STARTSAMPLING",
-//                                               "SETNUMCHANNELS", "SETCOUPLING", "SETCALFREQ"};
-
 Capturing::Capturing( HantekDsoControl *hdc ) : hdc( hdc ) { hdc->capturing = true; }
 
 
@@ -39,7 +36,7 @@ double id2sr( uint8_t timediv ) {
 
 void Capturing::xferSamples() {
     QWriteLocker locker( &hdc->raw.lock );
-    if ( !rollMode )
+    if ( !freeRun )
         swap( data, hdc->raw.data );
     hdc->raw.channels = channels;
     hdc->raw.samplerate = samplerate;
@@ -48,7 +45,7 @@ void Capturing::xferSamples() {
     hdc->raw.gainValue[ 1 ] = gainValue[ 1 ];
     hdc->raw.gainIndex[ 0 ] = gainIndex[ 0 ];
     hdc->raw.gainIndex[ 1 ] = gainIndex[ 1 ];
-    hdc->raw.rollMode = rollMode;
+    hdc->raw.freeRun = freeRun;
     hdc->raw.valid = valid;
     hdc->raw.tag = tag;
 }
@@ -72,8 +69,12 @@ void Capturing::capture() {
                 gainIndex[ 1 ] = controlCommand->data()[ 1 ];
                 break;
             case uint8_t( ControlCode::CONTROL_SETNUMCHANNELS ):
-                if ( realSlow ) // force 2 channels for slow samplings where roll mode is possible
-                    *controlCommand->data() = 2;
+                if ( realSlow ) { // force 2 channels for slow samplings where roll mode is possible
+                    if ( *controlCommand->data() == channels )
+                        controlCommand->pending = false;
+                    else
+                        *controlCommand->data() = 2;
+                }
                 channels = *controlCommand->data();
                 break;
             case uint8_t( ControlCode::CONTROL_SETSAMPLERATE ):
@@ -82,7 +83,7 @@ void Capturing::capture() {
                 oversampling = uint8_t( hdc->specification->fixedSampleRates[ sampleIndex ].oversampling );
                 effectiveSamplerate = hdc->specification->fixedSampleRates[ sampleIndex ].samplerate;
                 realSlow = effectiveSamplerate < 10e3;
-                if ( realSlow ) // always switch to two channels if roll mode is possible
+                if ( realSlow && channels != 2 ) // always switch to two channels if roll mode is possible
                     hdc->modifyCommand< ControlSetNumChannels >( ControlCode::CONTROL_SETNUMCHANNELS )->setNumChannels( 2 );
                 break;
             }
@@ -111,12 +112,12 @@ void Capturing::capture() {
         controlCommand = controlCommand->next;
     }
     valid = true;
-    rollMode = hdc->triggerModeNONE() && realSlow;
+    freeRun = hdc->triggerModeNONE() && realSlow;
     // sample step by step into the target if rollMode, else buffer and switch one big block
-    dp = rollMode ? &hdc->raw.data : &data;
+    dp = freeRun ? &hdc->raw.data : &data;
     rawSamplesize = hdc->grossSampleCount( hdc->getSamplesize() * oversampling ) * channels;
     dp->resize( rawSamplesize, 0x80 );
-    if ( tag && rollMode ) // in roll mode transfer settings immediately
+    if ( tag && freeRun ) // in free run mode transfer settings immediately
         xferSamples();
     ++tag;
     if ( hdc->scopeDevice->isRealHW() ) {
@@ -130,8 +131,10 @@ void Capturing::capture() {
         for ( auto it = dp->begin(); it != end; ++it )
             *it = 0x80; // fill with "zeros"
         valid = false;
+    } else {
+        hdc->raw.rollMode = true; // one complete buffer available, start to roll
     }
-    if ( !rollMode ) // in normal capturing mode transfer after capturing one block
+    if ( !freeRun ) // in normal capturing mode transfer after capturing one block
         xferSamples();
 }
 

openhantek/src/hantekdso/capturing.h

@@ -29,7 +29,7 @@ class Capturing : public QThread {
     unsigned gainIndex[ 2 ] = {0, 0}; // index 0..7
     unsigned tag = 0;
     bool valid = true;
-    bool rollMode = false;
+    bool freeRun = false;
     std::vector< unsigned char > data;
     std::vector< unsigned char > *dp = &data;
 };

openhantek/src/hantekdso/controlspecification.h

@@ -64,7 +64,7 @@ struct ControlSpecification {
 
     // Features
     std::vector< Coupling > couplings = {Dso::Coupling::DC, Dso::Coupling::AC};
-    std::vector< TriggerMode > triggerModes = {TriggerMode::NONE, TriggerMode::AUTO, TriggerMode::NORMAL, TriggerMode::SINGLE};
+    std::vector< TriggerMode > triggerModes = {TriggerMode::ROLL, TriggerMode::AUTO, TriggerMode::NORMAL, TriggerMode::SINGLE};
     int fixedUSBinLength = 0;
     bool hasACcoupling = false;
 

openhantek/src/hantekdso/dsosamples.h

@@ -12,11 +12,10 @@ struct DSOsamples {
     double samplerate = 0.0;                   ///< The samplerate of the input data
     unsigned char clipped = 0;                 ///< Bitmask of clipped channels
     bool liveTrigger = false;                  ///< live samples are triggered
-    unsigned triggeredPosition = 0;              ///< position for a triggered trace, 0 = not triggered
+    unsigned triggeredPosition = 0;            ///< position for a triggered trace, 0 = not triggered
     double pulseWidth1 = 0.0;                  ///< width from trigger point to next opposite slope
     double pulseWidth2 = 0.0;                  ///< width from next opposite slope to third slope
     bool freeRunning = false;                  ///< trigger: NONE, half sample count
-    unsigned freeRunPosition = 0;              ///< position of free running capturing
     unsigned tag = 0;                          ///< track individual sample blocks (debug support)
     mutable QReadWriteLock lock;
 };

openhantek/src/hantekdso/enums.cpp

@@ -4,7 +4,7 @@
 #include <QCoreApplication>
 
 namespace Dso {
-Enum< Dso::TriggerMode, Dso::TriggerMode::NONE, Dso::TriggerMode::SINGLE > TriggerModeEnum;
+Enum< Dso::TriggerMode, Dso::TriggerMode::ROLL, Dso::TriggerMode::SINGLE > TriggerModeEnum;
 Enum< Dso::Slope, Dso::Slope::Positive, Dso::Slope::Both > SlopeEnum;
 Enum< Dso::GraphFormat, Dso::GraphFormat::TY, Dso::GraphFormat::XY > GraphFormatEnum;
 
@@ -42,12 +42,12 @@ QString couplingString( Coupling coupling ) {
 /// \return The string that should be used in labels etc.
 QString triggerModeString( TriggerMode mode ) {
     switch ( mode ) {
+    case TriggerMode::ROLL:
+        return QCoreApplication::tr( "Roll" );
     case TriggerMode::AUTO:
         return QCoreApplication::tr( "Auto" );
     case TriggerMode::NORMAL:
         return QCoreApplication::tr( "Normal" );
-    case TriggerMode::NONE:
-        return QCoreApplication::tr( "None" );
     case TriggerMode::SINGLE:
         return QCoreApplication::tr( "Single" );
     }

openhantek/src/hantekdso/enums.h

@@ -33,12 +33,12 @@ enum class Coupling {
 /// \enum TriggerMode
 /// \brief The different triggering modes.
 enum class TriggerMode {
-    NONE,   ///< Free running without any trigger
+    ROLL,   ///< Free running without any trigger
     AUTO,   ///< Automatic without trigger event
     NORMAL, ///< Normal hardware trigger (or software trigger) mode
     SINGLE  ///< Stop after the first trigger event
 };          // <class T, T first, T last>
-extern Enum< Dso::TriggerMode, Dso::TriggerMode::NONE, Dso::TriggerMode::SINGLE > TriggerModeEnum;
+extern Enum< Dso::TriggerMode, Dso::TriggerMode::ROLL, Dso::TriggerMode::SINGLE > TriggerModeEnum;
 
 /// \enum Slope
 /// \brief The slope that causes a trigger.