Removing limitations to allow for floating point endianess

pawel-modine · Dec 10, 2019 · 67fd771 · 67fd771
1 parent 14d0bb7
commit 67fd771
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/dbc/dbc_classes.cpp b/dbc/dbc_classes.cpp
@@ -79,7 +79,7 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString, bool o
         //that the bytes that make up the integer are instead treated as having made up
         //a 32 bit single precision float. That's evil incarnate but it is very fast and small
         //in terms of new code.
-        result = Utility::processIntegerSignal(frame.data, startBit, 32, false, false);
+        result = Utility::processIntegerSignal(frame.data, startBit, 32, intelByteOrder, false);
         endResult = (*((float *)(&result)) * factor) + bias;
     }
     else //double precision float
@@ -91,7 +91,7 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString, bool o
         }
         //like the above, this is rotten and evil and wrong in so many ways. Force
         //calculation of a 64 bit integer and then cast it into a double.
-        result = Utility::processIntegerSignal(frame.data, 0, 64, false, false);
+        result = Utility::processIntegerSignal(frame.data, 0, 64, intelByteOrder, false);
         endResult = (*((double *)(&result)) * factor) + bias;
     }
 

diff --git a/dbc/dbcsignaleditor.cpp b/dbc/dbcsignaleditor.cpp
@@ -49,8 +49,6 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) :
             {
                 if (currentSignal == nullptr) return;
                 currentSignal->intelByteOrder = ui->cbIntelFormat->isChecked();
-                if (currentSignal->valType == SP_FLOAT || currentSignal->valType == DP_FLOAT)
-                    currentSignal->intelByteOrder = false;
                 fillSignalForm(currentSignal);
             });
 
@@ -74,13 +72,11 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) :
                     break;
                 case 2:
                     currentSignal->valType = SP_FLOAT;
-                    currentSignal->intelByteOrder = false;
                     if (currentSignal->startBit > 39) currentSignal->startBit = 39;
                     currentSignal->signalSize = 32;
                     break;
                 case 3:
                     currentSignal->valType = DP_FLOAT;
-                    currentSignal->intelByteOrder = false;
                     currentSignal->startBit = 7; //has to be!
                     currentSignal->signalSize = 64;
                     break;