VAG canned tunes

This commit is contained in:
Andrey 2021-07-08 20:42:35 -04:00
parent ecfcd935ac
commit 3d0ba4af5c
10 changed files with 42 additions and 19 deletions

View File

@ -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 Thu Jul 08 03:47:45 UTC 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 08 20:15:18 EDT 2021
// see also gen_config_and_enums.bat
@ -902,10 +902,12 @@ case HELLEN_121_VAG:
return "HELLEN_121_VAG";
case HELLEN_121_VAG_5_CYL:
return "HELLEN_121_VAG_5_CYL";
case HELLEN_121_VAG_6_CYL:
return "HELLEN_121_VAG_6_CYL";
case HELLEN_121_VAG_8_CYL:
return "HELLEN_121_VAG_8_CYL";
case HELLEN_121_VAG_V6_CYL:
return "HELLEN_121_VAG_V6_CYL";
case HELLEN_121_VAG_VR6_CYL:
return "HELLEN_121_VAG_VR6_CYL";
case HELLEN_128_MERCEDES:
return "HELLEN_128_MERCEDES";
case HELLEN_134_BMW:

View File

@ -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 Thu Jul 08 03:47:44 UTC 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 08 20:15:17 EDT 2021
// see also gen_config_and_enums.bat
@ -698,10 +698,12 @@ case HELLEN_121_VAG:
return "HELLEN_121_VAG";
case HELLEN_121_VAG_5_CYL:
return "HELLEN_121_VAG_5_CYL";
case HELLEN_121_VAG_6_CYL:
return "HELLEN_121_VAG_6_CYL";
case HELLEN_121_VAG_8_CYL:
return "HELLEN_121_VAG_8_CYL";
case HELLEN_121_VAG_V6_CYL:
return "HELLEN_121_VAG_V6_CYL";
case HELLEN_121_VAG_VR6_CYL:
return "HELLEN_121_VAG_VR6_CYL";
case HELLEN_128_MERCEDES:
return "HELLEN_128_MERCEDES";
case HELLEN_134_BMW:

View File

@ -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 Thu Jul 08 03:47:45 UTC 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 08 20:15:18 EDT 2021
// see also gen_config_and_enums.bat
@ -898,10 +898,12 @@ case HELLEN_121_VAG:
return "HELLEN_121_VAG";
case HELLEN_121_VAG_5_CYL:
return "HELLEN_121_VAG_5_CYL";
case HELLEN_121_VAG_6_CYL:
return "HELLEN_121_VAG_6_CYL";
case HELLEN_121_VAG_8_CYL:
return "HELLEN_121_VAG_8_CYL";
case HELLEN_121_VAG_V6_CYL:
return "HELLEN_121_VAG_V6_CYL";
case HELLEN_121_VAG_VR6_CYL:
return "HELLEN_121_VAG_VR6_CYL";
case HELLEN_128_MERCEDES:
return "HELLEN_128_MERCEDES";
case HELLEN_134_BMW:

View File

@ -73,7 +73,12 @@ void setHellen121Vag_5_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.firingOrder = FO_1_2_4_5_3;
}
void setHellen121Vag_6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
void setHellen121Vag_vr6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.cylindersCount = 6;
engineConfiguration->specs.firingOrder = FO_1_5_3_6_2_4;
}
void setHellen121Vag_v6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.cylindersCount = 6;
engineConfiguration->specs.displacement = 2.7;
// todo? typo? missing? engineConfiguration->specs.firingOrder = FO_1_4_3_6_2_5;

View File

@ -13,5 +13,6 @@ void setVwAba(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setHellen121Vag_5_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setHellen121Vag_6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setHellen121Vag_vr6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setHellen121Vag_v6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setHellen121Vag_8_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE);

View File

