From a4f33e9a349a285395f4616a3037df229f6ddc50 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 9 Jan 2016 11:01:43 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/daihatsu.cpp | 1 + firmware/controllers/trigger/trigger_decoder.cpp | 4 ++-- java_console/ui/src/com/rusefi/ui/FormulasPane.java | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/firmware/config/engines/daihatsu.cpp b/firmware/config/engines/daihatsu.cpp index 38a578450a..4e0b601c5f 100644 --- a/firmware/config/engines/daihatsu.cpp +++ b/firmware/config/engines/daihatsu.cpp @@ -1,6 +1,7 @@ /** * @file daihatsu.cpp * + * Daihatsu 3-Cylinder KF-VE * set_engine_type 34 * * @date Sep 10, 2015 diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index 68d7b457d7..05c8d9fed8 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -401,13 +401,13 @@ static void configureOnePlus60_2(TriggerShape *s, operation_mode_e operationMode * External logger is needed because at this point our logger is not yet initialized */ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMETER_S) { + const trigger_config_s *triggerConfig = &engineConfiguration->trigger; #if EFI_PROD_CODE || defined(__DOXYGEN__) efiAssertVoid(getRemainingStack(chThdSelf()) > 256, "init t"); - scheduleMsg(logger, "initializeTriggerShape()"); + scheduleMsg(logger, "initializeTriggerShape(%s/%d)", getTrigger_type_e(triggerConfig->type), (int) triggerConfig->type); #endif TriggerShape *triggerShape = this; - const trigger_config_s *triggerConfig = &engineConfiguration->trigger; switch (triggerConfig->type) { diff --git a/java_console/ui/src/com/rusefi/ui/FormulasPane.java b/java_console/ui/src/com/rusefi/ui/FormulasPane.java index bd4e81cba6..0c4a882e35 100644 --- a/java_console/ui/src/com/rusefi/ui/FormulasPane.java +++ b/java_console/ui/src/com/rusefi/ui/FormulasPane.java @@ -20,6 +20,9 @@ import java.awt.image.BufferedImage; import static com.rusefi.ui.util.LocalizedMessages.PAUSE; +/** + * (c) Andrey Belomutskiy 2013-2015 + */ public class FormulasPane { private final JPanel content = new JPanel(new BorderLayout()); private final JPanel centerProxy = new JPanel(new BorderLayout());