Removed mAddressDisplay

saleae · Aug 7, 2020 · 582cfb8 · 582cfb8
1 parent 4228ee1
commit 582cfb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 43 deletions.
diff --git a/src/I2cAnalyzerResults.cpp b/src/I2cAnalyzerResults.cpp
@@ -34,18 +34,7 @@ void I2cAnalyzerResults::GenerateBubbleText( U64 frame_index, Channel& /*channel
     if( frame.mType == I2cAddress )
     {
         char number_str[ 128 ];
-        switch( mSettings->mAddressDisplay )
-        {
-        case NO_DIRECTION_7:
-            AnalyzerHelpers::GetNumberString( frame.mData1 >> 1, display_base, 7, number_str, 128 );
-            break;
-        case NO_DIRECTION_8:
-            AnalyzerHelpers::GetNumberString( frame.mData1 & 0xFE, display_base, 8, number_str, 128 );
-            break;
-        case YES_DIRECTION_8:
-            AnalyzerHelpers::GetNumberString( frame.mData1, display_base, 8, number_str, 128 );
-            break;
-        }
+        AnalyzerHelpers::GetNumberString( frame.mData1 >> 1, display_base, 7, number_str, 128 );
 
         I2cDirection direction;
         if( ( frame.mData1 & 0x1 ) != 0 )
@@ -127,18 +116,7 @@ void I2cAnalyzerResults::GenerateExportFile( const char* file, DisplayBase displ
 
         if( frame.mType == I2cAddress )
         {
-            switch( mSettings->mAddressDisplay )
-            {
-            case NO_DIRECTION_7:
-                AnalyzerHelpers::GetNumberString( frame.mData1 >> 1, display_base, 7, address, 128 );
-                break;
-            case NO_DIRECTION_8:
-                AnalyzerHelpers::GetNumberString( frame.mData1 & 0xFE, display_base, 8, address, 128 );
-                break;
-            case YES_DIRECTION_8:
-                AnalyzerHelpers::GetNumberString( frame.mData1, display_base, 8, address, 128 );
-                break;
-            }
+            AnalyzerHelpers::GetNumberString( frame.mData1 >> 1, display_base, 7, address, 128 );
             if( ( frame.mData1 & 0x1 ) != 0 )
                 snprintf( rw, sizeof( rw ), "Read" );
             else
@@ -219,18 +197,7 @@ void I2cAnalyzerResults::GenerateFrameTabularText( U64 frame_index, DisplayBase
     if( frame.mType == I2cAddress )
     {
         char number_str[ 128 ];
-        switch( mSettings->mAddressDisplay )
-        {
-        case NO_DIRECTION_7:
-            AnalyzerHelpers::GetNumberString( frame.mData1 >> 1, display_base, 7, number_str, 128 );
-            break;
-        case NO_DIRECTION_8:
-            AnalyzerHelpers::GetNumberString( frame.mData1 & 0xFE, display_base, 8, number_str, 128 );
-            break;
-        case YES_DIRECTION_8:
-            AnalyzerHelpers::GetNumberString( frame.mData1, display_base, 8, number_str, 128 );
-            break;
-        }
+        AnalyzerHelpers::GetNumberString( frame.mData1 >> 1, display_base, 7, number_str, 128 );
 
         I2cDirection direction;
         if( ( frame.mData1 & 0x1 ) != 0 )

diff --git a/src/I2cAnalyzerSettings.cpp b/src/I2cAnalyzerSettings.cpp
@@ -4,7 +4,7 @@
 #include <cstring>
 
 I2cAnalyzerSettings::I2cAnalyzerSettings()
-    : mSdaChannel( UNDEFINED_CHANNEL ), mSclChannel( UNDEFINED_CHANNEL ), mAddressDisplay( NO_DIRECTION_7 )
+    : mSdaChannel( UNDEFINED_CHANNEL ), mSclChannel( UNDEFINED_CHANNEL )
 {
     mSdaChannelInterface.reset( new AnalyzerSettingInterfaceChannel() );
     mSdaChannelInterface->SetTitleAndTooltip( "SDA", "Serial Data Line" );
@@ -61,7 +61,6 @@ void I2cAnalyzerSettings::LoadSettings( const char* settings )
 
     text_archive >> mSdaChannel;
     text_archive >> mSclChannel;
-    text_archive >> *( U32* )&mAddressDisplay;
 
     ClearChannels();
     AddChannel( mSdaChannel, "SDA", true );
@@ -77,7 +76,6 @@ const char* I2cAnalyzerSettings::SaveSettings()
     text_archive << "SaleaeI2CAnalyzer";
     text_archive << mSdaChannel;
     text_archive << mSclChannel;
-    text_archive << mAddressDisplay;
 
     return SetReturnString( text_archive.GetString() );
 }

diff --git a/src/I2cAnalyzerSettings.h b/src/I2cAnalyzerSettings.h
@@ -36,10 +36,6 @@ class I2cAnalyzerSettings : public AnalyzerSettings
 
     Channel mSdaChannel;
     Channel mSclChannel;
-    enum AddressDisplay mAddressDisplay
-    {
-        NO_DIRECTION_7
-    };
 
   protected:
     std::auto_ptr<AnalyzerSettingInterfaceChannel> mSdaChannelInterface;