slow mode finetuning

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 "20200614 build 703"
+#define OH_BUILD "20200615 build 704"

openhantek/src/hantekdso/capturing.cpp

@@ -167,8 +167,6 @@ unsigned Capturing::getDemoSamples() {
     static int counter = 0;
     unsigned received = 0;
     timestampDebug( QString( "Request dummy packet %1: %2" ).arg( tag ).arg( rawSamplesize ) );
-    dp->resize( rawSamplesize, 0x80 );
-    auto end = dp->end();
     int deltaT = 99;
     // deltaT (=99) defines the frequency of the dummy signals:
     // ch1 = 1 kHz and ch2 = 500 Hz
@@ -178,7 +176,11 @@ unsigned Capturing::getDemoSamples() {
     // adapt demo samples for high sample rates >10 MS/s
     if ( samplerate > 10e6 )
         deltaT = int( round( deltaT * samplerate / 10e6 ) );
-    int block = 0;
+    const unsigned packetLength = 512 * 78; // 50 blocks for one screen width of 20000
+    unsigned block = 0;
+    dp->resize( rawSamplesize, 0x80 );
+    auto end = dp->end();
+    unsigned packet = 0;
     for ( auto it = dp->begin(); it != end; ++it ) {
         if ( ++counter >= deltaT ) {
             counter = 0;
@@ -193,15 +195,16 @@ unsigned Capturing::getDemoSamples() {
             *++it = ch2;
             ++received;
         }
-        if ( ++block >= 1024 ) {
+        if ( ( block += channels ) >= packetLength ) {
+            ++packet;
             block = 0;
-            QThread::usleep( unsigned( 1024 * 1e6 / samplerate ) );
+            if ( realSlow ) // clear next block as visible hint where we are
+                std::for_each( it, qMin( it + packetLength, end ), []( uint8_t &d ) { d = 0x80; } );
+            QThread::usleep( unsigned( 1e6 * packetLength / channels / samplerate ) );
             if ( !hdc->capturing || hdc->scopeDevice->hasStopped() )
                 break;
         }
     }
-    // qDebug() << unsigned( rawSamplesize * 1000.0 / samplerate / channels );
-    // QThread::msleep( unsigned( rawSamplesize * 1000.0 / samplerate / channels ) );
-    timestampDebug( QString( "Received dummy packet %1: %2" ).arg( tag ).arg( rawSamplesize ) );
+    timestampDebug( QString( "Received dummy packet %1: %2" ).arg( packet ).arg( rawSamplesize ) );
     return received;
 }

openhantek/src/hantekdso/models/modelDSO6022.cpp

@@ -107,8 +107,8 @@ static void initSpecifications( Dso::ControlSpecification &specification ) {
 
     specification.fixedSampleRates = {
         // samplerate, sampleId, downsampling
-        {200, 102, 100},  // very slow! 100x downsampling from 20, 50 kS/s
-        {500, 105, 100},  // very slow!
+        {200, 102, 100},  // very slow! 100x downsampling from 20 kS/s
+        {500, 105, 100},  // very slow! 100x downsampling from 50 kS/s
         {1e3, 110, 100},  // slow! 100x downsampling from 100, 200, 500 kS/s
         {2e3, 120, 100},  // slow!
         {5e3, 150, 100},  // slow!

openhantek/src/usb/scopedevice.cpp

@@ -220,13 +220,11 @@ int ScopeDevice::bulkTransfer( unsigned char endpoint, const unsigned char *data
 int ScopeDevice::bulkReadMulti( unsigned char *data, unsigned length, bool bigBlock, int attempts ) {
     if ( !handle )
         return LIBUSB_ERROR_NO_DEVICE;
-    const unsigned packetLength = 512 * 128;
     int retCode = 0;
     // printf("USBDevice::bulkReadMulti( %d )\n", length );
     if ( bigBlock ) {
         // more stable if fast data is read as one big block (up to 4 MB)
         retCode = bulkTransfer( HANTEK_EP_IN, data, length, attempts, HANTEK_TIMEOUT_MULTI * length / inPacketLength );
-        QWriteLocker locker( &lock );
         if ( retCode < 0 )
             received = 0;
         else
@@ -235,28 +233,26 @@ int ScopeDevice::bulkReadMulti( unsigned char *data, unsigned length, bool bigBl
         return retCode;
     } else {
         // slow data is read in smaller chunks -> quick screen update
+        const unsigned packetLength = 512 * 78; // 50 blocks for one screen width of 20000
         retCode = int( packetLength );
         unsigned int packet;
-        {
-            QWriteLocker locker( &lock );
-            received = 0;
-        }
+        received = 0;
         for ( packet = 0; unsigned( received ) < length && retCode == int( packetLength ); ++packet ) {
             if ( hasStopped() )
                 break;
             retCode = bulkTransfer( HANTEK_EP_IN, data + packet * packetLength, qMin( length - unsigned( received ), packetLength ),
                                     attempts, HANTEK_TIMEOUT_MULTI * 10 );
-            if ( ( packet + 1 ) * packetLength < length ) { // clear the next+1 packet
-                unsigned char *dp = data + ( packet + 1 ) * packetLength;
-                for ( unsigned iii = ( packet + 1 ) * packetLength; iii < qMin( ( packet + 2 ) * packetLength, length ); ++iii )
-                    *dp++ = 0x80;
-            }
-            if ( retCode > 0 ) {
-                QWriteLocker locker( &lock );
+            unsigned next = ( packet + 1 ) * packetLength;
+            if ( next > length )
+                next = 0;
+            unsigned char *dp = data + next;
+            unsigned end = qMin( next + packetLength, length );
+            for ( unsigned iii = next; iii < end; ++iii )
+                *dp++ = 0x80;
+            if ( retCode > 0 )
                 received += unsigned( retCode );
-            }
         }
-        // printf( "total packets: %d, received: %d\n", packet + 1, received );
+        // printf( "total packets: %d, received: %d\n", packet, received );
         if ( received > 0 )
             retCode = int( received );
         return retCode;

openhantek/src/usb/scopedevice.h

@@ -48,13 +48,6 @@ class ScopeDevice : public QObject {
     bool isRealHW() const { return realHW; }
     bool isDemoDevice() const { return !realHW; }
 
-    /// \brief the number of samples in the buffer
-    unsigned hasReceived() const {
-        QReadLocker locker( &lock );
-        printf( "hasReceived: %u\n", received );
-        return received;
-    }
-
     /// \brief Stop a long running (interruptable) bulk transfer
     void stopSampling() { stopTransfer = true; }
 
@@ -193,8 +186,6 @@ class ScopeDevice : public QObject {
     bool realHW = true;
     bool stopTransfer = false;
     unsigned received = 0;
-    mutable QReadWriteLock lock;
-
 
   signals:
     void deviceDisconnected(); ///< The device has been disconnected

openhantek/src/viewconstants.h

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#define DIVS_TIME 10.0 ///< Number of horizontal screen divs
-
+#define DIVS_TIME 10.0   ///< Number of horizontal screen divs
 #define DIVS_VOLTAGE 8.0 ///< Number of vertical screen divs
 #define DIVS_SUB 5       ///< Number of sub-divisions per div