t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New version number, synched to upgraded GVRET version. Some fixes to make file comparator window work better. Add ability to enter single wire mode from SavvyCAN. Add continuous comm validation to SavvyCAN. It will now continuously make sure the connection seems to be viable and try to reconnect if things went south.

Browse Source
This commit is contained in:
Collin Kidder
2015-07-28 21:29:31 -04:00
parent b8bd058f40
commit fc470ade58
7 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filecomparatorwindow.cpp
+17 -5
View File
@@ -116,8 +116,14 @@ void FileComparatorWindow::calculateDetails()
//it would be possible to implement a constructor for FrameData
//that sets the bitmap and values to zero. That would be cleaner and better.
newData->bitmap = 0;
//C++ arrays take the form of a single memory block so zap the whole block at once
memset(newData->values, 0, 256 * 8);
for (int x = 0; x < 8; x++)
{
for (int y = 0; y < 256; y++)
{
newData->values[x][y] = 0;
}
}
//memset(newData->values, 0, 256 * 8);
for (int y = 0; y < frame.len; y++)
{
newData->values[y][frame.data[y]] = 1;
@@ -144,7 +150,14 @@ void FileComparatorWindow::calculateDetails()
newData->ID = frame.ID;
newData->dataLen = frame.len;
newData->bitmap = 0;
memset(newData->values, 0, 256 * 8);
for (int x = 0; x < 8; x++)
{
for (int y = 0; y < 256; y++)
{
newData->values[x][y] = 0;
}
}
//memset(newData->values, 0, 256 * 8);
for (int y = 0; y < frame.len; y++)
{
newData->values[y][frame.data[y]] = 1;
@@ -185,7 +198,7 @@ void FileComparatorWindow::calculateDetails()
sharedItem->addChild(bitmapBaseSecond);
//first up, which bits were set in one file but not the other
for (int b = 0; b < 64; b++)
for (int b = 0; b < (8 * first.dataLen); b++)
{
detail = new QTreeWidgetItem();
detail->setText(0, QString::number(b) + " (" + QString::number(b / 8) + ":" + QString::number(b % 8) + ")");
@@ -251,7 +264,6 @@ void FileComparatorWindow::calculateDetails()
{
ui->treeDetails->expandAll();
}
}
void FileComparatorWindow::saveDetails()