@ -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 Thu Jul 08 03:47:44 UTC 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 08 20:15:17 EDT 2021
// see also gen_config_and_enums.bat
@ -874,10 +874,12 @@ case HELLEN_121_VAG:
return "HELLEN_121_VAG";
case HELLEN_121_VAG_5_CYL:
return "HELLEN_121_VAG_5_CYL";
case HELLEN_121_VAG_6_CYL:
return "HELLEN_121_VAG_6_CYL";
case HELLEN_121_VAG_8_CYL:
return "HELLEN_121_VAG_8_CYL";
case HELLEN_121_VAG_V6_CYL:
return "HELLEN_121_VAG_V6_CYL";
case HELLEN_121_VAG_VR6_CYL:
return "HELLEN_121_VAG_VR6_CYL";
case HELLEN_128_MERCEDES:
return "HELLEN_128_MERCEDES";
case HELLEN_134_BMW:

View File

@ -950,8 +950,11 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case HELLEN_121_VAG_5_CYL:
setHellen121Vag_5_cyl(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case HELLEN_121_VAG_6_CYL:
setHellen121Vag_6_cyl(PASS_CONFIG_PARAMETER_SIGNATURE);
case HELLEN_121_VAG_V6_CYL:
setHellen121Vag_v6_cyl(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case HELLEN_121_VAG_VR6_CYL:
setHellen121Vag_vr6_cyl(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case HELLEN_121_VAG_8_CYL:
setHellen121Vag_8_cyl(PASS_CONFIG_PARAMETER_SIGNATURE);

View File

@ -31,10 +31,11 @@ typedef enum {
FO_1_2_4_5_3 = 6,
// 6 cylinder
FO_1_5_3_6_2_4 = 4,
FO_1_5_3_6_2_4 = 4, // VAG VR6
FO_1_4_2_5_3_6 = 7,
FO_1_2_3_4_5_6 = 9, // all Nissan v6
FO_1_6_3_2_5_4 = 13, // EG33
FO_1_4_3_6_2_5 = 27, // VAG v6 different from VAG VR6
// todo: one day we shall support 7 cylinder radial, probably not before one actually approaches us
@ -65,7 +66,7 @@ typedef enum {
// unfortunately not supported by default firmware because MAX_CYLINDER_COUNT=12 by default
FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16
// max used = 26
// max used = 27
Force_4b_firing_order = ENUM_32_BITS,
} firing_order_e;

View File

@ -201,7 +201,8 @@ typedef enum {
HELLEN_154_VAG = ET_HELLEN_154_VAG,
HELLEN_121_VAG_5_CYL = ET_HELLEN_121_VAG_5_CYL,
HELLEN_121_VAG_6_CYL = ET_HELLEN_121_VAG_6_CYL,
HELLEN_121_VAG_V6_CYL = ET_HELLEN_121_VAG_V6_CYL,
HELLEN_121_VAG_VR6_CYL = ET_HELLEN_121_VAG_VR6_CYL,
HELLEN_121_VAG_8_CYL = ET_HELLEN_121_VAG_8_CYL,
HELLEN_NA94 = ET_HELLEN_NA94,

View File

@ -122,6 +122,7 @@ static const int order_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4[] = { 1, 5, 3, 6, 2,
static const int order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[] = { 1, 4, 2, 5, 3, 6 };
static const int order_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6[] = { 1, 2, 3, 4, 5, 6 };
static const int order_1_6_3_2_5_4[] = {1, 6, 3, 2, 5, 4};
static const int order_1_4_3_6_2_5[] = {1, 4, 3, 6, 2, 5};
// 8 cylinder
static const int order_1_8_4_3_6_5_7_2[] = { 1, 8, 4, 3, 6, 5, 7, 2 };
@ -174,6 +175,7 @@ static int getFiringOrderLength(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
case FO_1_4_2_5_3_6:
case FO_1_2_3_4_5_6:
case FO_1_6_3_2_5_4:
case FO_1_4_3_6_2_5:
return 6;
// 8 cylinder
@ -245,6 +247,8 @@ static const int *getFiringOrderTable(DECLARE_ENGINE_PARAMETER_SIGNATURE)
return order_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6;
case FO_1_6_3_2_5_4:
return order_1_6_3_2_5_4;
case FO_1_4_3_6_2_5:
return order_1_4_3_6_2_5;
// 8 cylinder
case FO_1_8_4_3_6_5_7_2: