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

Replace temp ADC values with degrees in comms

This commit is contained in:
Josh Stewart 2014-09-09 09:39:20 +10:00
parent 599071849a
commit 70ec365a87
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
comms.ino
View File

@ -111,8 +111,8 @@ void sendValues(int length)
response[2] = currentStatus.engine; //Engine Status Bitfield - NOT YET WORKING
response[3] = 0x00; //baro
response[4] = currentStatus.MAP; //map
response[5] = currentStatus.iatADC; //mat
response[6] = currentStatus.cltADC; //Coolant ADC
response[5] = currentStatus.IAT; //mat
response[6] = currentStatus.coolant; //Coolant ADC
response[7] = currentStatus.tpsADC; //TPS (Raw 0-255)
response[8] = currentStatus.batADC; //battery voltage
response[9] = currentStatus.O2; //O2
@ -139,6 +139,9 @@ void sendValues(int length)
response[26] = highByte(mem); //(byte)((currentStatus.loopsPerSecond >> 8) & 0xFF);
response[27] = lowByte(mem);
//response[26] = highByte(cltCalibrationTable.axisX16[0]); //(byte)((currentStatus.loopsPerSecond >> 8) & 0xFF);
//response[27] = lowByte(cltCalibrationTable.axisX16[0]);
Serial.write(response, (size_t)packetSize);
Serial.flush();
@ -300,12 +303,12 @@ void receiveCalibration(byte tableID)
default_val = 1800;
break;
case 1:
//coolant table
//Inlet air temp table
pnt_TargetTable = (table2D *)&iatCalibrationTable;
default_val = 700;
break;
case 2:
//coolant table
//O2 table
pnt_TargetTable = (table2D *)&o2CalibrationTable;
default_val = -1; //-1 is used when there is no default value
break;

19
reference/speeduino 0.1.ini
View File

@ -564,8 +564,8 @@ help = helpEnrichments, "Enrichments Help"
;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld
baroADCGauge = baroADC, "Barometer ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
mapADCGauge = mapADC, "MAP ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
matADCGauge = matADC, "MAT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
cltADCGauge = cltADC, "CLT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
#matADCGauge = matADC, "MAT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
#cltADCGauge = cltADC, "CLT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
tpsADCGauge = tpsADC, "TPS ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
batADCGauge = batADC, "BAT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
@ -751,8 +751,15 @@ help = helpEnrichments, "Enrichments Help"
mapaccden = bits, U08, 2, [7:7]
baroADC = scalar, U08, 3, "ADC", 1.000, 0.000
mapADC = scalar, U08, 4, "ADC", 1.000, 0.000
matADC = scalar, U08, 5, "ADC", 1.000, 0.000
cltADC = scalar, U08, 6, "ADC", 1.000, 0.000
#matADC = scalar, U08, 5, "ADC", 1.000, 0.000
#cltADC = scalar, U08, 6, "ADC", 1.000, 0.000
#if CELSIUS
mat = scalar, U08, 5, "°C", 1.000, 0.000
coolant = scalar, U08, 6, "°C", 1.000, 0.000
#else
mat = scalar, U08, 5, "°F", 1.000, 0.000
coolant = scalar, U08, 6, "°F", 1.000, 0.000
#endif
tpsADC = scalar, U08, 7, "ADC", 1.000, 0.000
batADC = scalar, U08, 8, "ADC", 1.000, 0.000
egoADC = scalar, U08, 9, "ADC", 1.000, 0.000
@ -778,9 +785,9 @@ help = helpEnrichments, "Enrichments Help"
accDecEnrich = { accelEnrich + ((engine & 0b00100000) ? tdePct : 100) }
batteryVoltage = { batADC / 255.0 * 30.0 } ; Current MS power supply voltage.
coolant = { tempCvt(table(cltADC, "thermfactor.inc")-40) } ; Coolant sensor temperature in user units.
#coolant = { tempCvt(table(cltADC, "thermfactor.inc")-40) } ; Coolant sensor temperature in user units.
#mat = { tempCvt(table(matADC, "matfactor.inc")-40) } ; Manifold temperature in user units.
egoVoltage = { egoADC / 255.0 * 5.0 } ; EGO sensor voltage.
mat = { tempCvt(table(matADC, "matfactor.inc")-40) } ; Manifold temperature in user units.
rpm = { rpm100*100 } ; True RPM.
time = { timeNow } ; "timeNow" is a parameterless built-in function.
;loopsPerSecond = { loopsPerSecond10*10 } ; True number of mainloops per second