diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 97d2f02cae..1975f6944c 100644 --- a/firmware/console/binary/ts_outputs_generated.h +++ b/firmware/console/binary/ts_outputs_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Thu Nov 18 20:17:37 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sat Nov 20 13:19:55 EST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -7,100 +7,100 @@ struct ts_outputs_s { /** offset 0 bit 0 */ - bool sd_present : 1; + bool sd_present : 1 {}; /** offset 0 bit 1 */ - bool isIgnitionEnabledIndicator : 1; + bool isIgnitionEnabledIndicator : 1 {}; /** offset 0 bit 2 */ - bool isInjectionEnabledIndicator : 1; + bool isInjectionEnabledIndicator : 1 {}; /** offset 0 bit 3 */ - bool sd_logging_internal : 1; + bool sd_logging_internal : 1 {}; /** offset 0 bit 4 */ - bool isCylinderCleanupActivated : 1; + bool isCylinderCleanupActivated : 1 {}; /** offset 0 bit 5 */ - bool isFuelPumpOn : 1; + bool isFuelPumpOn : 1 {}; /** offset 0 bit 6 */ - bool isFanOn : 1; + bool isFanOn : 1 {}; /** offset 0 bit 7 */ - bool isO2HeaterOn : 1; + bool isO2HeaterOn : 1 {}; /** offset 0 bit 8 */ - bool checkEngine : 1; + bool checkEngine : 1 {}; /** offset 0 bit 9 */ - bool needBurn : 1; + bool needBurn : 1 {}; /** offset 0 bit 10 */ - bool sd_msd : 1; + bool sd_msd : 1 {}; /** offset 0 bit 11 */ - bool clutchUpState : 1; + bool clutchUpState : 1 {}; /** offset 0 bit 12 */ - bool clutchDownState : 1; + bool clutchDownState : 1 {}; /** offset 0 bit 13 */ - bool isFan2On : 1; + bool isFan2On : 1 {}; /** offset 0 bit 14 */ - bool unusedb14 : 1; + bool unusedb14 : 1 {}; /** offset 0 bit 15 */ - bool brakePedalState : 1; + bool brakePedalState : 1 {}; /** offset 0 bit 16 */ - bool toothLogReady : 1; + bool toothLogReady : 1 {}; /** offset 0 bit 17 */ - bool acSwitchState : 1; + bool acSwitchState : 1 {}; /** offset 0 bit 18 */ - bool isTpsError : 1; + bool isTpsError : 1 {}; /** offset 0 bit 19 */ - bool isCltError : 1; + bool isCltError : 1 {}; /** offset 0 bit 20 */ - bool isMapError : 1; + bool isMapError : 1 {}; /** offset 0 bit 21 */ - bool isIatError : 1; + bool isIatError : 1 {}; /** offset 0 bit 22 */ - bool acState : 1; + bool acState : 1 {}; /** offset 0 bit 23 */ - bool isTriggerError : 1; + bool isTriggerError : 1 {}; /** offset 0 bit 24 */ - bool hasCriticalError : 1; + bool hasCriticalError : 1 {}; /** offset 0 bit 25 */ - bool isWarnNow : 1; + bool isWarnNow : 1 {}; /** offset 0 bit 26 */ - bool isPedalError : 1; + bool isPedalError : 1 {}; /** offset 0 bit 27 */ - bool isKnockChipOk : 1; + bool isKnockChipOk : 1 {}; /** offset 0 bit 28 */ - bool launchTriggered : 1; + bool launchTriggered : 1 {}; /** offset 0 bit 29 */ - bool isTps2Error : 1; + bool isTps2Error : 1 {}; /** offset 0 bit 30 */ - bool isIdleClosedLoop : 1; + bool isIdleClosedLoop : 1 {}; /** offset 0 bit 31 */ - bool isIdleCoasting : 1; + bool isIdleCoasting : 1 {}; /** * offset 4 */ @@ -109,8 +109,28 @@ struct ts_outputs_s { * offset 6 */ uint16_t rpmAcceleration = (uint16_t)0; - /** total size 8*/ + /** + * offset 8 + */ + uint16_t speedToRpmRatio = (uint16_t)0; + /** + * offset 10 + */ + scaled_channel vehicleSpeedKph = (uint8_t)0; + /** + * offset 11 + */ + scaled_channel internalMcuTemperature = (uint8_t)0; + /** + * offset 12 + */ + scaled_channel coolantTemperature = (uint16_t)0; + /** + * offset 14 + */ + scaled_channel intakeAirTemperature = (uint16_t)0; + /** total size 16*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Thu Nov 18 00:04:44 EST 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/output_channels.txt Sat Nov 20 13:19:55 EST 2021 diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index f2a7b98c3f..d3bbd8e601 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -44,13 +44,6 @@ enum class TsCalMode : uint8_t { struct TunerStudioOutputChannels : ts_outputs_s { /* see also [OutputChannels] in rusefi.input */ - scaled_percent speedToRpmRatio; // 8 - scaled_channel vehicleSpeedKph; // 10 - - // temperatures - scaled_channel internalMcuTemperature; // offset 11 - scaled_temperature coolantTemperature; // offset 12 - scaled_temperature intakeAirTemperature; // offset 14 scaled_temperature auxTemp1; // offset 16 scaled_temperature auxTemp2; // offset 18 diff --git a/firmware/integration/output_channels.txt b/firmware/integration/output_channels.txt index 21533248e2..cc990cc753 100644 --- a/firmware/integration/output_channels.txt +++ b/firmware/integration/output_channels.txt @@ -38,11 +38,11 @@ uint16_t autoscale rpm;;"",1, 0, 0, 0, 0 uint16_t rpmAcceleration;;"",1, 0, 0, 0, 0 - uint16_t speedToRpmRatio;;"",{@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + uint16_t speedToRpmRatio;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint8_t autoscale vehicleSpeedKph;;"",1, 0, 0, 0, 0 uint8_t autoscale internalMcuTemperature;;"",1, 0, 0, 0, 0 - uint16_t autoscale coolantTemperature;;"",@@PACK_MULT_TEMPERATURE@@, 0, 0, 0, 0 - uint16_t autoscale intakeAirTemperature;;"",@@PACK_MULT_TEMPERATURE@@, 0, 0, 0, 0 + uint16_t autoscale coolantTemperature;;"",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 + uint16_t autoscale intakeAirTemperature;;"",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 end_struct