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

Warnings cleanup

This commit is contained in:
Josh Stewart 2019-07-12 16:46:34 +10:00
parent 549ec979fa
commit 8e9be7ef17
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
speeduino/comms.h
View File

@ -58,7 +58,7 @@ void saveConfig();
void sendPage(); void sendPage();
void sendPageASCII(); void sendPageASCII();
void receiveCalibration(byte); void receiveCalibration(byte);
void sendToothLog(bool); void sendToothLog();
void testComm(); void testComm();
void commandButtons(); void commandButtons();
byte getPageValue(byte, uint16_t); byte getPageValue(byte, uint16_t);

6
speeduino/comms.ino
View File

@ -273,7 +273,7 @@ void command()
break; break;
case 'T': //Send 256 tooth log entries to Tuner Studios tooth logger case 'T': //Send 256 tooth log entries to Tuner Studios tooth logger
if(currentStatus.toothLogEnabled == true) { sendToothLog(false); } //Sends tooth log values as ints if(currentStatus.toothLogEnabled == true) { sendToothLog(); } //Sends tooth log values as ints
else if (currentStatus.compositeLogEnabled == true) { sendCompositeLog(); } else if (currentStatus.compositeLogEnabled == true) { sendCompositeLog(); }
break; break;
@ -416,7 +416,7 @@ void command()
break; break;
case 'z': //Send 256 tooth log entries to a terminal emulator case 'z': //Send 256 tooth log entries to a terminal emulator
sendToothLog(true); //Sends tooth log values as chars sendToothLog(); //Sends tooth log values as chars
break; break;
case '`': //Custom 16u2 firmware is making its presence known case '`': //Custom 16u2 firmware is making its presence known
@ -1695,7 +1695,7 @@ Send 256 tooth log entries
* if useChar is true, the values are sent as chars to be printed out by a terminal emulator * if useChar is true, the values are sent as chars to be printed out by a terminal emulator
* if useChar is false, the values are sent as a 2 byte integer which is readable by TunerStudios tooth logger * if useChar is false, the values are sent as a 2 byte integer which is readable by TunerStudios tooth logger
*/ */
void sendToothLog(bool useChar) void sendToothLog()
{ {
//We need TOOTH_LOG_SIZE number of records to send to TunerStudio. If there aren't that many in the buffer then we just return and wait for the next call //We need TOOTH_LOG_SIZE number of records to send to TunerStudio. If there aren't that many in the buffer then we just return and wait for the next call
if (BIT_CHECK(currentStatus.status1, BIT_STATUS1_TOOTHLOG1READY)) //Sanity check. Flagging system means this should always be true if (BIT_CHECK(currentStatus.status1, BIT_STATUS1_TOOTHLOG1READY)) //Sanity check. Flagging system means this should always be true

2
speeduino/speeduino.ino
View File

@ -491,7 +491,6 @@ void loop()
injector3StartAngle = calculateInjector3StartAngle(PWdivTimerPerDegree); injector3StartAngle = calculateInjector3StartAngle(PWdivTimerPerDegree);
injector4StartAngle = injector3StartAngle + (CRANK_ANGLE_MAX_INJ / 2); //Phase this either 180 or 360 degrees out from inj3 (In reality this will always be 180 as you can't have sequential and staged currently) injector4StartAngle = injector3StartAngle + (CRANK_ANGLE_MAX_INJ / 2); //Phase this either 180 or 360 degrees out from inj3 (In reality this will always be 180 as you can't have sequential and staged currently)
if(injector4StartAngle < 0) {injector4StartAngle += CRANK_ANGLE_MAX_INJ;}
if(injector4StartAngle > (uint16_t)CRANK_ANGLE_MAX_INJ) { injector4StartAngle -= CRANK_ANGLE_MAX_INJ; } if(injector4StartAngle > (uint16_t)CRANK_ANGLE_MAX_INJ) { injector4StartAngle -= CRANK_ANGLE_MAX_INJ; }
} }
break; break;
@ -528,7 +527,6 @@ void loop()
injector3StartAngle = calculateInjector3StartAngle(PWdivTimerPerDegree); injector3StartAngle = calculateInjector3StartAngle(PWdivTimerPerDegree);
injector4StartAngle = injector3StartAngle + (CRANK_ANGLE_MAX_INJ / 2); //Phase this either 180 or 360 degrees out from inj3 (In reality this will always be 180 as you can't have sequential and staged currently) injector4StartAngle = injector3StartAngle + (CRANK_ANGLE_MAX_INJ / 2); //Phase this either 180 or 360 degrees out from inj3 (In reality this will always be 180 as you can't have sequential and staged currently)
if(injector4StartAngle < 0) {injector4StartAngle += CRANK_ANGLE_MAX_INJ;}
if(injector4StartAngle > (uint16_t)CRANK_ANGLE_MAX_INJ) { injector4StartAngle -= CRANK_ANGLE_MAX_INJ; } if(injector4StartAngle > (uint16_t)CRANK_ANGLE_MAX_INJ) { injector4StartAngle -= CRANK_ANGLE_MAX_INJ; }
} }
break; break;

