auto-sync

firmware/config/engines/citroenBerlingoTU3JP.cpp

@@ -11,44 +11,80 @@
  * @author Andrey Belomutskiy, (c) 2012-2014
  */
 
+#include "engine_math.h"
 #include "thermistors.h"
 #include "citroenBerlingoTU3JP.h"
 
 void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
 	engineConfiguration->engineType = CITROEN_TU3JP;
 
-	// base engine setting
+	/**
+	 * Base engine setting
+	 */
+	setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
 	engineConfiguration->triggerConfig.triggerType = TT_TOOTHED_WHEEL_60_2;
-	engineConfiguration->globalTriggerAngleOffset = 144;
+	engineConfiguration->globalTriggerAngleOffset = 114;
 	engineConfiguration->cylindersCount = 4;
 	engineConfiguration->displacement = 1.360;
 	engineConfiguration->firingOrder = FO_1_THEN_3_THEN_4_THEN2;
 	engineConfiguration->ignitionMode = IM_WASTED_SPARK;
 	engineConfiguration->injectionMode = IM_BATCH;
 	engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
-
-	// rpm limiter
 	engineConfiguration->rpmHardLimit = 5000;
+	engineConfiguration->crankingSettings.crankingRpm = 600;
+
+	/**
+	* Cranking fuel setting
+	* TODO: they recomend using something like -40C for low point and +80C for high point
+	*/
+	engineConfiguration->crankingSettings.coolantTempMaxC = 65;
+	engineConfiguration->crankingSettings.fuelAtMaxTempMs = 2;
+	engineConfiguration->crankingSettings.coolantTempMinC = 0;
+	engineConfiguration->crankingSettings.fuelAtMinTempMs = 2;
+
+	/**
+	 * Algorithm Alpha-N setting
+	 */
+	engineConfiguration->algorithm = LM_ALPHA_N;
+	setFuelLoadBin(engineConfiguration, 0, 100);
+	setFuelRpmBin(engineConfiguration, 800, 7000);
+	setTimingLoadBin(engineConfiguration, 0, 100);
+	setTimingRpmBin(engineConfiguration, 800, 7000);
 
 	/**
 	 * Outputs
 	 */
-	// Frankenstain low out #3: PE6  injector 1-4
-	// Frankenstain low out #4: PC13 injector 2-3
 
+	// Frankenstein lo-side output #1: PC14 Igniter 1-4
+	// Frankenstein lo-side output #2: PC15 Igniter 2-3
+	// Frankenstein lo-side output #3: PE6  Injector 1-4
+	// Frankenstein lo-side output #4: PC13 Injector 2-3
+	// Frankenstein lo-side output #5: PE4
+	// Frankenstein lo-side output #6: PE5
+	// Frankenstein lo-side output #7: PE2
+	// Frankenstein lo-side output #8: PE3
+	// Frankenstein lo-side output #9: PE0
+	// Frankenstein lo-side output #10: PE1
+	// Frankenstein lo-side output #11: PB8
+	// Frankenstein lo-side output #12: PB9 Fuel pump
+
+	engineConfiguration->injectorFlow = 137; //SIEMENS DEKA VAZ20734
 	boardConfiguration->injectionPins[0] = GPIOE_6;
 	boardConfiguration->injectionPins[1] = GPIOC_13;
 	boardConfiguration->injectionPins[2] = GPIO_NONE;
 	boardConfiguration->injectionPins[3] = GPIO_NONE;
 
-//	boardConfiguration->ignitionPins[0] = GPIO_NONE;
+	boardConfiguration->ignitionPins[0] = GPIOC_14;
-//	boardConfiguration->ignitionPins[1] = GPIO_NONE;
+	boardConfiguration->ignitionPins[1] = GPIOC_15;
-//	boardConfiguration->ignitionPins[2] = GPIO_NONE;
+	boardConfiguration->ignitionPins[2] = GPIO_NONE;
-//	boardConfiguration->ignitionPins[3] = GPIO_NONE;
+	boardConfiguration->ignitionPins[3] = GPIO_NONE;
 
 	boardConfiguration->fuelPumpPin = GPIOB_9;
 	boardConfiguration->fuelPumpPinMode = OM_DEFAULT;
 
+	boardConfiguration->fanPin = GPIO_NONE;
+//	boardConfiguration->fanPinMode = OM_DEFAULT;
+
 //	boardConfiguration->o2heaterPin = GPIOC_13;
 //	boardConfiguration->logicAnalyzerPins[1] = GPIO_NONE;
 
@@ -81,8 +117,8 @@ void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfigur
 	 * TPS <MAGNETI MARELLI>
 	 */
 	engineConfiguration->tpsAdcChannel = EFI_ADC_3;
-	engineConfiguration->tpsMin = 433;
+	engineConfiguration->tpsMin = 108; // convert 12to10 bit (ADC/4)
-	engineConfiguration->tpsMax = 3248;
+	engineConfiguration->tpsMax = 812; // convert 12to10 bit (ADC/4)
 	/**
 	 * IAT <OEM ECU>
 	 */
