diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 9ae540b556..6ce1a22b9f 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Dec 11 16:41:07 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Dec 21 12:00:03 EST 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -347,6 +347,93 @@ struct trigger_config_s { * This option could be used if your second trigger channel is broken offset 4 bit 2 */ bool useOnlyFirstChannel : 1; + /** + offset 4 bit 3 */ + bool unusedBit_4_3 : 1; + /** + offset 4 bit 4 */ + bool unusedBit_4_4 : 1; + /** + offset 4 bit 5 */ + bool unusedBit_4_5 : 1; + /** + offset 4 bit 6 */ + bool unusedBit_4_6 : 1; + /** + offset 4 bit 7 */ + bool unusedBit_4_7 : 1; + /** + offset 4 bit 8 */ + bool unusedBit_4_8 : 1; + /** + offset 4 bit 9 */ + bool unusedBit_4_9 : 1; + /** + offset 4 bit 10 */ + bool unusedBit_4_10 : 1; + /** + offset 4 bit 11 */ + bool unusedBit_4_11 : 1; + /** + offset 4 bit 12 */ + bool unusedBit_4_12 : 1; + /** + offset 4 bit 13 */ + bool unusedBit_4_13 : 1; + /** + offset 4 bit 14 */ + bool unusedBit_4_14 : 1; + /** + offset 4 bit 15 */ + bool unusedBit_4_15 : 1; + /** + offset 4 bit 16 */ + bool unusedBit_4_16 : 1; + /** + offset 4 bit 17 */ + bool unusedBit_4_17 : 1; + /** + offset 4 bit 18 */ + bool unusedBit_4_18 : 1; + /** + offset 4 bit 19 */ + bool unusedBit_4_19 : 1; + /** + offset 4 bit 20 */ + bool unusedBit_4_20 : 1; + /** + offset 4 bit 21 */ + bool unusedBit_4_21 : 1; + /** + offset 4 bit 22 */ + bool unusedBit_4_22 : 1; + /** + offset 4 bit 23 */ + bool unusedBit_4_23 : 1; + /** + offset 4 bit 24 */ + bool unusedBit_4_24 : 1; + /** + offset 4 bit 25 */ + bool unusedBit_4_25 : 1; + /** + offset 4 bit 26 */ + bool unusedBit_4_26 : 1; + /** + offset 4 bit 27 */ + bool unusedBit_4_27 : 1; + /** + offset 4 bit 28 */ + bool unusedBit_4_28 : 1; + /** + offset 4 bit 29 */ + bool unusedBit_4_29 : 1; + /** + offset 4 bit 30 */ + bool unusedBit_4_30 : 1; + /** + offset 4 bit 31 */ + bool unusedBit_4_31 : 1; /** * offset 8 */ @@ -557,6 +644,9 @@ struct engine_configuration_s { /** offset 76 bit 30 */ bool issue_294_31 : 1; + /** + offset 76 bit 31 */ + bool unusedBit_34_31 : 1; /** * Closed throttle. todo: extract these two fields into a structure * See also tps1_1AdcChannel @@ -1476,6 +1566,96 @@ struct engine_configuration_s { /** offset 976 bit 1 */ bool todoClutchDownPinInverted : 1; + /** + offset 976 bit 2 */ + bool unusedBit_247_2 : 1; + /** + offset 976 bit 3 */ + bool unusedBit_247_3 : 1; + /** + offset 976 bit 4 */ + bool unusedBit_247_4 : 1; + /** + offset 976 bit 5 */ + bool unusedBit_247_5 : 1; + /** + offset 976 bit 6 */ + bool unusedBit_247_6 : 1; + /** + offset 976 bit 7 */ + bool unusedBit_247_7 : 1; + /** + offset 976 bit 8 */ + bool unusedBit_247_8 : 1; + /** + offset 976 bit 9 */ + bool unusedBit_247_9 : 1; + /** + offset 976 bit 10 */ + bool unusedBit_247_10 : 1; + /** + offset 976 bit 11 */ + bool unusedBit_247_11 : 1; + /** + offset 976 bit 12 */ + bool unusedBit_247_12 : 1; + /** + offset 976 bit 13 */ + bool unusedBit_247_13 : 1; + /** + offset 976 bit 14 */ + bool unusedBit_247_14 : 1; + /** + offset 976 bit 15 */ + bool unusedBit_247_15 : 1; + /** + offset 976 bit 16 */ + bool unusedBit_247_16 : 1; + /** + offset 976 bit 17 */ + bool unusedBit_247_17 : 1; + /** + offset 976 bit 18 */ + bool unusedBit_247_18 : 1; + /** + offset 976 bit 19 */ + bool unusedBit_247_19 : 1; + /** + offset 976 bit 20 */ + bool unusedBit_247_20 : 1; + /** + offset 976 bit 21 */ + bool unusedBit_247_21 : 1; + /** + offset 976 bit 22 */ + bool unusedBit_247_22 : 1; + /** + offset 976 bit 23 */ + bool unusedBit_247_23 : 1; + /** + offset 976 bit 24 */ + bool unusedBit_247_24 : 1; + /** + offset 976 bit 25 */ + bool unusedBit_247_25 : 1; + /** + offset 976 bit 26 */ + bool unusedBit_247_26 : 1; + /** + offset 976 bit 27 */ + bool unusedBit_247_27 : 1; + /** + offset 976 bit 28 */ + bool unusedBit_247_28 : 1; + /** + offset 976 bit 29 */ + bool unusedBit_247_29 : 1; + /** + offset 976 bit 30 */ + bool unusedBit_247_30 : 1; + /** + offset 976 bit 31 */ + bool unusedBit_247_31 : 1; /** * offset 980 */ @@ -2928,4 +3108,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Dec 11 16:41:07 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Dec 21 12:00:03 EST 2019 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 5478384f06..395355382b 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1849,6 +1849,64 @@ #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID" #define trigger_type_offset 524 #define trigger_type_offset_hex 20c +#define trigger_unusedBit_4_10_offset 528 +#define trigger_unusedBit_4_10_offset_hex 210 +#define trigger_unusedBit_4_11_offset 528 +#define trigger_unusedBit_4_11_offset_hex 210 +#define trigger_unusedBit_4_12_offset 528 +#define trigger_unusedBit_4_12_offset_hex 210 +#define trigger_unusedBit_4_13_offset 528 +#define trigger_unusedBit_4_13_offset_hex 210 +#define trigger_unusedBit_4_14_offset 528 +#define trigger_unusedBit_4_14_offset_hex 210 +#define trigger_unusedBit_4_15_offset 528 +#define trigger_unusedBit_4_15_offset_hex 210 +#define trigger_unusedBit_4_16_offset 528 +#define trigger_unusedBit_4_16_offset_hex 210 +#define trigger_unusedBit_4_17_offset 528 +#define trigger_unusedBit_4_17_offset_hex 210 +#define trigger_unusedBit_4_18_offset 528 +#define trigger_unusedBit_4_18_offset_hex 210 +#define trigger_unusedBit_4_19_offset 528 +#define trigger_unusedBit_4_19_offset_hex 210 +#define trigger_unusedBit_4_20_offset 528 +#define trigger_unusedBit_4_20_offset_hex 210 +#define trigger_unusedBit_4_21_offset 528 +#define trigger_unusedBit_4_21_offset_hex 210 +#define trigger_unusedBit_4_22_offset 528 +#define trigger_unusedBit_4_22_offset_hex 210 +#define trigger_unusedBit_4_23_offset 528 +#define trigger_unusedBit_4_23_offset_hex 210 +#define trigger_unusedBit_4_24_offset 528 +#define trigger_unusedBit_4_24_offset_hex 210 +#define trigger_unusedBit_4_25_offset 528 +#define trigger_unusedBit_4_25_offset_hex 210 +#define trigger_unusedBit_4_26_offset 528 +#define trigger_unusedBit_4_26_offset_hex 210 +#define trigger_unusedBit_4_27_offset 528 +#define trigger_unusedBit_4_27_offset_hex 210 +#define trigger_unusedBit_4_28_offset 528 +#define trigger_unusedBit_4_28_offset_hex 210 +#define trigger_unusedBit_4_29_offset 528 +#define trigger_unusedBit_4_29_offset_hex 210 +#define trigger_unusedBit_4_30_offset 528 +#define trigger_unusedBit_4_30_offset_hex 210 +#define trigger_unusedBit_4_31_offset 528 +#define trigger_unusedBit_4_31_offset_hex 210 +#define trigger_unusedBit_4_3_offset 528 +#define trigger_unusedBit_4_3_offset_hex 210 +#define trigger_unusedBit_4_4_offset 528 +#define trigger_unusedBit_4_4_offset_hex 210 +#define trigger_unusedBit_4_5_offset 528 +#define trigger_unusedBit_4_5_offset_hex 210 +#define trigger_unusedBit_4_6_offset 528 +#define trigger_unusedBit_4_6_offset_hex 210 +#define trigger_unusedBit_4_7_offset 528 +#define trigger_unusedBit_4_7_offset_hex 210 +#define trigger_unusedBit_4_8_offset 528 +#define trigger_unusedBit_4_8_offset_hex 210 +#define trigger_unusedBit_4_9_offset 528 +#define trigger_unusedBit_4_9_offset_hex 210 #define trigger_unusedCustomIsSynchronizationNeeded_offset 528 #define trigger_unusedCustomIsSynchronizationNeeded_offset_hex 210 #define trigger_unusedCustomNeedSecondTriggerInput_offset 528 @@ -1887,7 +1945,7 @@ #define triggerSimulatorPins2_offset_hex 2e1 #define triggerSimulatorPins3_offset 738 #define triggerSimulatorPins3_offset_hex 2e2 -#define TS_FILE_VERSION 20190701 +#define TS_FILE_VERSION 20191221 #define TS_OUTPUT_SIZE 220 #define ts_show_cj125 true #define ts_show_egt true @@ -1898,7 +1956,7 @@ #define ts_show_hip9011 true #define ts_show_joystick true #define ts_show_lcd true -#define TS_SIGNATURE "rusEFI v1.07" +#define TS_SIGNATURE "rusEFI v1.08" #define tunerStudioSerialSpeed_offset 728 #define tunerStudioSerialSpeed_offset_hex 2d8 #define twoWireBatchIgnition_offset 1476 @@ -1945,6 +2003,68 @@ #define unusedAnotherOne_offset_hex 2e8 #define unusedAtOldBoardConfigurationEnd_offset 988 #define unusedAtOldBoardConfigurationEnd_offset_hex 3dc +#define unusedBit_247_10_offset 976 +#define unusedBit_247_10_offset_hex 3d0 +#define unusedBit_247_11_offset 976 +#define unusedBit_247_11_offset_hex 3d0 +#define unusedBit_247_12_offset 976 +#define unusedBit_247_12_offset_hex 3d0 +#define unusedBit_247_13_offset 976 +#define unusedBit_247_13_offset_hex 3d0 +#define unusedBit_247_14_offset 976 +#define unusedBit_247_14_offset_hex 3d0 +#define unusedBit_247_15_offset 976 +#define unusedBit_247_15_offset_hex 3d0 +#define unusedBit_247_16_offset 976 +#define unusedBit_247_16_offset_hex 3d0 +#define unusedBit_247_17_offset 976 +#define unusedBit_247_17_offset_hex 3d0 +#define unusedBit_247_18_offset 976 +#define unusedBit_247_18_offset_hex 3d0 +#define unusedBit_247_19_offset 976 +#define unusedBit_247_19_offset_hex 3d0 +#define unusedBit_247_20_offset 976 +#define unusedBit_247_20_offset_hex 3d0 +#define unusedBit_247_21_offset 976 +#define unusedBit_247_21_offset_hex 3d0 +#define unusedBit_247_22_offset 976 +#define unusedBit_247_22_offset_hex 3d0 +#define unusedBit_247_23_offset 976 +#define unusedBit_247_23_offset_hex 3d0 +#define unusedBit_247_24_offset 976 +#define unusedBit_247_24_offset_hex 3d0 +#define unusedBit_247_25_offset 976 +#define unusedBit_247_25_offset_hex 3d0 +#define unusedBit_247_26_offset 976 +#define unusedBit_247_26_offset_hex 3d0 +#define unusedBit_247_27_offset 976 +#define unusedBit_247_27_offset_hex 3d0 +#define unusedBit_247_28_offset 976 +#define unusedBit_247_28_offset_hex 3d0 +#define unusedBit_247_29_offset 976 +#define unusedBit_247_29_offset_hex 3d0 +#define unusedBit_247_2_offset 976 +#define unusedBit_247_2_offset_hex 3d0 +#define unusedBit_247_30_offset 976 +#define unusedBit_247_30_offset_hex 3d0 +#define unusedBit_247_31_offset 976 +#define unusedBit_247_31_offset_hex 3d0 +#define unusedBit_247_3_offset 976 +#define unusedBit_247_3_offset_hex 3d0 +#define unusedBit_247_4_offset 976 +#define unusedBit_247_4_offset_hex 3d0 +#define unusedBit_247_5_offset 976 +#define unusedBit_247_5_offset_hex 3d0 +#define unusedBit_247_6_offset 976 +#define unusedBit_247_6_offset_hex 3d0 +#define unusedBit_247_7_offset 976 +#define unusedBit_247_7_offset_hex 3d0 +#define unusedBit_247_8_offset 976 +#define unusedBit_247_8_offset_hex 3d0 +#define unusedBit_247_9_offset 976 +#define unusedBit_247_9_offset_hex 3d0 +#define unusedBit_34_31_offset 76 +#define unusedBit_34_31_offset_hex 4c #define unusedErrorPin_offset 2040 #define unusedErrorPin_offset_hex 7f8 #define unusedFlexFuelSensor_offset 3100 diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 153b3ef331..4a304fd171 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -819,6 +819,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20191213; + return 20191221; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 8904f90435..4a0dcdf330 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1945,7 +1945,7 @@ #define triggerSimulatorPins2_offset_hex 2e1 #define triggerSimulatorPins3_offset 738 #define triggerSimulatorPins3_offset_hex 2e2 -#define TS_FILE_VERSION 20190701 +#define TS_FILE_VERSION 20191221 #define TS_OUTPUT_SIZE 220 #define ts_show_cj125 true #define ts_show_egt true @@ -1956,7 +1956,7 @@ #define ts_show_hip9011 true #define ts_show_joystick true #define ts_show_lcd true -#define TS_SIGNATURE "rusEFI v1.07" +#define TS_SIGNATURE "rusEFI v1.08" #define tunerStudioSerialSpeed_offset 728 #define tunerStudioSerialSpeed_offset_hex 2d8 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 24c6898f0d..30b7b23428 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -23,12 +23,12 @@ ! type name;comment -#define TS_SIGNATURE "rusEFI v1.07" +#define TS_SIGNATURE "rusEFI v1.08" ! ! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version ! so not forget to change fileVersion in rusefi.ini ! todo: is this not needed in light of TS_SIGNATURE? -#define TS_FILE_VERSION 20190701 +#define TS_FILE_VERSION 20191221 ! all the sub-structures are going to be nested within the primary structure, that's diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 11201f9aa5..74e2686545 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -44,7 +44,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 18 19:37:18 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 11:59:51 EST 2019 pageSize = 20000 page = 1 @@ -1248,141 +1248,177 @@ fileVersion = { 20190701 } ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 356 + ochBlockSize = 220 ; ; see TunerStudioOutputChannels struct ; - RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 + +; Bit flags + hasSdCard = bits, U32, 0, [0:0], "true", "false"; + isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; + ind_injection_enabled=bits,U32, 0, [2:2], "true", "false"; + isCylinderCleanupEnabled=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"; + ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false"; + clutchUpState =bits, U32, 0, [11:11], "true", "false"; + clutchDownState =bits, U32, 0, [12:12], "true", "false"; + knockEverIndicator=bits, U32, 0, [13:13], "true", "false"; + knockNowIndicator=bits, U32, 0, [14:14], "true", "false"; + brakePedalIndicator=bits, U32, 0, [15:15], "true", "false"; + toothLogReady =bits, U32, 0, [16:16], "true", "false"; + acSwitchIndicator =bits, U32, 0, [17:17], "true", "false"; + ind_tps_error = bits, U32, 0, [18:18], "true", "false"; + ind_clt_error = bits, U32, 0, [19:19], "true", "false"; + ind_map_error = bits, U32, 0, [20:21], "true", "false"; + ind_iat_error = bits, U32, 0, [21:22], "true", "false"; + ind_isTriggerError = bits, U32, 0, [23:23], "true", "false"; + ind_hasFatalError=bits, U32, 0, [24:24], "true", "false"; + ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; + +; RPM, vss + RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 + speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 + vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 + +; temperatures + internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0 #if CELSIUS - coolant = scalar, F32, 4, "deg C", 1, 0.0 + coolant = scalar, S16, 12, "deg C", 0.01, 0.0 #else - coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 + coolant = scalar, S16, 12, "deg F",{9/500}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "deg C", 1, 0.0 + intake = scalar, S16, 14, "deg C", 0.01, 0.0 #else - intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 + intake = scalar, S16, 14, "deg F",{9/500}, 17.77777 #endif - TPSValue = scalar, F32, 12, "%", 1, 0 - MAFValue = scalar, F32, 16, "V", 1, 0 - AFRValue = scalar, F32, 20, "AFR", 1, 0.0 - engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm - VBatt = scalar, F32, 28, "V", 1, 0.0 +; todo: aux1 +; todo: aux2 + + +; throttle, pedal + TPSValue = scalar, U16, 20, "%", 0.01, 0 + throttlePedalPosition = scalar,U16, 22, "%", 0.01, 0 + tpsADC = scalar, U16, 24, "ADC", 1, 0.0; + +; air flow/mass measurments + MAFValue = scalar, U16, 26, "V",0.001, 0 + massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 + baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 + AFRValue = scalar, U16, 34, "AFR",0.001, 0.0 + engineLoad = scalar, U16, 36, "%", 0.01, 0.0 ; Blend of MAP and TPS, depends on algorithm + +; misc sensors + VBatt = scalar, U16, 38, "V",0.001, 0.0 + oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0 + vvtPosition = scalar, U16, 42, "deg", 0.02, 0 + ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC = scalar, U16, 32, "ADC", 1, 0.0; - tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; - baroPressure = scalar, F32, 36, "pres", 1, 0.0; - MAPValue = scalar, F32, 40, "MAP", 1, 0.0; - ; total fuel squirt duration (in MS) per engine cycle according to current CLT - crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0; - baseFuel = scalar, F32, 48, "ms", 1, 0 - tCharge = scalar, F32, 52, "T", 1, 0.0; - ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0; - sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0; - ; actual total Ms time per engine cycle with all corrections - actualLastInjection = scalar, F32, 64, "ms", 1, 0.0; - debugFloatField1 = scalar, F32, 68, "val", 1, 0.0; - - hasSdCard = bits, U32, 72, [0:0], "true", "false"; - isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; - ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; - isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; - isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; - ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; - ind_fan = bits, U32, 72, [6:6], "true", "false"; - ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; - ind_check_engine= bits, U32, 72, [8:8], "true", "false"; - needBurn = bits, U32, 72, [9:9], "true", "false"; - ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; - clutchUpState =bits, U32, 72, [11:11], "true", "false"; - clutchDownState =bits, U32, 72, [12:12], "true", "false"; - knockEverIndicator=bits, U32, 72, [13:13], "true", "false"; - knockNowIndicator=bits, U32, 72, [14:14], "true", "false"; - brakePedalIndicator=bits, U32, 72, [15:15], "true", "false"; - toothLogReady =bits, U32, 72, [16:16], "true", "false"; - acSwitchIndicator =bits, U32, 72, [17:17], "true", "false"; - vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0; - - ind_tps_error = bits, U32, 80, [0:0], "true", "false"; - ind_clt_error = bits, U32, 80, [1:1], "true", "false"; - ind_map_error = bits, U32, 80, [2:2], "true", "false"; - ind_iat_error = bits, U32, 80, [3:3], "true", "false"; - ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; - ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; - ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; - firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "deg C", 1, 0 - egt2 = scalar, S16, 90, "deg C", 1, 0 - egt3 = scalar, S16, 92, "deg C", 1, 0 - egt4 = scalar, S16, 94, "deg C", 1, 0 - egt5 = scalar, S16, 96, "deg C", 1, 0 - egt6 = scalar, S16, 98, "deg C", 1, 0 - egt7 = scalar, S16, 100, "deg C", 1, 0 - egt8 = scalar, S16, 102, "deg C", 1, 0 - rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 - massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 - veValue = scalar, F32, 112, "ratio", 1, 0 - deltaTps = scalar, F32, 116, "ratio", 1, 0 - triggerErrorsCounter = scalar, U32,120, "counter", 1, 0 - engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0 - tpsAccelFuel = scalar, F32, 128, "ms", 1, 0 - baroCorrection = scalar, F32, 132, "%", 1, 0 - throttlePedalPosition = scalar, F32, 136, "%", 1, 0 - injectorDutyCycle= scalar, F32, 140, "%", 1, 0 - knockCount = scalar, U32, 144, "counter", 1, 0 - fuelTankLevel = scalar, F32, 148, "amount", 1, 0 - knockLevel = scalar, F32, 152, "Volts", 1, 0 - ; totalTriggerErrorCounter 156 - wallFuelAmount = scalar, F32, 160, "ms", 1, 0 - iatCorrection = scalar, F32, 164, "%", 1, 0 - wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 - idleAirValvePosition = scalar, F32, 172, "percent", 1, 0 - currentTargetAfr = scalar, F32, 176, "ratio", 1, 0 - chargeAirMass = scalar, F32, 180, "g", 1, 0 - cltCorrection = scalar, F32, 184, "%", 1, 0 - fuelRunning = scalar, F32, 188, "g", 1, 0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0; - injectorLagMs = scalar, F32, 196, "ms", 1, 0.0; - debugFloatField2 = scalar, F32, 200, "val", 1, 0.0; - debugFloatField3 = scalar, F32, 204, "val", 1, 0.0; - debugFloatField4 = scalar, F32, 208, "val", 1, 0.0; - debugFloatField5 = scalar, F32, 212, "val", 1, 0.0; - debugIntField2 = scalar, S32, 216, "val", 1, 0.0; - debugIntField3 = scalar, S32, 220, "val", 1, 0.0; - timeSeconds = scalar, U32, 224, "sec", 1, 0.0; - engineLoadDelta = scalar,F32, 228, "value", 1, 0 - speedToRpmRatio = scalar,F32, 232, "value", 1, 0 - warningCounter = scalar,U16, 236, "count", 1, 0 - - lastErrorCode = scalar,U16, 240, "error", 1, 0 - - internalMcuTemperature = scalar,F32, 244, "C", 1, 0 - vvtPosition = scalar,F32, 248, "deg", 1, 0 - engineMode = scalar, U32, 252, "em", 1, 0.0; - debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; - debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; - firmwareVersion = scalar,U32, 264, "version_f", 1, 0 - fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 - coilDutyCycle = scalar, F32, 272, "perc", 1, 0 - accelerationX = scalar, S16, 276, "G", 0.01, 0 - accelerationY = scalar, S16, 278, "G", 0.01, 0 - oilPressure = scalar, F32, 280, "kPa", 1, 0.0 - fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 - injectionOffset = scalar, F32, 288, "deg", 1, 0; - debugIntField4 = scalar, S16, 292, "val", 1, 0.0; - debugIntField5 = scalar, S16, 294, "val", 1, 0.0; - recentErrorCode0 = scalar,U16, 296, "error", 1, 0 - recentErrorCode1 = scalar,U16, 298, "error", 1, 0 - recentErrorCode2 = scalar,U16, 300, "error", 1, 0 - recentErrorCode3 = scalar,U16, 302, "error", 1, 0 - recentErrorCode4 = scalar,U16, 304, "error", 1, 0 - recentErrorCode5 = scalar,U16, 306, "error", 1, 0 - recentErrorCode6 = scalar,U16, 308, "error", 1, 0 - recentErrorCode7 = scalar,U16, 310, "error", 1, 0 - etbTarget = scalar,F32, 312, "%", 1, 0 - etb1DutyCycle = scalar,F32, 316, "%", 1, 0 - etb1Error = scalar,F32, 320, "%", 1, 0 + ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0; + +; fuel math + chargeAirMass = scalar, U16, 44, "g",0.001, 0 + crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + currentTargetAfr= scalar, U16, 48, "ratio",0.001, 0 + baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 + injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 + veValue = scalar, U08, 57, "ratio", 0.5, 0 + injectionOffset = scalar, S16, 58, "deg", 0.02, 0 + tCharge = scalar, U16, 60, "deg C", 0.01, 0.0 + +; Corrections + injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0 + iatCorrection = scalar, U16, 64, "%", 0.01, 0 + cltCorrection = scalar, U16, 66, "%", 0.01, 0 + baroCorrection = scalar, U16, 68, "%", 0.01, 0 + fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0 + +; Wall model AE + wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0 + wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0 + +; TPS/load AE + engineLoadDelta = scalar, S16, 76, "value", 0.01, 0 + deltaTps = scalar, S16, 78, "ratio", 0.01, 0 + engineLoadAccelExtra=scalar,S16, 80, "value", 0.01, 0 + tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0 + +; Ignition + ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0.0 + sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 + coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 + +; Idle & ETB + idleAirValvePosition=scalar,S16, 90, "%", 0.01, 0 + etbTarget = scalar, S16, 92, "%", 0.01, 0 + etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 + etb1Error = scalar, S16, 96, "%", 0.01, 0 + +; Fuel system + fuelTankLevel = scalar, S16, 98, "amount", 0.01, 0 + fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0 + +; Knock + knockCount = scalar, U32, 104,"counter", 1, 0 + knockLevel = scalar, F32, 108, "Volts", 1, 0 + +; Mode, firmware, protocol, run time + timeSeconds = scalar, U32, 112, "sec", 1, 0.0 + engineMode = scalar, U32, 116, "em", 1, 0.0; + firmwareVersion = scalar, U32, 120,"version_f", 1, 0 + firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0 + +; Errors + triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0 + ; totalTriggerErrorCounter 132 + warningCounter = scalar, U16, 136, "count", 1, 0 + lastErrorCode = scalar, U16, 138, "error", 1, 0 + recentErrorCode0= scalar, U16, 140, "error", 1, 0 + recentErrorCode1= scalar, U16, 142, "error", 1, 0 + recentErrorCode2= scalar, U16, 144, "error", 1, 0 + recentErrorCode3= scalar, U16, 146, "error", 1, 0 + recentErrorCode4= scalar, U16, 148, "error", 1, 0 + recentErrorCode5= scalar, U16, 150, "error", 1, 0 + recentErrorCode6= scalar, U16, 152, "error", 1, 0 + recentErrorCode7= scalar, U16, 154, "error", 1, 0 + +; Debug + debugFloatField1= scalar, F32, 156, "val", 1, 0.0 + debugFloatField2= scalar, F32, 160, "val", 1, 0.0 + debugFloatField3= scalar, F32, 164, "val", 1, 0.0 + debugFloatField4= scalar, F32, 168, "val", 1, 0.0 + debugFloatField5= scalar, F32, 172, "val", 1, 0.0 + debugFloatField6= scalar, F32, 176, "val", 1, 0.0 + debugFloatField7= scalar, F32, 180, "val", 1, 0.0 + debugIntField1 = scalar, S32, 184, "val", 1, 0.0 + debugIntField2 = scalar, S32, 188, "val", 1, 0.0 + debugIntField3 = scalar, S32, 192, "val", 1, 0.0 + debugIntField4 = scalar, S16, 196, "val", 1, 0.0 + debugIntField5 = scalar, S16, 198, "val", 1, 0.0 + +; Accel + accelerationX = scalar, S16, 200, "G", 0.01, 0 + accelerationY = scalar, S16, 202, "G", 0.01, 0 + +; egt + egt1 = scalar, S16, 204, "deg C", 1, 0 + egt2 = scalar, S16, 206, "deg C", 1, 0 + egt3 = scalar, S16, 208, "deg C", 1, 0 + egt4 = scalar, S16, 210, "deg C", 1, 0 + egt5 = scalar, S16, 212, "deg C", 1, 0 + egt6 = scalar, S16, 214, "deg C", 1, 0 + egt7 = scalar, S16, 216, "deg C", 1, 0 + egt8 = scalar, S16, 218, "deg C", 1, 0 ; diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 7d67e3ec1b..7736fbfe71 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -44,7 +44,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 18 19:37:24 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 11:59:57 EST 2019 pageSize = 20000 page = 1 @@ -1248,141 +1248,177 @@ fileVersion = { 20190701 } ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 356 + ochBlockSize = 220 ; ; see TunerStudioOutputChannels struct ; - RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 + +; Bit flags + hasSdCard = bits, U32, 0, [0:0], "true", "false"; + isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; + ind_injection_enabled=bits,U32, 0, [2:2], "true", "false"; + isCylinderCleanupEnabled=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"; + ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false"; + clutchUpState =bits, U32, 0, [11:11], "true", "false"; + clutchDownState =bits, U32, 0, [12:12], "true", "false"; + knockEverIndicator=bits, U32, 0, [13:13], "true", "false"; + knockNowIndicator=bits, U32, 0, [14:14], "true", "false"; + brakePedalIndicator=bits, U32, 0, [15:15], "true", "false"; + toothLogReady =bits, U32, 0, [16:16], "true", "false"; + acSwitchIndicator =bits, U32, 0, [17:17], "true", "false"; + ind_tps_error = bits, U32, 0, [18:18], "true", "false"; + ind_clt_error = bits, U32, 0, [19:19], "true", "false"; + ind_map_error = bits, U32, 0, [20:21], "true", "false"; + ind_iat_error = bits, U32, 0, [21:22], "true", "false"; + ind_isTriggerError = bits, U32, 0, [23:23], "true", "false"; + ind_hasFatalError=bits, U32, 0, [24:24], "true", "false"; + ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; + +; RPM, vss + RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 + speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 + vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 + +; temperatures + internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0 #if CELSIUS - coolant = scalar, F32, 4, "deg C", 1, 0.0 + coolant = scalar, S16, 12, "deg C", 0.01, 0.0 #else - coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 + coolant = scalar, S16, 12, "deg F",{9/500}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "deg C", 1, 0.0 + intake = scalar, S16, 14, "deg C", 0.01, 0.0 #else - intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 + intake = scalar, S16, 14, "deg F",{9/500}, 17.77777 #endif - TPSValue = scalar, F32, 12, "%", 1, 0 - MAFValue = scalar, F32, 16, "V", 1, 0 - AFRValue = scalar, F32, 20, "AFR", 1, 0.0 - engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm - VBatt = scalar, F32, 28, "V", 1, 0.0 +; todo: aux1 +; todo: aux2 + + +; throttle, pedal + TPSValue = scalar, U16, 20, "%", 0.01, 0 + throttlePedalPosition = scalar,U16, 22, "%", 0.01, 0 + tpsADC = scalar, U16, 24, "ADC", 1, 0.0; + +; air flow/mass measurments + MAFValue = scalar, U16, 26, "V",0.001, 0 + massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 + baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 + AFRValue = scalar, U16, 34, "AFR",0.001, 0.0 + engineLoad = scalar, U16, 36, "%", 0.01, 0.0 ; Blend of MAP and TPS, depends on algorithm + +; misc sensors + VBatt = scalar, U16, 38, "V",0.001, 0.0 + oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0 + vvtPosition = scalar, U16, 42, "deg", 0.02, 0 + ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC = scalar, U16, 32, "ADC", 1, 0.0; - tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; - baroPressure = scalar, F32, 36, "pres", 1, 0.0; - MAPValue = scalar, F32, 40, "MAP", 1, 0.0; - ; total fuel squirt duration (in MS) per engine cycle according to current CLT - crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0; - baseFuel = scalar, F32, 48, "ms", 1, 0 - tCharge = scalar, F32, 52, "T", 1, 0.0; - ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0; - sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0; - ; actual total Ms time per engine cycle with all corrections - actualLastInjection = scalar, F32, 64, "ms", 1, 0.0; - debugFloatField1 = scalar, F32, 68, "val", 1, 0.0; - - hasSdCard = bits, U32, 72, [0:0], "true", "false"; - isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; - ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; - isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; - isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; - ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; - ind_fan = bits, U32, 72, [6:6], "true", "false"; - ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; - ind_check_engine= bits, U32, 72, [8:8], "true", "false"; - needBurn = bits, U32, 72, [9:9], "true", "false"; - ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; - clutchUpState =bits, U32, 72, [11:11], "true", "false"; - clutchDownState =bits, U32, 72, [12:12], "true", "false"; - knockEverIndicator=bits, U32, 72, [13:13], "true", "false"; - knockNowIndicator=bits, U32, 72, [14:14], "true", "false"; - brakePedalIndicator=bits, U32, 72, [15:15], "true", "false"; - toothLogReady =bits, U32, 72, [16:16], "true", "false"; - acSwitchIndicator =bits, U32, 72, [17:17], "true", "false"; - vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0; - - ind_tps_error = bits, U32, 80, [0:0], "true", "false"; - ind_clt_error = bits, U32, 80, [1:1], "true", "false"; - ind_map_error = bits, U32, 80, [2:2], "true", "false"; - ind_iat_error = bits, U32, 80, [3:3], "true", "false"; - ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; - ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; - ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; - firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "deg C", 1, 0 - egt2 = scalar, S16, 90, "deg C", 1, 0 - egt3 = scalar, S16, 92, "deg C", 1, 0 - egt4 = scalar, S16, 94, "deg C", 1, 0 - egt5 = scalar, S16, 96, "deg C", 1, 0 - egt6 = scalar, S16, 98, "deg C", 1, 0 - egt7 = scalar, S16, 100, "deg C", 1, 0 - egt8 = scalar, S16, 102, "deg C", 1, 0 - rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 - massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 - veValue = scalar, F32, 112, "ratio", 1, 0 - deltaTps = scalar, F32, 116, "ratio", 1, 0 - triggerErrorsCounter = scalar, U32,120, "counter", 1, 0 - engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0 - tpsAccelFuel = scalar, F32, 128, "ms", 1, 0 - baroCorrection = scalar, F32, 132, "%", 1, 0 - throttlePedalPosition = scalar, F32, 136, "%", 1, 0 - injectorDutyCycle= scalar, F32, 140, "%", 1, 0 - knockCount = scalar, U32, 144, "counter", 1, 0 - fuelTankLevel = scalar, F32, 148, "amount", 1, 0 - knockLevel = scalar, F32, 152, "Volts", 1, 0 - ; totalTriggerErrorCounter 156 - wallFuelAmount = scalar, F32, 160, "ms", 1, 0 - iatCorrection = scalar, F32, 164, "%", 1, 0 - wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 - idleAirValvePosition = scalar, F32, 172, "percent", 1, 0 - currentTargetAfr = scalar, F32, 176, "ratio", 1, 0 - chargeAirMass = scalar, F32, 180, "g", 1, 0 - cltCorrection = scalar, F32, 184, "%", 1, 0 - fuelRunning = scalar, F32, 188, "g", 1, 0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0; - injectorLagMs = scalar, F32, 196, "ms", 1, 0.0; - debugFloatField2 = scalar, F32, 200, "val", 1, 0.0; - debugFloatField3 = scalar, F32, 204, "val", 1, 0.0; - debugFloatField4 = scalar, F32, 208, "val", 1, 0.0; - debugFloatField5 = scalar, F32, 212, "val", 1, 0.0; - debugIntField2 = scalar, S32, 216, "val", 1, 0.0; - debugIntField3 = scalar, S32, 220, "val", 1, 0.0; - timeSeconds = scalar, U32, 224, "sec", 1, 0.0; - engineLoadDelta = scalar,F32, 228, "value", 1, 0 - speedToRpmRatio = scalar,F32, 232, "value", 1, 0 - warningCounter = scalar,U16, 236, "count", 1, 0 - - lastErrorCode = scalar,U16, 240, "error", 1, 0 - - internalMcuTemperature = scalar,F32, 244, "C", 1, 0 - vvtPosition = scalar,F32, 248, "deg", 1, 0 - engineMode = scalar, U32, 252, "em", 1, 0.0; - debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; - debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; - firmwareVersion = scalar,U32, 264, "version_f", 1, 0 - fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 - coilDutyCycle = scalar, F32, 272, "perc", 1, 0 - accelerationX = scalar, S16, 276, "G", 0.01, 0 - accelerationY = scalar, S16, 278, "G", 0.01, 0 - oilPressure = scalar, F32, 280, "kPa", 1, 0.0 - fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 - injectionOffset = scalar, F32, 288, "deg", 1, 0; - debugIntField4 = scalar, S16, 292, "val", 1, 0.0; - debugIntField5 = scalar, S16, 294, "val", 1, 0.0; - recentErrorCode0 = scalar,U16, 296, "error", 1, 0 - recentErrorCode1 = scalar,U16, 298, "error", 1, 0 - recentErrorCode2 = scalar,U16, 300, "error", 1, 0 - recentErrorCode3 = scalar,U16, 302, "error", 1, 0 - recentErrorCode4 = scalar,U16, 304, "error", 1, 0 - recentErrorCode5 = scalar,U16, 306, "error", 1, 0 - recentErrorCode6 = scalar,U16, 308, "error", 1, 0 - recentErrorCode7 = scalar,U16, 310, "error", 1, 0 - etbTarget = scalar,F32, 312, "%", 1, 0 - etb1DutyCycle = scalar,F32, 316, "%", 1, 0 - etb1Error = scalar,F32, 320, "%", 1, 0 + ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0; + +; fuel math + chargeAirMass = scalar, U16, 44, "g",0.001, 0 + crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + currentTargetAfr= scalar, U16, 48, "ratio",0.001, 0 + baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 + injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 + veValue = scalar, U08, 57, "ratio", 0.5, 0 + injectionOffset = scalar, S16, 58, "deg", 0.02, 0 + tCharge = scalar, U16, 60, "deg C", 0.01, 0.0 + +; Corrections + injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0 + iatCorrection = scalar, U16, 64, "%", 0.01, 0 + cltCorrection = scalar, U16, 66, "%", 0.01, 0 + baroCorrection = scalar, U16, 68, "%", 0.01, 0 + fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0 + +; Wall model AE + wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0 + wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0 + +; TPS/load AE + engineLoadDelta = scalar, S16, 76, "value", 0.01, 0 + deltaTps = scalar, S16, 78, "ratio", 0.01, 0 + engineLoadAccelExtra=scalar,S16, 80, "value", 0.01, 0 + tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0 + +; Ignition + ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0.0 + sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 + coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 + +; Idle & ETB + idleAirValvePosition=scalar,S16, 90, "%", 0.01, 0 + etbTarget = scalar, S16, 92, "%", 0.01, 0 + etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 + etb1Error = scalar, S16, 96, "%", 0.01, 0 + +; Fuel system + fuelTankLevel = scalar, S16, 98, "amount", 0.01, 0 + fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0 + +; Knock + knockCount = scalar, U32, 104,"counter", 1, 0 + knockLevel = scalar, F32, 108, "Volts", 1, 0 + +; Mode, firmware, protocol, run time + timeSeconds = scalar, U32, 112, "sec", 1, 0.0 + engineMode = scalar, U32, 116, "em", 1, 0.0; + firmwareVersion = scalar, U32, 120,"version_f", 1, 0 + firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0 + +; Errors + triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0 + ; totalTriggerErrorCounter 132 + warningCounter = scalar, U16, 136, "count", 1, 0 + lastErrorCode = scalar, U16, 138, "error", 1, 0 + recentErrorCode0= scalar, U16, 140, "error", 1, 0 + recentErrorCode1= scalar, U16, 142, "error", 1, 0 + recentErrorCode2= scalar, U16, 144, "error", 1, 0 + recentErrorCode3= scalar, U16, 146, "error", 1, 0 + recentErrorCode4= scalar, U16, 148, "error", 1, 0 + recentErrorCode5= scalar, U16, 150, "error", 1, 0 + recentErrorCode6= scalar, U16, 152, "error", 1, 0 + recentErrorCode7= scalar, U16, 154, "error", 1, 0 + +; Debug + debugFloatField1= scalar, F32, 156, "val", 1, 0.0 + debugFloatField2= scalar, F32, 160, "val", 1, 0.0 + debugFloatField3= scalar, F32, 164, "val", 1, 0.0 + debugFloatField4= scalar, F32, 168, "val", 1, 0.0 + debugFloatField5= scalar, F32, 172, "val", 1, 0.0 + debugFloatField6= scalar, F32, 176, "val", 1, 0.0 + debugFloatField7= scalar, F32, 180, "val", 1, 0.0 + debugIntField1 = scalar, S32, 184, "val", 1, 0.0 + debugIntField2 = scalar, S32, 188, "val", 1, 0.0 + debugIntField3 = scalar, S32, 192, "val", 1, 0.0 + debugIntField4 = scalar, S16, 196, "val", 1, 0.0 + debugIntField5 = scalar, S16, 198, "val", 1, 0.0 + +; Accel + accelerationX = scalar, S16, 200, "G", 0.01, 0 + accelerationY = scalar, S16, 202, "G", 0.01, 0 + +; egt + egt1 = scalar, S16, 204, "deg C", 1, 0 + egt2 = scalar, S16, 206, "deg C", 1, 0 + egt3 = scalar, S16, 208, "deg C", 1, 0 + egt4 = scalar, S16, 210, "deg C", 1, 0 + egt5 = scalar, S16, 212, "deg C", 1, 0 + egt6 = scalar, S16, 214, "deg C", 1, 0 + egt7 = scalar, S16, 216, "deg C", 1, 0 + egt8 = scalar, S16, 218, "deg C", 1, 0 ; diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index de38ec4432..f591542be6 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -44,7 +44,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Dec 08 00:34:54 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Dec 21 12:00:03 EST 2019 pageSize = 20000 page = 1 @@ -125,6 +125,7 @@ page = 1 issue_294_29 = bits, U32, 76, [28:28], "false", "true" issue_294_30 = bits, U32, 76, [29:29], "false", "true" issue_294_31 = bits, U32, 76, [30:30], "false", "true" + unusedBit_34_31 = bits, U32, 76, [31:31], "false", "true" tpsMin = scalar, S16, 80, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 82, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1, 0, -40, 200, 0 @@ -207,6 +208,35 @@ page = 1 trigger_unusedCustomIsSynchronizationNeeded= bits, U32, 528, [0:0], "false", "true" trigger_unusedCustomNeedSecondTriggerInput= bits, U32, 528, [1:1], "false", "true" trigger_useOnlyFirstChannel= bits, U32, 528, [2:2], "false", "true" + trigger_unusedBit_4_3 = bits, U32, 528, [3:3], "false", "true" + trigger_unusedBit_4_4 = bits, U32, 528, [4:4], "false", "true" + trigger_unusedBit_4_5 = bits, U32, 528, [5:5], "false", "true" + trigger_unusedBit_4_6 = bits, U32, 528, [6:6], "false", "true" + trigger_unusedBit_4_7 = bits, U32, 528, [7:7], "false", "true" + trigger_unusedBit_4_8 = bits, U32, 528, [8:8], "false", "true" + trigger_unusedBit_4_9 = bits, U32, 528, [9:9], "false", "true" + trigger_unusedBit_4_10 = bits, U32, 528, [10:10], "false", "true" + trigger_unusedBit_4_11 = bits, U32, 528, [11:11], "false", "true" + trigger_unusedBit_4_12 = bits, U32, 528, [12:12], "false", "true" + trigger_unusedBit_4_13 = bits, U32, 528, [13:13], "false", "true" + trigger_unusedBit_4_14 = bits, U32, 528, [14:14], "false", "true" + trigger_unusedBit_4_15 = bits, U32, 528, [15:15], "false", "true" + trigger_unusedBit_4_16 = bits, U32, 528, [16:16], "false", "true" + trigger_unusedBit_4_17 = bits, U32, 528, [17:17], "false", "true" + trigger_unusedBit_4_18 = bits, U32, 528, [18:18], "false", "true" + trigger_unusedBit_4_19 = bits, U32, 528, [19:19], "false", "true" + trigger_unusedBit_4_20 = bits, U32, 528, [20:20], "false", "true" + trigger_unusedBit_4_21 = bits, U32, 528, [21:21], "false", "true" + trigger_unusedBit_4_22 = bits, U32, 528, [22:22], "false", "true" + trigger_unusedBit_4_23 = bits, U32, 528, [23:23], "false", "true" + trigger_unusedBit_4_24 = bits, U32, 528, [24:24], "false", "true" + trigger_unusedBit_4_25 = bits, U32, 528, [25:25], "false", "true" + trigger_unusedBit_4_26 = bits, U32, 528, [26:26], "false", "true" + trigger_unusedBit_4_27 = bits, U32, 528, [27:27], "false", "true" + trigger_unusedBit_4_28 = bits, U32, 528, [28:28], "false", "true" + trigger_unusedBit_4_29 = bits, U32, 528, [29:29], "false", "true" + trigger_unusedBit_4_30 = bits, U32, 528, [30:30], "false", "true" + trigger_unusedBit_4_31 = bits, U32, 528, [31:31], "false", "true" trigger_customTotalToothCount = scalar, S32, 532, "number", 1, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:7], "Off", "SPI1", "SPI2", "SPI3", "SPI4" @@ -502,6 +532,36 @@ page = 1 ;no TS info - skipping unused offset 972 todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true" + unusedBit_247_2 = bits, U32, 976, [2:2], "false", "true" + unusedBit_247_3 = bits, U32, 976, [3:3], "false", "true" + unusedBit_247_4 = bits, U32, 976, [4:4], "false", "true" + unusedBit_247_5 = bits, U32, 976, [5:5], "false", "true" + unusedBit_247_6 = bits, U32, 976, [6:6], "false", "true" + unusedBit_247_7 = bits, U32, 976, [7:7], "false", "true" + unusedBit_247_8 = bits, U32, 976, [8:8], "false", "true" + unusedBit_247_9 = bits, U32, 976, [9:9], "false", "true" + unusedBit_247_10 = bits, U32, 976, [10:10], "false", "true" + unusedBit_247_11 = bits, U32, 976, [11:11], "false", "true" + unusedBit_247_12 = bits, U32, 976, [12:12], "false", "true" + unusedBit_247_13 = bits, U32, 976, [13:13], "false", "true" + unusedBit_247_14 = bits, U32, 976, [14:14], "false", "true" + unusedBit_247_15 = bits, U32, 976, [15:15], "false", "true" + unusedBit_247_16 = bits, U32, 976, [16:16], "false", "true" + unusedBit_247_17 = bits, U32, 976, [17:17], "false", "true" + unusedBit_247_18 = bits, U32, 976, [18:18], "false", "true" + unusedBit_247_19 = bits, U32, 976, [19:19], "false", "true" + unusedBit_247_20 = bits, U32, 976, [20:20], "false", "true" + unusedBit_247_21 = bits, U32, 976, [21:21], "false", "true" + unusedBit_247_22 = bits, U32, 976, [22:22], "false", "true" + unusedBit_247_23 = bits, U32, 976, [23:23], "false", "true" + unusedBit_247_24 = bits, U32, 976, [24:24], "false", "true" + unusedBit_247_25 = bits, U32, 976, [25:25], "false", "true" + unusedBit_247_26 = bits, U32, 976, [26:26], "false", "true" + unusedBit_247_27 = bits, U32, 976, [27:27], "false", "true" + unusedBit_247_28 = bits, U32, 976, [28:28], "false", "true" + unusedBit_247_29 = bits, U32, 976, [29:29], "false", "true" + unusedBit_247_30 = bits, U32, 976, [30:30], "false", "true" + unusedBit_247_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" etbIo1_controlPin1 = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" @@ -1188,141 +1248,177 @@ fileVersion = { 20190701 } ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 356 + ochBlockSize = 220 ; ; see TunerStudioOutputChannels struct ; - RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 + +; Bit flags + hasSdCard = bits, U32, 0, [0:0], "true", "false"; + isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; + ind_injection_enabled=bits,U32, 0, [2:2], "true", "false"; + isCylinderCleanupEnabled=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"; + ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false"; + clutchUpState =bits, U32, 0, [11:11], "true", "false"; + clutchDownState =bits, U32, 0, [12:12], "true", "false"; + knockEverIndicator=bits, U32, 0, [13:13], "true", "false"; + knockNowIndicator=bits, U32, 0, [14:14], "true", "false"; + brakePedalIndicator=bits, U32, 0, [15:15], "true", "false"; + toothLogReady =bits, U32, 0, [16:16], "true", "false"; + acSwitchIndicator =bits, U32, 0, [17:17], "true", "false"; + ind_tps_error = bits, U32, 0, [18:18], "true", "false"; + ind_clt_error = bits, U32, 0, [19:19], "true", "false"; + ind_map_error = bits, U32, 0, [20:21], "true", "false"; + ind_iat_error = bits, U32, 0, [21:22], "true", "false"; + ind_isTriggerError = bits, U32, 0, [23:23], "true", "false"; + ind_hasFatalError=bits, U32, 0, [24:24], "true", "false"; + ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; + +; RPM, vss + RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 + speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 + vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 + +; temperatures + internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0 #if CELSIUS - coolant = scalar, F32, 4, "deg C", 1, 0.0 + coolant = scalar, S16, 12, "deg C", 0.01, 0.0 #else - coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 + coolant = scalar, S16, 12, "deg F",{9/500}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "deg C", 1, 0.0 + intake = scalar, S16, 14, "deg C", 0.01, 0.0 #else - intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 + intake = scalar, S16, 14, "deg F",{9/500}, 17.77777 #endif - TPSValue = scalar, F32, 12, "%", 1, 0 - MAFValue = scalar, F32, 16, "V", 1, 0 - AFRValue = scalar, F32, 20, "AFR", 1, 0.0 - engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm - VBatt = scalar, F32, 28, "V", 1, 0.0 +; todo: aux1 +; todo: aux2 + + +; throttle, pedal + TPSValue = scalar, U16, 20, "%", 0.01, 0 + throttlePedalPosition = scalar,U16, 22, "%", 0.01, 0 + tpsADC = scalar, U16, 24, "ADC", 1, 0.0; + +; air flow/mass measurments + MAFValue = scalar, U16, 26, "V",0.001, 0 + massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 + baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 + AFRValue = scalar, U16, 34, "AFR",0.001, 0.0 + engineLoad = scalar, U16, 36, "%", 0.01, 0.0 ; Blend of MAP and TPS, depends on algorithm + +; misc sensors + VBatt = scalar, U16, 38, "V",0.001, 0.0 + oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0 + vvtPosition = scalar, U16, 42, "deg", 0.02, 0 + ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC = scalar, U16, 32, "ADC", 1, 0.0; - tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; - baroPressure = scalar, F32, 36, "pres", 1, 0.0; - MAPValue = scalar, F32, 40, "MAP", 1, 0.0; - ; total fuel squirt duration (in MS) per engine cycle according to current CLT - crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0; - baseFuel = scalar, F32, 48, "ms", 1, 0 - tCharge = scalar, F32, 52, "T", 1, 0.0; - ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0; - sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0; - ; actual total Ms time per engine cycle with all corrections - actualLastInjection = scalar, F32, 64, "ms", 1, 0.0; - debugFloatField1 = scalar, F32, 68, "val", 1, 0.0; - - hasSdCard = bits, U32, 72, [0:0], "true", "false"; - isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; - ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; - isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; - isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; - ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; - ind_fan = bits, U32, 72, [6:6], "true", "false"; - ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; - ind_check_engine= bits, U32, 72, [8:8], "true", "false"; - needBurn = bits, U32, 72, [9:9], "true", "false"; - ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; - clutchUpState =bits, U32, 72, [11:11], "true", "false"; - clutchDownState =bits, U32, 72, [12:12], "true", "false"; - knockEverIndicator=bits, U32, 72, [13:13], "true", "false"; - knockNowIndicator=bits, U32, 72, [14:14], "true", "false"; - brakePedalIndicator=bits, U32, 72, [15:15], "true", "false"; - toothLogReady =bits, U32, 72, [16:16], "true", "false"; - acSwitchIndicator =bits, U32, 72, [17:17], "true", "false"; - vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0; - - ind_tps_error = bits, U32, 80, [0:0], "true", "false"; - ind_clt_error = bits, U32, 80, [1:1], "true", "false"; - ind_map_error = bits, U32, 80, [2:2], "true", "false"; - ind_iat_error = bits, U32, 80, [3:3], "true", "false"; - ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; - ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; - ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; - firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "deg C", 1, 0 - egt2 = scalar, S16, 90, "deg C", 1, 0 - egt3 = scalar, S16, 92, "deg C", 1, 0 - egt4 = scalar, S16, 94, "deg C", 1, 0 - egt5 = scalar, S16, 96, "deg C", 1, 0 - egt6 = scalar, S16, 98, "deg C", 1, 0 - egt7 = scalar, S16, 100, "deg C", 1, 0 - egt8 = scalar, S16, 102, "deg C", 1, 0 - rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 - massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 - veValue = scalar, F32, 112, "ratio", 1, 0 - deltaTps = scalar, F32, 116, "ratio", 1, 0 - triggerErrorsCounter = scalar, U32,120, "counter", 1, 0 - engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0 - tpsAccelFuel = scalar, F32, 128, "ms", 1, 0 - baroCorrection = scalar, F32, 132, "%", 1, 0 - throttlePedalPosition = scalar, F32, 136, "%", 1, 0 - injectorDutyCycle= scalar, F32, 140, "%", 1, 0 - knockCount = scalar, U32, 144, "counter", 1, 0 - fuelTankLevel = scalar, F32, 148, "amount", 1, 0 - knockLevel = scalar, F32, 152, "Volts", 1, 0 - ; totalTriggerErrorCounter 156 - wallFuelAmount = scalar, F32, 160, "ms", 1, 0 - iatCorrection = scalar, F32, 164, "%", 1, 0 - wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 - idleAirValvePosition = scalar, F32, 172, "percent", 1, 0 - currentTargetAfr = scalar, F32, 176, "ratio", 1, 0 - chargeAirMass = scalar, F32, 180, "g", 1, 0 - cltCorrection = scalar, F32, 184, "%", 1, 0 - fuelRunning = scalar, F32, 188, "g", 1, 0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0; - injectorLagMs = scalar, F32, 196, "ms", 1, 0.0; - debugFloatField2 = scalar, F32, 200, "val", 1, 0.0; - debugFloatField3 = scalar, F32, 204, "val", 1, 0.0; - debugFloatField4 = scalar, F32, 208, "val", 1, 0.0; - debugFloatField5 = scalar, F32, 212, "val", 1, 0.0; - debugIntField2 = scalar, S32, 216, "val", 1, 0.0; - debugIntField3 = scalar, S32, 220, "val", 1, 0.0; - timeSeconds = scalar, U32, 224, "sec", 1, 0.0; - engineLoadDelta = scalar,F32, 228, "value", 1, 0 - speedToRpmRatio = scalar,F32, 232, "value", 1, 0 - warningCounter = scalar,U16, 236, "count", 1, 0 - - lastErrorCode = scalar,U16, 240, "error", 1, 0 - - internalMcuTemperature = scalar,F32, 244, "C", 1, 0 - vvtPosition = scalar,F32, 248, "deg", 1, 0 - engineMode = scalar, U32, 252, "em", 1, 0.0; - debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; - debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; - firmwareVersion = scalar,U32, 264, "version_f", 1, 0 - fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 - coilDutyCycle = scalar, F32, 272, "perc", 1, 0 - accelerationX = scalar, S16, 276, "G", 0.01, 0 - accelerationY = scalar, S16, 278, "G", 0.01, 0 - oilPressure = scalar, F32, 280, "kPa", 1, 0.0 - fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 - injectionOffset = scalar, F32, 288, "deg", 1, 0; - debugIntField4 = scalar, S16, 292, "val", 1, 0.0; - debugIntField5 = scalar, S16, 294, "val", 1, 0.0; - recentErrorCode0 = scalar,U16, 296, "error", 1, 0 - recentErrorCode1 = scalar,U16, 298, "error", 1, 0 - recentErrorCode2 = scalar,U16, 300, "error", 1, 0 - recentErrorCode3 = scalar,U16, 302, "error", 1, 0 - recentErrorCode4 = scalar,U16, 304, "error", 1, 0 - recentErrorCode5 = scalar,U16, 306, "error", 1, 0 - recentErrorCode6 = scalar,U16, 308, "error", 1, 0 - recentErrorCode7 = scalar,U16, 310, "error", 1, 0 - etbTarget = scalar,F32, 312, "%", 1, 0 - etb1DutyCycle = scalar,F32, 316, "%", 1, 0 - etb1Error = scalar,F32, 320, "%", 1, 0 + ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0; + +; fuel math + chargeAirMass = scalar, U16, 44, "g",0.001, 0 + crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + currentTargetAfr= scalar, U16, 48, "ratio",0.001, 0 + baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 + injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 + veValue = scalar, U08, 57, "ratio", 0.5, 0 + injectionOffset = scalar, S16, 58, "deg", 0.02, 0 + tCharge = scalar, U16, 60, "deg C", 0.01, 0.0 + +; Corrections + injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0 + iatCorrection = scalar, U16, 64, "%", 0.01, 0 + cltCorrection = scalar, U16, 66, "%", 0.01, 0 + baroCorrection = scalar, U16, 68, "%", 0.01, 0 + fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0 + +; Wall model AE + wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0 + wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0 + +; TPS/load AE + engineLoadDelta = scalar, S16, 76, "value", 0.01, 0 + deltaTps = scalar, S16, 78, "ratio", 0.01, 0 + engineLoadAccelExtra=scalar,S16, 80, "value", 0.01, 0 + tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0 + +; Ignition + ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0.0 + sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 + coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 + +; Idle & ETB + idleAirValvePosition=scalar,S16, 90, "%", 0.01, 0 + etbTarget = scalar, S16, 92, "%", 0.01, 0 + etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 + etb1Error = scalar, S16, 96, "%", 0.01, 0 + +; Fuel system + fuelTankLevel = scalar, S16, 98, "amount", 0.01, 0 + fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0 + +; Knock + knockCount = scalar, U32, 104,"counter", 1, 0 + knockLevel = scalar, F32, 108, "Volts", 1, 0 + +; Mode, firmware, protocol, run time + timeSeconds = scalar, U32, 112, "sec", 1, 0.0 + engineMode = scalar, U32, 116, "em", 1, 0.0; + firmwareVersion = scalar, U32, 120,"version_f", 1, 0 + firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0 + +; Errors + triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0 + ; totalTriggerErrorCounter 132 + warningCounter = scalar, U16, 136, "count", 1, 0 + lastErrorCode = scalar, U16, 138, "error", 1, 0 + recentErrorCode0= scalar, U16, 140, "error", 1, 0 + recentErrorCode1= scalar, U16, 142, "error", 1, 0 + recentErrorCode2= scalar, U16, 144, "error", 1, 0 + recentErrorCode3= scalar, U16, 146, "error", 1, 0 + recentErrorCode4= scalar, U16, 148, "error", 1, 0 + recentErrorCode5= scalar, U16, 150, "error", 1, 0 + recentErrorCode6= scalar, U16, 152, "error", 1, 0 + recentErrorCode7= scalar, U16, 154, "error", 1, 0 + +; Debug + debugFloatField1= scalar, F32, 156, "val", 1, 0.0 + debugFloatField2= scalar, F32, 160, "val", 1, 0.0 + debugFloatField3= scalar, F32, 164, "val", 1, 0.0 + debugFloatField4= scalar, F32, 168, "val", 1, 0.0 + debugFloatField5= scalar, F32, 172, "val", 1, 0.0 + debugFloatField6= scalar, F32, 176, "val", 1, 0.0 + debugFloatField7= scalar, F32, 180, "val", 1, 0.0 + debugIntField1 = scalar, S32, 184, "val", 1, 0.0 + debugIntField2 = scalar, S32, 188, "val", 1, 0.0 + debugIntField3 = scalar, S32, 192, "val", 1, 0.0 + debugIntField4 = scalar, S16, 196, "val", 1, 0.0 + debugIntField5 = scalar, S16, 198, "val", 1, 0.0 + +; Accel + accelerationX = scalar, S16, 200, "G", 0.01, 0 + accelerationY = scalar, S16, 202, "G", 0.01, 0 + +; egt + egt1 = scalar, S16, 204, "deg C", 1, 0 + egt2 = scalar, S16, 206, "deg C", 1, 0 + egt3 = scalar, S16, 208, "deg C", 1, 0 + egt4 = scalar, S16, 210, "deg C", 1, 0 + egt5 = scalar, S16, 212, "deg C", 1, 0 + egt6 = scalar, S16, 214, "deg C", 1, 0 + egt7 = scalar, S16, 216, "deg C", 1, 0 + egt8 = scalar, S16, 218, "deg C", 1, 0 ; @@ -1344,6 +1440,10 @@ fileVersion = { 20190701 } wueAfrTargetOffset = array, S16, [ 16], ":1", 0.1, 0.0, -3.0, 3.0, 1; wueAnalRecommend = array, U08, [ 16], "%", 1.00, 0.0, 100, 255.00, 0 +; These are inverted (false = "Yes") so that they default to enabled + enableLogDebugChannels = bits, U08, [0:0], "Yes", "No" + enableLogErrorList = bits, U08, [0:0], "Yes", "No" + [ConstantsExtensions] defaultValue = wueAfrTargetOffset, -1.5 -1.4 -1.15 -0.95 -0.775 -0.65 -0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0 @@ -2004,16 +2104,16 @@ gaugeCategory = Throttle Body (incl. ETB) entry = coilDutyCycle, "dwell: coil duty cycle", float,"%.3f" entry = currentTargetAfr,"fuel: target AFR", float,"%.3f" - entry = accelerationX, "Acceleration: X", float,"%.2f" - entry = accelerationY, "Acceleration: Y", float,"%.2f" - entry = egt1, "EGT1", float,"%.1f" - entry = egt2, "EGT2", float,"%.1f" - entry = egt3, "EGT3", float,"%.1f" - entry = egt4, "EGT4", float,"%.1f" - entry = egt5, "EGT5", float,"%.1f" - entry = egt6, "EGT6", float,"%.1f" - entry = egt7, "EGT7", float,"%.1f" - entry = egt8, "EGT8", float,"%.1f" + entry = accelerationX, "Acceleration: X", float,"%.2f", { LIS302DLCsPin != 0 } + entry = accelerationY, "Acceleration: Y", float,"%.2f", { LIS302DLCsPin != 0 } + entry = egt1, "EGT1", float,"%.1f", { max31855_cs1 != 0} + entry = egt2, "EGT2", float,"%.1f", { max31855_cs2 != 0} + entry = egt3, "EGT3", float,"%.1f", { max31855_cs3 != 0} + entry = egt4, "EGT4", float,"%.1f", { max31855_cs4 != 0} + entry = egt5, "EGT5", float,"%.1f", { max31855_cs5 != 0} + entry = egt6, "EGT6", float,"%.1f", { max31855_cs6 != 0} + entry = egt7, "EGT7", float,"%.1f", { max31855_cs7 != 0} + entry = egt8, "EGT8", float,"%.1f", { max31855_cs8 != 0} entry = engineLoadAccelExtra, "fuel: engine load acceleration extra fuel",float, "%.3f" entry = engineLoadDelta, "fuel: load change",float, "%.3f" @@ -2035,54 +2135,54 @@ gaugeCategory = Throttle Body (incl. ETB) ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" ; Alternator_PID: alternator duty cycle ; DBG_TPS_ACCEL: from TPS - entry = debugFloatField1, "debug f1",float,"%.4f" + entry = debugFloatField1, "debug f1",float,"%.4f", { !enableLogDebugChannels } ; Alternator_PID: current integration term ; DBG_TPS_ACCEL: to TPS - entry = debugFloatField2, "debug f2: iTerm",float,"%.4f" + entry = debugFloatField2, "debug f2: iTerm",float,"%.4f", { !enableLogDebugChannels } ; Alternator_PID: previous error ; DBG_TPS_ACCEL: tps<>tps table value - entry = debugFloatField3, "debug f3: prevError",float,"%.4f" + entry = debugFloatField3, "debug f3: prevError",float,"%.4f", { !enableLogDebugChannels } ; Alternator_PID: I setting ; DBG_TPS_ACCEL: extra fuel - entry = debugFloatField4, "debug f4: iParam",float,"%.4f" + entry = debugFloatField4, "debug f4: iParam",float,"%.4f", { !enableLogDebugChannels } ; Alternator_PID: D setting - entry = debugFloatField5, "debug f5: dParam",float,"%.4f" + entry = debugFloatField5, "debug f5: dParam",float,"%.4f", { !enableLogDebugChannels } ; Alternator_PID: dTerm - entry = debugFloatField6, "debug f6: dTerm",float,"%.4f" + entry = debugFloatField6, "debug f6: dTerm",float,"%.4f", { !enableLogDebugChannels } - entry = debugFloatField7, "debug f7",float,"%.4f" + entry = debugFloatField7, "debug f7",float,"%.4f", { !enableLogDebugChannels } ; Alternator_PID: P setting - entry = debugIntField1, "debug i1: pParam",int,"%d" + entry = debugIntField1, "debug i1: pParam",int,"%d", { !enableLogDebugChannels } ; Alternator_PID: offset setting - entry = debugIntField2, "debug i2: offset",int,"%d" + entry = debugIntField2, "debug i2: offset",int,"%d", { !enableLogDebugChannels } ; Alternator_PID: PID reset counter - entry = debugIntField3, "debug i3",int,"%d" + entry = debugIntField3, "debug i3",int,"%d", { !enableLogDebugChannels } + + entry = debugIntField4, "debug i4",int,"%d", { !enableLogDebugChannels } + + entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } - entry = debugIntField4, "debug i4",int,"%d" - entry = debugIntField5, "debug i5",int,"%d" - - entry = engineMode, "Engine Mode",int,"%d" entry = warningCounter, "warning: counter",int,"%d" entry = lastErrorCode, "warning: last",int,"%d" - entry = recentErrorCode0, "error 0",int,"%d" - entry = recentErrorCode1, "error 1",int,"%d" - entry = recentErrorCode2, "error 2",int,"%d" - entry = recentErrorCode3, "error 3",int,"%d" - entry = recentErrorCode4, "error 4",int,"%d" - entry = recentErrorCode5, "error 5",int,"%d" - entry = recentErrorCode6, "error 6",int,"%d" - entry = recentErrorCode7, "error 7",int,"%d" + entry = recentErrorCode0, "error 0",int,"%d", { !enableLogErrorList } + entry = recentErrorCode1, "error 1",int,"%d", { !enableLogErrorList } + entry = recentErrorCode2, "error 2",int,"%d", { !enableLogErrorList } + entry = recentErrorCode3, "error 3",int,"%d", { !enableLogErrorList } + entry = recentErrorCode4, "error 4",int,"%d", { !enableLogErrorList } + entry = recentErrorCode5, "error 5",int,"%d", { !enableLogErrorList } + entry = recentErrorCode6, "error 6",int,"%d", { !enableLogErrorList } + entry = recentErrorCode7, "error 7",int,"%d", { !enableLogErrorList } entry = internalMcuTemperature, "CPU Temperature",float,"%.2f" entry = tCharge, "tCharge",float,"%.3f" @@ -2258,6 +2358,7 @@ menuDialog = main menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" + subMenu = datalogSettings, "Datalogging" subMenu = ioTest, "Bench test" subMenu = engineTypeDialog, "Popular vehicles" subMenu = std_separator @@ -2678,13 +2779,13 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Idle Stepper Enable", stepperEnablePin field = "Fuel Pump Pin", fuelPumpPin field = "Fuel Pump Pin Mode", fuelPumpPinMode - field = "ETB#1 Dir #1", etb1_directionPin1 - field = "ETB#1 Dir #2", etb1_directionPin2 - field = "ETB#1 Control #1", etb1_controlPin1 - field = "etb1_controlPinMode", etb1_controlPinMode - field = "ETB#2 Dir #1", etb2_directionPin1 - field = "ETB#2 Dir #2", etb2_directionPin2 - field = "ETB#2 Control #1", etb2_controlPin1 + field = "ETB#1 Dir #1", etbIo1_directionPin1 + field = "ETB#1 Dir #2", etbIo1_directionPin2 + field = "ETB#1 Control #1", etbIo1_controlPin1 + field = "etb1_controlPinMode", etbIo1_controlPinMode + field = "ETB#2 Dir #1", etbIo2_directionPin1 + field = "ETB#2 Dir #2", etbIo2_directionPin2 + field = "ETB#2 Control #1", etbIo2_controlPin1 field = "SD CS Pin", sdCardCsPin field = "MIL / Check Engine Pin", malfunctionIndicatorPin field = "MIL / Check Engine Pin Mode", malfunctionIndicatorPinMode @@ -3531,7 +3632,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "No1 Control #1", etbIo1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} field = "No2 Direction #1", etbIo2_directionPin1, {throttlePedalPositionAdcChannel != 16} field = "No2 Direction #2", etbIo2_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "No2 Control #1", etbIo2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} field = "TPS#2 min", tps2Min, {etbIo2_directionPin1 != 0} field = "TPS#2 max", tps2Max, {etbIo2_directionPin1 != 0} panel = etbPidDialog @@ -3632,6 +3733,11 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Engine chart size", engineChartSize + dialog = datalogSettings, "Datalogging Settings" + field = "#Disabling optional logging may increase update rate!" + field = "Log debug channels", enableLogDebugChannels + field = "Log recent errors list", enableLogErrorList + ; Racing Features->Launch Control dialog = smLaunchControl, "Launch Control Settings NOT WORKING" field = "RPM Step1 Limit", step1rpm diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 26b46b3c6e..9fcdb09b07 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -44,7 +44,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 18 19:37:21 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 11:59:54 EST 2019 pageSize = 20000 page = 1 @@ -1248,141 +1248,177 @@ fileVersion = { 20190701 } ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 356 + ochBlockSize = 220 ; ; see TunerStudioOutputChannels struct ; - RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 + +; Bit flags + hasSdCard = bits, U32, 0, [0:0], "true", "false"; + isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; + ind_injection_enabled=bits,U32, 0, [2:2], "true", "false"; + isCylinderCleanupEnabled=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"; + ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false"; + clutchUpState =bits, U32, 0, [11:11], "true", "false"; + clutchDownState =bits, U32, 0, [12:12], "true", "false"; + knockEverIndicator=bits, U32, 0, [13:13], "true", "false"; + knockNowIndicator=bits, U32, 0, [14:14], "true", "false"; + brakePedalIndicator=bits, U32, 0, [15:15], "true", "false"; + toothLogReady =bits, U32, 0, [16:16], "true", "false"; + acSwitchIndicator =bits, U32, 0, [17:17], "true", "false"; + ind_tps_error = bits, U32, 0, [18:18], "true", "false"; + ind_clt_error = bits, U32, 0, [19:19], "true", "false"; + ind_map_error = bits, U32, 0, [20:21], "true", "false"; + ind_iat_error = bits, U32, 0, [21:22], "true", "false"; + ind_isTriggerError = bits, U32, 0, [23:23], "true", "false"; + ind_hasFatalError=bits, U32, 0, [24:24], "true", "false"; + ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; + +; RPM, vss + RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 + speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 + vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 + +; temperatures + internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0 #if CELSIUS - coolant = scalar, F32, 4, "deg C", 1, 0.0 + coolant = scalar, S16, 12, "deg C", 0.01, 0.0 #else - coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 + coolant = scalar, S16, 12, "deg F",{9/500}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "deg C", 1, 0.0 + intake = scalar, S16, 14, "deg C", 0.01, 0.0 #else - intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 + intake = scalar, S16, 14, "deg F",{9/500}, 17.77777 #endif - TPSValue = scalar, F32, 12, "%", 1, 0 - MAFValue = scalar, F32, 16, "V", 1, 0 - AFRValue = scalar, F32, 20, "AFR", 1, 0.0 - engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm - VBatt = scalar, F32, 28, "V", 1, 0.0 +; todo: aux1 +; todo: aux2 + + +; throttle, pedal + TPSValue = scalar, U16, 20, "%", 0.01, 0 + throttlePedalPosition = scalar,U16, 22, "%", 0.01, 0 + tpsADC = scalar, U16, 24, "ADC", 1, 0.0; + +; air flow/mass measurments + MAFValue = scalar, U16, 26, "V",0.001, 0 + massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 + baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 + AFRValue = scalar, U16, 34, "AFR",0.001, 0.0 + engineLoad = scalar, U16, 36, "%", 0.01, 0.0 ; Blend of MAP and TPS, depends on algorithm + +; misc sensors + VBatt = scalar, U16, 38, "V",0.001, 0.0 + oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0 + vvtPosition = scalar, U16, 42, "deg", 0.02, 0 + ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC = scalar, U16, 32, "ADC", 1, 0.0; - tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; - baroPressure = scalar, F32, 36, "pres", 1, 0.0; - MAPValue = scalar, F32, 40, "MAP", 1, 0.0; - ; total fuel squirt duration (in MS) per engine cycle according to current CLT - crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0; - baseFuel = scalar, F32, 48, "ms", 1, 0 - tCharge = scalar, F32, 52, "T", 1, 0.0; - ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0; - sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0; - ; actual total Ms time per engine cycle with all corrections - actualLastInjection = scalar, F32, 64, "ms", 1, 0.0; - debugFloatField1 = scalar, F32, 68, "val", 1, 0.0; - - hasSdCard = bits, U32, 72, [0:0], "true", "false"; - isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; - ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; - isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; - isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; - ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; - ind_fan = bits, U32, 72, [6:6], "true", "false"; - ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; - ind_check_engine= bits, U32, 72, [8:8], "true", "false"; - needBurn = bits, U32, 72, [9:9], "true", "false"; - ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; - clutchUpState =bits, U32, 72, [11:11], "true", "false"; - clutchDownState =bits, U32, 72, [12:12], "true", "false"; - knockEverIndicator=bits, U32, 72, [13:13], "true", "false"; - knockNowIndicator=bits, U32, 72, [14:14], "true", "false"; - brakePedalIndicator=bits, U32, 72, [15:15], "true", "false"; - toothLogReady =bits, U32, 72, [16:16], "true", "false"; - acSwitchIndicator =bits, U32, 72, [17:17], "true", "false"; - vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0; - - ind_tps_error = bits, U32, 80, [0:0], "true", "false"; - ind_clt_error = bits, U32, 80, [1:1], "true", "false"; - ind_map_error = bits, U32, 80, [2:2], "true", "false"; - ind_iat_error = bits, U32, 80, [3:3], "true", "false"; - ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; - ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; - ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; - firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "deg C", 1, 0 - egt2 = scalar, S16, 90, "deg C", 1, 0 - egt3 = scalar, S16, 92, "deg C", 1, 0 - egt4 = scalar, S16, 94, "deg C", 1, 0 - egt5 = scalar, S16, 96, "deg C", 1, 0 - egt6 = scalar, S16, 98, "deg C", 1, 0 - egt7 = scalar, S16, 100, "deg C", 1, 0 - egt8 = scalar, S16, 102, "deg C", 1, 0 - rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 - massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 - veValue = scalar, F32, 112, "ratio", 1, 0 - deltaTps = scalar, F32, 116, "ratio", 1, 0 - triggerErrorsCounter = scalar, U32,120, "counter", 1, 0 - engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0 - tpsAccelFuel = scalar, F32, 128, "ms", 1, 0 - baroCorrection = scalar, F32, 132, "%", 1, 0 - throttlePedalPosition = scalar, F32, 136, "%", 1, 0 - injectorDutyCycle= scalar, F32, 140, "%", 1, 0 - knockCount = scalar, U32, 144, "counter", 1, 0 - fuelTankLevel = scalar, F32, 148, "amount", 1, 0 - knockLevel = scalar, F32, 152, "Volts", 1, 0 - ; totalTriggerErrorCounter 156 - wallFuelAmount = scalar, F32, 160, "ms", 1, 0 - iatCorrection = scalar, F32, 164, "%", 1, 0 - wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 - idleAirValvePosition = scalar, F32, 172, "percent", 1, 0 - currentTargetAfr = scalar, F32, 176, "ratio", 1, 0 - chargeAirMass = scalar, F32, 180, "g", 1, 0 - cltCorrection = scalar, F32, 184, "%", 1, 0 - fuelRunning = scalar, F32, 188, "g", 1, 0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0; - injectorLagMs = scalar, F32, 196, "ms", 1, 0.0; - debugFloatField2 = scalar, F32, 200, "val", 1, 0.0; - debugFloatField3 = scalar, F32, 204, "val", 1, 0.0; - debugFloatField4 = scalar, F32, 208, "val", 1, 0.0; - debugFloatField5 = scalar, F32, 212, "val", 1, 0.0; - debugIntField2 = scalar, S32, 216, "val", 1, 0.0; - debugIntField3 = scalar, S32, 220, "val", 1, 0.0; - timeSeconds = scalar, U32, 224, "sec", 1, 0.0; - engineLoadDelta = scalar,F32, 228, "value", 1, 0 - speedToRpmRatio = scalar,F32, 232, "value", 1, 0 - warningCounter = scalar,U16, 236, "count", 1, 0 - - lastErrorCode = scalar,U16, 240, "error", 1, 0 - - internalMcuTemperature = scalar,F32, 244, "C", 1, 0 - vvtPosition = scalar,F32, 248, "deg", 1, 0 - engineMode = scalar, U32, 252, "em", 1, 0.0; - debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; - debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; - firmwareVersion = scalar,U32, 264, "version_f", 1, 0 - fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 - coilDutyCycle = scalar, F32, 272, "perc", 1, 0 - accelerationX = scalar, S16, 276, "G", 0.01, 0 - accelerationY = scalar, S16, 278, "G", 0.01, 0 - oilPressure = scalar, F32, 280, "kPa", 1, 0.0 - fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 - injectionOffset = scalar, F32, 288, "deg", 1, 0; - debugIntField4 = scalar, S16, 292, "val", 1, 0.0; - debugIntField5 = scalar, S16, 294, "val", 1, 0.0; - recentErrorCode0 = scalar,U16, 296, "error", 1, 0 - recentErrorCode1 = scalar,U16, 298, "error", 1, 0 - recentErrorCode2 = scalar,U16, 300, "error", 1, 0 - recentErrorCode3 = scalar,U16, 302, "error", 1, 0 - recentErrorCode4 = scalar,U16, 304, "error", 1, 0 - recentErrorCode5 = scalar,U16, 306, "error", 1, 0 - recentErrorCode6 = scalar,U16, 308, "error", 1, 0 - recentErrorCode7 = scalar,U16, 310, "error", 1, 0 - etbTarget = scalar,F32, 312, "%", 1, 0 - etb1DutyCycle = scalar,F32, 316, "%", 1, 0 - etb1Error = scalar,F32, 320, "%", 1, 0 + ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0; + +; fuel math + chargeAirMass = scalar, U16, 44, "g",0.001, 0 + crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + currentTargetAfr= scalar, U16, 48, "ratio",0.001, 0 + baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 + injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 + veValue = scalar, U08, 57, "ratio", 0.5, 0 + injectionOffset = scalar, S16, 58, "deg", 0.02, 0 + tCharge = scalar, U16, 60, "deg C", 0.01, 0.0 + +; Corrections + injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0 + iatCorrection = scalar, U16, 64, "%", 0.01, 0 + cltCorrection = scalar, U16, 66, "%", 0.01, 0 + baroCorrection = scalar, U16, 68, "%", 0.01, 0 + fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0 + +; Wall model AE + wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0 + wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0 + +; TPS/load AE + engineLoadDelta = scalar, S16, 76, "value", 0.01, 0 + deltaTps = scalar, S16, 78, "ratio", 0.01, 0 + engineLoadAccelExtra=scalar,S16, 80, "value", 0.01, 0 + tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0 + +; Ignition + ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0.0 + sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 + coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 + +; Idle & ETB + idleAirValvePosition=scalar,S16, 90, "%", 0.01, 0 + etbTarget = scalar, S16, 92, "%", 0.01, 0 + etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 + etb1Error = scalar, S16, 96, "%", 0.01, 0 + +; Fuel system + fuelTankLevel = scalar, S16, 98, "amount", 0.01, 0 + fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0 + +; Knock + knockCount = scalar, U32, 104,"counter", 1, 0 + knockLevel = scalar, F32, 108, "Volts", 1, 0 + +; Mode, firmware, protocol, run time + timeSeconds = scalar, U32, 112, "sec", 1, 0.0 + engineMode = scalar, U32, 116, "em", 1, 0.0; + firmwareVersion = scalar, U32, 120,"version_f", 1, 0 + firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0 + +; Errors + triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0 + ; totalTriggerErrorCounter 132 + warningCounter = scalar, U16, 136, "count", 1, 0 + lastErrorCode = scalar, U16, 138, "error", 1, 0 + recentErrorCode0= scalar, U16, 140, "error", 1, 0 + recentErrorCode1= scalar, U16, 142, "error", 1, 0 + recentErrorCode2= scalar, U16, 144, "error", 1, 0 + recentErrorCode3= scalar, U16, 146, "error", 1, 0 + recentErrorCode4= scalar, U16, 148, "error", 1, 0 + recentErrorCode5= scalar, U16, 150, "error", 1, 0 + recentErrorCode6= scalar, U16, 152, "error", 1, 0 + recentErrorCode7= scalar, U16, 154, "error", 1, 0 + +; Debug + debugFloatField1= scalar, F32, 156, "val", 1, 0.0 + debugFloatField2= scalar, F32, 160, "val", 1, 0.0 + debugFloatField3= scalar, F32, 164, "val", 1, 0.0 + debugFloatField4= scalar, F32, 168, "val", 1, 0.0 + debugFloatField5= scalar, F32, 172, "val", 1, 0.0 + debugFloatField6= scalar, F32, 176, "val", 1, 0.0 + debugFloatField7= scalar, F32, 180, "val", 1, 0.0 + debugIntField1 = scalar, S32, 184, "val", 1, 0.0 + debugIntField2 = scalar, S32, 188, "val", 1, 0.0 + debugIntField3 = scalar, S32, 192, "val", 1, 0.0 + debugIntField4 = scalar, S16, 196, "val", 1, 0.0 + debugIntField5 = scalar, S16, 198, "val", 1, 0.0 + +; Accel + accelerationX = scalar, S16, 200, "G", 0.01, 0 + accelerationY = scalar, S16, 202, "G", 0.01, 0 + +; egt + egt1 = scalar, S16, 204, "deg C", 1, 0 + egt2 = scalar, S16, 206, "deg C", 1, 0 + egt3 = scalar, S16, 208, "deg C", 1, 0 + egt4 = scalar, S16, 210, "deg C", 1, 0 + egt5 = scalar, S16, 212, "deg C", 1, 0 + egt6 = scalar, S16, 214, "deg C", 1, 0 + egt7 = scalar, S16, 216, "deg C", 1, 0 + egt8 = scalar, S16, 218, "deg C", 1, 0 ; diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 674622bc07..2a2a67b842 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -44,7 +44,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 18 19:37:26 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 12:00:00 EST 2019 pageSize = 20000 page = 1 @@ -1248,141 +1248,177 @@ fileVersion = { 20190701 } ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 356 + ochBlockSize = 220 ; ; see TunerStudioOutputChannels struct ; - RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 + +; Bit flags + hasSdCard = bits, U32, 0, [0:0], "true", "false"; + isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; + ind_injection_enabled=bits,U32, 0, [2:2], "true", "false"; + isCylinderCleanupEnabled=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"; + ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false"; + clutchUpState =bits, U32, 0, [11:11], "true", "false"; + clutchDownState =bits, U32, 0, [12:12], "true", "false"; + knockEverIndicator=bits, U32, 0, [13:13], "true", "false"; + knockNowIndicator=bits, U32, 0, [14:14], "true", "false"; + brakePedalIndicator=bits, U32, 0, [15:15], "true", "false"; + toothLogReady =bits, U32, 0, [16:16], "true", "false"; + acSwitchIndicator =bits, U32, 0, [17:17], "true", "false"; + ind_tps_error = bits, U32, 0, [18:18], "true", "false"; + ind_clt_error = bits, U32, 0, [19:19], "true", "false"; + ind_map_error = bits, U32, 0, [20:21], "true", "false"; + ind_iat_error = bits, U32, 0, [21:22], "true", "false"; + ind_isTriggerError = bits, U32, 0, [23:23], "true", "false"; + ind_hasFatalError=bits, U32, 0, [24:24], "true", "false"; + ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; + +; RPM, vss + RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 + speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 + vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 + +; temperatures + internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0 #if CELSIUS - coolant = scalar, F32, 4, "deg C", 1, 0.0 + coolant = scalar, S16, 12, "deg C", 0.01, 0.0 #else - coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 + coolant = scalar, S16, 12, "deg F",{9/500}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "deg C", 1, 0.0 + intake = scalar, S16, 14, "deg C", 0.01, 0.0 #else - intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 + intake = scalar, S16, 14, "deg F",{9/500}, 17.77777 #endif - TPSValue = scalar, F32, 12, "%", 1, 0 - MAFValue = scalar, F32, 16, "V", 1, 0 - AFRValue = scalar, F32, 20, "AFR", 1, 0.0 - engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm - VBatt = scalar, F32, 28, "V", 1, 0.0 +; todo: aux1 +; todo: aux2 + + +; throttle, pedal + TPSValue = scalar, U16, 20, "%", 0.01, 0 + throttlePedalPosition = scalar,U16, 22, "%", 0.01, 0 + tpsADC = scalar, U16, 24, "ADC", 1, 0.0; + +; air flow/mass measurments + MAFValue = scalar, U16, 26, "V",0.001, 0 + massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0 + MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0 + baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0 + AFRValue = scalar, U16, 34, "AFR",0.001, 0.0 + engineLoad = scalar, U16, 36, "%", 0.01, 0.0 ; Blend of MAP and TPS, depends on algorithm + +; misc sensors + VBatt = scalar, U16, 38, "V",0.001, 0.0 + oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0 + vvtPosition = scalar, U16, 42, "deg", 0.02, 0 + ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC = scalar, U16, 32, "ADC", 1, 0.0; - tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; - baroPressure = scalar, F32, 36, "pres", 1, 0.0; - MAPValue = scalar, F32, 40, "MAP", 1, 0.0; - ; total fuel squirt duration (in MS) per engine cycle according to current CLT - crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0; - baseFuel = scalar, F32, 48, "ms", 1, 0 - tCharge = scalar, F32, 52, "T", 1, 0.0; - ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0; - sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0; - ; actual total Ms time per engine cycle with all corrections - actualLastInjection = scalar, F32, 64, "ms", 1, 0.0; - debugFloatField1 = scalar, F32, 68, "val", 1, 0.0; - - hasSdCard = bits, U32, 72, [0:0], "true", "false"; - isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; - ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; - isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; - isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; - ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; - ind_fan = bits, U32, 72, [6:6], "true", "false"; - ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; - ind_check_engine= bits, U32, 72, [8:8], "true", "false"; - needBurn = bits, U32, 72, [9:9], "true", "false"; - ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; - clutchUpState =bits, U32, 72, [11:11], "true", "false"; - clutchDownState =bits, U32, 72, [12:12], "true", "false"; - knockEverIndicator=bits, U32, 72, [13:13], "true", "false"; - knockNowIndicator=bits, U32, 72, [14:14], "true", "false"; - brakePedalIndicator=bits, U32, 72, [15:15], "true", "false"; - toothLogReady =bits, U32, 72, [16:16], "true", "false"; - acSwitchIndicator =bits, U32, 72, [17:17], "true", "false"; - vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0; - - ind_tps_error = bits, U32, 80, [0:0], "true", "false"; - ind_clt_error = bits, U32, 80, [1:1], "true", "false"; - ind_map_error = bits, U32, 80, [2:2], "true", "false"; - ind_iat_error = bits, U32, 80, [3:3], "true", "false"; - ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; - ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; - ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; - firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "deg C", 1, 0 - egt2 = scalar, S16, 90, "deg C", 1, 0 - egt3 = scalar, S16, 92, "deg C", 1, 0 - egt4 = scalar, S16, 94, "deg C", 1, 0 - egt5 = scalar, S16, 96, "deg C", 1, 0 - egt6 = scalar, S16, 98, "deg C", 1, 0 - egt7 = scalar, S16, 100, "deg C", 1, 0 - egt8 = scalar, S16, 102, "deg C", 1, 0 - rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 - massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 - veValue = scalar, F32, 112, "ratio", 1, 0 - deltaTps = scalar, F32, 116, "ratio", 1, 0 - triggerErrorsCounter = scalar, U32,120, "counter", 1, 0 - engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0 - tpsAccelFuel = scalar, F32, 128, "ms", 1, 0 - baroCorrection = scalar, F32, 132, "%", 1, 0 - throttlePedalPosition = scalar, F32, 136, "%", 1, 0 - injectorDutyCycle= scalar, F32, 140, "%", 1, 0 - knockCount = scalar, U32, 144, "counter", 1, 0 - fuelTankLevel = scalar, F32, 148, "amount", 1, 0 - knockLevel = scalar, F32, 152, "Volts", 1, 0 - ; totalTriggerErrorCounter 156 - wallFuelAmount = scalar, F32, 160, "ms", 1, 0 - iatCorrection = scalar, F32, 164, "%", 1, 0 - wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 - idleAirValvePosition = scalar, F32, 172, "percent", 1, 0 - currentTargetAfr = scalar, F32, 176, "ratio", 1, 0 - chargeAirMass = scalar, F32, 180, "g", 1, 0 - cltCorrection = scalar, F32, 184, "%", 1, 0 - fuelRunning = scalar, F32, 188, "g", 1, 0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0; - injectorLagMs = scalar, F32, 196, "ms", 1, 0.0; - debugFloatField2 = scalar, F32, 200, "val", 1, 0.0; - debugFloatField3 = scalar, F32, 204, "val", 1, 0.0; - debugFloatField4 = scalar, F32, 208, "val", 1, 0.0; - debugFloatField5 = scalar, F32, 212, "val", 1, 0.0; - debugIntField2 = scalar, S32, 216, "val", 1, 0.0; - debugIntField3 = scalar, S32, 220, "val", 1, 0.0; - timeSeconds = scalar, U32, 224, "sec", 1, 0.0; - engineLoadDelta = scalar,F32, 228, "value", 1, 0 - speedToRpmRatio = scalar,F32, 232, "value", 1, 0 - warningCounter = scalar,U16, 236, "count", 1, 0 - - lastErrorCode = scalar,U16, 240, "error", 1, 0 - - internalMcuTemperature = scalar,F32, 244, "C", 1, 0 - vvtPosition = scalar,F32, 248, "deg", 1, 0 - engineMode = scalar, U32, 252, "em", 1, 0.0; - debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; - debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; - firmwareVersion = scalar,U32, 264, "version_f", 1, 0 - fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 - coilDutyCycle = scalar, F32, 272, "perc", 1, 0 - accelerationX = scalar, S16, 276, "G", 0.01, 0 - accelerationY = scalar, S16, 278, "G", 0.01, 0 - oilPressure = scalar, F32, 280, "kPa", 1, 0.0 - fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 - injectionOffset = scalar, F32, 288, "deg", 1, 0; - debugIntField4 = scalar, S16, 292, "val", 1, 0.0; - debugIntField5 = scalar, S16, 294, "val", 1, 0.0; - recentErrorCode0 = scalar,U16, 296, "error", 1, 0 - recentErrorCode1 = scalar,U16, 298, "error", 1, 0 - recentErrorCode2 = scalar,U16, 300, "error", 1, 0 - recentErrorCode3 = scalar,U16, 302, "error", 1, 0 - recentErrorCode4 = scalar,U16, 304, "error", 1, 0 - recentErrorCode5 = scalar,U16, 306, "error", 1, 0 - recentErrorCode6 = scalar,U16, 308, "error", 1, 0 - recentErrorCode7 = scalar,U16, 310, "error", 1, 0 - etbTarget = scalar,F32, 312, "%", 1, 0 - etb1DutyCycle = scalar,F32, 316, "%", 1, 0 - etb1Error = scalar,F32, 320, "%", 1, 0 + ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0; + +; fuel math + chargeAirMass = scalar, U16, 44, "g",0.001, 0 + crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + currentTargetAfr= scalar, U16, 48, "ratio",0.001, 0 + baseFuel = scalar, U16, 50, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 + injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 + veValue = scalar, U08, 57, "ratio", 0.5, 0 + injectionOffset = scalar, S16, 58, "deg", 0.02, 0 + tCharge = scalar, U16, 60, "deg C", 0.01, 0.0 + +; Corrections + injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0 + iatCorrection = scalar, U16, 64, "%", 0.01, 0 + cltCorrection = scalar, U16, 66, "%", 0.01, 0 + baroCorrection = scalar, U16, 68, "%", 0.01, 0 + fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0 + +; Wall model AE + wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0 + wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0 + +; TPS/load AE + engineLoadDelta = scalar, S16, 76, "value", 0.01, 0 + deltaTps = scalar, S16, 78, "ratio", 0.01, 0 + engineLoadAccelExtra=scalar,S16, 80, "value", 0.01, 0 + tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0 + +; Ignition + ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0.0 + sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 + coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 + +; Idle & ETB + idleAirValvePosition=scalar,S16, 90, "%", 0.01, 0 + etbTarget = scalar, S16, 92, "%", 0.01, 0 + etb1DutyCycle = scalar, S16, 94, "%", 0.01, 0 + etb1Error = scalar, S16, 96, "%", 0.01, 0 + +; Fuel system + fuelTankLevel = scalar, S16, 98, "amount", 0.01, 0 + fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0 + +; Knock + knockCount = scalar, U32, 104,"counter", 1, 0 + knockLevel = scalar, F32, 108, "Volts", 1, 0 + +; Mode, firmware, protocol, run time + timeSeconds = scalar, U32, 112, "sec", 1, 0.0 + engineMode = scalar, U32, 116, "em", 1, 0.0; + firmwareVersion = scalar, U32, 120,"version_f", 1, 0 + firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0 + +; Errors + triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0 + ; totalTriggerErrorCounter 132 + warningCounter = scalar, U16, 136, "count", 1, 0 + lastErrorCode = scalar, U16, 138, "error", 1, 0 + recentErrorCode0= scalar, U16, 140, "error", 1, 0 + recentErrorCode1= scalar, U16, 142, "error", 1, 0 + recentErrorCode2= scalar, U16, 144, "error", 1, 0 + recentErrorCode3= scalar, U16, 146, "error", 1, 0 + recentErrorCode4= scalar, U16, 148, "error", 1, 0 + recentErrorCode5= scalar, U16, 150, "error", 1, 0 + recentErrorCode6= scalar, U16, 152, "error", 1, 0 + recentErrorCode7= scalar, U16, 154, "error", 1, 0 + +; Debug + debugFloatField1= scalar, F32, 156, "val", 1, 0.0 + debugFloatField2= scalar, F32, 160, "val", 1, 0.0 + debugFloatField3= scalar, F32, 164, "val", 1, 0.0 + debugFloatField4= scalar, F32, 168, "val", 1, 0.0 + debugFloatField5= scalar, F32, 172, "val", 1, 0.0 + debugFloatField6= scalar, F32, 176, "val", 1, 0.0 + debugFloatField7= scalar, F32, 180, "val", 1, 0.0 + debugIntField1 = scalar, S32, 184, "val", 1, 0.0 + debugIntField2 = scalar, S32, 188, "val", 1, 0.0 + debugIntField3 = scalar, S32, 192, "val", 1, 0.0 + debugIntField4 = scalar, S16, 196, "val", 1, 0.0 + debugIntField5 = scalar, S16, 198, "val", 1, 0.0 + +; Accel + accelerationX = scalar, S16, 200, "G", 0.01, 0 + accelerationY = scalar, S16, 202, "G", 0.01, 0 + +; egt + egt1 = scalar, S16, 204, "deg C", 1, 0 + egt2 = scalar, S16, 206, "deg C", 1, 0 + egt3 = scalar, S16, 208, "deg C", 1, 0 + egt4 = scalar, S16, 210, "deg C", 1, 0 + egt5 = scalar, S16, 212, "deg C", 1, 0 + egt6 = scalar, S16, 214, "deg C", 1, 0 + egt7 = scalar, S16, 216, "deg C", 1, 0 + egt8 = scalar, S16, 218, "deg C", 1, 0 ; diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 1f3aab3511..9cb4fe0767 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 14 16:03:19 EST 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 12:07:30 EST 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1296,9 +1296,9 @@ public class Fields { public static final int triggerSimulatorPins1_offset = 736; public static final int triggerSimulatorPins2_offset = 737; public static final int triggerSimulatorPins3_offset = 738; - public static final int TS_FILE_VERSION = 20190701; - public static final int TS_OUTPUT_SIZE = 356; - public static final String TS_SIGNATURE = "rusEFI v1.07"; + public static final int TS_FILE_VERSION = 20191221; + public static final int TS_OUTPUT_SIZE = 220; + public static final String TS_SIGNATURE = "rusEFI v1.08"; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; public static final int twoWireBatchInjection_offset = 1476; diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index f15db788ad..5c29dff36c 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -49,7 +49,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20191201; + public static final int CONSOLE_VERSION = 20191221; public static final String INI_FILE_PATH = System.getProperty("ini_file_path", ".."); public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String TOOLS_PATH = System.getProperty("tools_path", ".");