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 24fb00ce9e..b8128baeff 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 kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 05 03:19:46 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 05 11:59:25 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1322,9 +1322,10 @@ struct engine_configuration_s { */ uint8_t acIdleExtraOffset; /** + * CANbus thread period, ms * offset 712 */ - int unusedAt712; + int can2SleepPeriodMs; /** * offset 716 */ @@ -2592,12 +2593,130 @@ struct engine_configuration_s { /** * offset 2111 */ - uint8_t unused_former_warmup_target_afr[18]; + uint8_t unused_former_warmup_target_afr2; /** - * need 4 byte alignment - * offset 2129 + * offset 2112 */ - uint8_t alignmentFill_at_2129[3]; + uint32_t verboseCan2BaseAddress; + /** + * CAN broadcast using custom rusEFI protocol + * enable can_broadcast/disable can_broadcast + offset 2116 bit 0 */ + bool enableVerboseCan2Tx : 1; + /** + * enable can_read/disable can_read + offset 2116 bit 1 */ + bool can2ReadEnabled : 1; + /** + * enable can_write/disable can_write + offset 2116 bit 2 */ + bool can2WriteEnabled : 1; + /** + offset 2116 bit 3 */ + bool unused1126 : 1; + /** + offset 2116 bit 4 */ + bool unused1127 : 1; + /** + offset 2116 bit 5 */ + bool unused1128 : 1; + /** + offset 2116 bit 6 */ + bool unused1129 : 1; + /** + offset 2116 bit 7 */ + bool unused1130 : 1; + /** + offset 2116 bit 8 */ + bool unusedBit_477_8 : 1; + /** + offset 2116 bit 9 */ + bool unusedBit_477_9 : 1; + /** + offset 2116 bit 10 */ + bool unusedBit_477_10 : 1; + /** + offset 2116 bit 11 */ + bool unusedBit_477_11 : 1; + /** + offset 2116 bit 12 */ + bool unusedBit_477_12 : 1; + /** + offset 2116 bit 13 */ + bool unusedBit_477_13 : 1; + /** + offset 2116 bit 14 */ + bool unusedBit_477_14 : 1; + /** + offset 2116 bit 15 */ + bool unusedBit_477_15 : 1; + /** + offset 2116 bit 16 */ + bool unusedBit_477_16 : 1; + /** + offset 2116 bit 17 */ + bool unusedBit_477_17 : 1; + /** + offset 2116 bit 18 */ + bool unusedBit_477_18 : 1; + /** + offset 2116 bit 19 */ + bool unusedBit_477_19 : 1; + /** + offset 2116 bit 20 */ + bool unusedBit_477_20 : 1; + /** + offset 2116 bit 21 */ + bool unusedBit_477_21 : 1; + /** + offset 2116 bit 22 */ + bool unusedBit_477_22 : 1; + /** + offset 2116 bit 23 */ + bool unusedBit_477_23 : 1; + /** + offset 2116 bit 24 */ + bool unusedBit_477_24 : 1; + /** + offset 2116 bit 25 */ + bool unusedBit_477_25 : 1; + /** + offset 2116 bit 26 */ + bool unusedBit_477_26 : 1; + /** + offset 2116 bit 27 */ + bool unusedBit_477_27 : 1; + /** + offset 2116 bit 28 */ + bool unusedBit_477_28 : 1; + /** + offset 2116 bit 29 */ + bool unusedBit_477_29 : 1; + /** + offset 2116 bit 30 */ + bool unusedBit_477_30 : 1; + /** + offset 2116 bit 31 */ + bool unusedBit_477_31 : 1; + /** + * set can_mode X + * offset 2120 + */ + can_nbc_e can2NbcType; + /** + * set_can2_tx_pin X + * offset 2124 + */ + brain_pin_e can2TxPin; + /** + * set_can2_rx_pin X + * offset 2125 + */ + brain_pin_e can2RxPin; + /** + * offset 2126 + */ + uint8_t unused_former_warmup_target_afr[6]; /** * kPa value at which we need to cut fuel and spark, 0 if not enabled * offset 2132 @@ -3532,4 +3651,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 05 03:19:46 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 05 11:59:25 UTC 2020 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 176e98d6ce..53573bd821 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -41,7 +41,6 @@ #define afterstartHoldTime_offset 6152 #define air_pressure_sensor_config_s_size 16 #define alignEngineSnifferAtTDC_offset 744 -#define alignmentFill_at_2129_offset 2129 #define alignmentFill_at_4514_offset 4514 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 @@ -177,6 +176,12 @@ #define camInputs3_offset 558 #define camInputs4_offset 559 #define can2BaudRate_offset 2110 +#define can2NbcType_offset 2120 +#define can2ReadEnabled_offset 2116 +#define can2RxPin_offset 2125 +#define can2SleepPeriodMs_offset 712 +#define can2TxPin_offset 2124 +#define can2WriteEnabled_offset 2116 #define can_baudrate_e_enum "100kbps", "250kbps" , "500kbps", "1Mbps" #define CAN_DEFAULT_BASE 0x200 #define canBaudRate_offset 2108 @@ -304,6 +309,7 @@ #define enableInnovateLC2_offset 976 #define enableLaunchBoost_offset 976 #define enableLaunchRetard_offset 976 +#define enableVerboseCan2Tx_offset 2116 #define enableVerboseCanTx_offset 744 #define engine_configuration_s_size 6000 #define engine_load_mode_e_enum "INVALID", "Alpha-N/TPS", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "INVALID" @@ -1076,7 +1082,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 3559534882 +#define SIGNATURE_HASH 2006635304 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1337,6 +1343,7 @@ #define TS_SET_LOGGER_SWITCH 'l' #define ts_show_analog_divider true #define ts_show_auxserial_pins true +#define ts_show_can2 true #define ts_show_can_pins true #define ts_show_cj125 true #define ts_show_egt true @@ -1353,7 +1360,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.05.kin.3559534882" +#define TS_SIGNATURE "rusEFI 2020.08.05.kin.2006635304" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1361,6 +1368,11 @@ #define uartConsoleSerialSpeed_offset 2076 #define un1used_former_warmup_target_afr_offset 2109 #define unused1059_offset 3964 +#define unused1126_offset 2116 +#define unused1127_offset 2116 +#define unused1128_offset 2116 +#define unused1129_offset 2116 +#define unused1130_offset 2116 #define unused1476b20_offset 1476 #define unused15136_offset 15136 #define unused2432_offset 2432 @@ -1381,8 +1393,8 @@ #define unused_1484_bit_30_offset 1476 #define unused_1484_bit_31_offset 1476 #define unused_alFIn_offset 4024 -#define unused_former_warmup_target_afr_offset 2111 -#define unusedAt712_offset 712 +#define unused_former_warmup_target_afr2_offset 2111 +#define unused_former_warmup_target_afr_offset 2126 #define unusedAt716_offset 716 #define unusedAt720_offset 720 #define unusedAt724_offset 724 @@ -1411,6 +1423,30 @@ #define unusedBit_284_30_offset 976 #define unusedBit_284_31_offset 976 #define unusedBit_34_31_offset 76 +#define unusedBit_477_10_offset 2116 +#define unusedBit_477_11_offset 2116 +#define unusedBit_477_12_offset 2116 +#define unusedBit_477_13_offset 2116 +#define unusedBit_477_14_offset 2116 +#define unusedBit_477_15_offset 2116 +#define unusedBit_477_16_offset 2116 +#define unusedBit_477_17_offset 2116 +#define unusedBit_477_18_offset 2116 +#define unusedBit_477_19_offset 2116 +#define unusedBit_477_20_offset 2116 +#define unusedBit_477_21_offset 2116 +#define unusedBit_477_22_offset 2116 +#define unusedBit_477_23_offset 2116 +#define unusedBit_477_24_offset 2116 +#define unusedBit_477_25_offset 2116 +#define unusedBit_477_26_offset 2116 +#define unusedBit_477_27_offset 2116 +#define unusedBit_477_28_offset 2116 +#define unusedBit_477_29_offset 2116 +#define unusedBit_477_30_offset 2116 +#define unusedBit_477_31_offset 2116 +#define unusedBit_477_8_offset 2116 +#define unusedBit_477_9_offset 2116 #define unusedFlexFuelSensor_offset 3100 #define unusedHere_offset 762 #define unusedHereWeHave_offset 1464 @@ -1467,6 +1503,7 @@ #define vehicleSpeedCoef_offset 476 #define vehicleSpeedSensorInputPin_offset 968 #define veLoadBins_offset 18464 +#define verboseCan2BaseAddress_offset 2112 #define verboseCanBaseAddress_offset 756 #define verboseTLE8888_offset 744 #define verboseTriggerSynchDetails_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 43ac0fe160..ea99304033 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:35 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1322,9 +1322,10 @@ struct engine_configuration_s { */ uint8_t acIdleExtraOffset; /** + * CANbus thread period, ms * offset 712 */ - int unusedAt712; + int can2SleepPeriodMs; /** * offset 716 */ @@ -2592,12 +2593,130 @@ struct engine_configuration_s { /** * offset 2111 */ - uint8_t unused_former_warmup_target_afr[18]; + uint8_t unused_former_warmup_target_afr2; /** - * need 4 byte alignment - * offset 2129 + * offset 2112 */ - uint8_t alignmentFill_at_2129[3]; + uint32_t verboseCan2BaseAddress; + /** + * CAN broadcast using custom rusEFI protocol + * enable can_broadcast/disable can_broadcast + offset 2116 bit 0 */ + bool enableVerboseCan2Tx : 1; + /** + * enable can_read/disable can_read + offset 2116 bit 1 */ + bool can2ReadEnabled : 1; + /** + * enable can_write/disable can_write + offset 2116 bit 2 */ + bool can2WriteEnabled : 1; + /** + offset 2116 bit 3 */ + bool unused1126 : 1; + /** + offset 2116 bit 4 */ + bool unused1127 : 1; + /** + offset 2116 bit 5 */ + bool unused1128 : 1; + /** + offset 2116 bit 6 */ + bool unused1129 : 1; + /** + offset 2116 bit 7 */ + bool unused1130 : 1; + /** + offset 2116 bit 8 */ + bool unusedBit_477_8 : 1; + /** + offset 2116 bit 9 */ + bool unusedBit_477_9 : 1; + /** + offset 2116 bit 10 */ + bool unusedBit_477_10 : 1; + /** + offset 2116 bit 11 */ + bool unusedBit_477_11 : 1; + /** + offset 2116 bit 12 */ + bool unusedBit_477_12 : 1; + /** + offset 2116 bit 13 */ + bool unusedBit_477_13 : 1; + /** + offset 2116 bit 14 */ + bool unusedBit_477_14 : 1; + /** + offset 2116 bit 15 */ + bool unusedBit_477_15 : 1; + /** + offset 2116 bit 16 */ + bool unusedBit_477_16 : 1; + /** + offset 2116 bit 17 */ + bool unusedBit_477_17 : 1; + /** + offset 2116 bit 18 */ + bool unusedBit_477_18 : 1; + /** + offset 2116 bit 19 */ + bool unusedBit_477_19 : 1; + /** + offset 2116 bit 20 */ + bool unusedBit_477_20 : 1; + /** + offset 2116 bit 21 */ + bool unusedBit_477_21 : 1; + /** + offset 2116 bit 22 */ + bool unusedBit_477_22 : 1; + /** + offset 2116 bit 23 */ + bool unusedBit_477_23 : 1; + /** + offset 2116 bit 24 */ + bool unusedBit_477_24 : 1; + /** + offset 2116 bit 25 */ + bool unusedBit_477_25 : 1; + /** + offset 2116 bit 26 */ + bool unusedBit_477_26 : 1; + /** + offset 2116 bit 27 */ + bool unusedBit_477_27 : 1; + /** + offset 2116 bit 28 */ + bool unusedBit_477_28 : 1; + /** + offset 2116 bit 29 */ + bool unusedBit_477_29 : 1; + /** + offset 2116 bit 30 */ + bool unusedBit_477_30 : 1; + /** + offset 2116 bit 31 */ + bool unusedBit_477_31 : 1; + /** + * set can_mode X + * offset 2120 + */ + can_nbc_e can2NbcType; + /** + * set_can2_tx_pin X + * offset 2124 + */ + brain_pin_e can2TxPin; + /** + * set_can2_rx_pin X + * offset 2125 + */ + brain_pin_e can2RxPin; + /** + * offset 2126 + */ + uint8_t unused_former_warmup_target_afr[6]; /** * kPa value at which we need to cut fuel and spark, 0 if not enabled * offset 2132 @@ -3532,4 +3651,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:35 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index fd1a2d91d6..b8c48d3cc4 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 6e19895492..1b577bed0a 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 3b2a596302..10fc0e9974 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 8b6d352c06..05930ed6e3 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 2bca64ea26..0130768863 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -41,7 +41,6 @@ #define afterstartHoldTime_offset 6152 #define air_pressure_sensor_config_s_size 16 #define alignEngineSnifferAtTDC_offset 744 -#define alignmentFill_at_2129_offset 2129 #define alignmentFill_at_4514_offset 4514 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 @@ -177,6 +176,12 @@ #define camInputs3_offset 558 #define camInputs4_offset 559 #define can2BaudRate_offset 2110 +#define can2NbcType_offset 2120 +#define can2ReadEnabled_offset 2116 +#define can2RxPin_offset 2125 +#define can2SleepPeriodMs_offset 712 +#define can2TxPin_offset 2124 +#define can2WriteEnabled_offset 2116 #define can_baudrate_e_enum "100kbps", "250kbps" , "500kbps", "1Mbps" #define CAN_DEFAULT_BASE 0x200 #define canBaudRate_offset 2108 @@ -304,6 +309,7 @@ #define enableInnovateLC2_offset 976 #define enableLaunchBoost_offset 976 #define enableLaunchRetard_offset 976 +#define enableVerboseCan2Tx_offset 2116 #define enableVerboseCanTx_offset 744 #define engine_configuration_s_size 6000 #define engine_load_mode_e_enum "INVALID", "Alpha-N/TPS", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "INVALID" @@ -1076,7 +1082,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 4227757186 +#define SIGNATURE_HASH 1481545352 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1337,6 +1343,7 @@ #define TS_SET_LOGGER_SWITCH 'l' #define ts_show_analog_divider true #define ts_show_auxserial_pins true +#define ts_show_can2 true #define ts_show_can_pins true #define ts_show_cj125 true #define ts_show_egt true @@ -1353,7 +1360,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.05.all.4227757186" +#define TS_SIGNATURE "rusEFI 2020.08.05.all.1481545352" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1361,6 +1368,11 @@ #define uartConsoleSerialSpeed_offset 2076 #define un1used_former_warmup_target_afr_offset 2109 #define unused1059_offset 3964 +#define unused1126_offset 2116 +#define unused1127_offset 2116 +#define unused1128_offset 2116 +#define unused1129_offset 2116 +#define unused1130_offset 2116 #define unused1476b20_offset 1476 #define unused15136_offset 15136 #define unused2432_offset 2432 @@ -1381,8 +1393,8 @@ #define unused_1484_bit_30_offset 1476 #define unused_1484_bit_31_offset 1476 #define unused_alFIn_offset 4024 -#define unused_former_warmup_target_afr_offset 2111 -#define unusedAt712_offset 712 +#define unused_former_warmup_target_afr2_offset 2111 +#define unused_former_warmup_target_afr_offset 2126 #define unusedAt716_offset 716 #define unusedAt720_offset 720 #define unusedAt724_offset 724 @@ -1411,6 +1423,30 @@ #define unusedBit_284_30_offset 976 #define unusedBit_284_31_offset 976 #define unusedBit_34_31_offset 76 +#define unusedBit_477_10_offset 2116 +#define unusedBit_477_11_offset 2116 +#define unusedBit_477_12_offset 2116 +#define unusedBit_477_13_offset 2116 +#define unusedBit_477_14_offset 2116 +#define unusedBit_477_15_offset 2116 +#define unusedBit_477_16_offset 2116 +#define unusedBit_477_17_offset 2116 +#define unusedBit_477_18_offset 2116 +#define unusedBit_477_19_offset 2116 +#define unusedBit_477_20_offset 2116 +#define unusedBit_477_21_offset 2116 +#define unusedBit_477_22_offset 2116 +#define unusedBit_477_23_offset 2116 +#define unusedBit_477_24_offset 2116 +#define unusedBit_477_25_offset 2116 +#define unusedBit_477_26_offset 2116 +#define unusedBit_477_27_offset 2116 +#define unusedBit_477_28_offset 2116 +#define unusedBit_477_29_offset 2116 +#define unusedBit_477_30_offset 2116 +#define unusedBit_477_31_offset 2116 +#define unusedBit_477_8_offset 2116 +#define unusedBit_477_9_offset 2116 #define unusedFlexFuelSensor_offset 3100 #define unusedHere_offset 762 #define unusedHereWeHave_offset 1464 @@ -1467,6 +1503,7 @@ #define vehicleSpeedCoef_offset 476 #define vehicleSpeedSensorInputPin_offset 968 #define veLoadBins_offset 18464 +#define verboseCan2BaseAddress_offset 2112 #define verboseCanBaseAddress_offset 756 #define verboseTLE8888_offset 744 #define verboseTriggerSynchDetails_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 2e3eb7205f..6e1d151d75 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 4227757186 -#define TS_SIGNATURE "rusEFI 2020.08.05.all.4227757186" +#define SIGNATURE_HASH 1481545352 +#define TS_SIGNATURE "rusEFI 2020.08.05.all.1481545352" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 698d3a015f..badb6c7a0d 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 3348332891 -#define TS_SIGNATURE "rusEFI 2020.08.05.frankenso_na6.3348332891" +#define SIGNATURE_HASH 1680040785 +#define TS_SIGNATURE "rusEFI 2020.08.05.frankenso_na6.1680040785" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 70b1e2a299..77a7264976 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 3559534882 -#define TS_SIGNATURE "rusEFI 2020.08.05.kin.3559534882" +#define SIGNATURE_HASH 2006635304 +#define TS_SIGNATURE "rusEFI 2020.08.05.kin.2006635304" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index dec8a0d76b..45a144ce37 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1357527862 -#define TS_SIGNATURE "rusEFI 2020.08.05.mre_f4.1357527862" +#define SIGNATURE_HASH 2749367251 +#define TS_SIGNATURE "rusEFI 2020.08.05.mre_f4.2749367251" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index d67592d069..6aaa36c9ad 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1357527862 -#define TS_SIGNATURE "rusEFI 2020.08.05.mre_f7.1357527862" +#define SIGNATURE_HASH 2749367251 +#define TS_SIGNATURE "rusEFI 2020.08.05.mre_f7.2749367251" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index b70150b729..b4c2f3f2d4 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 3959960892 -#define TS_SIGNATURE "rusEFI 2020.08.05.prometheus_405.3959960892" +#define SIGNATURE_HASH 1337513782 +#define TS_SIGNATURE "rusEFI 2020.08.05.prometheus_405.1337513782" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index c0cd1a7fe6..ca849f7921 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 3959960892 -#define TS_SIGNATURE "rusEFI 2020.08.05.prometheus_469.3959960892" +#define SIGNATURE_HASH 1337513782 +#define TS_SIGNATURE "rusEFI 2020.08.05.prometheus_469.1337513782" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5514427523..2cdd9b0cd0 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 2491784311 -#define TS_SIGNATURE "rusEFI 2020.08.05.proteus_f4.2491784311" +#define SIGNATURE_HASH 1736580947 +#define TS_SIGNATURE "rusEFI 2020.08.05.proteus_f4.1736580947" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index c9c276795b..a2265b2171 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 2491784311 -#define TS_SIGNATURE "rusEFI 2020.08.05.proteus_f7.2491784311" +#define SIGNATURE_HASH 1736580947 +#define TS_SIGNATURE "rusEFI 2020.08.05.proteus_f7.1736580947" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index cb989e0fb5..795378003a 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index cb4b9e4711..d010872ce3 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.all.4227757186" + signature = "rusEFI 2020.08.05.all.1481545352" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.all.4227757186" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.all.1481545352" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:35 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3791,6 +3828,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RX pin", canRxPin field = "TX pin", canTxPin + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + field = "RX pin", can2RxPin + field = "TX pin", can2TxPin + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3831,6 +3879,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC vRef voltage", adcVcc panel = tsPort panel = canBus + panel = canBus2 panel = auxSerial panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 134a9e5ae3..1049989c7d 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.frankenso_na6.3348332891" + signature = "rusEFI 2020.08.05.frankenso_na6.1680040785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.frankenso_na6.3348332891" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.frankenso_na6.1680040785" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:40 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:18 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3791,6 +3828,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RX pin", canRxPin field = "TX pin", canTxPin + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + field = "RX pin", can2RxPin + field = "TX pin", can2TxPin + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3831,6 +3879,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC vRef voltage", adcVcc panel = tsPort panel = canBus + panel = canBus2 panel = auxSerial panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 0cad3e6f25..a62ab6735d 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.kin.3559534882" + signature = "rusEFI 2020.08.05.kin.2006635304" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.kin.3559534882" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.kin.2006635304" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 05 03:19:46 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 05 11:59:25 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3792,6 +3829,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RX pin", canRxPin field = "TX pin", canTxPin + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + field = "RX pin", can2RxPin + field = "TX pin", can2TxPin + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3832,6 +3880,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC vRef voltage", adcVcc panel = tsPort panel = canBus + panel = canBus2 panel = auxSerial panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 62219c593e..c30c756990 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.mre_f4.1357527862" + signature = "rusEFI 2020.08.05.mre_f4.2749367251" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.mre_f4.1357527862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.mre_f4.2749367251" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:38 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:17 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3770,6 +3807,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 5973a5d2a0..00d8aaf51b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.mre_f7.1357527862" + signature = "rusEFI 2020.08.05.mre_f7.2749367251" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.mre_f7.1357527862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.mre_f7.2749367251" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:37 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:15 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3770,6 +3807,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 93d1c5b7ee..9b2ad231a0 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.prometheus_405.3959960892" + signature = "rusEFI 2020.08.05.prometheus_405.1337513782" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.prometheus_405.3959960892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.prometheus_405.1337513782" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:42 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:21 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3787,6 +3824,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RX pin", canRxPin field = "TX pin", canTxPin + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + field = "RX pin", can2RxPin + field = "TX pin", can2TxPin + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3827,6 +3875,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC vRef voltage", adcVcc panel = tsPort panel = canBus + panel = canBus2 panel = auxSerial panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 549c566a00..545d445109 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.prometheus_469.3959960892" + signature = "rusEFI 2020.08.05.prometheus_469.1337513782" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.prometheus_469.3959960892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.prometheus_469.1337513782" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:41 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:19 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3787,6 +3824,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RX pin", canRxPin field = "TX pin", canTxPin + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + field = "RX pin", can2RxPin + field = "TX pin", can2TxPin + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin @@ -3827,6 +3875,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ADC vRef voltage", adcVcc panel = tsPort panel = canBus + panel = canBus2 panel = auxSerial panel = sdCard panel = gpsReceiver diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 45cb69f043..673026c6e5 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.proteus_f4.2491784311" + signature = "rusEFI 2020.08.05.proteus_f4.1736580947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.proteus_f4.2491784311" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.proteus_f4.1736580947" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:45 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:24 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3763,6 +3800,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index f92692fe68..0fe9193e3c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.05.proteus_f7.2491784311" + signature = "rusEFI 2020.08.05.proteus_f7.1736580947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.05.proteus_f7.2491784311" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.05.proteus_f7.1736580947" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:44 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:22 UTC 2020 pageSize = 20000 page = 1 @@ -341,7 +341,7 @@ page = 1 canRxPin = bits, U08, 709, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" throttlePedalUpPinMode = scalar, U08, 710, "todo", 1, 0, 0, 20, 1 acIdleExtraOffset = scalar, U08, 711, "Percent", 1, 0, 0, 255, 0 - unusedAt712 = scalar, S32, 712, "units", 1, 0, -20, 100, 0 + can2SleepPeriodMs = scalar, S32, 712, "ms", 1, 0, 0, 1000.0, 2 unusedAt716 = scalar, S32, 716, "units", 1, 0, -20, 100, 0 unusedAt720 = scalar, S32, 720, "units", 1, 0, -20, 100, 0 unusedAt724 = scalar, S32, 724, "units", 1, 0, -20, 100, 0 @@ -823,8 +823,44 @@ page = 1 canBaudRate = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" un1used_former_warmup_target_afr = scalar, U08, 2109, "units", 1, 0, -20, 100, 0 can2BaudRate = bits, U08, 2110, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps" - unused_former_warmup_target_afr = array, U08, 2111, [18], "units", 1, 0, -20, 100, 0 - alignmentFill_at_2129 = array, U08, 2129, [3], "units", 1, 0, -20, 100, 0 + unused_former_warmup_target_afr2 = scalar, U08, 2111, "units", 1, 0, -20, 100, 0 + verboseCan2BaseAddress = scalar, U32, 2112, "", 1, 0, 0, 536870911, 0 + enableVerboseCan2Tx = bits, U32, 2116, [0:0], "false", "true" + can2ReadEnabled = bits, U32, 2116, [1:1], "false", "true" + can2WriteEnabled = bits, U32, 2116, [2:2], "false", "true" + unused1126 = bits, U32, 2116, [3:3], "false", "true" + unused1127 = bits, U32, 2116, [4:4], "false", "true" + unused1128 = bits, U32, 2116, [5:5], "false", "true" + unused1129 = bits, U32, 2116, [6:6], "false", "true" + unused1130 = bits, U32, 2116, [7:7], "false", "true" + unusedBit_477_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_477_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_477_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_477_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_477_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_477_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_477_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_477_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_477_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_477_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_477_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_477_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_477_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_477_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_477_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_477_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_477_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_477_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_477_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_477_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_477_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_477_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_477_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_477_31 = bits, U32, 2116, [31:31], "false", "true" + can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unused_former_warmup_target_afr = array, U08, 2126, [6], "units", 1, 0, -20, 100, 0 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1313,6 +1349,7 @@ page = 1 slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" throttlePedalSecondaryWOTVoltage = "Pedal in the floor" + enableVerboseCan2Tx = "CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -3763,6 +3800,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs + dialog = canBus2, "Secondary CAN Bus" + field = "Can Read Enabled", can2ReadEnabled + field = "Can Write Enabled", can2WriteEnabled + field = "Can Nbc Type", can2NbcType + field = "Can Baud Rate", can2BaudRate + field = "Enable rusEFI CAN broadcast", enableVerboseCan2Tx + field = "rusEfi CAN data base address", verboseCan2BaseAddress + field = "Can Sleep Period", can2SleepPeriodMs + dialog = auxSerial, "AUX Serial" field = "RX pin", auxSerialRxPin field = "TX pin", auxSerialTxPin diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index ee62876dee..0d62828a7f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/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 gen_config.sh integration/rusefi_config.txt Wed Aug 05 03:19:35 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -44,7 +44,6 @@ public class Fields { public static final int afterstartHoldTime_offset = 6152; public static final int air_pressure_sensor_config_s_size = 16; public static final int alignEngineSnifferAtTDC_offset = 744; - public static final int alignmentFill_at_2129_offset = 2129; public static final int alignmentFill_at_4514_offset = 4514; public static final int alternator_antiwindupFreq_offset = 1764; public static final int alternator_derivativeFilterLoss_offset = 1760; @@ -177,6 +176,12 @@ public class Fields { public static final int camInputs3_offset = 558; public static final int camInputs4_offset = 559; public static final int can2BaudRate_offset = 2110; + public static final int can2NbcType_offset = 2120; + public static final int can2ReadEnabled_offset = 2116; + public static final int can2RxPin_offset = 2125; + public static final int can2SleepPeriodMs_offset = 712; + public static final int can2TxPin_offset = 2124; + public static final int can2WriteEnabled_offset = 2116; public static final int CAN_DEFAULT_BASE = 0x200; public static final int canBaudRate_offset = 2108; public static final int canNbcType_offset = 480; @@ -301,6 +306,7 @@ public class Fields { public static final int enableInnovateLC2_offset = 976; public static final int enableLaunchBoost_offset = 976; public static final int enableLaunchRetard_offset = 976; + public static final int enableVerboseCan2Tx_offset = 2116; public static final int enableVerboseCanTx_offset = 744; public static final int engine_configuration_s_size = 6000; public static final String ENGINE_MAKE_BMW = "BMW"; @@ -1058,6 +1064,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 1481545352; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1313,7 +1320,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.08.05.all.4227757186"; + public static final String TS_SIGNATURE = "rusEFI 2020.08.05.all.1481545352"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1321,6 +1328,11 @@ public class Fields { public static final int uartConsoleSerialSpeed_offset = 2076; public static final int un1used_former_warmup_target_afr_offset = 2109; public static final int unused1059_offset = 3964; + public static final int unused1126_offset = 2116; + public static final int unused1127_offset = 2116; + public static final int unused1128_offset = 2116; + public static final int unused1129_offset = 2116; + public static final int unused1130_offset = 2116; public static final int unused1476b20_offset = 1476; public static final int unused15136_offset = 15136; public static final int unused2432_offset = 2432; @@ -1341,8 +1353,8 @@ public class Fields { public static final int unused_1484_bit_30_offset = 1476; public static final int unused_1484_bit_31_offset = 1476; public static final int unused_alFIn_offset = 4024; - public static final int unused_former_warmup_target_afr_offset = 2111; - public static final int unusedAt712_offset = 712; + public static final int unused_former_warmup_target_afr2_offset = 2111; + public static final int unused_former_warmup_target_afr_offset = 2126; public static final int unusedAt716_offset = 716; public static final int unusedAt720_offset = 720; public static final int unusedAt724_offset = 724; @@ -1371,6 +1383,30 @@ public class Fields { public static final int unusedBit_284_30_offset = 976; public static final int unusedBit_284_31_offset = 976; public static final int unusedBit_34_31_offset = 76; + public static final int unusedBit_477_10_offset = 2116; + public static final int unusedBit_477_11_offset = 2116; + public static final int unusedBit_477_12_offset = 2116; + public static final int unusedBit_477_13_offset = 2116; + public static final int unusedBit_477_14_offset = 2116; + public static final int unusedBit_477_15_offset = 2116; + public static final int unusedBit_477_16_offset = 2116; + public static final int unusedBit_477_17_offset = 2116; + public static final int unusedBit_477_18_offset = 2116; + public static final int unusedBit_477_19_offset = 2116; + public static final int unusedBit_477_20_offset = 2116; + public static final int unusedBit_477_21_offset = 2116; + public static final int unusedBit_477_22_offset = 2116; + public static final int unusedBit_477_23_offset = 2116; + public static final int unusedBit_477_24_offset = 2116; + public static final int unusedBit_477_25_offset = 2116; + public static final int unusedBit_477_26_offset = 2116; + public static final int unusedBit_477_27_offset = 2116; + public static final int unusedBit_477_28_offset = 2116; + public static final int unusedBit_477_29_offset = 2116; + public static final int unusedBit_477_30_offset = 2116; + public static final int unusedBit_477_31_offset = 2116; + public static final int unusedBit_477_8_offset = 2116; + public static final int unusedBit_477_9_offset = 2116; public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedHere_offset = 762; public static final int unusedHereWeHave_offset = 1464; @@ -1427,6 +1463,7 @@ public class Fields { public static final int vehicleSpeedCoef_offset = 476; public static final int vehicleSpeedSensorInputPin_offset = 968; public static final int veLoadBins_offset = 18464; + public static final int verboseCan2BaseAddress_offset = 2112; public static final int verboseCanBaseAddress_offset = 756; public static final int verboseTLE8888_offset = 744; public static final int verboseTriggerSynchDetails_offset = 1476; @@ -1698,7 +1735,7 @@ public class Fields { public static final Field CANRXPIN = Field.create("CANRXPIN", 709, FieldType.INT8, brain_pin_e); public static final Field THROTTLEPEDALUPPINMODE = Field.create("THROTTLEPEDALUPPINMODE", 710, FieldType.INT8); public static final Field ACIDLEEXTRAOFFSET = Field.create("ACIDLEEXTRAOFFSET", 711, FieldType.INT8); - public static final Field UNUSEDAT712 = Field.create("UNUSEDAT712", 712, FieldType.INT); + public static final Field CAN2SLEEPPERIODMS = Field.create("CAN2SLEEPPERIODMS", 712, FieldType.INT); public static final Field UNUSEDAT716 = Field.create("UNUSEDAT716", 716, FieldType.INT); public static final Field UNUSEDAT720 = Field.create("UNUSEDAT720", 720, FieldType.INT); public static final Field UNUSEDAT724 = Field.create("UNUSEDAT724", 724, FieldType.INT); @@ -2176,6 +2213,43 @@ public class Fields { public static final Field CANBAUDRATE = Field.create("CANBAUDRATE", 2108, FieldType.INT8, can_baudrate_e); public static final Field UN1USED_FORMER_WARMUP_TARGET_AFR = Field.create("UN1USED_FORMER_WARMUP_TARGET_AFR", 2109, FieldType.INT8); public static final Field CAN2BAUDRATE = Field.create("CAN2BAUDRATE", 2110, FieldType.INT8, can_baudrate_e); + public static final Field UNUSED_FORMER_WARMUP_TARGET_AFR2 = Field.create("UNUSED_FORMER_WARMUP_TARGET_AFR2", 2111, FieldType.INT8); + public static final Field VERBOSECAN2BASEADDRESS = Field.create("VERBOSECAN2BASEADDRESS", 2112, FieldType.INT); + public static final Field ENABLEVERBOSECAN2TX = Field.create("ENABLEVERBOSECAN2TX", 2116, FieldType.BIT, 0); + public static final Field CAN2READENABLED = Field.create("CAN2READENABLED", 2116, FieldType.BIT, 1); + public static final Field CAN2WRITEENABLED = Field.create("CAN2WRITEENABLED", 2116, FieldType.BIT, 2); + public static final Field UNUSED1126 = Field.create("UNUSED1126", 2116, FieldType.BIT, 3); + public static final Field UNUSED1127 = Field.create("UNUSED1127", 2116, FieldType.BIT, 4); + public static final Field UNUSED1128 = Field.create("UNUSED1128", 2116, FieldType.BIT, 5); + public static final Field UNUSED1129 = Field.create("UNUSED1129", 2116, FieldType.BIT, 6); + public static final Field UNUSED1130 = Field.create("UNUSED1130", 2116, FieldType.BIT, 7); + public static final Field UNUSEDBIT_477_8 = Field.create("UNUSEDBIT_477_8", 2116, FieldType.BIT, 8); + public static final Field UNUSEDBIT_477_9 = Field.create("UNUSEDBIT_477_9", 2116, FieldType.BIT, 9); + public static final Field UNUSEDBIT_477_10 = Field.create("UNUSEDBIT_477_10", 2116, FieldType.BIT, 10); + public static final Field UNUSEDBIT_477_11 = Field.create("UNUSEDBIT_477_11", 2116, FieldType.BIT, 11); + public static final Field UNUSEDBIT_477_12 = Field.create("UNUSEDBIT_477_12", 2116, FieldType.BIT, 12); + public static final Field UNUSEDBIT_477_13 = Field.create("UNUSEDBIT_477_13", 2116, FieldType.BIT, 13); + public static final Field UNUSEDBIT_477_14 = Field.create("UNUSEDBIT_477_14", 2116, FieldType.BIT, 14); + public static final Field UNUSEDBIT_477_15 = Field.create("UNUSEDBIT_477_15", 2116, FieldType.BIT, 15); + public static final Field UNUSEDBIT_477_16 = Field.create("UNUSEDBIT_477_16", 2116, FieldType.BIT, 16); + public static final Field UNUSEDBIT_477_17 = Field.create("UNUSEDBIT_477_17", 2116, FieldType.BIT, 17); + public static final Field UNUSEDBIT_477_18 = Field.create("UNUSEDBIT_477_18", 2116, FieldType.BIT, 18); + public static final Field UNUSEDBIT_477_19 = Field.create("UNUSEDBIT_477_19", 2116, FieldType.BIT, 19); + public static final Field UNUSEDBIT_477_20 = Field.create("UNUSEDBIT_477_20", 2116, FieldType.BIT, 20); + public static final Field UNUSEDBIT_477_21 = Field.create("UNUSEDBIT_477_21", 2116, FieldType.BIT, 21); + public static final Field UNUSEDBIT_477_22 = Field.create("UNUSEDBIT_477_22", 2116, FieldType.BIT, 22); + public static final Field UNUSEDBIT_477_23 = Field.create("UNUSEDBIT_477_23", 2116, FieldType.BIT, 23); + public static final Field UNUSEDBIT_477_24 = Field.create("UNUSEDBIT_477_24", 2116, FieldType.BIT, 24); + public static final Field UNUSEDBIT_477_25 = Field.create("UNUSEDBIT_477_25", 2116, FieldType.BIT, 25); + public static final Field UNUSEDBIT_477_26 = Field.create("UNUSEDBIT_477_26", 2116, FieldType.BIT, 26); + public static final Field UNUSEDBIT_477_27 = Field.create("UNUSEDBIT_477_27", 2116, FieldType.BIT, 27); + public static final Field UNUSEDBIT_477_28 = Field.create("UNUSEDBIT_477_28", 2116, FieldType.BIT, 28); + public static final Field UNUSEDBIT_477_29 = Field.create("UNUSEDBIT_477_29", 2116, FieldType.BIT, 29); + public static final Field UNUSEDBIT_477_30 = Field.create("UNUSEDBIT_477_30", 2116, FieldType.BIT, 30); + public static final Field UNUSEDBIT_477_31 = Field.create("UNUSEDBIT_477_31", 2116, FieldType.BIT, 31); + public static final Field CAN2NBCTYPE = Field.create("CAN2NBCTYPE", 2120, FieldType.INT); + public static final Field CAN2TXPIN = Field.create("CAN2TXPIN", 2124, FieldType.INT8, brain_pin_e); + public static final Field CAN2RXPIN = Field.create("CAN2RXPIN", 2125, FieldType.INT8, brain_pin_e); public static final Field BOOSTCUTPRESSURE = Field.create("BOOSTCUTPRESSURE", 2132, FieldType.FLOAT); public static final Field FSIOADC1 = Field.create("FSIOADC1", 2200, FieldType.INT8, adc_channel_e); public static final Field FSIOADC2 = Field.create("FSIOADC2", 2201, FieldType.INT8, adc_channel_e); @@ -2687,7 +2761,7 @@ public class Fields { CANRXPIN, THROTTLEPEDALUPPINMODE, ACIDLEEXTRAOFFSET, - UNUSEDAT712, + CAN2SLEEPPERIODMS, UNUSEDAT716, UNUSEDAT720, UNUSEDAT724, @@ -3159,6 +3233,43 @@ public class Fields { CANBAUDRATE, UN1USED_FORMER_WARMUP_TARGET_AFR, CAN2BAUDRATE, + UNUSED_FORMER_WARMUP_TARGET_AFR2, + VERBOSECAN2BASEADDRESS, + ENABLEVERBOSECAN2TX, + CAN2READENABLED, + CAN2WRITEENABLED, + UNUSED1126, + UNUSED1127, + UNUSED1128, + UNUSED1129, + UNUSED1130, + UNUSEDBIT_477_8, + UNUSEDBIT_477_9, + UNUSEDBIT_477_10, + UNUSEDBIT_477_11, + UNUSEDBIT_477_12, + UNUSEDBIT_477_13, + UNUSEDBIT_477_14, + UNUSEDBIT_477_15, + UNUSEDBIT_477_16, + UNUSEDBIT_477_17, + UNUSEDBIT_477_18, + UNUSEDBIT_477_19, + UNUSEDBIT_477_20, + UNUSEDBIT_477_21, + UNUSEDBIT_477_22, + UNUSEDBIT_477_23, + UNUSEDBIT_477_24, + UNUSEDBIT_477_25, + UNUSEDBIT_477_26, + UNUSEDBIT_477_27, + UNUSEDBIT_477_28, + UNUSEDBIT_477_29, + UNUSEDBIT_477_30, + UNUSEDBIT_477_31, + CAN2NBCTYPE, + CAN2TXPIN, + CAN2RXPIN, BOOSTCUTPRESSURE, FSIOADC1, FSIOADC2, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 96925c7ab7..bea616d3f2 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +