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

more fuel info in verbose CAN (#3229) 

* more fuel info

* missed a comma
This commit is contained in:
Matthew Kennedy 2021-09-07 14:39:30 -07:00 committed by GitHub
parent 2e5a4b3691
commit e5fef07db8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 89 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
firmware/controllers/can/can_verbose.cpp
View File

@ -16,131 +16,144 @@
#include "spark_logic.h" #include "spark_logic.h"
struct Status { struct Status {
uint16_t warningCounter; uint16_t warningCounter;
uint16_t lastErrorCode; uint16_t lastErrorCode;
uint8_t revLimit : 1; uint8_t revLimit : 1;
uint8_t mainRelay : 1; uint8_t mainRelay : 1;
uint8_t fuelPump : 1; uint8_t fuelPump : 1;
uint8_t checkEngine : 1; uint8_t checkEngine : 1;
uint8_t o2Heater : 1; uint8_t o2Heater : 1;
uint8_t pad6 : 1; uint8_t pad6 : 1;
uint8_t pad7 : 1; uint8_t pad7 : 1;
uint8_t pad8 : 1; uint8_t pad8 : 1;
uint8_t pad[3]; uint8_t pad[3];
}; };
static void populateFrame(Status& msg) { static void populateFrame(Status& msg) {
msg.warningCounter = engine->engineState.warnings.warningCounter; msg.warningCounter = engine->engineState.warnings.warningCounter;
msg.lastErrorCode = engine->engineState.warnings.lastErrorCode; msg.lastErrorCode = engine->engineState.warnings.lastErrorCode;
msg.revLimit = GET_RPM() > CONFIG(rpmHardLimit); msg.revLimit = GET_RPM() > CONFIG(rpmHardLimit);
msg.mainRelay = enginePins.mainRelay.getLogicValue(); msg.mainRelay = enginePins.mainRelay.getLogicValue();
msg.fuelPump = enginePins.fuelPumpRelay.getLogicValue(); msg.fuelPump = enginePins.fuelPumpRelay.getLogicValue();
msg.checkEngine = enginePins.checkEnginePin.getLogicValue(); msg.checkEngine = enginePins.checkEnginePin.getLogicValue();
msg.o2Heater = enginePins.o2heater.getLogicValue(); msg.o2Heater = enginePins.o2heater.getLogicValue();
} }
struct Speeds { struct Speeds {
uint16_t rpm; uint16_t rpm;
scaled_angle timing; scaled_angle timing;
scaled_channel<uint8_t, 2> injDuty; scaled_channel<uint8_t, 2> injDuty;
scaled_channel<uint8_t, 2> coilDuty; scaled_channel<uint8_t, 2> coilDuty;
scaled_channel<uint8_t> vssKph; scaled_channel<uint8_t> vssKph;
uint8_t pad[1]; uint8_t pad[1];
}; };
static void populateFrame(Speeds& msg) { static void populateFrame(Speeds& msg) {
auto rpm = GET_RPM(); auto rpm = GET_RPM();
msg.rpm = rpm; msg.rpm = rpm;
auto timing = engine->engineState.timingAdvance; auto timing = engine->engineState.timingAdvance;
msg.timing = timing > 360 ? timing - 720 : timing; msg.timing = timing > 360 ? timing - 720 : timing;
msg.injDuty = getInjectorDutyCycle(rpm); msg.injDuty = getInjectorDutyCycle(rpm);
msg.coilDuty = getCoilDutyCycle(rpm); msg.coilDuty = getCoilDutyCycle(rpm);
msg.vssKph = Sensor::get(SensorType::VehicleSpeed).value_or(0); msg.vssKph = Sensor::get(SensorType::VehicleSpeed).value_or(0);
} }
struct PedalAndTps { struct PedalAndTps {
scaled_percent pedal; scaled_percent pedal;
scaled_percent tps1; scaled_percent tps1;
scaled_percent tps2; scaled_percent tps2;
uint8_t pad[2]; uint8_t pad[2];
}; };
static void populateFrame(PedalAndTps& msg) static void populateFrame(PedalAndTps& msg)
{ {
msg.pedal = Sensor::get(SensorType::AcceleratorPedal).value_or(-1); msg.pedal = Sensor::get(SensorType::AcceleratorPedal).value_or(-1);
msg.tps1 = Sensor::get(SensorType::Tps1).value_or(-1); msg.tps1 = Sensor::get(SensorType::Tps1).value_or(-1);
msg.tps2 = Sensor::get(SensorType::Tps2).value_or(-1); msg.tps2 = Sensor::get(SensorType::Tps2).value_or(-1);
} }
struct Sensors1 { struct Sensors1 {
scaled_pressure map; scaled_pressure map;
scaled_channel<uint8_t> clt; scaled_channel<uint8_t> clt;
scaled_channel<uint8_t> iat; scaled_channel<uint8_t> iat;
scaled_channel<uint8_t> aux1; scaled_channel<uint8_t> aux1;
scaled_channel<uint8_t> aux2; scaled_channel<uint8_t> aux2;
scaled_channel<uint8_t> mcuTemp; scaled_channel<uint8_t> mcuTemp;
scaled_channel<uint8_t, 2> fuelLevel; scaled_channel<uint8_t, 2> fuelLevel;
}; };
static void populateFrame(Sensors1& msg) { static void populateFrame(Sensors1& msg) {
msg.map = Sensor::get(SensorType::Map).value_or(0); msg.map = Sensor::get(SensorType::Map).value_or(0);
msg.clt = Sensor::get(SensorType::Clt).value_or(0) + PACK_ADD_TEMPERATURE; msg.clt = Sensor::get(SensorType::Clt).value_or(0) + PACK_ADD_TEMPERATURE;
msg.iat = Sensor::get(SensorType::Iat).value_or(0) + PACK_ADD_TEMPERATURE; msg.iat = Sensor::get(SensorType::Iat).value_or(0) + PACK_ADD_TEMPERATURE;
msg.aux1 = Sensor::get(SensorType::AuxTemp1).value_or(0) + PACK_ADD_TEMPERATURE; msg.aux1 = Sensor::get(SensorType::AuxTemp1).value_or(0) + PACK_ADD_TEMPERATURE;
msg.aux2 = Sensor::get(SensorType::AuxTemp2).value_or(0) + PACK_ADD_TEMPERATURE; msg.aux2 = Sensor::get(SensorType::AuxTemp2).value_or(0) + PACK_ADD_TEMPERATURE;
msg.mcuTemp = getMCUInternalTemperature(); msg.mcuTemp = getMCUInternalTemperature();
msg.fuelLevel = Sensor::get(SensorType::FuelLevel).value_or(0); msg.fuelLevel = Sensor::get(SensorType::FuelLevel).value_or(0);
} }
struct Sensors2 { struct Sensors2 {
scaled_afr afr; scaled_afr afr;
scaled_pressure oilPressure; scaled_pressure oilPressure;
scaled_angle vvtPos; scaled_angle vvtPos;
scaled_voltage vbatt; scaled_voltage vbatt;
}; };
static void populateFrame(Sensors2& msg) { static void populateFrame(Sensors2& msg) {
msg.afr = Sensor::get(SensorType::Lambda1).value_or(0) * STOICH_RATIO; msg.afr = Sensor::get(SensorType::Lambda1).value_or(0) * STOICH_RATIO;
msg.oilPressure = Sensor::get(SensorType::OilPressure).value_or(-1); msg.oilPressure = Sensor::get(SensorType::OilPressure).value_or(-1);
msg.vvtPos = engine->triggerCentral.getVVTPosition(0, 0); msg.vvtPos = engine->triggerCentral.getVVTPosition(0, 0);
msg.vbatt = Sensor::get(SensorType::BatteryVoltage).value_or(0); msg.vbatt = Sensor::get(SensorType::BatteryVoltage).value_or(0);
} }
struct Fueling { struct Fueling {
scaled_channel<uint16_t, 1000> cylAirmass; scaled_channel<uint16_t, 1000> cylAirmass;
scaled_channel<uint16_t, 100> estAirflow; scaled_channel<uint16_t, 100> estAirflow;
scaled_ms fuel_pulse; scaled_ms fuel_pulse;
scaled_percent stft; uint16_t pad;
}; };
static void populateFrame(Fueling& msg) { static void populateFrame(Fueling& msg) {
msg.cylAirmass = engine->engineState.sd.airMassInOneCylinder; msg.cylAirmass = engine->engineState.sd.airMassInOneCylinder;
msg.estAirflow = engine->engineState.airFlow; msg.estAirflow = engine->engineState.airFlow;
msg.fuel_pulse = engine->actualLastInjection[0]; msg.fuel_pulse = engine->actualLastInjection[0];
}
// todo struct Fueling2 {
msg.stft = 0; scaled_channel<uint16_t> fuelConsumedGram;
scaled_channel<uint16_t, PACK_MULT_FUEL_FLOW> fuelFlowRate;
scaled_percent fuelTrim[2];
};
static void populateFrame(Fueling2& msg) {
msg.fuelConsumedGram = engine->engineState.fuelConsumption.getConsumedGrams();
msg.fuelFlowRate = engine->engineState.fuelConsumption.getConsumptionGramPerSecond();
for (size_t i = 0; i < 2; i++) {
msg.fuelTrim[i] = 100.0f * (ENGINE(stftCorrection)[i] - 1.0f);
}
} }
void sendCanVerbose() { void sendCanVerbose() {
auto base = CONFIG(verboseCanBaseAddress); auto base = CONFIG(verboseCanBaseAddress);
transmitStruct<Status> (base + 0); transmitStruct<Status> (base + 0);
transmitStruct<Speeds> (base + 1); transmitStruct<Speeds> (base + 1);
transmitStruct<PedalAndTps> (base + CAN_PEDAL_TPS_OFFSET); transmitStruct<PedalAndTps> (base + CAN_PEDAL_TPS_OFFSET);
transmitStruct<Sensors1> (base + CAN_SENSOR_1_OFFSET); transmitStruct<Sensors1> (base + CAN_SENSOR_1_OFFSET);
transmitStruct<Sensors2> (base + 4); transmitStruct<Sensors2> (base + 4);
transmitStruct<Fueling> (base + 5); transmitStruct<Fueling> (base + 5);
transmitStruct<Fueling2> (base + 6);
} }
#endif // EFI_CAN_SUPPORT #endif // EFI_CAN_SUPPORT