From f2245df8477d9d8b1dcf641457d44ff7aa93ccba Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 30 May 2015 14:06:21 -0400 Subject: [PATCH] auto-sync --- ...ngine_configuration_generated_structures.h | 6 ++--- firmware/integration/rusefi_config.txt | 5 ++-- firmware/tunerstudio/rusefi.ini | 26 ++++++++++++------- .../models/src/com/rusefi/core/Sensor.java | 1 + .../src/com/rusefi/core/SensorCentral.java | 1 + java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../com/rusefi/ui/widgets/SensorGauge.java | 1 - 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 2c0f5e0cb6..483ad97121 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated by config_definition.jar on Fri May 29 23:04:33 EDT 2015 +// this section was generated by config_definition.jar on Sat May 30 13:04:24 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -279,7 +279,7 @@ typedef struct { */ idle_hardware_s idle; /** - * value between 0 and 100 + * value between 0 and 100 used in Manual mode * offset 20 */ float idlePosition; @@ -1398,4 +1398,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Fri May 29 23:04:33 EDT 2015 +// this section was generated by config_definition.jar on Sat May 30 13:04:24 EDT 2015 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 33a0774f38..23c3e4c895 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -310,7 +310,7 @@ struct_no_prefix board_configuration_s idle_hardware_s idle; - float idlePosition;value between 0 and 100;"%", 1, 0, 0, 100, 0 + float idlePosition;value between 0 and 100 used in Manual mode;"%", 1, 0, 0, 100, 0 brain_pin_e fuelPumpPin; pin_output_mode_e fuelPumpPinMode; @@ -486,6 +486,7 @@ bit cutSparkOnHardLimit bit hasFrequencyReportingMapSensor; adc_channel_e hipOutputChannel; +custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "false", "true" idle_mode_e idleMode; bit isInjectionEnabled @@ -509,7 +510,7 @@ bit hasFrequencyReportingMapSensor; uint32_t engineChartSize;;"count", 1, 0, 0, 300, 0 - int targetIdleRpm; + int targetIdleRpm;;"RPM", 1, 0, 0, 7000, 0 adc_channel_e acSwitchAdc;A/C button input handled as analog input diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index f4636abfda..9698ccd9e2 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -30,7 +30,6 @@ enable2ndByteCanID = false writeBlocks = on interWriteDelay = 10 blockReadTimeout = 3000; Milliseconds general timeout - dataReadTimeout = 3000 ; really not sure if this is applicable here blockingFactor = 256 ; max chunk size ;end communication settings @@ -41,7 +40,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Fri May 29 23:04:37 EDT 2015 +; this section was generated by ConfigDefinition.jar on Sat May 30 13:04:28 EDT 2015 pageSize = 15288 page = 1 @@ -398,7 +397,7 @@ page = 1 cutSparkOnHardLimit = bits, U32, 1496, [17:17], "false", "true" hasFrequencyReportingMapSensor= bits, U32, 1496, [18:18], "false", "true" hipOutputChannel = bits, U32, 1500, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" -;skipping idleMode offset 1504 + idleMode = bits, U32, 1504, [0:0], "false", "true" isInjectionEnabled = bits, U32, 1508, [0:0], "false", "true" isIgnitionEnabled = bits, U32, 1508, [1:1], "false", "true" isCylinderCleanupEnabled= bits, U32, 1508, [2:2], "false", "true" @@ -415,7 +414,7 @@ page = 1 twoWireBatch = bits, U32, 1508, [13:13], "false", "true" useOnlyFrontForTrigger = bits, U32, 1508, [14:14], "false", "true" engineChartSize = scalar, U32, 1512, "count", 1, 0, 0, 300, 0 -;skipping targetIdleRpm offset 1516 + targetIdleRpm = scalar, S32, 1516, "RPM", 1, 0, 0, 7000, 0 acSwitchAdc = bits, U32, 1520, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ;skipping ignMathCalculateAtIndex offset 1524 ;skipping acCutoffLowRpm offset 1528 @@ -637,7 +636,9 @@ fileVersion = { 20150522 } deltaTps = scalar, F32, 116, "ratio", 1, 0 triggerErrorsCounter = scalar, U32,120, "counter", 1, 0 currentMapAccelDelta = scalar,F32, 124, "%", 1, 0 - currentTpsAccel = scalar, F32, 128, "ms", 1, 0 + tpsAccelFuel = scalar, F32, 128, "ms", 1, 0 + baroCorrection = scalar, F32, 132, "%", 1, 0 + pedalPosition = scalar, F32, 136, "%", 1, 0 egoCorrection = { 100 } time = { timeNow } ; engineLoad = { algorithm == 0 ? MAF : TPS } @@ -833,7 +834,10 @@ fileVersion = { 20150522 } deltaTpsGauge = deltaTps, "%", "", 0, 120, 10, 10, 100, 100, 1, 1 ; minDeltaGauge = minDelta, "%", "", 0, 120, 10, 10, 100, 100, 1, 1 currentMapAccelDeltaGauge = currentMapAccelDelta,"MAP enrich", "%", 0, 120, 10, 10, 100, 100, 1, 1 - currentTpsAccelGauge = currentTpsAccel,"TPS enrich", "ms", 0, 120, 10, 10, 100, 100, 1, 1 + tpsAccelFuelGauge = tpsAccelFuel,"TPS enrich", "ms", 0, 120, 10, 10, 100, 100, 1, 1 + baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1 + pedalPositionGauge = pedalPosition,"Pedal Position", "%", 0, 120, 10, 10, 100, 100, 1, 1 + triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 [FrontPage] @@ -902,7 +906,9 @@ fileVersion = { 20150522 } entry = massAirFlowValue,"Mass", float, "%.3f" entry = veValue, "ratio", float, "%.3f" entry = currentMapAccelDelta, "mapAccel",float, "%.3f" - entry = currentTpsAccel, "tpsAccel", float, "%.3f" + entry = tpsAccelFuel, "tpsAccel", float, "%.3f" + entry = baroCorrection "baroCorrection",float,"%.3f" + entry = pedalPosition, "pedal", float, "%.3f" entry = triggerErrorsCounter, "trg err",int, "%d" @@ -1154,9 +1160,11 @@ fileVersion = { 20150522 } panel = idleStepper, East dialog = idleSettings, "", yAxis - slider = "Idle Position", idlePosition + field = "Manual mode", idleMode + field = "Auto target", targetIdleRpm, { idleMode == 0} + slider = "Manual Idle Position", idlePosition, horizontal field = "" - field = "use stepper", useStepperIdle + field = "use stepper", useStepperIdle panel = idleType ; Engine->Fan Settings diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index a7feb09696..98a647fbb3 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -24,6 +24,7 @@ public enum Sensor { MAF("MAF", SensorCategory.SENSOR_INPUTS, "Volts", 4), MAFR("MAFR", SensorCategory.SENSOR_INPUTS, "kg/hr", 4), TPS("throttle", SensorCategory.SENSOR_INPUTS, "%", 100), + PPS("pedal", SensorCategory.SENSOR_INPUTS, "%", 100), VSS("Speed", SensorCategory.SENSOR_INPUTS, "kph", 100), ENGINE_LOAD("Engine Load", SensorCategory.SENSOR_INPUTS, "x", 300), diff --git a/java_console/models/src/com/rusefi/core/SensorCentral.java b/java_console/models/src/com/rusefi/core/SensorCentral.java index 2781cf22f4..ccb815c4f6 100644 --- a/java_console/models/src/com/rusefi/core/SensorCentral.java +++ b/java_console/models/src/com/rusefi/core/SensorCentral.java @@ -178,6 +178,7 @@ public class SensorCentral { addDoubleSensor("baro", Sensor.BARO, es); addDoubleSensor("clt", Sensor.CLT, es); addDoubleSensor("tp", Sensor.TPS, es); + addDoubleSensor("pps", Sensor.TPS, es); addDoubleSensor(Sensor.VSS, es); addDoubleSensor(Sensor.ENGINE_LOAD, es); diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index c355a98757..7ba36280d7 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see com.rusefi.StartupFrame */ public class Launcher { - public static final int CONSOLE_VERSION = 20150529; + public static final int CONSOLE_VERSION = 20150530; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java b/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java index 454d7d635d..363b05b2c0 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java @@ -23,7 +23,6 @@ import java.util.Hashtable; */ public class SensorGauge { - public static Component createGauge(final Sensor sensor) { return createGauge(sensor, GaugeChangeListener.VOID); }