4
speeduino/src/PID_v1/PID_v1.cpp
View File

@ -82,8 +82,6 @@ bool PID::Compute()
******************************************************************************/ ******************************************************************************/
void PID::SetTunings(byte Kp, byte Ki, byte Kd) void PID::SetTunings(byte Kp, byte Ki, byte Kd)
{ {
if (Kp<0 || Ki<0 || Kd<0) return;
dispKp = Kp; dispKi = Ki; dispKd = Kd; dispKp = Kp; dispKi = Ki; dispKd = Kd;
/* /*
@ -270,7 +268,6 @@ bool integerPID::Compute()
******************************************************************************/ ******************************************************************************/
void integerPID::SetTunings(byte Kp, byte Ki, byte Kd) void integerPID::SetTunings(byte Kp, byte Ki, byte Kd)
{ {
if (Kp<0 || Ki<0 || Kd<0) return;
if ( dispKp == Kp && dispKi == Ki && dispKd == Kd ) return; //Only do anything if one of the values has changed if ( dispKp == Kp && dispKi == Ki && dispKd == Kd ) return; //Only do anything if one of the values has changed
dispKp = Kp; dispKi = Ki; dispKd = Kd; dispKp = Kp; dispKi = Ki; dispKd = Kd;
@ -479,7 +476,6 @@ bool integerPID_ideal::Compute()
******************************************************************************/ ******************************************************************************/
void integerPID_ideal::SetTunings(byte Kp, byte Ki, byte Kd) void integerPID_ideal::SetTunings(byte Kp, byte Ki, byte Kd)
{ {
if (Kp<0 || Ki<0 || Kd<0) return;
if ( dispKp == Kp && dispKi == Ki && dispKd == Kd ) return; //Only do anything if one of the values has changed if ( dispKp == Kp && dispKi == Ki && dispKd == Kd ) return; //Only do anything if one of the values has changed
dispKp = Kp; dispKi = Ki; dispKd = Kd; dispKp = Kp; dispKi = Ki; dispKd = Kd;

2
speeduino/updates.ino
View File

@ -219,9 +219,9 @@ void doUpdates()
configPage2.maeThresh = configPage2.taeThresh; configPage2.maeThresh = configPage2.taeThresh;
//Set some sane values for the MAP AE curve //Set some sane values for the MAP AE curve
configPage4.maeRates[0] = 75; configPage4.maeRates[0] = 75;
configPage4.maeRates[1] = 75;
configPage4.maeRates[2] = 75; configPage4.maeRates[2] = 75;
configPage4.maeRates[3] = 75; configPage4.maeRates[3] = 75;
configPage4.maeRates[4] = 75;
configPage4.maeBins[0] = 7; configPage4.maeBins[0] = 7;
configPage4.maeBins[1] = 12; configPage4.maeBins[1] = 12;
configPage4.maeBins[2] = 20; configPage4.maeBins[2] = 20;