Skip to content

Commit bcee6a6

Browse files
pierremolinaropierremolinaro
committed
Removing data table generation, causes crashes (?)
1 parent 1e133c4 commit bcee6a6

File tree

1 file changed

+74
-75
lines changed

1 file changed

+74
-75
lines changed

‎src/CANFDMolinaroAnalyzer.cpp

Lines changed: 74 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Analyzer2 (),
1414
mSettings (new CANFDMolinaroAnalyzerSettings ()),
1515
mSimulationInitialized (false) {
1616
SetAnalyzerSettings (mSettings.get()) ;
17-
UseFrameV2 () ;
17+
// UseFrameV2 () ;
1818
}
1919

2020
//--------------------------------------------------------------------------------------------------
@@ -710,80 +710,79 @@ void CANFDMolinaroAnalyzer::addBubble (const U8 inBubbleType,
710710
const U64 endSampleNumber = inBitCenterSampleNumber + mCurrentSamplesPerBit / 2 ;
711711
frame.mEndingSampleInclusive = endSampleNumber ;
712712
mResults->AddFrame (frame) ;
713-
// mResults->CommitResults () ;
714-
715-
FrameV2 frameV2 ;
716-
switch (inBubbleType) {
717-
case STANDARD_IDENTIFIER_FIELD_RESULT :
718-
{ const U8 idf [2] = { U8 (inData1 >> 8), U8 (inData1) } ;
719-
frameV2.AddByteArray ("Value", idf, 2) ;
720-
mResults->AddFrameV2 (frameV2, "Std Idf", mStartOfFieldSampleNumber, endSampleNumber) ;
721-
}
722-
break ;
723-
case EXTENDED_IDENTIFIER_FIELD_RESULT :
724-
{ const U8 idf [4] = {
725-
U8 (inData1 >> 24), U8 (inData1 >> 16), U8 (inData1 >> 8), U8 (inData1)
726-
} ;
727-
frameV2.AddByteArray ("Value", idf, 4) ;
728-
mResults->AddFrameV2 (frameV2, "Ext Idf", mStartOfFieldSampleNumber, endSampleNumber) ;
729-
}
730-
break ;
731-
case CAN20B_CONTROL_FIELD_RESULT :
732-
frameV2.AddByte ("Value", inData1) ;
733-
mResults->AddFrameV2 (frameV2, "Ctrl", mStartOfFieldSampleNumber, endSampleNumber) ;
734-
break ;
735-
case CANFD_CONTROL_FIELD_RESULT :
736-
{ frameV2.AddByte ("Value", inData1) ;
737-
std::stringstream str ;
738-
str << "Ctrl (FDF" ;
739-
if ((inData2 & 1) != 0) {
740-
str << ", BRS" ;
741-
}
742-
if ((inData2 & 2) != 0) {
743-
str << ", ESI" ;
744-
}
745-
str << ")" ;
746-
mResults->AddFrameV2 (frameV2, str.str ().c_str (), mStartOfFieldSampleNumber, endSampleNumber) ;
747-
}
748-
break ;
749-
case DATA_FIELD_RESULT :
750-
{ frameV2.AddByte ("Value", inData1) ;
751-
std::stringstream str ;
752-
str << "D" << inData2 ;
753-
mResults->AddFrameV2 (frameV2, str.str ().c_str (), mStartOfFieldSampleNumber, endSampleNumber) ;
754-
}
755-
break ;
756-
case CRC15_FIELD_RESULT :
757-
{ const U8 crc [2] = { U8 (inData1 >> 8), U8 (inData1) } ;
758-
frameV2.AddByteArray ("Value", crc, 2) ;
759-
mResults->AddFrameV2 (frameV2, "CRC15", mStartOfFieldSampleNumber, endSampleNumber) ;
760-
}
761-
break ;
762-
case CRC17_FIELD_RESULT :
763-
{ const U8 crc [3] = { U8 (inData1 >> 16), U8 (inData1 >> 8), U8 (inData1) } ;
764-
frameV2.AddByteArray ("Value", crc, 3) ;
765-
mResults->AddFrameV2 (frameV2, "CRC17", mStartOfFieldSampleNumber, endSampleNumber) ;
766-
}
767-
break ;
768-
case CRC21_FIELD_RESULT :
769-
{ const U8 crc [3] = { U8 (inData1 >> 16), U8 (inData1 >> 8), U8 (inData1) } ;
770-
frameV2.AddByteArray ("Value", crc, 3) ;
771-
mResults->AddFrameV2 (frameV2, "CRC21", mStartOfFieldSampleNumber, endSampleNumber) ;
772-
}
773-
break ;
774-
case ACK_FIELD_RESULT :
775-
mResults->AddFrameV2 (frameV2, "ACK", mStartOfFieldSampleNumber, endSampleNumber) ;
776-
break ;
777-
case EOF_FIELD_RESULT :
778-
mResults->AddFrameV2 (frameV2, "EOF", mStartOfFieldSampleNumber, endSampleNumber) ;
779-
break ;
780-
case INTERMISSION_FIELD_RESULT :
781-
mResults->AddFrameV2 (frameV2, "IFS", mStartOfFieldSampleNumber, endSampleNumber) ;
782-
break ;
783-
case CAN_ERROR_RESULT :
784-
mResults->AddFrameV2 (frameV2, "Error", mStartOfFieldSampleNumber, endSampleNumber) ;
785-
break ;
786-
}
713+
714+
// FrameV2 frameV2 ;
715+
// switch (inBubbleType) {
716+
// case STANDARD_IDENTIFIER_FIELD_RESULT :
717+
// { const U8 idf [2] = { U8 (inData1 >> 8), U8 (inData1) } ;
718+
// frameV2.AddByteArray ("Value", idf, 2) ;
719+
// mResults->AddFrameV2 (frameV2, "Std Idf", mStartOfFieldSampleNumber, endSampleNumber) ;
720+
// }
721+
// break ;
722+
// case EXTENDED_IDENTIFIER_FIELD_RESULT :
723+
// { const U8 idf [4] = {
724+
// U8 (inData1 >> 24), U8 (inData1 >> 16), U8 (inData1 >> 8), U8 (inData1)
725+
// } ;
726+
// frameV2.AddByteArray ("Value", idf, 4) ;
727+
// mResults->AddFrameV2 (frameV2, "Ext Idf", mStartOfFieldSampleNumber, endSampleNumber) ;
728+
// }
729+
// break ;
730+
// case CAN20B_CONTROL_FIELD_RESULT :
731+
// frameV2.AddByte ("Value", inData1) ;
732+
// mResults->AddFrameV2 (frameV2, "Ctrl", mStartOfFieldSampleNumber, endSampleNumber) ;
733+
// break ;
734+
// case CANFD_CONTROL_FIELD_RESULT :
735+
// { frameV2.AddByte ("Value", inData1) ;
736+
// std::stringstream str ;
737+
// str << "Ctrl (FDF" ;
738+
// if ((inData2 & 1) != 0) {
739+
// str << ", BRS" ;
740+
// }
741+
// if ((inData2 & 2) != 0) {
742+
// str << ", ESI" ;
743+
// }
744+
// str << ")" ;
745+
// mResults->AddFrameV2 (frameV2, str.str ().c_str (), mStartOfFieldSampleNumber, endSampleNumber) ;
746+
// }
747+
// break ;
748+
// case DATA_FIELD_RESULT :
749+
// { frameV2.AddByte ("Value", inData1) ;
750+
// std::stringstream str ;
751+
// str << "D" << inData2 ;
752+
// mResults->AddFrameV2 (frameV2, str.str ().c_str (), mStartOfFieldSampleNumber, endSampleNumber) ;
753+
// }
754+
// break ;
755+
// case CRC15_FIELD_RESULT :
756+
// { const U8 crc [2] = { U8 (inData1 >> 8), U8 (inData1) } ;
757+
// frameV2.AddByteArray ("Value", crc, 2) ;
758+
// mResults->AddFrameV2 (frameV2, "CRC15", mStartOfFieldSampleNumber, endSampleNumber) ;
759+
// }
760+
// break ;
761+
// case CRC17_FIELD_RESULT :
762+
// { const U8 crc [3] = { U8 (inData1 >> 16), U8 (inData1 >> 8), U8 (inData1) } ;
763+
// frameV2.AddByteArray ("Value", crc, 3) ;
764+
// mResults->AddFrameV2 (frameV2, "CRC17", mStartOfFieldSampleNumber, endSampleNumber) ;
765+
// }
766+
// break ;
767+
// case CRC21_FIELD_RESULT :
768+
// { const U8 crc [3] = { U8 (inData1 >> 16), U8 (inData1 >> 8), U8 (inData1) } ;
769+
// frameV2.AddByteArray ("Value", crc, 3) ;
770+
// mResults->AddFrameV2 (frameV2, "CRC21", mStartOfFieldSampleNumber, endSampleNumber) ;
771+
// }
772+
// break ;
773+
// case ACK_FIELD_RESULT :
774+
// mResults->AddFrameV2 (frameV2, "ACK", mStartOfFieldSampleNumber, endSampleNumber) ;
775+
// break ;
776+
// case EOF_FIELD_RESULT :
777+
// mResults->AddFrameV2 (frameV2, "EOF", mStartOfFieldSampleNumber, endSampleNumber) ;
778+
// break ;
779+
// case INTERMISSION_FIELD_RESULT :
780+
// mResults->AddFrameV2 (frameV2, "IFS", mStartOfFieldSampleNumber, endSampleNumber) ;
781+
// break ;
782+
// case CAN_ERROR_RESULT :
783+
// mResults->AddFrameV2 (frameV2, "Error", mStartOfFieldSampleNumber, endSampleNumber) ;
784+
// break ;
785+
// }
787786

788787
mResults->CommitResults () ;
789788
ReportProgress (frame.mEndingSampleInclusive) ;

0 commit comments

Comments
 (0)