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

automation around outputs section #197 

packing & making my job easier
This commit is contained in:
rusefillc 2021-11-17 23:22:08 -05:00
parent cb300ec985
commit 54a9b62de1
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/console/binary/tunerstudio_outputs.h
View File

@ -30,12 +30,12 @@ enum class TsCalMode : uint8_t {
};
/**
* At the moment rusEfi does NOT have any code generation around TS output channels, three locations have to be changed manually
* todo https://github.com/rusefi/rusefi/issues/197
* At the moment rusEFI does NOT have any code generation around TS output channels, three locations have to be changed manually
* 1) this TunerStudioOutputChannels firmware version of the structure
* 2) '[OutputChannels]' block in rusefi.input
* 3) com.rusefi.core.Sensor enum in rusEfi console source code
* 3) com.rusefi.core.Sensor enum in rusEFI console source code
*
* please be aware that 'float' (F32) type requires TunerStudio version 2.6 and later
*/
struct TunerStudioOutputChannels {
/* see also [OutputChannels] in rusefi.input */
@ -47,17 +47,17 @@ struct TunerStudioOutputChannels {
unsigned int sd_present : 1; // bit 0, 72
unsigned int isIgnitionEnabledIndicator : 1; // bit 1
unsigned int isInjectionEnabledIndicator : 1; // bit 2
unsigned int unusedb3 : 1; // bit 3
unsigned int sd_logging_internal : 1; // bit 3
unsigned int isCylinderCleanupActivated : 1; // bit 4
unsigned int isFuelPumpOn : 1; // bit 5
unsigned int isFanOn : 1; // bit 6
unsigned int isO2HeaterOn : 1; // bit 7
unsigned int checkEngine : 1; // bit 8
unsigned int needBurn : 1; // bit 9
unsigned int unusedBit10 : 1; // bit 10
unsigned int sd_msd : 1; // bit 10
unsigned int clutchUpState : 1; // bit 11
unsigned int clutchDownState : 1; // bit 12
unsigned int unusedb13 : 1; // bit 13
unsigned int isFan2On : 1; // bit 13
unsigned int unusedb14 : 1; // bit 14
unsigned int brakePedalState : 1; // bit 15. 0 - not pressed, 1 = pressed
unsigned int toothLogReady : 1; // bit 16
@ -233,10 +233,7 @@ struct TunerStudioOutputChannels {
scaled_channel<uint16_t> tuneCrc16; // 244
// Offset 246: bits
uint8_t sd_logging_internal : 1; // bit 0
uint8_t sd_msd : 1; // bit 1
uint8_t isFan2On : 1; // bit 2
scaled_channel<uint8_t> unusedAt246;
scaled_channel<uint8_t> tcuCurrentGear; // 247

6
firmware/tunerstudio/rusefi.input
View File

@ -188,14 +188,17 @@ enable2ndByteCanID = false
sd_present = bits, U32, 0, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false";
isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false";
sd_logging_internal = bits U32 , 0, [3:3], "true", "false"
isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 0, [5:5], "true", "false";
ind_fan = bits, U32, 0, [6:6], "true", "false";
ind_o2_heater = bits, U32, 0, [7:7], "true", "false";
ind_check_engine= bits, U32, 0, [8:8], "true", "false";
needBurn = bits, U32, 0, [9:9], "true", "false";
sd_msd = bits, U32, 0, [10:10], "true", "false"
clutchUpState =bits, U32, 0, [11:11], "true", "false";
clutchDownState =bits, U32, 0, [12:12], "true", "false";
ind_fan_2 = bits, U32, 0, [13:13], "true", "false"
brakePedalIndicator=bits, U32, 0, [15:15], "true", "false";
toothLogReady =bits, U32, 0, [16:16], "true", "false";
acSwitchState =bits, U32, 0, [17:17], "true", "false";
@ -376,9 +379,6 @@ enable2ndByteCanID = false
; we use this to match logs to tunes
tuneCrc16 = scalar, U16, 244, "crc16", 1, 0
sd_logging_internal = bits, U08, 246, [0:0], "true", "false"
sd_msd = bits, U08, 246, [1:1], "true", "false"
ind_fan_2 = bits, U08, 246, [2:2], "true", "false"
; Transmission
tcuCurrentGear = scalar, S08, 247, "gear", 1, 0