@@ -101,15 +137,8 @@ void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfigur
 	engineConfiguration->vbattAdcChannel = EFI_ADC_0;
 	engineConfiguration->vbattDividerCoeff = ((float) (2.7 + 10)) / 2.7 * 2;
 
-
+	/**
-	// todo: better values
+	* Other
-	// set_cranking_fuel_max 24 40
+	*/
-	engineConfiguration->crankingSettings.coolantTempMaxC = 40; // 6ms at 40C
+//	engineConfiguration->mafAdcChannel = GPIO_NONE;
-	engineConfiguration->crankingSettings.fuelAtMaxTempMs = 24;
-
-	// set_cranking_fuel_min 24 -40
-	engineConfiguration->crankingSettings.coolantTempMinC = -40; // 6ms at -40C
-	engineConfiguration->crankingSettings.fuelAtMinTempMs = 24;
-
-
 }

java_console/io/src/com/rusefi/io/LinkManager.java

@@ -57,7 +57,7 @@ public class LinkManager {
     public static boolean isStimulationMode;
 
     public static void start(String port) {
-        if (port.equals(LOG_VIEWER)) {
+        if (isLogViewerMode(port)) {
             connector = LinkManager.VOID;
         } else if (TcpConnector.isTcpPort(port)) {
             connector = new TcpConnector(port);
@@ -67,6 +67,10 @@ public class LinkManager {
         }
     }
 
+    public static boolean isLogViewerMode(String port) {
+        return port.equals(LOG_VIEWER);
+    }
+
     public static boolean isLogViewer() {
         return connector == LinkManager.VOID;
     }

java_console/ui/src/com/irnems/Launcher.java

@@ -33,6 +33,9 @@ public class Launcher extends FrameHelper {
 
         JTabbedPane tabbedPane = new JTabbedPane();
 
+        if (LinkManager.isLogViewerMode(port))
+            tabbedPane.add("Log Viewer", new LogViewer());
+
         RpmPanel rpmPanel = new RpmPanel();
         tabbedPane.addTab("Main", rpmPanel.createRpmPanel());
         tabbedPane.addTab("Gauges", new GaugesPanel().getContent());
@@ -47,10 +50,9 @@ public class Launcher extends FrameHelper {
 //        tabbedPane.addTab("live map adjustment", new Live3DReport().getControl());
         tabbedPane.add("Messages", new MsgPanel(true).getContent());
 
-        tabbedPane.add("Log Viewer", new LogViewer());
 
-        tabbedPane.setSelectedIndex(2);
+        if (!LinkManager.isLogViewerMode(port))
-//        tabbedPane.setSelectedIndex(5);
+            tabbedPane.setSelectedIndex(2);
 
         showFrame(tabbedPane);
     }

java_console/ui/src/com/rusefi/ui/ChartStatusPanel.java

@@ -1,6 +1,7 @@
 package com.rusefi.ui;
 
 import com.irnems.waves.TimeAxisTranslator;
+import com.rusefi.ui.widgets.UpDownImage;
 import com.rusefi.waves.WaveReport;
 import com.irnems.waves.ZoomProvider;
 import com.rusefi.waves.RevolutionLog;
@@ -65,6 +66,14 @@ public class ChartStatusPanel {
 
         infoPanel.add(new JLabel(" RPM: "));
         infoPanel.add(rpmLabel);
+
+        JLabel green = new JLabel("  Green line is engine cycle");
+        green.setForeground(UpDownImage.ENGINE_CYCLE_COLOR);
+        infoPanel.add(green);
+
+        JLabel red = new JLabel("  Red line is time scale");
+        red.setForeground(UpDownImage.TIME_SCALE_COLOR);
+        infoPanel.add(red);
     }
 
     public void setWaveReport(TimeAxisTranslator translator) {

java_console/ui/src/com/rusefi/ui/widgets/UpDownImage.java

@@ -27,7 +27,8 @@ import java.util.TreeMap;
 public class UpDownImage extends JPanel {
     private static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss");
     private static final int LINE_SIZE = 20;
-    private static final Color TIME_SCALE_COLOR = Color.red;
+    public static final Color TIME_SCALE_COLOR = Color.red;
+    public static final Color ENGINE_CYCLE_COLOR = Color.green;
 
     private long lastUpdateTime;
     private ZoomProvider zoomProvider = ZoomProvider.DEFAULT;
@@ -180,7 +181,7 @@ public class UpDownImage extends JPanel {
         g2.setStroke(new BasicStroke());
         for (int time : time2rpm.keySet()) {
             int x = translator.timeToScreen(time, d.width, zoomProvider);
-            g2.setColor(Color.green);
+            g2.setColor(ENGINE_CYCLE_COLOR);
             g2.drawLine(x, 0, x, d.height);
         }
     }