From 3295b7de5ff6ddd66ffb25ab5a5c17c55b55f110 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 21 Mar 2016 17:02:08 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/lada_kalina.cpp | 1 + firmware/controllers/algo/engine_configuration.cpp | 2 +- java_console/models/src/com/rusefi/config/Fields.java | 4 ++-- java_console/ui/src/com/rusefi/Launcher.java | 2 +- java_console/ui/src/com/rusefi/ui/config/IniFileModel.java | 2 ++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/firmware/config/engines/lada_kalina.cpp b/firmware/config/engines/lada_kalina.cpp index d506cce060..71eb1b2b24 100644 --- a/firmware/config/engines/lada_kalina.cpp +++ b/firmware/config/engines/lada_kalina.cpp @@ -18,6 +18,7 @@ void setLadaKalina(DECLARE_ENGINE_PARAMETER_F) { setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); + engineConfiguration->trigger.type = TT_60_2_VW; // starter relay solenoid diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 1b3c98714c..0216856e28 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -884,7 +884,7 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN applyNonPersistentConfiguration(logger PASS_ENGINE_PARAMETER); // todo: eliminate triggerShape.operationMode? if (engineConfiguration->operationMode != engine->triggerShape.getOperationMode()) - firmwareError("operationMode mismatch"); + firmwareError("operationMode/trigger mismatch"); #if EFI_TUNER_STUDIO syncTunerStudioCopy(); diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 86d5dc3f8d..ff7337a91d 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,9 +1,9 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 12 17:59:43 EST 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Mar 20 15:05:16 EDT 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; - public static final int TS_FILE_VERSION = 20160122; + public static final int TS_FILE_VERSION = 20160312; public static final int WARMUP_TARGET_AFR_SIZE = 4; public static final int MAP_ANGLE_SIZE = 8; public static final int MAP_WINDOW_SIZE = 8; diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 29a55b8142..9cc096098a 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -36,7 +36,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20160303; + public static final int CONSOLE_VERSION = 20160321; 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/config/IniFileModel.java b/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java index 7b76ce39ed..bd22b98246 100644 --- a/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java +++ b/java_console/ui/src/com/rusefi/ui/config/IniFileModel.java @@ -57,6 +57,8 @@ public class IniFileModel { private void finishDialog() { if (fields.isEmpty()) return; + if (dialogUiName == null) + throw new NullPointerException("dialogUiName for" + fields); dialogs.put(dialogUiName, new DialogModel(dialogId, dialogUiName, fields)); dialogId = null;