diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index be1cfc5fdb..5b51dc929c 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -48,15 +48,15 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 uint16_t autoscale auxTemp1;;"deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 uint16_t autoscale auxTemp2;;"deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 - uint16_t autoscale TPSValue;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 - uint16_t autoscale throttlePedalPosition;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + uint16_t autoscale TPSValue;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + uint16_t autoscale throttlePedalPosition;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 - uint16_t tpsADC;;"", 1, 0, 0, 0, 0 - uint16_t autoscale MAFValue;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 + uint16_t tpsADC;;"ADC", 1, 0, 0, 0, 0 + uint16_t autoscale MAFValue;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 - uint16_t autoscale massAirFlowValue;;"",{1/@@PACK_MULT_MASS_FLOW@@}, 0, 0, 0, 0 - uint16_t autoscale MAPValue;;"",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 - uint16_t autoscale baroPressure;;"",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 + uint16_t autoscale massAirFlowValue;;"Kg/h",{1/@@PACK_MULT_MASS_FLOW@@}, 0, 0, 0, 0 + uint16_t autoscale MAPValue;;"kPa",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 + uint16_t autoscale baroPressure;;"kPa",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 uint16_t autoscale lambdaValue;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0 uint8_t autoscale knockRetard;;"",{1/10}, 0, 0, 0, 0 @@ -65,7 +65,7 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 uint16_t autoscale VBatt;;"",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 uint16_t autoscale oilPressure;;"",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 - uint16_t autoscale vvtPositionB1I;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + uint16_t autoscale vvtPositionB1I;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 uint16_t autoscale chargeAirMass;;"",{1/1000}, 0, 0, 0, 0 uint16_t autoscale crankingFuelMass;airmass in mg, 0-65 grams;"",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 @@ -216,9 +216,9 @@ uint16_t rpmAcceleration;;"RPM/s",1, 0, 0, 0, 0 uint16_t autoscale lambda2;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0 uint16_t autoscale airFuelRatio2;;"",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0 - uint16_t autoscale vvtPositionB1E;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 - uint16_t autoscale vvtPositionB2I;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 - uint16_t autoscale vvtPositionB2E;;"",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + uint16_t autoscale vvtPositionB1E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + uint16_t autoscale vvtPositionB2I;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + uint16_t autoscale vvtPositionB2E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 uint16_t[2] autoscale fuelTrim;;"",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index c7bd0ae943..f865fe339c 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -36,6 +36,7 @@ enum class TsCalMode : uint8_t { * 1) we inherit from generated ts_outputs_s based on output_channels.txt * 2) '[OutputChannels]' block in rusefi.input * 3) com.rusefi.core.Sensor enum in rusEFI console source code + * 4) static constexpr LogField fields[] SD card logging * * see also [OutputChannels] in rusefi.input * see also TS_OUTPUT_SIZE in rusefi_config.txt diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 0fda03e621..6d41bb0e53 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -217,18 +217,15 @@ isTps2Error = bits, U32, 0, [29:29] isIdleClosedLoop = bits, U32, 0, [30:30] isIdleCoasting = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 +rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 +speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 +vehicleSpeedKph = scalar, U08, 10, "kph", 1, 0 +internalMcuTemperature = scalar, U08, 11, "deg C", 1, 0 +coolant = scalar, U16, 12, "deg C", 0.01, 0 +intake = scalar, U16, 14, "deg C", 0.01, 0 +auxTemp1 = scalar, U16, 16, "deg C", 0.01, 0 +auxTemp2 = scalar, U16, 18, "deg C", 0.01, 0 - rpmAcceleration = scalar, S16, 6, "RPM/s", 1, 0 - speedToRpmRatio = scalar, S16, 8, "value",{1/@@PACK_MULT_PERCENT@@}, 0 - vehicleSpeedKph = scalar, U08, 10, "kph", 1, 0.0 - -; temperatures - internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0 - coolant = scalar, S16, 12, "deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0.0 - intake = scalar, S16, 14, "deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0.0 - auxTemp1 = scalar, S16, 16, "deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0.0 - auxTemp2 = scalar, S16, 18, "deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0.0 - ; throttle, pedal TPSValue = scalar, S16, 20, "%",{1/@@PACK_MULT_PERCENT@@}, 0