update manual and fixes

Signed-off-by: Dylan Gardham <[email protected]>
OpenHantek · Nov 28, 2024 · 21c413c · 21c413c
1 parent 2a9f0c9
commit 21c413c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/OpenHantek6022_User_Manual.odt b/docs/OpenHantek6022_User_Manual.odt
diff --git a/openhantek/src/hantekdso/mathchannel.cpp b/openhantek/src/hantekdso/mathchannel.cpp
@@ -98,14 +98,14 @@ void MathChannel::calculate( DSOsamples &result ) {
         case Dso::MathMode::GREAT_CH1_CH2:
             // logic values: above / below trigger level
             for ( auto it = mathChannel.begin(), end = mathChannel.end(); it != end; ++it, ++ch1Iterator, ++ch2Iterator )
-                *it = ( ( *ch1Iterator >= scope->voltage[ CH1 ].trigger ) > ( *ch2Iterator >= scope->voltage[ CH2 ].trigger )
+                *it = ( ( *ch1Iterator ) > ( *ch2Iterator )
                             ? 1.0
                             : 0.0 );
             break;
         case Dso::MathMode::GREAT_CH2_CH1:
             // logic values: above / below trigger level
             for ( auto it = mathChannel.begin(), end = mathChannel.end(); it != end; ++it, ++ch1Iterator, ++ch2Iterator )
-                *it = ( ( *ch2Iterator >= scope->voltage[ CH2 ].trigger ) > ( *ch1Iterator >= scope->voltage[ CH1 ].trigger )
+                *it = ( ( *ch2Iterator ) > ( *ch1Iterator )
                             ? 1.0
                             : 0.0 );
             break;

diff --git a/openhantek/src/hantekdso/mathmodes.cpp b/openhantek/src/hantekdso/mathmodes.cpp
@@ -52,7 +52,7 @@ QString mathModeString( MathMode mode ) {
     case MathMode::GREAT_CH1_CH2:
         return QCoreApplication::tr( "CH1 > CH2" );
     case MathMode::GREAT_CH2_CH1:
-        return QCoreApplication::tr( "CH2 < CH1" );
+        return QCoreApplication::tr( "CH2 > CH1" );
     case MathMode::LP10_CH1:
         return QCoreApplication::tr( "CH1 LP10" );
     case MathMode::LP10_CH2: