diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index 34dc678..548d89d 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -812,9 +812,9 @@ entry = esr1, "WBO: ESR1", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" -entry = value0, "ETB: SENT value0", int, "%d" -entry = value1, "ETB: SENT value1", int, "%d" -entry = errorRate, "ETB: SENT error rate", float, "%.3f" +entry = value0, "SENT ch0 value0", int, "%d" +entry = value1, "SENT ch0 value1", int, "%d" +entry = errorRate, "SENT ch0 error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" diff --git a/generated/console/binary/generated/gauges.ini b/generated/console/binary/generated/gauges.ini index 838c516..2417c51 100644 --- a/generated/console/binary/generated/gauges.ini +++ b/generated/console/binary/generated/gauges.ini @@ -37,6 +37,7 @@ etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count" etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -value0Gauge = value0,"ETB: SENT value0", "value", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -value1Gauge = value1,"ETB: SENT value1", "value", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -errorRateGauge = errorRate,"ETB: SENT error rate", "ratio", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 + gaugeCategory = "Sensors - SENT" +value0Gauge = value0,"SENT ch0 value0", "RAW", 0.0,4095.0, 0.0,4095.0, 0.0,4095.0, 0,0 +value1Gauge = value1,"SENT ch0 value1", "RAW", 0.0,4095.0, 0.0,4095.0, 0.0,4095.0, 0,0 +errorRateGauge = errorRate,"SENT ch0 error rate", "% (don't belive me)", 0.0,100.0, 0.0,100.0, 0.0,100.0, 2,2 diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index dad8757..80f15d1 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -899,9 +899,9 @@ dcOutput0 = scalar, F32, 1776, "per", 1,0 isEnabled0_int = scalar, U08, 1780, "per", 1,0 isEnabled0 = bits, U32, 1784, [0:0] ; total TS size = 1788 -value0 = scalar, U16, 1788, "value", 1,0 -value1 = scalar, U16, 1790, "value", 1,0 -errorRate = scalar, F32, 1792, "ratio", 1,0 +value0 = scalar, U16, 1788, "RAW", 1,0 +value1 = scalar, U16, 1790, "RAW", 1,0 +errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 ; total TS size = 1796 vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 vvtOutput = scalar, U08, 1798, "%", 0.5, 0 diff --git a/generated/controllers/generated/engine_configuration_generated_structures_hellen-f4-community.h b/generated/controllers/generated/engine_configuration_generated_structures_hellen-f4-community.h index b4e834c..9dfb1ea 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_hellen-f4-community.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_hellen-f4-community.h @@ -4189,6 +4189,7 @@ struct engine_configuration_s { */ uint8_t acRelayAlternatorDutyAdder; /** + * If you have SENT TPS sensor please select type. For analog TPS lease None * offset 3359 */ SentEtbType sentEtbType; @@ -4697,9 +4698,14 @@ struct engine_configuration_s { */ float secondaryInjectorFuelReferencePressure; /** - * units: units + * SENT input connected to ETB * offset 3924 */ + SentInput EtbSentInput; + /** + * units: units + * offset 3925 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment diff --git a/generated/controllers/generated/rusefi_generated_hellen-f4-community.h b/generated/controllers/generated/rusefi_generated_hellen-f4-community.h index 94a6238..26ffddd 100644 --- a/generated/controllers/generated/rusefi_generated_hellen-f4-community.h +++ b/generated/controllers/generated/rusefi_generated_hellen-f4-community.h @@ -352,7 +352,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 111 +#define END_OF_CALIBRATION_PADDING 110 #define engine_configuration_s_size 4036 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -503,6 +503,7 @@ #define GAUGE_CATEGORY_BOOST_CONTROL "Boost Control" #define GAUGE_CATEGORY_ETB "ETB more" #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" +#define GAUGE_CATEGORY_SENT "Sensors - SENT" #define GAUGE_CATEGORY_SYNC "Sync" #define GAUGE_CATEGORY_TIMING "Timing" #define GAUGE_COIL_DWELL_TIME "Ignition: coil charge time" @@ -1295,9 +1296,19 @@ #define SentEtbType_FORD_TYPE_1 2 #define SentEtbType_GM_TYPE_1 1 #define SentEtbType_NONE 0 +#define SentInput_auto_enum 0="NONE",1="INPUT1",2="INPUT2",3="INPUT3",4="INPUT4",5="INPUT5",6="INPUT6",7="INPUT7" +#define SentInput_enum "None", "SENT input 1", "SENT input 2", "SENT input 3", "SENT input 4", "SENT input 5", "SENT input 6", "SENT input 7" +#define SentInput_INPUT1 1 +#define SentInput_INPUT2 2 +#define SentInput_INPUT3 3 +#define SentInput_INPUT4 4 +#define SentInput_INPUT5 5 +#define SentInput_INPUT6 6 +#define SentInput_INPUT7 7 +#define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 901998387 +#define SIGNATURE_HASH 372452181 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1758,7 +1769,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI main.2024.11.26.hellen-f4-community.901998387" +#define TS_SIGNATURE "rusEFI main.2024.11.27.hellen-f4-community.372452181" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_hellen-f4-community.h b/generated/controllers/generated/signature_hellen-f4-community.h index 01140b8..6460e30 100644 --- a/generated/controllers/generated/signature_hellen-f4-community.h +++ b/generated/controllers/generated/signature_hellen-f4-community.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 901998387 -#define TS_SIGNATURE "rusEFI main.2024.11.26.hellen-f4-community.901998387" +#define SIGNATURE_HASH 372452181 +#define TS_SIGNATURE "rusEFI main.2024.11.27.hellen-f4-community.372452181" diff --git a/generated/live_data_generated/sent_state_generated.h b/generated/live_data_generated/sent_state_generated.h index c26bb82..e5f61e7 100644 --- a/generated/live_data_generated/sent_state_generated.h +++ b/generated/live_data_generated/sent_state_generated.h @@ -6,20 +6,20 @@ // start of sent_state_s struct sent_state_s { /** - * "ETB: SENT value0" - * units: value + * "SENT ch0 value0" + * units: RAW * offset 0 */ uint16_t value0 = (uint16_t)0; /** - * "ETB: SENT value1" - * units: value + * "SENT ch0 value1" + * units: RAW * offset 2 */ uint16_t value1 = (uint16_t)0; /** - * "ETB: SENT error rate" - * units: ratio + * "SENT ch0 error rate" + * units: % (don't belive me) * offset 4 */ float errorRate = (float)0; diff --git a/generated/tunerstudio/generated/rusefi_hellen-f4-community.ini b/generated/tunerstudio/generated/rusefi_hellen-f4-community.ini index 32da849..d6f726f 100644 --- a/generated/tunerstudio/generated/rusefi_hellen-f4-community.ini +++ b/generated/tunerstudio/generated/rusefi_hellen-f4-community.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2024.11.26.hellen-f4-community.901998387" + signature = "rusEFI main.2024.11.27.hellen-f4-community.372452181" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.11.26.hellen-f4-community.901998387" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.11.27.hellen-f4-community.372452181" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -1391,7 +1391,8 @@ knockSpectrumSensitivity = scalar, F32, 3908, "sense", 1, 0, 0, 1, 2 knockFrequency = scalar, F32, 3912, "Hz", 1, 0, 0, 20000, 2 secondaryInjectorCompensationMode = bits, U08, 3916, [0:1], "None", "Fixed rail pressure", "Sensed Rail Pressure", "INVALID" secondaryInjectorFuelReferencePressure = scalar, F32, 3920, "kPa", 1, 0, 50, 700000, 0 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3924, [111], "units", 1, 0, 0, 1, 0 +EtbSentInput = bits, U08, 3924, [0:2], "None", "SENT input 1", "SENT input 2", "SENT input 3", "SENT input 4", "SENT input 5", "SENT input 6", "SENT input 7" +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3925, [110], "units", 1, 0, 0, 1, 0 postCrankingFactor = array, F32, 4036, [6x6], "mult", 1, 0, 1, 3, 2 postCrankingDurationBins = array, F32, 4180, [6], "count", 1, 0, 0, 1000, 0 postCrankingCLTBins = array, S16, 4204, [6], "C", 1, 0, -100, 250, 0 @@ -2357,6 +2358,7 @@ minimumOilPressureValues = array, U08, 22964, [8], "kPa", 10.0, 0, 0, 1000, 0 luaDigitalInputPins6 = "luaDigitalInputPins 6" luaDigitalInputPins7 = "luaDigitalInputPins 7" luaDigitalInputPins8 = "luaDigitalInputPins 8" + sentEtbType = "If you have SENT TPS sensor please select type. For analog TPS lease None" acPressureEnableHyst = "Hysterisis: if Pressure High Disable is 240kpa, and acPressureEnableHyst is 20, when the ECU sees 240kpa, A/C will be disabled, and stay disabled until 240-20=220kpa is reached" tpsSecondaryMaximum = "For Ford TPS, use 53%. For Toyota ETCS-i, use ~65%" ppsSecondaryMaximum = "For Toyota ETCS-i, use ~69%" @@ -2454,6 +2456,7 @@ minimumOilPressureValues = array, U08, 22964, [8], "kPa", 10.0, 0, 0, 1000, 0 knockFrequency = "Estimated knock frequency, ignore cylinderBore if this one > 0" secondaryInjectorCompensationMode = "None = I have a MAP-referenced fuel pressure regulator\nFixed rail pressure = I have an atmosphere-referenced fuel pressure regulator (returnless, typically)\nSensed rail pressure = I have a fuel pressure sensor" secondaryInjectorFuelReferencePressure = "This is the pressure at which your injector flow is known.\nFor example if your injectors flow 400cc/min at 3.5 bar, enter 350kpa here." + EtbSentInput = "SENT input connected to ETB" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, open loop component of PID closed loop control" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -3485,9 +3488,9 @@ dcOutput0 = scalar, F32, 1776, "per", 1,0 isEnabled0_int = scalar, U08, 1780, "per", 1,0 isEnabled0 = bits, U32, 1784, [0:0] ; total TS size = 1788 -value0 = scalar, U16, 1788, "value", 1,0 -value1 = scalar, U16, 1790, "value", 1,0 -errorRate = scalar, F32, 1792, "ratio", 1,0 +value0 = scalar, U16, 1788, "RAW", 1,0 +value1 = scalar, U16, 1790, "RAW", 1,0 +errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 ; total TS size = 1796 vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 vvtOutput = scalar, U08, 1798, "%", 0.5, 0 @@ -4769,9 +4772,10 @@ etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count" etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -value0Gauge = value0,"ETB: SENT value0", "value", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -value1Gauge = value1,"ETB: SENT value1", "value", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -errorRateGauge = errorRate,"ETB: SENT error rate", "ratio", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 + gaugeCategory = "Sensors - SENT" +value0Gauge = value0,"SENT ch0 value0", "RAW", 0.0,4095.0, 0.0,4095.0, 0.0,4095.0, 0,0 +value1Gauge = value1,"SENT ch0 value1", "RAW", 0.0,4095.0, 0.0,4095.0, 0.0,4095.0, 0,0 +errorRateGauge = errorRate,"SENT ch0 error rate", "% (don't belive me)", 0.0,100.0, 0.0,100.0, 0.0,100.0, 2,2 @@ -6037,9 +6041,9 @@ entry = esr1, "WBO: ESR1", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" -entry = value0, "ETB: SENT value0", int, "%d" -entry = value1, "ETB: SENT value1", int, "%d" -entry = errorRate, "ETB: SENT error rate", float, "%.3f" +entry = value0, "SENT ch0 value0", int, "%d" +entry = value1, "SENT ch0 value1", int, "%d" +entry = errorRate, "SENT ch0 error rate", float, "%.3f" entry = vvtTarget, "vvtTarget", float, "%.3f" entry = vvtOutput, "vvtOutput", float, "%.3f" entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" @@ -6319,6 +6323,10 @@ menuDialog = main subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } subMenu = std_separator + # SENT interface + subMenu = sentInputs "SENT inputs" + subMenu = std_separator + # Misc sensors groupMenu = "Oil sensors" groupChildMenu = oilPressureSensor, "Oil pressure" @@ -7759,8 +7767,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0} dialog = tpsSent1, "SENT TPS" - field = "Input #1", sentInputPins1 - field = "ETB type", sentEtbType, {sentInputPins1 != 0} + field = "ETB SENT type", sentEtbType + field = "ETB SENT input" EtbSentInput, {sentEtbType != 0 } field = "Closed value", customSentTpsMin, {sentEtbType == 3 } field = "Open value", customSentTpsMax, {sentEtbType == 3 } @@ -8290,8 +8298,11 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = auxLinearSensor2 field = "Aux Speed Input 1", auxSpeedSensorInputPin1 field = "Aux Speed Input 2", auxSpeedSensorInputPin2 - field = "Use Aux Speed Sensors for slip ratio", useAuxSpeedForSlipRatio - field = "Use VSS As Second Wheel Speed", useVssAsSecondWheelSpeed + field = "Use Aux Speed Sensors for slip ratio", useAuxSpeedForSlipRatio + field = "Use VSS As Second Wheel Speed", useVssAsSecondWheelSpeed + + dialog = sentInputs, "SENT protocol inputs" + field = "SENT Input #1", sentInputPins1 ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis diff --git a/generated/tunerstudio/generated/signature_hellen-f4-community.txt b/generated/tunerstudio/generated/signature_hellen-f4-community.txt index 1aff35a..e12e261 100644 --- a/generated/tunerstudio/generated/signature_hellen-f4-community.txt +++ b/generated/tunerstudio/generated/signature_hellen-f4-community.txt @@ -1,4 +1,4 @@ ! Generated by gen_signature.sh ! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar ! gen_signature.sh Using env variable branch [main] -#define TS_SIGNATURE "rusEFI main.2024.11.26.hellen-f4-community.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.11.27.hellen-f4-community.@@SIGNATURE_HASH@@"