noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for composite log not tracking time correctly after last commit

This commit is contained in:
Josh Stewart 2020-08-22 21:47:46 +10:00
parent 21063a60ff
commit e68ab5f285
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
speeduino/comms.h
View File

@ -36,6 +36,7 @@ int valueOffset; /**< THe memory offset within a given page for a value to be re
byte tsCanId = 0; // current tscanid requested
byte inProgressOffset;
byte inProgressLength;
uint32_t inProgressCompositeTime;
bool serialInProgress = false;
bool toothLogSendInProgress = false;
bool compositeLogSendInProgress = false;

13
speeduino/comms.ino
View File

@ -1859,7 +1859,7 @@ void sendCompositeLog(byte startOffset)
{
if (BIT_CHECK(currentStatus.status1, BIT_STATUS1_TOOTHLOG1READY)) //Sanity check. Flagging system means this should always be true
{
uint32_t runTime = 0;
if(startOffset == 0) { inProgressCompositeTime = 0; }
for (int x = startOffset; x < TOOTH_LOG_SIZE; x++)
{
//Check whether the tx buffer still has space
@ -1871,14 +1871,14 @@ void sendCompositeLog(byte startOffset)
return;
}
runTime += toothHistory[toothHistorySerialIndex]; //This combined runtime (in us) that the log was going for by this record)
inProgressCompositeTime += toothHistory[toothHistorySerialIndex]; //This combined runtime (in us) that the log was going for by this record)
//Serial.write(highByte(runTime));
//Serial.write(lowByte(runTime));
Serial.write(runTime >> 24);
Serial.write(runTime >> 16);
Serial.write(runTime >> 8);
Serial.write(runTime);
Serial.write(inProgressCompositeTime >> 24);
Serial.write(inProgressCompositeTime >> 16);
Serial.write(inProgressCompositeTime >> 8);
Serial.write(inProgressCompositeTime);
//Serial.write(highByte(toothHistory[toothHistorySerialIndex]));
//Serial.write(lowByte(toothHistory[toothHistorySerialIndex]));
@ -1894,6 +1894,7 @@ void sendCompositeLog(byte startOffset)
compositeLastToothTime = 0;
cmdPending = false;
compositeLogSendInProgress = false;
inProgressCompositeTime = 0;
}
else
{

1
speeduino/updates.ino
View File

@ -425,7 +425,6 @@ void doUpdates()
writeAllConfig();
EEPROM.write(EEPROM_DATA_VERSION, 15);
}
//Final check is always for 255 and 0 (Brand new arduino)