Skip to content

Fix sample index and label handling #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix sample index and label handling #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fd4a94
Fix sample index handling
evan-a-a Feb 9, 2024
e016e5f
Fix end of transaction sample accounting
evan-a-a Feb 9, 2024
ce4ebfc
Cleanup sample labeling errors
evan-a-a Feb 12, 2024
f82d89f
Merge branch 'master' into bug/sample_index
AddioElectronics Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/QSpiAnalyzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ void QSpiAnalyzer::GetBlock()

Frame result_frame;
result_frame.mStartingSampleInclusive = first_sample;
result_frame.mEndingSampleInclusive = WouldAdvancingTheClockToggleEnable () ? mCs->GetSampleOfNextEdge() : mSck->GetSampleOfNextEdge();
result_frame.mEndingSampleInclusive = mSck->GetSampleNumber();
result_frame.mData1 = data_word;
result_frame.mFlags = 0;
result_frame.mType = (U8)mTransactionState;
Expand Down Expand Up @@ -430,7 +430,7 @@ void QSpiAnalyzer::GetDummyBlock()

Frame result_frame;
result_frame.mStartingSampleInclusive = first_sample;
result_frame.mEndingSampleInclusive = WouldAdvancingTheClockToggleEnable() ? mSck->GetSampleNumber() : mSck->GetSampleOfNextEdge();
result_frame.mEndingSampleInclusive = mSck->GetSampleNumber();
result_frame.mData1 = 0;
result_frame.mFlags = 0;
result_frame.mType = (U8)mTransactionState;
Expand Down
33 changes: 12 additions & 21 deletions src/QSpiAnalyzerResults.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@ void QSpiAnalyzerResults::GenerateBubbleText(U64 frame_index, Channel &channel,
U32 bit_count = GetStateBitCount(mSettings, transaction_state);
U32 clock_count = GetStateClockCount(mSettings, transaction_state, data_lines);

char number_str[128];
char result_str[128];
char number_str[128] = { 0 };
char result_str[128] = { 0 };

if (frame.mType == QSpiTypes::DUMMY_STATE)
{
AddResultString("X");
AddResultString("Dummy");
data_index = 0;
return;
}
else
{
Expand All @@ -65,12 +66,9 @@ void QSpiAnalyzerResults::GenerateBubbleText(U64 frame_index, Channel &channel,
AddResultString(number_str);
snprintf(result_str, sizeof(result_str), "Data: %s", number_str);
AddResultString(result_str);
snprintf(result_str, sizeof(result_str), "Data %d: %s", data_index++, number_str);
break;
}



}
AddResultString(result_str);
}
Expand Down Expand Up @@ -101,21 +99,21 @@ void QSpiAnalyzerResults::GenerateExportFile(const char *file, DisplayBase displ
continue;
}

char time_str[128];
AnalyzerHelpers::GetTimeString(frame.mStartingSampleInclusive, trigger_sample, sample_rate, time_str, 128);
char time_str[128] = { 0 };
AnalyzerHelpers::GetTimeString(frame.mStartingSampleInclusive, trigger_sample, sample_rate, time_str, sizeof(time_str));

char data_str[128] = "";
char data_str[128] = { 0 };

QSpiTypes::TransactionState transaction_state = (QSpiTypes::TransactionState)frame.mType;
QSpiTypes::IOMode data_lines = GetIOMode(mSettings, transaction_state);
U32 bit_count = GetStateBitCount(mSettings, transaction_state);
U32 clock_count = GetStateClockCount(mSettings, transaction_state, data_lines);

if (frame.mType == QSpiTypes::DUMMY_STATE){
strcpy(data_str, "Dummy");
strncpy(data_str, "Dummy", sizeof(data_str));
}
else{
AnalyzerHelpers::GetNumberString(frame.mData1, display_base, bit_count, data_str, 128);
AnalyzerHelpers::GetNumberString(frame.mData1, display_base, bit_count, data_str, sizeof(data_str));
}

U64 packet_id = GetPacketContainingFrameSequential(i);
Expand Down Expand Up @@ -144,7 +142,7 @@ void QSpiAnalyzerResults::GenerateFrameTabularText(U64 frame_index, DisplayBase
Frame frame = GetFrame(frame_index);


char data_str[128];
char data_str[128] = { 0 };
QSpiTypes::TransactionState transaction_state = (QSpiTypes::TransactionState)frame.mType;
QSpiTypes::IOMode data_lines = GetIOMode(mSettings, transaction_state);
U32 bit_count = GetStateBitCount(mSettings, transaction_state);
Expand All @@ -157,16 +155,11 @@ void QSpiAnalyzerResults::GenerateFrameTabularText(U64 frame_index, DisplayBase
if (frame.mType != QSpiTypes::DATA_STATE && data_index > 0)
{
data_index = 0;
/*ss << " ";
AddTabularText(ss.str().c_str());
ss.clear();*/
}

if (frame.mType == QSpiTypes::DUMMY_STATE)
{
/*ss << "Dummy: ";
strcpy(data_str, "(Dummy)");*/
sprintf(data_str, "(Dummy) %d bits", bit_count);
snprintf(data_str, sizeof(data_str), "(Dummy) %d bits", bit_count);
}
else
{
Expand All @@ -179,13 +172,11 @@ void QSpiAnalyzerResults::GenerateFrameTabularText(U64 frame_index, DisplayBase
ss << "Addr: ";
break;
case QSpiTypes::DATA_STATE:
sprintf(data_str, "Data %d: ", data_index++);
//ss << "Data: ";
ss << data_str;
snprintf(data_str, sizeof(data_str), "Data %d: ", data_index++);
break;
}

AnalyzerHelpers::GetNumberString(frame.mData1, display_base, bit_count, data_str, 128);
AnalyzerHelpers::GetNumberString(frame.mData1, display_base, bit_count, data_str, sizeof(data_str));
}

ss << data_str;
Expand Down