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

Merge branch 'can_io_2' of https://github.com/Autohome2/speeduino into can_io_2 

# Conflicts:
#	speeduino/comms.ino
This commit is contained in:
darren siepka 2017-06-13 03:07:12 +01:00
parent 0296f06438 b62f943bb3
commit 8d996f7b31
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
speeduino/comms.ino
View File

@ -279,8 +279,8 @@ void sendValues(uint16_t offset, uint16_t packetLength, byte cmd, byte portNum)
fullStatus[5] = (byte)(currentStatus.IAT + CALIBRATION_TEMPERATURE_OFFSET); //mat
fullStatus[6] = (byte)(currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET); //Coolant ADC
fullStatus[7] = currentStatus.tpsADC; //TPS (Raw 0-255)
fullStatus[8] = currentStatus.battery10; //battery voltage
fullStatus[9] = currentStatus.O2; //O2
fullStatus[8] = 121;//currentStatus.battery10; //battery voltage
fullStatus[9] = 54;//currentStatus.O2; //O2
fullStatus[10] = currentStatus.egoCorrection; //Exhaust gas correction (%)
fullStatus[11] = currentStatus.iatCorrection; //Air temperature Correction (%)
fullStatus[12] = currentStatus.wueCorrection; //Warmup enrichment (%)
@ -342,12 +342,21 @@ void sendValues(uint16_t offset, uint16_t packetLength, byte cmd, byte portNum)
if (portNum == 0) { Serial.write(fullStatus[offset+x]); }
else if (portNum == 3){ CANSerial.write(fullStatus[offset+x]); }
<<<<<<< HEAD
//if (portNum == 3) //TESTING USE!
//{
// Serial.print("r"); //confirm cmd type
// Serial.print(cmd);
// Serial.print(fullStatus[offset+x]);
//}
=======
if (portNum == 3) //TESTING USE!
{
Serial.print("r"); //confirm cmd type
Serial.print(cmd);
Serial.print(fullStatus[offset+x]);
}
>>>>>>> b62f943bb340de45be584a0ea12be9cddabda82a
}
}