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

[TCU] TS interface and output channels (#1747) 

* add tcu ts outputs

* accidental change?

* rearrange
This commit is contained in:
David Holdeman 2020-09-02 12:30:54 -05:00 committed by GitHub
parent e287a4e211
commit 9ef0813962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,14 +229,18 @@ typedef struct {
scaled_voltage rawOilPressure; // 242 scaled_voltage rawOilPressure; // 242
int16_t tuneCrc16; // 244 int16_t tuneCrc16; // 244
uint8_t sd_status; // 246
uint8_t pad; uint8_t sd_status; // 246
int8_t tcuCurrentGear; // 247
scaled_voltage rawPpsSecondary; // 248 scaled_voltage rawPpsSecondary; // 248
int8_t knockLevels[12]; int8_t knockLevels[12];
uint8_t unusedAtTheEnd[26]; // we have some unused bytes to allow compatible TS changes int8_t tcuDesiredGear; // 262
uint8_t unusedAtTheEnd[22]; // we have some unused bytes to allow compatible TS changes
// Temporary - will remove soon // Temporary - will remove soon
TsDebugChannels* getDebugChannels() { TsDebugChannels* getDebugChannels() {

26
firmware/tunerstudio/rusefi.input
View File

@ -343,6 +343,10 @@ enable2ndByteCanID = false
tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0
sd_status = scalar, U08, 246, "", 1.0, 0.0 sd_status = scalar, U08, 246, "", 1.0, 0.0
; Transmission
tcuCurrentGear = scalar, S08, 247, "gear", 1, 0
tcuDesiredGear = scalar, S08, 262, "gear", 1, 0
knock1 = scalar, S08, 250, "dbv", 1, 0 knock1 = scalar, S08, 250, "dbv", 1, 0
knock2 = scalar, S08, 251, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0
knock3 = scalar, S08, 252, "dbv", 1, 0 knock3 = scalar, S08, 252, "dbv", 1, 0
@ -973,6 +977,10 @@ gaugeCategory = Sensors - Raw
rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0
rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0
gaugeCategory = Transmission
desiredGearGauge = tcuDesiredGear, "Desired", "gear", -1, 10, -1, -1, 10, 10, 0, 0
currentGearGauge = tcuCurrentGear, "Current", "gear", -1, 10, -1, -1, 10, 10, 0, 0
gaugeCategory = Knock gaugeCategory = Knock
knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
@ -1186,6 +1194,10 @@ gaugeCategory = Knock
entry = etb1DutyCycle, @@GAUGE_NAME_ETB_DUTY@@, float, "%.3f" entry = etb1DutyCycle, @@GAUGE_NAME_ETB_DUTY@@, float, "%.3f"
entry = etbTarget, "ETB Target", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f"
; Transmission
entry = tcuDesiredGear, "Desired Gear", int, "%d"
entry = tcuCurrentGear, "Current Gear", int, "%d"
entry = knock1, "Knock 1", int, "%d" entry = knock1, "Knock 1", int, "%d"
entry = knock2, "Knock 2", int, "%d" entry = knock2, "Knock 2", int, "%d"
entry = knock3, "Knock 3", int, "%d" entry = knock3, "Knock 3", int, "%d"
@ -1326,6 +1338,9 @@ menuDialog = main
subMenu = fsioCurve3, "FSIO Curve #3" subMenu = fsioCurve3, "FSIO Curve #3"
subMenu = fsioCurve4, "FSIO Curve #4" subMenu = fsioCurve4, "FSIO Curve #4"
subMenu = std_separator
subMenu = tcuControls, "Transmission Settings"
menu = "&Sensors" menu = "&Sensors"
# Base analog input settings # Base analog input settings
subMenu = otherSensorInputs, "Misc sensors" subMenu = otherSensorInputs, "Misc sensors"
@ -2373,7 +2388,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11}
field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12}
; Engine->hip9011 Settings ; Engine->hip9011 Settings
dialog = hipFunction, "HIP9011 Settings (knock decoder)" dialog = hipFunction, "HIP9011 Settings (knock decoder)"
field = "Enabled", isHip9011Enabled field = "Enabled", isHip9011Enabled
@ -2849,6 +2863,16 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
field = "ADC #3", fsioAdc3 field = "ADC #3", fsioAdc3
field = "ADC #4", fsioAdc4 field = "ADC #4", fsioAdc4
dialog = shiftInputPanel
field = "TCU Enabled" tcuEnabled
field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled }
field = "Upshift Pin Mode" tcuUpshiftButtonPinMode, { tcuEnabled }
field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled }
field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled }
dialog = tcuControls, "Transmission Settings"
panel = shiftInputPanel
;Boost Open Loop ;Boost Open Loop
dialog = boost_left, "" dialog = boost_left, ""