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

add detected gear to CAN format, update dbc 

(cherry picked from commit f9b9da9e92)
This commit is contained in:
Matthew Kennedy 2023-04-28 13:02:52 -07:00 committed by Andrey
parent b3824c63cd
commit 139f6224b3
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,9 @@ struct Status {
uint8_t pad7 : 1;
uint8_t pad8 : 1;
uint8_t pad[3];
uint8_t gear;
uint8_t pad[2];
};
static void populateFrame(Status& msg) {
@ -44,6 +46,8 @@ static void populateFrame(Status& msg) {
msg.fuelPump = enginePins.fuelPumpRelay.getLogicValue();
msg.checkEngine = enginePins.checkEnginePin.getLogicValue();
msg.o2Heater = enginePins.o2heater.getLogicValue();
msg.gear = Sensor::getOrZero(SensorType::DetectedGear);
}
struct Speeds {
@ -74,7 +78,7 @@ struct PedalAndTps {
scaled_percent pedal;
scaled_percent tps1;
scaled_percent tps2;
uint8_t pad[2];
scaled_percent wastegate;
};
static void populateFrame(PedalAndTps& msg)
@ -82,6 +86,7 @@ static void populateFrame(PedalAndTps& msg)
msg.pedal = Sensor::get(SensorType::AcceleratorPedal).value_or(-1);
msg.tps1 = Sensor::get(SensorType::Tps1).value_or(-1);
msg.tps2 = Sensor::get(SensorType::Tps2).value_or(-1);
msg.wastegate = Sensor::get(SensorType::WastegatePosition).value_or(-1);
}
struct Sensors1 {

2
firmware/controllers/can/readme.md
View File

@ -1,3 +1,3 @@
For documentation best we have is [rusEFI_CAN_verbose.dbc](rusEFI_CAN_verbose.dbc)
For documentation best we have is [rusEFI_CAN_verbose.dbc](rusEFI_CAN_verbose.dbc). Edit or view that file with the free Kvaser Database Editor, or various other software.
https://github.com/rusefi/rusefi/wiki/CAN

11
firmware/controllers/can/rusEFI_CAN_verbose.dbc
View File

@ -54,6 +54,7 @@ BO_ 512 BASE0: 8 Vector__XXX
SG_ FuelPumpAct : 34|1@1+ (1,0) [0|0] "" Vector__XXX
SG_ CELAct : 35|1@1+ (1,0) [0|0] "" Vector__XXX
SG_ EGOHeatAct : 36|1@1+ (1,0) [0|0] "" Vector__XXX
SG_ CurrentGear : 40|8@1+ (1,0) [0|0] "" Vector__XXX
BO_ 513 BASE1: 8 Vector__XXX
SG_ RPM : 0|16@1+ (1,0) [0|0] "RPM" Vector__XXX
@ -64,9 +65,10 @@ BO_ 513 BASE1: 8 Vector__XXX
SG_ FlexPct : 56|8@1+ (1,0) [0|100] "%" Vector__XXX
BO_ 514 BASE2: 8 Vector__XXX
SG_ PPS : 0|16@1- (0.01,0) [0|0] "%" Vector__XXX
SG_ TPS1 : 16|16@1- (0.01,0) [0|0] "%" Vector__XXX
SG_ TPS2 : 32|16@1- (0.01,0) [0|0] "%" Vector__XXX
SG_ PPS : 0|16@1- (0.01,0) [0|100] "%" Vector__XXX
SG_ TPS1 : 16|16@1- (0.01,0) [0|100] "%" Vector__XXX
SG_ TPS2 : 32|16@1- (0.01,0) [0|100] "%" Vector__XXX
SG_ Wastegate : 48|16@1- (0.01,0) [0|100] "%" Vector__XXX
BO_ 515 BASE3: 8 Vector__XXX
SG_ MAP : 0|16@1+ (0.03333333,0) [0|0] "kPa" Vector__XXX
@ -121,6 +123,7 @@ CM_ SG_ 512 MainRelayAct "Main Relay Active";
CM_ SG_ 512 FuelPumpAct "Fuel Pump Output Active";
CM_ SG_ 512 CELAct "Check Engine Light Active";
CM_ SG_ 512 EGOHeatAct "EGO Heater Commanded On";
CM_ SG_ 512 CurrentGear "Current detected gear. 0 means neutral, 1 means first, etc.";
CM_ SG_ 513 RPM "Current RPM";
CM_ SG_ 513 IgnitionTiming "Current Ignition Timing. Positive is advance.";
CM_ SG_ 513 InjDuty "Injection Duty
@ -128,10 +131,12 @@ CM_ SG_ 513 InjDuty "Injection Duty
CM_ SG_ 513 IgnDuty "Ignition Duty";
CM_ SG_ 513 VehicleSpeed "Current Vehicle Speed";
CM_ SG_ 513 FlexPct "Ethanol percent";
CM_ BO_ 514 "Throttle positions";
CM_ SG_ 514 PPS "Current Accelerator Pedal Position
";
CM_ SG_ 514 TPS1 "Throttle Body 1 Position";
CM_ SG_ 514 TPS2 "Throttle Body 2 Position";
CM_ SG_ 514 Wastegate "Wastegate actuator position";
CM_ SG_ 515 MAP "Current MAP Reading";
CM_ SG_ 515 CoolantTemp "Current Coolant Temperature Reading";
CM_ SG_ 515 IntakeTemp "Current Intake Air Temperature";