Merge pull request #226 from TobinHall/pr-little_endian_float

Add support for Little Endian Floats
This commit is contained in:
Collin Kidder
2019-12-11 19:00:29 -05:00
committed by GitHub
3 changed files with 14 additions and 8 deletions
+2 -2
View File
@@ -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 //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 //a 32 bit single precision float. That's evil incarnate but it is very fast and small
//in terms of new code. //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; endResult = (*((float *)(&result)) * factor) + bias;
} }
else //double precision float 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 //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. //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; endResult = (*((double *)(&result)) * factor) + bias;
} }
+12 -2
View File
@@ -465,6 +465,14 @@ DBC_SIGNAL* DBCFile::parseSignalLine(QString line, DBC_MESSAGE *msg)
case 4: case 4:
sig.valType = STRING; sig.valType = STRING;
break; break;
case 5: //single point float in little endian
sig.valType = SP_FLOAT;
sig.intelByteOrder = true;
break;
case 6: //double point float in little endian
sig.valType = DP_FLOAT;
sig.intelByteOrder = true;
break;
} }
sig.factor = match.captured(6 + offset).toDouble(); sig.factor = match.captured(6 + offset).toDouble();
sig.bias = match.captured(7 + offset).toDouble(); sig.bias = match.captured(7 + offset).toDouble();
@@ -1230,10 +1238,12 @@ void DBCFile::saveFile(QString fileName)
else msgOutput.append("0-"); else msgOutput.append("0-");
break; break;
case SP_FLOAT: case SP_FLOAT:
msgOutput.append("2-"); if (sig->intelByteOrder) msgOutput.append("5-");
else msgOutput.append("2-");
break; break;
case DP_FLOAT: case DP_FLOAT:
msgOutput.append("3-"); if (sig->intelByteOrder) msgOutput.append("6-");
else msgOutput.append("3-");
break; break;
case STRING: case STRING:
msgOutput.append("4-"); msgOutput.append("4-");
-4
View File
@@ -49,8 +49,6 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) :
{ {
if (currentSignal == nullptr) return; if (currentSignal == nullptr) return;
currentSignal->intelByteOrder = ui->cbIntelFormat->isChecked(); currentSignal->intelByteOrder = ui->cbIntelFormat->isChecked();
if (currentSignal->valType == SP_FLOAT || currentSignal->valType == DP_FLOAT)
currentSignal->intelByteOrder = false;
fillSignalForm(currentSignal); fillSignalForm(currentSignal);
}); });
@@ -74,13 +72,11 @@ DBCSignalEditor::DBCSignalEditor(QWidget *parent) :
break; break;
case 2: case 2:
currentSignal->valType = SP_FLOAT; currentSignal->valType = SP_FLOAT;
currentSignal->intelByteOrder = false;
if (currentSignal->startBit > 39) currentSignal->startBit = 39; if (currentSignal->startBit > 39) currentSignal->startBit = 39;
currentSignal->signalSize = 32; currentSignal->signalSize = 32;
break; break;
case 3: case 3:
currentSignal->valType = DP_FLOAT; currentSignal->valType = DP_FLOAT;
currentSignal->intelByteOrder = false;
currentSignal->startBit = 7; //has to be! currentSignal->startBit = 7; //has to be!
currentSignal->signalSize = 64; currentSignal->signalSize = 64;
break; break;