diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 2b52cb5d78..7ae6267fcc 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Jun 13 21:14:31 EDT 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Jul 01 16:59:55 EDT 2021 // see also gen_config_and_enums.bat @@ -1545,6 +1545,8 @@ case VVT_INACTIVE: return "VVT_INACTIVE"; case VVT_MIATA_NB2: return "VVT_MIATA_NB2"; +case VVT_NISSAN_VQ: + return "VVT_NISSAN_VQ"; case VVT_SECOND_HALF: return "VVT_SECOND_HALF"; } diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index 6e64441da9..8eac9cf477 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -161,6 +161,10 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX); + + // Bosch VQ40 VR56 VK56 0280158007 + engineConfiguration->injector.flow = 296.2; + engineConfiguration->specs.cylindersCount = 6; engineConfiguration->specs.firingOrder = FO_1_2_3_4_5_6; diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index c0246dde20..0aaef5ee8f 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Jun 13 21:14:31 EDT 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Jul 01 16:59:55 EDT 2021 // see also gen_config_and_enums.bat @@ -1341,6 +1341,8 @@ case VVT_INACTIVE: return "VVT_INACTIVE"; case VVT_MIATA_NB2: return "VVT_MIATA_NB2"; +case VVT_NISSAN_VQ: + return "VVT_NISSAN_VQ"; case VVT_SECOND_HALF: return "VVT_SECOND_HALF"; } diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp index 8ef614594c..ad692fb897 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Jun 13 21:14:32 EDT 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Jul 01 16:59:56 EDT 2021 // see also gen_config_and_enums.bat @@ -1541,6 +1541,8 @@ case VVT_INACTIVE: return "VVT_INACTIVE"; case VVT_MIATA_NB2: return "VVT_MIATA_NB2"; +case VVT_NISSAN_VQ: + return "VVT_NISSAN_VQ"; case VVT_SECOND_HALF: return "VVT_SECOND_HALF"; } diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index ac8342cc49..08ac8756c9 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Jun 13 21:14:31 EDT 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Jul 01 16:59:55 EDT 2021 // see also gen_config_and_enums.bat @@ -1517,6 +1517,8 @@ case VVT_INACTIVE: return "VVT_INACTIVE"; case VVT_MIATA_NB2: return "VVT_MIATA_NB2"; +case VVT_NISSAN_VQ: + return "VVT_NISSAN_VQ"; case VVT_SECOND_HALF: return "VVT_SECOND_HALF"; } diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 8168abf74e..76edbbf081 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -400,7 +400,7 @@ typedef enum { // // Another point: once you add a new trigger, run get_trigger_images.bat which would run rusefi_test.exe from unit_tests // - TT_UNUSED = 58, // this is used if we want to iterate over all trigger types + TT_UNUSED = 59, // this is used if we want to iterate over all trigger types Force_4_bytes_size_trigger_type = ENUM_32_BITS, } trigger_type_e; // TriggerProcessor.java has this "trigger_type_e" name hard-coded! @@ -475,6 +475,8 @@ typedef enum __attribute__ ((__packed__)) { VVT_FORD_ST170 = 7, VVT_BARRA_3_PLUS_1 = 8, + + VVT_NISSAN_VQ = 9, } vvt_mode_e; /** diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index b7ecf7a2a4..fb5548717e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -447,6 +447,7 @@ end_struct #define TT_TT_SKODA_FAVORIT 55 #define TT_TT_VVT_BARRA_3_PLUS_1 56 #define TT_TT_KAWA_KX450F 57 +#define TT_TT_NISSAN_VQ 58 ! todo https://github.com/rusefi/rusefi/issues/2102