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

Fix readable log alignment

This commit is contained in:
Josh Stewart 2021-10-13 17:54:55 +11:00
parent ef59fbabf0
commit 3160e88b61
1 changed files with 82 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
speeduino/logger.ino
View File

@ -196,140 +196,99 @@ int16_t getReadableLogEntry(uint16_t logIndex)
case 7: statusValue = currentStatus.batCorrection; break; //Battery voltage correction (%)
case 8: statusValue = currentStatus.battery10; break; //battery voltage
case 9: statusValue = currentStatus.O2; break; //O2
case 11: statusValue = currentStatus.egoCorrection; break; //Exhaust gas correction (%)
case 12: statusValue = currentStatus.iatCorrection; break; //Air temperature Correction (%)
case 13: statusValue = currentStatus.wueCorrection; break; //Warmup enrichment (%)
case 14: statusValue = lowByte(currentStatus.RPM); break; //rpm HB
case 15: statusValue = highByte(currentStatus.RPM); break; //rpm LB
case 16: statusValue = (byte)(currentStatus.AEamount >> 1); break; //TPS acceleration enrichment (%) divided by 2 (Can exceed 255)
case 17: statusValue = lowByte(currentStatus.corrections); break; //Total GammaE (%)
case 18: statusValue = highByte(currentStatus.corrections); break; //Total GammaE (%)
case 19: statusValue = currentStatus.VE1; break; //VE 1 (%)
case 20: statusValue = currentStatus.VE2; break; //VE 2 (%)
case 21: statusValue = currentStatus.afrTarget; break;
case 22: statusValue = currentStatus.tpsDOT; break; //TPS DOT
case 23: statusValue = currentStatus.advance; break;
case 24: statusValue = currentStatus.TPS; break; // TPS (0% to 100%)
case 10: statusValue = currentStatus.egoCorrection; break; //Exhaust gas correction (%)
case 11: statusValue = currentStatus.iatCorrection; break; //Air temperature Correction (%)
case 12: statusValue = currentStatus.wueCorrection; break; //Warmup enrichment (%)
case 13: statusValue = currentStatus.RPM; break; //rpm HB
case 14: statusValue = currentStatus.AEamount; break; //TPS acceleration enrichment (%) divided by 2 (Can exceed 255)
case 15: statusValue = currentStatus.corrections; break; //Total GammaE (%)
case 16: statusValue = currentStatus.VE1; break; //VE 1 (%)
case 17: statusValue = currentStatus.VE2; break; //VE 2 (%)
case 18: statusValue = currentStatus.afrTarget; break;
case 19: statusValue = currentStatus.tpsDOT; break; //TPS DOT
case 20: statusValue = currentStatus.advance; break;
case 21: statusValue = currentStatus.TPS; break; // TPS (0% to 100%)
case 25:
case 22:
if(currentStatus.loopsPerSecond > 60000) { currentStatus.loopsPerSecond = 60000;}
statusValue = lowByte(currentStatus.loopsPerSecond);
break;
case 26:
if(currentStatus.loopsPerSecond > 60000) { currentStatus.loopsPerSecond = 60000;}
statusValue = highByte(currentStatus.loopsPerSecond);
statusValue = currentStatus.loopsPerSecond;
break;
case 27:
case 23:
currentStatus.freeRAM = freeRam();
statusValue = lowByte(currentStatus.freeRAM); //(byte)((currentStatus.loopsPerSecond >> 8) & 0xFF);
statusValue = currentStatus.freeRAM;
break;
case 28:
currentStatus.freeRAM = freeRam();
statusValue = highByte(currentStatus.freeRAM);
break;
case 29: statusValue = (byte)(currentStatus.boostTarget >> 1); break; //Divide boost target by 2 to fit in a byte
case 30: statusValue = (byte)(currentStatus.boostDuty / 100); break;
case 31: statusValue = currentStatus.spark; break; //Spark related bitfield
case 24: statusValue = currentStatus.boostTarget; break;
case 25: statusValue = currentStatus.boostDuty; break;
case 26: statusValue = currentStatus.spark; break; //Spark related bitfield
case 27: statusValue = currentStatus.rpmDOT; break;
case 28: statusValue = currentStatus.ethanolPct; break; //Flex sensor value (or 0 if not used)
case 29: statusValue = currentStatus.flexCorrection; break; //Flex fuel correction (% above or below 100)
case 30: statusValue = currentStatus.flexIgnCorrection; break; //Ignition correction (Increased degrees of advance) for flex fuel
case 31: statusValue = currentStatus.idleLoad; break;
case 32: statusValue = currentStatus.testOutputs; break;
case 33: statusValue = currentStatus.O2_2; break; //O2
case 34: statusValue = currentStatus.baro; break; //Barometer value
//rpmDOT must be sent as a signed integer
case 32: statusValue = lowByte(currentStatus.rpmDOT); break;
case 33: statusValue = highByte(currentStatus.rpmDOT); break;
case 35: statusValue = currentStatus.canin[0]; break;
case 36: statusValue = currentStatus.canin[1]; break;
case 37: statusValue = currentStatus.canin[2]; break;
case 38: statusValue = currentStatus.canin[3]; break;
case 39: statusValue = currentStatus.canin[4]; break;
case 40: statusValue = currentStatus.canin[5]; break;
case 41: statusValue = currentStatus.canin[6]; break;
case 42: statusValue = currentStatus.canin[7]; break;
case 43: statusValue = currentStatus.canin[8]; break;
case 44: statusValue = currentStatus.canin[9]; break;
case 45: statusValue = currentStatus.canin[10]; break;
case 46: statusValue = currentStatus.canin[11]; break;
case 47: statusValue = currentStatus.canin[12]; break;
case 48: statusValue = currentStatus.canin[13]; break;
case 49: statusValue = currentStatus.canin[14]; break;
case 50: statusValue = currentStatus.canin[15]; break;
case 51: statusValue = currentStatus.tpsADC; break;
case 52: statusValue = getNextError(); break;
case 34: statusValue = currentStatus.ethanolPct; break; //Flex sensor value (or 0 if not used)
case 35: statusValue = currentStatus.flexCorrection; break; //Flex fuel correction (% above or below 100)
case 36: statusValue = currentStatus.flexIgnCorrection; break; //Ignition correction (Increased degrees of advance) for flex fuel
case 53: statusValue = currentStatus.PW1; break; //Pulsewidth 1 multiplied by 10 in ms. Have to convert from uS to mS.
case 54: statusValue = currentStatus.PW2; break; //Pulsewidth 2 multiplied by 10 in ms. Have to convert from uS to mS.
case 55: statusValue = currentStatus.PW3; break; //Pulsewidth 3 multiplied by 10 in ms. Have to convert from uS to mS.
case 56: statusValue = currentStatus.PW4; break; //Pulsewidth 4 multiplied by 10 in ms. Have to convert from uS to mS.
case 57: statusValue = currentStatus.status3; break;
case 58: statusValue = currentStatus.engineProtectStatus; break;
case 37: statusValue = currentStatus.idleLoad; break;
case 38: statusValue = currentStatus.testOutputs; break;
case 59: break; //UNUSED!!
case 39: statusValue = currentStatus.O2_2; break; //O2
case 40: statusValue = currentStatus.baro; break; //Barometer value
case 41: statusValue = lowByte(currentStatus.canin[0]); break;
case 42: statusValue = highByte(currentStatus.canin[0]); break;
case 43: statusValue = lowByte(currentStatus.canin[1]); break;
case 44: statusValue = highByte(currentStatus.canin[1]); break;
case 45: statusValue = lowByte(currentStatus.canin[2]); break;
case 46: statusValue = highByte(currentStatus.canin[2]); break;
case 47: statusValue = lowByte(currentStatus.canin[3]); break;
case 48: statusValue = highByte(currentStatus.canin[3]); break;
case 49: statusValue = lowByte(currentStatus.canin[4]); break;
case 50: statusValue = highByte(currentStatus.canin[4]); break;
case 51: statusValue = lowByte(currentStatus.canin[5]); break;
case 52: statusValue = highByte(currentStatus.canin[5]); break;
case 53: statusValue = lowByte(currentStatus.canin[6]); break;
case 54: statusValue = highByte(currentStatus.canin[6]); break;
case 55: statusValue = lowByte(currentStatus.canin[7]); break;
case 56: statusValue = highByte(currentStatus.canin[7]); break;
case 57: statusValue = lowByte(currentStatus.canin[8]); break;
case 58: statusValue = highByte(currentStatus.canin[8]); break;
case 59: statusValue = lowByte(currentStatus.canin[9]); break;
case 60: statusValue = highByte(currentStatus.canin[9]); break;
case 61: statusValue = lowByte(currentStatus.canin[10]); break;
case 62: statusValue = highByte(currentStatus.canin[10]); break;
case 63: statusValue = lowByte(currentStatus.canin[11]); break;
case 64: statusValue = highByte(currentStatus.canin[11]); break;
case 65: statusValue = lowByte(currentStatus.canin[12]); break;
case 66: statusValue = highByte(currentStatus.canin[12]); break;
case 67: statusValue = lowByte(currentStatus.canin[13]); break;
case 68: statusValue = highByte(currentStatus.canin[13]); break;
case 69: statusValue = lowByte(currentStatus.canin[14]); break;
case 70: statusValue = highByte(currentStatus.canin[14]); break;
case 71: statusValue = lowByte(currentStatus.canin[15]); break;
case 72: statusValue = highByte(currentStatus.canin[15]); break;
case 73: statusValue = currentStatus.tpsADC; break;
case 74: statusValue = getNextError(); break;
case 75: statusValue = lowByte(currentStatus.PW1); break; //Pulsewidth 1 multiplied by 10 in ms. Have to convert from uS to mS.
case 76: statusValue = highByte(currentStatus.PW1); break; //Pulsewidth 1 multiplied by 10 in ms. Have to convert from uS to mS.
case 77: statusValue = lowByte(currentStatus.PW2); break; //Pulsewidth 2 multiplied by 10 in ms. Have to convert from uS to mS.
case 78: statusValue = highByte(currentStatus.PW2); break; //Pulsewidth 2 multiplied by 10 in ms. Have to convert from uS to mS.
case 79: statusValue = lowByte(currentStatus.PW3); break; //Pulsewidth 3 multiplied by 10 in ms. Have to convert from uS to mS.
case 80: statusValue = highByte(currentStatus.PW3); break; //Pulsewidth 3 multiplied by 10 in ms. Have to convert from uS to mS.
case 81: statusValue = lowByte(currentStatus.PW4); break; //Pulsewidth 4 multiplied by 10 in ms. Have to convert from uS to mS.
case 82: statusValue = highByte(currentStatus.PW4); break; //Pulsewidth 4 multiplied by 10 in ms. Have to convert from uS to mS.
case 83: statusValue = currentStatus.status3; break;
case 84: statusValue = currentStatus.engineProtectStatus; break;
case 85: statusValue = lowByte(currentStatus.fuelLoad); break;
case 86: statusValue = highByte(currentStatus.fuelLoad); break;
case 87: statusValue = lowByte(currentStatus.ignLoad); break;
case 88: statusValue = highByte(currentStatus.ignLoad); break;
case 89: statusValue = lowByte(currentStatus.dwell); break;
case 90: statusValue = highByte(currentStatus.dwell); break;
case 91: statusValue = currentStatus.CLIdleTarget; break;
case 92: statusValue = currentStatus.mapDOT; break;
case 93: statusValue = lowByte(currentStatus.vvt1Angle); break; //2 bytes for vvt1Angle
case 94: statusValue = highByte(currentStatus.vvt1Angle); break;
case 95: statusValue = currentStatus.vvt1TargetAngle; break;
case 96: statusValue = (byte)(currentStatus.vvt1Duty); break;
case 97: statusValue = lowByte(currentStatus.flexBoostCorrection); break;
case 98: statusValue = highByte(currentStatus.flexBoostCorrection); break;
case 99: statusValue = currentStatus.baroCorrection; break;
case 100: statusValue = currentStatus.VE; break; //Current VE (%). Can be equal to VE1 or VE2 or a calculated value from both of them
case 101: statusValue = currentStatus.ASEValue; break; //Current ASE (%)
case 102: statusValue = lowByte(currentStatus.vss); break;
case 103: statusValue = highByte(currentStatus.vss); break;
case 104: statusValue = currentStatus.gear; break;
case 105: statusValue = currentStatus.fuelPressure; break;
case 106: statusValue = currentStatus.oilPressure; break;
case 107: statusValue = currentStatus.wmiPW; break;
case 108: statusValue = currentStatus.status4; break;
case 109: statusValue = lowByte(currentStatus.vvt2Angle); break; //2 bytes for vvt2Angle
case 110: statusValue = highByte(currentStatus.vvt2Angle); break;
case 111: statusValue = currentStatus.vvt2TargetAngle; break;
case 112: statusValue = (byte)(currentStatus.vvt2Duty); break;
case 113: statusValue = currentStatus.outputsStatus; break;
case 114: statusValue = (byte)(currentStatus.fuelTemp + CALIBRATION_TEMPERATURE_OFFSET); break; //Fuel temperature from flex sensor
case 115: statusValue = currentStatus.fuelTempCorrection; break; //Fuel temperature Correction (%)
case 116: statusValue = currentStatus.advance1; break; //advance 1 (%)
case 117: statusValue = currentStatus.advance2; break; //advance 2 (%)
case 118: statusValue = currentStatus.TS_SD_Status; break; //SD card status
case 119: statusValue = lowByte(currentStatus.EMAP); break; //2 bytes for EMAP
case 120: statusValue = highByte(currentStatus.EMAP); break;
case 60: statusValue = currentStatus.fuelLoad; break;
case 61: statusValue = currentStatus.ignLoad; break;
case 62: statusValue = currentStatus.dwell; break;
case 63: statusValue = currentStatus.CLIdleTarget; break;
case 64: statusValue = currentStatus.mapDOT; break;
case 65: statusValue = currentStatus.vvt1Angle; break;
case 66: statusValue = currentStatus.vvt1TargetAngle; break;
case 67: statusValue = currentStatus.vvt1Duty; break;
case 68: statusValue = currentStatus.flexBoostCorrection; break;
case 69: statusValue = currentStatus.baroCorrection; break;
case 70: statusValue = currentStatus.VE; break; //Current VE (%). Can be equal to VE1 or VE2 or a calculated value from both of them
case 71: statusValue = currentStatus.ASEValue; break; //Current ASE (%)
case 72: statusValue = currentStatus.vss; break;
case 73: statusValue = currentStatus.gear; break;
case 74: statusValue = currentStatus.fuelPressure; break;
case 75: statusValue = currentStatus.oilPressure; break;
case 76: statusValue = currentStatus.wmiPW; break;
case 77: statusValue = currentStatus.status4; break;
case 78: statusValue = currentStatus.vvt2Angle; break; //2 bytes for vvt2Angle
case 79: statusValue = currentStatus.vvt2TargetAngle; break;
case 80: statusValue = currentStatus.vvt2Duty; break;
case 81: statusValue = currentStatus.outputsStatus; break;
case 82: statusValue = currentStatus.fuelTemp; break; //Fuel temperature from flex sensor
case 83: statusValue = currentStatus.fuelTempCorrection; break; //Fuel temperature Correction (%)
case 84: statusValue = currentStatus.advance1; break; //advance 1 (%)
case 85: statusValue = currentStatus.advance2; break; //advance 2 (%)
case 86: statusValue = currentStatus.TS_SD_Status; break; //SD card status
case 87: statusValue = currentStatus.EMAP; break;
}
return statusValue;