diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index a861c5514f..6f5a182d96 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 Tue Jun 30 19:19:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 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 0d3a3027b6..dfef2bae69 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 Tue Jun 30 19:19:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 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 1c7c7685f9..9a1c0b54d5 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 Tue Jun 30 19:19:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 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 769de9b82e..1cc9ea6ef3 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 Tue Jun 30 19:19:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/tunerstudio/cache/frankenso/rusefi_config.txt b/firmware/tunerstudio/cache/frankenso/rusefi_config.txt index 18c6890c44..4494b49640 100644 --- a/firmware/tunerstudio/cache/frankenso/rusefi_config.txt +++ b/firmware/tunerstudio/cache/frankenso/rusefi_config.txt @@ -304,7 +304,7 @@ struct gppwm_channel uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0 gppwm_channel_e loadAxis;+Selects the load axis to use for the table.; - uint8_t[1] alignmentFill; + uint8_t alignmentFill_map;;"unit", 1, 0, 0, 100, 0 uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load", 1, 0, 0.0, 250, 0 uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa", 1, 0, -400, 800, 2 float highValue;kPa value at high volts;"kpa", 1, 0, -400, 800, 2 air_pressure_sensor_type_e type; adc_channel_e hwChannel; -uint8_t[3] alignmentFill; +uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 end_struct @@ -349,7 +349,7 @@ end_struct struct oil_pressure_config_s @brief Oil pressure sensor interpolation adc_channel_e hwChannel; - uint8_t[3] alignmentFill; + uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "kPa", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, struct afr_sensor_s adc_channel_e hwChannel; -uint8_t[3] alignmentFill_afr; +uint8_t[3] alignmentFill_afr;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "AFR", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds", 1, 0 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%", 1, 0, 0, 600, 1 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds", 1, 0, 0, 100, 1 - boost_table_t boostTableOpenLoop; uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -1636,6 +1635,8 @@ end_struct #define ET_MRE_MIATA_NB2_MAF 15 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_NEW_TEST_BOARD 31 +#define ET_MRE_DEFAULTS 60 + #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NB2 47 #define ET_FRANKENSO_MIATA_NA6_VAF 57 diff --git a/firmware/tunerstudio/cache/kinetis/rusefi_config.txt b/firmware/tunerstudio/cache/kinetis/rusefi_config.txt index 18c6890c44..4494b49640 100644 --- a/firmware/tunerstudio/cache/kinetis/rusefi_config.txt +++ b/firmware/tunerstudio/cache/kinetis/rusefi_config.txt @@ -304,7 +304,7 @@ struct gppwm_channel uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0 gppwm_channel_e loadAxis;+Selects the load axis to use for the table.; - uint8_t[1] alignmentFill; + uint8_t alignmentFill_map;;"unit", 1, 0, 0, 100, 0 uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load", 1, 0, 0.0, 250, 0 uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa", 1, 0, -400, 800, 2 float highValue;kPa value at high volts;"kpa", 1, 0, -400, 800, 2 air_pressure_sensor_type_e type; adc_channel_e hwChannel; -uint8_t[3] alignmentFill; +uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 end_struct @@ -349,7 +349,7 @@ end_struct struct oil_pressure_config_s @brief Oil pressure sensor interpolation adc_channel_e hwChannel; - uint8_t[3] alignmentFill; + uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "kPa", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, struct afr_sensor_s adc_channel_e hwChannel; -uint8_t[3] alignmentFill_afr; +uint8_t[3] alignmentFill_afr;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "AFR", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds", 1, 0 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%", 1, 0, 0, 600, 1 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds", 1, 0, 0, 100, 1 - boost_table_t boostTableOpenLoop; uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -1636,6 +1635,8 @@ end_struct #define ET_MRE_MIATA_NB2_MAF 15 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_NEW_TEST_BOARD 31 +#define ET_MRE_DEFAULTS 60 + #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NB2 47 #define ET_FRANKENSO_MIATA_NA6_VAF 57 diff --git a/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt b/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt index 18c6890c44..4494b49640 100644 --- a/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt +++ b/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt @@ -304,7 +304,7 @@ struct gppwm_channel uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0 gppwm_channel_e loadAxis;+Selects the load axis to use for the table.; - uint8_t[1] alignmentFill; + uint8_t alignmentFill_map;;"unit", 1, 0, 0, 100, 0 uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load", 1, 0, 0.0, 250, 0 uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa", 1, 0, -400, 800, 2 float highValue;kPa value at high volts;"kpa", 1, 0, -400, 800, 2 air_pressure_sensor_type_e type; adc_channel_e hwChannel; -uint8_t[3] alignmentFill; +uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 end_struct @@ -349,7 +349,7 @@ end_struct struct oil_pressure_config_s @brief Oil pressure sensor interpolation adc_channel_e hwChannel; - uint8_t[3] alignmentFill; + uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "kPa", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, struct afr_sensor_s adc_channel_e hwChannel; -uint8_t[3] alignmentFill_afr; +uint8_t[3] alignmentFill_afr;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "AFR", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds", 1, 0 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%", 1, 0, 0, 600, 1 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds", 1, 0, 0, 100, 1 - boost_table_t boostTableOpenLoop; uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -1636,6 +1635,8 @@ end_struct #define ET_MRE_MIATA_NB2_MAF 15 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_NEW_TEST_BOARD 31 +#define ET_MRE_DEFAULTS 60 + #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NB2 47 #define ET_FRANKENSO_MIATA_NA6_VAF 57 diff --git a/firmware/tunerstudio/cache/prometheus/rusefi_config.txt b/firmware/tunerstudio/cache/prometheus/rusefi_config.txt index 18c6890c44..4494b49640 100644 --- a/firmware/tunerstudio/cache/prometheus/rusefi_config.txt +++ b/firmware/tunerstudio/cache/prometheus/rusefi_config.txt @@ -304,7 +304,7 @@ struct gppwm_channel uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0 gppwm_channel_e loadAxis;+Selects the load axis to use for the table.; - uint8_t[1] alignmentFill; + uint8_t alignmentFill_map;;"unit", 1, 0, 0, 100, 0 uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load", 1, 0, 0.0, 250, 0 uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa", 1, 0, -400, 800, 2 float highValue;kPa value at high volts;"kpa", 1, 0, -400, 800, 2 air_pressure_sensor_type_e type; adc_channel_e hwChannel; -uint8_t[3] alignmentFill; +uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 end_struct @@ -349,7 +349,7 @@ end_struct struct oil_pressure_config_s @brief Oil pressure sensor interpolation adc_channel_e hwChannel; - uint8_t[3] alignmentFill; + uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "kPa", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, struct afr_sensor_s adc_channel_e hwChannel; -uint8_t[3] alignmentFill_afr; +uint8_t[3] alignmentFill_afr;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "AFR", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds", 1, 0 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%", 1, 0, 0, 600, 1 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds", 1, 0, 0, 100, 1 - boost_table_t boostTableOpenLoop; uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -1636,6 +1635,8 @@ end_struct #define ET_MRE_MIATA_NB2_MAF 15 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_NEW_TEST_BOARD 31 +#define ET_MRE_DEFAULTS 60 + #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NB2 47 #define ET_FRANKENSO_MIATA_NA6_VAF 57 diff --git a/firmware/tunerstudio/cache/proteus/rusefi_config.txt b/firmware/tunerstudio/cache/proteus/rusefi_config.txt index 18c6890c44..4494b49640 100644 --- a/firmware/tunerstudio/cache/proteus/rusefi_config.txt +++ b/firmware/tunerstudio/cache/proteus/rusefi_config.txt @@ -304,7 +304,7 @@ struct gppwm_channel uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0 gppwm_channel_e loadAxis;+Selects the load axis to use for the table.; - uint8_t[1] alignmentFill; + uint8_t alignmentFill_map;;"unit", 1, 0, 0, 100, 0 uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load", 1, 0, 0.0, 250, 0 uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa", 1, 0, -400, 800, 2 float highValue;kPa value at high volts;"kpa", 1, 0, -400, 800, 2 air_pressure_sensor_type_e type; adc_channel_e hwChannel; -uint8_t[3] alignmentFill; +uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 end_struct @@ -349,7 +349,7 @@ end_struct struct oil_pressure_config_s @brief Oil pressure sensor interpolation adc_channel_e hwChannel; - uint8_t[3] alignmentFill; + uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "kPa", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, struct afr_sensor_s adc_channel_e hwChannel; -uint8_t[3] alignmentFill_afr; +uint8_t[3] alignmentFill_afr;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "AFR", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds", 1, 0 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%", 1, 0, 0, 600, 1 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds", 1, 0, 0, 100, 1 - boost_table_t boostTableOpenLoop; uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -1636,6 +1635,8 @@ end_struct #define ET_MRE_MIATA_NB2_MAF 15 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_NEW_TEST_BOARD 31 +#define ET_MRE_DEFAULTS 60 + #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NB2 47 #define ET_FRANKENSO_MIATA_NA6_VAF 57 diff --git a/firmware/tunerstudio/cache/rusefi_config.txt b/firmware/tunerstudio/cache/rusefi_config.txt index 18c6890c44..4494b49640 100644 --- a/firmware/tunerstudio/cache/rusefi_config.txt +++ b/firmware/tunerstudio/cache/rusefi_config.txt @@ -304,7 +304,7 @@ struct gppwm_channel uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0 gppwm_channel_e loadAxis;+Selects the load axis to use for the table.; - uint8_t[1] alignmentFill; + uint8_t alignmentFill_map;;"unit", 1, 0, 0, 100, 0 uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load", 1, 0, 0.0, 250, 0 uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa", 1, 0, -400, 800, 2 float highValue;kPa value at high volts;"kpa", 1, 0, -400, 800, 2 air_pressure_sensor_type_e type; adc_channel_e hwChannel; -uint8_t[3] alignmentFill; +uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 end_struct @@ -349,7 +349,7 @@ end_struct struct oil_pressure_config_s @brief Oil pressure sensor interpolation adc_channel_e hwChannel; - uint8_t[3] alignmentFill; + uint8_t[3] alignmentFill;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "kPa", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, struct afr_sensor_s adc_channel_e hwChannel; -uint8_t[3] alignmentFill_afr; +uint8_t[3] alignmentFill_afr;;"unit", 1, 0, 0, 100, 0 float v1;; "volts", 1, 0.0, 0, 10.0, 2 float value1;; "AFR", 1, 0.0, 0, 1000.0, 2 float v2;; "volts", 1, 0.0, 0, 10.0, 2 @@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds", 1, 0 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%", 1, 0, 0, 600, 1 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds", 1, 0, 0, 100, 1 - boost_table_t boostTableOpenLoop; uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 @@ -1636,6 +1635,8 @@ end_struct #define ET_MRE_MIATA_NB2_MAF 15 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_NEW_TEST_BOARD 31 +#define ET_MRE_DEFAULTS 60 + #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NB2 47 #define ET_FRANKENSO_MIATA_NA6_VAF 57 diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index ca70e220cc..b69c94a540 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -321,6 +321,7 @@ public class Fields { public static final int ET_FRANKENSO_MIATA_NA6 = 41; public static final int ET_FRANKENSO_MIATA_NA6_VAF = 57; public static final int ET_FRANKENSO_MIATA_NB2 = 47; + public static final int ET_MRE_DEFAULTS = 60; public static final int ET_MRE_MIATA_NA6 = 12; public static final int ET_MRE_MIATA_NB2_MAF = 15; public static final int ET_MRE_MIATA_NB2_MAP = 11; @@ -601,7 +602,7 @@ public class Fields { public static final int gpioPinModes7_offset = 770; public static final int gpioPinModes8_offset = 771; public static final int gpioPinModes9_offset = 772; - public static final int gppwm1_alignmentFill_offset = 4151; + public static final int gppwm1_alignmentFill_map_offset = 4151; public static final int gppwm1_dutyIfError_offset = 4145; public static final int gppwm1_loadAxis_offset = 4150; public static final int gppwm1_loadBins_offset = 4152; @@ -612,7 +613,7 @@ public class Fields { public static final int gppwm1_pwmFrequency_offset = 4146; public static final int gppwm1_rpmBins_offset = 4160; public static final int gppwm1_table_offset = 4168; - public static final int gppwm2_alignmentFill_offset = 4239; + public static final int gppwm2_alignmentFill_map_offset = 4239; public static final int gppwm2_dutyIfError_offset = 4233; public static final int gppwm2_loadAxis_offset = 4238; public static final int gppwm2_loadBins_offset = 4240; @@ -623,7 +624,7 @@ public class Fields { public static final int gppwm2_pwmFrequency_offset = 4234; public static final int gppwm2_rpmBins_offset = 4248; public static final int gppwm2_table_offset = 4256; - public static final int gppwm3_alignmentFill_offset = 4327; + public static final int gppwm3_alignmentFill_map_offset = 4327; public static final int gppwm3_dutyIfError_offset = 4321; public static final int gppwm3_loadAxis_offset = 4326; public static final int gppwm3_loadBins_offset = 4328; @@ -634,7 +635,7 @@ public class Fields { public static final int gppwm3_pwmFrequency_offset = 4322; public static final int gppwm3_rpmBins_offset = 4336; public static final int gppwm3_table_offset = 4344; - public static final int gppwm4_alignmentFill_offset = 4415; + public static final int gppwm4_alignmentFill_map_offset = 4415; public static final int gppwm4_dutyIfError_offset = 4409; public static final int gppwm4_loadAxis_offset = 4414; public static final int gppwm4_loadBins_offset = 4416; @@ -1039,7 +1040,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 = 309701893; + public static final int SIGNATURE_HASH = 129680412; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1278,7 +1279,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.06.30.all.309701893"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.01.all.129680412"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -2333,7 +2334,7 @@ public class Fields { public static final Field GPPWM1_OFFBELOWDUTY = Field.create("GPPWM1_OFFBELOWDUTY", 4149, FieldType.INT8); public static final String[] gppwm_channel_e = {"TPS", "MAP", "CLT", "IAT"}; public static final Field GPPWM1_LOADAXIS = Field.create("GPPWM1_LOADAXIS", 4150, FieldType.INT8, gppwm_channel_e); - public static final Field GPPWM1_ALIGNMENTFILL = Field.create("GPPWM1_ALIGNMENTFILL", 4151, FieldType.INT8); + public static final Field GPPWM1_ALIGNMENTFILL_MAP = Field.create("GPPWM1_ALIGNMENTFILL_MAP", 4151, FieldType.INT8); public static final Field GPPWM1_TABLE = Field.create("GPPWM1_TABLE", 4168, FieldType.INT); public static final Field GPPWM2_PIN = Field.create("GPPWM2_PIN", 4232, FieldType.INT8, output_pin_e); public static final Field GPPWM2_DUTYIFERROR = Field.create("GPPWM2_DUTYIFERROR", 4233, FieldType.INT8); @@ -2341,7 +2342,7 @@ public class Fields { public static final Field GPPWM2_ONABOVEDUTY = Field.create("GPPWM2_ONABOVEDUTY", 4236, FieldType.INT8); public static final Field GPPWM2_OFFBELOWDUTY = Field.create("GPPWM2_OFFBELOWDUTY", 4237, FieldType.INT8); public static final Field GPPWM2_LOADAXIS = Field.create("GPPWM2_LOADAXIS", 4238, FieldType.INT8, gppwm_channel_e); - public static final Field GPPWM2_ALIGNMENTFILL = Field.create("GPPWM2_ALIGNMENTFILL", 4239, FieldType.INT8); + public static final Field GPPWM2_ALIGNMENTFILL_MAP = Field.create("GPPWM2_ALIGNMENTFILL_MAP", 4239, FieldType.INT8); public static final Field GPPWM2_TABLE = Field.create("GPPWM2_TABLE", 4256, FieldType.INT); public static final Field GPPWM3_PIN = Field.create("GPPWM3_PIN", 4320, FieldType.INT8, output_pin_e); public static final Field GPPWM3_DUTYIFERROR = Field.create("GPPWM3_DUTYIFERROR", 4321, FieldType.INT8); @@ -2349,7 +2350,7 @@ public class Fields { public static final Field GPPWM3_ONABOVEDUTY = Field.create("GPPWM3_ONABOVEDUTY", 4324, FieldType.INT8); public static final Field GPPWM3_OFFBELOWDUTY = Field.create("GPPWM3_OFFBELOWDUTY", 4325, FieldType.INT8); public static final Field GPPWM3_LOADAXIS = Field.create("GPPWM3_LOADAXIS", 4326, FieldType.INT8, gppwm_channel_e); - public static final Field GPPWM3_ALIGNMENTFILL = Field.create("GPPWM3_ALIGNMENTFILL", 4327, FieldType.INT8); + public static final Field GPPWM3_ALIGNMENTFILL_MAP = Field.create("GPPWM3_ALIGNMENTFILL_MAP", 4327, FieldType.INT8); public static final Field GPPWM3_TABLE = Field.create("GPPWM3_TABLE", 4344, FieldType.INT); public static final Field GPPWM4_PIN = Field.create("GPPWM4_PIN", 4408, FieldType.INT8, output_pin_e); public static final Field GPPWM4_DUTYIFERROR = Field.create("GPPWM4_DUTYIFERROR", 4409, FieldType.INT8); @@ -2357,7 +2358,7 @@ public class Fields { public static final Field GPPWM4_ONABOVEDUTY = Field.create("GPPWM4_ONABOVEDUTY", 4412, FieldType.INT8); public static final Field GPPWM4_OFFBELOWDUTY = Field.create("GPPWM4_OFFBELOWDUTY", 4413, FieldType.INT8); public static final Field GPPWM4_LOADAXIS = Field.create("GPPWM4_LOADAXIS", 4414, FieldType.INT8, gppwm_channel_e); - public static final Field GPPWM4_ALIGNMENTFILL = Field.create("GPPWM4_ALIGNMENTFILL", 4415, FieldType.INT8); + public static final Field GPPWM4_ALIGNMENTFILL_MAP = Field.create("GPPWM4_ALIGNMENTFILL_MAP", 4415, FieldType.INT8); public static final Field GPPWM4_TABLE = Field.create("GPPWM4_TABLE", 4432, FieldType.INT); public static final Field MC33_I_BOOST = Field.create("MC33_I_BOOST", 4496, FieldType.INT16); public static final Field MC33_I_PEAK = Field.create("MC33_I_PEAK", 4498, FieldType.INT16); @@ -3310,7 +3311,7 @@ public class Fields { GPPWM1_ONABOVEDUTY, GPPWM1_OFFBELOWDUTY, GPPWM1_LOADAXIS, - GPPWM1_ALIGNMENTFILL, + GPPWM1_ALIGNMENTFILL_MAP, GPPWM1_TABLE, GPPWM2_PIN, GPPWM2_DUTYIFERROR, @@ -3318,7 +3319,7 @@ public class Fields { GPPWM2_ONABOVEDUTY, GPPWM2_OFFBELOWDUTY, GPPWM2_LOADAXIS, - GPPWM2_ALIGNMENTFILL, + GPPWM2_ALIGNMENTFILL_MAP, GPPWM2_TABLE, GPPWM3_PIN, GPPWM3_DUTYIFERROR, @@ -3326,7 +3327,7 @@ public class Fields { GPPWM3_ONABOVEDUTY, GPPWM3_OFFBELOWDUTY, GPPWM3_LOADAXIS, - GPPWM3_ALIGNMENTFILL, + GPPWM3_ALIGNMENTFILL_MAP, GPPWM3_TABLE, GPPWM4_PIN, GPPWM4_DUTYIFERROR, @@ -3334,7 +3335,7 @@ public class Fields { GPPWM4_ONABOVEDUTY, GPPWM4_OFFBELOWDUTY, GPPWM4_LOADAXIS, - GPPWM4_ALIGNMENTFILL, + GPPWM4_ALIGNMENTFILL_MAP, GPPWM4_TABLE, MC33_I_BOOST, MC33_I_PEAK,