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

Use currentStatus.spark rather than currentStatus.engine for error indicator. Fixes #67

This commit is contained in:
Josh Stewart 2017-02-14 15:21:38 +11:00
parent 0ae02e23f1
commit a7d0a95611
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
speeduino/errors.ino
View File

@ -9,14 +9,14 @@ A full copy of the license may be found in the projects root directory
* Returns the error number or 0 if there is no more room for errors
*/
#include "errors.h"
byte setError(byte errorID)
{
if(errorCount < MAX_ERRORS)
{
errorCodes[errorCount] = errorID;
errorCount++;
if(errorCount == 1) { BIT_SET(currentStatus.engine, BIT_SPARK_ERROR); } //Enable the error indicator
if(errorCount == 1) { BIT_SET(currentStatus.spark, BIT_SPARK_ERROR); } //Enable the error indicator
return errorCount;
}
return 0;
@ -25,7 +25,7 @@ byte setError(byte errorID)
void clearError(byte errorID)
{
byte clearedError;
if (errorID == errorCodes[0]) { clearedError = 0; }
else if(errorID == errorCodes[1]) { clearedError = 1; }
else if(errorID == errorCodes[2]) { clearedError = 2; }
@ -41,20 +41,19 @@ void clearError(byte errorID)
}
errorCount--;
if(errorCount == 0) { BIT_CLEAR(currentStatus.engine, BIT_SPARK_ERROR); } //Enable the error indicator
if(errorCount == 0) { BIT_CLEAR(currentStatus.spark, BIT_SPARK_ERROR); } //Enable the error indicator
}
byte getNextError()
{
packedError currentError;
//We alternate through the errors once per second
byte currentErrorNum = currentStatus.secl % MAX_ERRORS; //Which error number will be returned. This changes once per second. Note that as long as MAX_ERRORS is a power of 2, this % operation is performed very quickly.
byte currentErrorNum = currentStatus.secl % MAX_ERRORS; //Which error number will be returned. This changes once per second. Note that as long as MAX_ERRORS is a power of 2, this % operation is performed very quickly.
currentError.errorNum = currentErrorNum;
currentError.errorID = errorCodes[currentErrorNum];
return *(byte*)&currentError; //Ugly, but this forces the cast of the currentError struct to a byte.
return *(byte*)&currentError; //Ugly, but this forces the cast of the currentError struct to a byte.
}

2
speeduino/sensors.h
View File

@ -2,7 +2,7 @@
#define SENSORS_H
#include "Arduino.h"
#include "globals.h"
// The following are alpha values for the ADC filters.
// Their values are from 0 to 255 with 0 being no filtering and 255 being maximum