From 6b9a659fd8f57d063d7e53454a2952c00b60c909 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 30 Jun 2020 19:10:53 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 +- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 4 +- firmware/tunerstudio/cache/rusefi_config.txt | 58 +++++++++---------- firmware/tunerstudio/rusefi.ini | 6 +- .../com/rusefi/config/generated/Fields.java | 6 +- java_console/rusefi.xml | 2 +- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index e83f9d9445..ebcc217db1 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 Tue Jun 30 01:45:56 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:10:36 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 01:45:56 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:10:36 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index fb57a99a53..6594147234 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 01:45:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:10:36 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 3934b1ad92..829faa42b8 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 01:45:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:10:36 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 8099a7a7d4..ffea98a879 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 01:45:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:10:36 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 68950f9d9a..749191cd43 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 01:45:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:10:36 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 a4deb9024d..77b0ec6850 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1058,7 +1058,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.06.30 -#define SIGNATURE_HASH 520656958 +#define SIGNATURE_HASH 615955297 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1318,7 +1318,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.06.30.all.520656958" +#define TS_SIGNATURE "rusEFI 2020.06.30.all.615955297" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/tunerstudio/cache/rusefi_config.txt b/firmware/tunerstudio/cache/rusefi_config.txt index e4bee5e6d5..b15dd43b29 100644 --- a/firmware/tunerstudio/cache/rusefi_config.txt +++ b/firmware/tunerstudio/cache/rusefi_config.txt @@ -519,7 +519,7 @@ adc_channel_e vbattAdcChannel;+This is the processor input pin that the battery adc_channel_e fuelLevelSensor;+This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined. adc_channel_e tps2_1AdcChannel;Second throttle body position sensor, single channel so far\nset_analog_input_pin tps2 X - int unusedAt516;;"units", 1, 0, -20, 100, 0 + int unusedAt516; int sensorChartFrequency;;"index", 1, 0, 0, 300, 0 ; size 4 struct trigger_config_s @brief Trigger wheel(s) configuration @@ -651,7 +651,7 @@ custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fas float fuelLevelFullTankVoltage;;"V", 1, 0, 0,10, 2 ego_sensor_e afr_type;AFR, WBO, EGO - whatever you like to call it; - uint32_t unused696;;"units", 1, 0, -20, 100, 0 + uint32_t unused696; brain_input_pin_e[TRIGGER_INPUT_PIN_COUNT iterate] triggerInputPins; pin_output_mode_e hip9011CsPinMode; @@ -664,12 +664,12 @@ custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fas brain_pin_e canRxPin;set_can_rx_pin X pin_input_mode_e throttlePedalUpPinMode; - uint8_t unused711;;"units", 1, 0, -20, 100, 0 + uint8_t unused711; - int unusedAt712;;"units", 1, 0, -20, 100, 0 - int unusedAt716;;"units", 1, 0, -20, 100, 0 - int unusedAt720;;"units", 1, 0, -20, 100, 0 - int unusedAt724;;"units", 1, 0, -20, 100, 0 + int unusedAt712; + int unusedAt716; + int unusedAt720; + int unusedAt724; uint32_t tunerStudioSerialSpeed;Secondary TTL channel baud rate;"BPs", 1, 0, 0,1000000, 0 @@ -726,7 +726,7 @@ pin_output_mode_e hip9011IntHoldPinMode; uint32_t verboseCanBaseAddress;;"", 1, 0, 0, 536870911, 0 uint8_t mc33_hvolt;;"v", 1, 0, 0, 100, 0 - uint8_t[3] unusedHere;;"units", 1, 0, -20, 100, 0 + uint8_t[3] unusedHere; pin_output_mode_e[FSIO_COMMAND_COUNT iterate] gpioPinModes; @@ -737,7 +737,7 @@ pin_output_mode_e hip9011IntHoldPinMode; custom uart_device_e 1 bits,U32, @OFFSET@, [0:1], "Off", "UART1", "UART2", "UART3" int16_t sdCardPeriodMs;+SD card logging period, in milliseconds;"ms", 1, 0, 0, 30000, 0 - uint8_t unused806;;"units", 1, 0, -20, 100, 0 + uint8_t unused806 brain_pin_e debugMapAveraging; output_pin_e starterRelayDisablePin; pin_output_mode_e starterRelayDisableMode;On some vehicles we can disable starter once engine is already running @@ -888,7 +888,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@ output_pin_e[TCU_SOLENOID_COUNT iterate] tcu_solenoid; - int[65] unusedAtOldBoardConfigurationEnd;;"units", 1, 0, -20, 100, 0 + int[65] unusedAtOldBoardConfigurationEnd; uint16_t tps2SecondaryMin;;"ADC", 1, 0, 0, 1000, 0 uint16_t tps2SecondaryMax;;"ADC", 1, 0, 0, 1000, 0 @@ -1100,7 +1100,7 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\ custom can_baudrate_e 1 bits, U08, @OFFSET@, [0:1], @@can_baudrate_e_enum@@ can_baudrate_e canBaudRate; set can_baudrate - uint32_t[5] unused_former_warmup_target_afr;;"units", 1, 0, -20, 100, 0 + uint32_t[5] unused_former_warmup_target_afr; float boostCutPressure;kPa value at which we need to cut fuel and spark, 0 if not enabled;"kPa", 1, 0, 0, 500, 0 @@ -1133,24 +1133,24 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygenBins;Narrow Band WBO Approximation;"V", 1, 0, -10.0, 10.0, 3 float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygen;;"ratio", 1, 0, -40.0, 40.0, 2 vvt_mode_e vvtMode;set vvt_mode X - uint8_t[20] unusedOldBiquad;;"units", 1, 0, -20, 100, 0 + uint8_t[20] unusedOldBiquad float[CLT_TIMING_CURVE_SIZE] cltTimingBins;CLT-based timing correction;"C", 1, 0, -100.0, 250.0, 1 float[CLT_TIMING_CURVE_SIZE] cltTimingExtra;;"degree", 1, 0, -400.0, 400.0, 0 custom tle8888_mode_e 1 bits, U08, @OFFSET@, [0:1], "Auto", "SemiAuto", "Manual", "Hall" tle8888_mode_e tle8888mode; - uint8_t[3] unusedSomethingWasHere;;"units", 1, 0, -20, 100, 0 - float unused244_1;;"units", 1, 0, -20, 100, 0 - float unused244_2;;"units", 1, 0, -20, 100, 0 - float unused244_3;;"units", 1, 0, -20, 100, 0 - float unused2432;;"units", 1, 0, -20, 100, 0 + uint8_t[3] unusedSomethingWasHere; + float unused244_1; + float unused244_2; + float unused244_3; + float unused2432; float postCrankingFactor;+Fuel multiplier (enrichment) immediately after engine start;"mult", 1, 0, 0, 100, 4 float postCrankingDurationSec;+Time over which to taper out after start enrichment;"seconds", 1, 0, 0, 100, 2 ThermistorConf auxTempSensor1;todo: finish implementation #332 ThermistorConf auxTempSensor2;todo: finish implementation #332 - uint8_t[6] unused2508;;"units", 1, 0, -20, 100, 0 + uint8_t[6] unused2508; int16_t etbFreq;;"Hz", 1, 0, 0, 30000, 0 - uint8_t[24] unused2516;;"units", 1, 0, -20, 100, 0 + uint8_t[24] unused2516; custom cfg_float_t_1f 4 scalar, F32, @OFFSET@, "Val", 1, 0, -20000000, 20000000, 1 cfg_float_t_1f[IGNITION_PIN_COUNT iterate] timing_offset_cylinder;per-cylinder timing correction @@ -1159,7 +1159,7 @@ tle8888_mode_e tle8888mode; float idlePidActivationTime;;"seconds", 1, 0, 0, 60, 1 spi_device_e sdCardSpiDevice; - uint8_t[3] unusedSpiPadding4;;"units", 1, 0, -20, 100, 0 + uint8_t[3] unusedSpiPadding4; pin_mode_e spi1SckMode; pin_mode_e spi1MosiMode;+Modes count be used for 3v<>5v integration using pull-ups/pull-downs etc. @@ -1190,7 +1190,7 @@ tle8888_mode_e tle8888mode; spi_device_e accelerometerSpiDevice; adc_channel_e auxVoltage1; adc_channel_e auxVoltage2; - uint8_t[1] unusedSpiPadding5;;"units", 1, 0, -20, 100, 0 + uint8_t[1] unusedSpiPadding5; float[FSIO_CURVE_16] fsioCurve1Bins;;"x", 1, 0, -999, 1000.0, 3 float[FSIO_CURVE_16] fsioCurve1;;"y", 1, 0, -999, 1000.0, 3 float[FSIO_CURVE_16] fsioCurve2Bins;;"x", 1, 0, -999, 1000.0, 3 @@ -1200,7 +1200,7 @@ tle8888_mode_e tle8888mode; float[FSIO_CURVE_8] fsioCurve4Bins;;"x", 1, 0, -999, 1000.0, 3 float[FSIO_CURVE_8] fsioCurve4;;"y", 1, 0, -999, 1000.0, 3 - uint8_t unusedFlexFuelSensor;For pinout see https://rusefi.com/forum/viewtopic.php?f=5&t=1324;"units", 1, 0, -20, 100, 0 + uint8_t unusedFlexFuelSensor;For pinout see https://rusefi.com/forum/viewtopic.php?f=5&t=1324 brain_pin_e test557pin pin_output_mode_e stepperDirectionPinMode; adc_channel_e externalKnockSenseAdc; @@ -1246,7 +1246,7 @@ tChargeMode_e tChargeMode; int16_t etb_iTermMin;iTerm min value;"", 1, 0, -30000, 30000.0, 0 int16_t etb_iTermMax;iTerm max value;"", 1, 0, -30000, 30000.0, 0 float etbDeadband;;"", 1, 0, 0, 100.0, 2 - uint8_t[4] unused1059;;"units", 1, 0, -20, 100, 0 + uint8_t[4] unused1059; pid_s idleTimingPid;See useIdleTimingPidControl int16_t idleTimingPidWorkZone;+When the current RPM is closer than this value to the target, closed-loop idle timing control is enabled.;"RPM", 1, 0, 0, 1000, 0 @@ -1261,18 +1261,18 @@ tChargeMode_e tChargeMode; int16_t idlerpmpid_iTermMin;iTerm min value;"", 1, 0, -30000, 30000.0, 0 spi_device_e tle6240spiDevice; - uint8_t[1] unusedSpiPadding7;;"units", 1, 0, -20, 100, 0 + uint8_t[1] unusedSpiPadding7; int16_t idlerpmpid_iTermMax;iTerm max value;"", 1, 0, -30000, 30000.0, 0 spi_device_e mc33972spiDevice; - uint8_t[3] unusedSpiPadding8;;"units", 1, 0, -20, 100, 0 + uint8_t[3] unusedSpiPadding8; float etbIdleThrottleRange; ETB idle authority; "%", 1, 0, 0, 15, 0 -uint8_t[4] unusedvref;;"units", 1, 0, -20, 100, 0 -uint8_t[4] unusedsw;;"units", 1, 0, -20, 100, 0 - int[3] unused_alFIn;;"units", 1, 0, -20, 100, 0 +uint8_t[4] unusedvref; +uint8_t[4] unusedsw; + int[3] unused_alFIn; uint8_t triggerCompCenterVolt;+Trigger comparator center point voltage;"V", @@VOLTAGE_1_BYTE_PACKING_DIV@@, 0, 0.0, 5.1, 2 uint8_t triggerCompHystMin;+Trigger comparator hysteresis voltage (Min);"V", @@VOLTAGE_1_BYTE_PACKING_DIV@@, 0, 0.0, 5.1, 2 @@ -1301,7 +1301,7 @@ uint8_t[4] unusedsw;;"units", 1, 0, -20, 100, 0 uint16_t mc33_t_hold_tot;;"X", 1, 0.0, 0, 64000, 0 ! just a reminder that 'int' and 'float' are 4 bytes each - int[371] mainUnusedEnd;;"units", 1, 0, -20, 100, 0 + int[371] mainUnusedEnd; ! end of engine_configuration_s end_struct diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 3f4ada0524..ec5d999901 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -46,12 +46,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.06.30.all.520656958" + signature = "rusEFI 2020.06.30.all.615955297" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.06.30.all.520656958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.06.30.all.615955297" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -89,7 +89,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 Tue Jun 30 01:45:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:10:36 UTC 2020 pageSize = 20000 page = 1 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 4ab860b24f..a29870a400 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 01:45:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:10:36 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1039,7 +1039,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 = 520656958; + public static final int SIGNATURE_HASH = 615955297; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1278,7 +1278,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.520656958"; + public static final String TS_SIGNATURE = "rusEFI 2020.06.30.all.615955297"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 67db23b660..5b695540a8 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +