From 4927450978bf2dc8dbc37322e89152741eb837d0 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 26 Mar 2015 08:10:31 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_626.cpp | 9 +++++++-- firmware/controllers/engine_controller.cpp | 12 ++++++++++++ .../controllers/trigger/main_trigger_callback.cpp | 2 +- firmware/rusefi.cpp | 2 +- .../src/com/romraider/swing/TableToolBar.java | 8 ++++++-- java_console/ui/src/com/rusefi/Launcher.java | 2 +- 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp index bc558e1c58..9778ff764c 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/firmware/config/engines/mazda_626.cpp @@ -36,13 +36,18 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->globalTriggerAngleOffset = -42; // set_cranking_timing_angle 15 - engineConfiguration->crankingTimingAngle = 15; + engineConfiguration->crankingTimingAngle = 8; engineConfiguration->crankingChargeAngle = 70; + // set_cranking_fuel 9 + engineConfiguration->cranking.baseFuel = 9; + + engineConfiguration->rpmHardLimit = 6000; + engineConfiguration->tpsMin = 80; engineConfiguration->tpsMax = 764; - setAlgorithm(LM_ALPHA_N PASS_ENGINE_PARAMETER); + setAlgorithm(LM_SPEED_DENSITY PASS_ENGINE_PARAMETER); setFuelLoadBin(0, 100 PASS_ENGINE_PARAMETER); // set_whole_fuel_map 9 diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 3c23ed278c..34f0dc14c2 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -408,6 +408,14 @@ void initConfigActions(void) { addConsoleActionI("get_short", getShort); } +// todo: move this logic somewhere else? +static void getKnockInfo(void) { + adc_channel_e hwChannel = engineConfiguration->externalKnockSenseAdc; + scheduleMsg(&logger, "externalKnockSenseAdc on ADC", getPinNameByAdcChannel(hwChannel, pinNameBuffer)); + + scheduleMsg(&logger, "knock now=%s/ever=%s", boolToString(engine->knockNow), boolToString(engine->knockEver)); +} + void initEngineContoller(Logging *sharedLogger, Engine *engine) { if (hasFirmwareError()) { return; @@ -502,6 +510,10 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) { } #endif + if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) { + addConsoleAction("knockinfo", getKnockInfo); + } + addConsoleAction("analoginfo", printAnalogInfo); initConfigActions(); diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index 4d76054ef8..41773903dc 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -340,7 +340,7 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECL if (eventIndex == engineConfiguration->ignMathCalculateAtIndex) { if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) { - float externalKnockValue = getAdcValue(engineConfiguration->externalKnockSenseAdc); + float externalKnockValue = getVoltageDivided(engineConfiguration->externalKnockSenseAdc); engine->knockNow = externalKnockValue > 2.5; engine->knockEver |= engine->knockNow; } diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index f6eb92ecc1..b1cf8c75fe 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -276,5 +276,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] == 0) return 1; // this is here to make the compiler happy about the unused array - return 20150325; + return 20150326; } diff --git a/java_console/romraider/src/com/romraider/swing/TableToolBar.java b/java_console/romraider/src/com/romraider/swing/TableToolBar.java index 2bb233e427..325340e1f1 100644 --- a/java_console/romraider/src/com/romraider/swing/TableToolBar.java +++ b/java_console/romraider/src/com/romraider/swing/TableToolBar.java @@ -272,8 +272,12 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene } private ImageIcon rescaleImageIcon(ImageIcon imageIcon, int percentOfOriginal) { - int newHeight = (int) (imageIcon.getImage().getHeight(this) * (percentOfOriginal * .01)); - int newWidth = (int) (imageIcon.getImage().getWidth(this) * (percentOfOriginal * .01)); + int height = imageIcon.getImage().getHeight(this); + int newHeight = (int) (height * (percentOfOriginal * .01)); + int width = imageIcon.getImage().getWidth(this); + int newWidth = (int) (width * (percentOfOriginal * .01)); + if (newHeight == 0 || newWidth == 0) + throw new IllegalStateException("rescale error: w " + width + "/" + newWidth + ", h " + height + "/" + newHeight); imageIcon.setImage(imageIcon.getImage().getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH)); return imageIcon; diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index df7c75b203..ae886172d6 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -34,7 +34,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see com.rusefi.StartupFrame */ public class Launcher { - public static final int CONSOLE_VERSION = 20150318; + public static final int CONSOLE_VERSION = 20150326; public static final boolean SHOW_STIMULATOR = false; public static final String TAB_INDEX = "main_tab"; private final String port;