auto-sync

firmware/config/engines/mazda_miata.cpp

@@ -3,6 +3,7 @@
  *
  * FORD_ESCORT_GT = 14
  * set_engine_type 14
+ * http://rusefi.com/wiki/index.php?title=Vehicle:Mazda_Protege_1993
  *
  * MIATA_1990 = 19
  * MIATA_1994_DEVIATOR = 20
@@ -229,6 +230,7 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur
 	engineConfiguration->trigger.type = TT_FORD_ESCORT_GT;
 
 	common079721_2351(engineConfiguration, boardConfiguration);
+	setFrankenso_01_LCD(boardConfiguration);
 
 
 //	boardConfiguration->triggerInputPins[0] = GPIOC_6; // 2G YEL/BLU
@@ -265,16 +267,42 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur
 	boardConfiguration->triggerSimulatorPinModes[1] = OM_OPENDRAIN;
 
 
-	boardConfiguration->ignitionPins[0] = GPIO_UNASSIGNED;
+	boardConfiguration->ignitionPins[0] = GPIOE_14; // Frankenso high side - pin 1G
 	boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
 	boardConfiguration->ignitionPins[2] = GPIO_UNASSIGNED;
 	boardConfiguration->ignitionPins[3] = GPIO_UNASSIGNED;
 	boardConfiguration->ignitionPinMode = OM_DEFAULT;
 
+	/**
+	 * Outputs
+	 */
+	// Frankenso low out #1: PE6
+	// Frankenso low out #2: PE5 MIL
+	// Frankenso low out #3:
+	// Frankenso low out #4:
+	// Frankenso low out #5: PE3
+	// Frankenso low out #6: PE4
+	// Frankenso low out #7: PE0<>PD5 INJ 1&3
+	// Frankenso low out #8: PE2 INJ
+	// Frankenso low out #9: PB9
+	// Frankenso low out #10: PE1<>PD3
+	// Frankenso low out #11: PB8
+	// Frankenso low out #12: PB7
+
+	boardConfiguration->injectionPins[0] = GPIOD_5;
+	boardConfiguration->injectionPins[2] = GPIOE_2;
+
 	// set_whole_fuel_map 3
 	setWholeFuelMap(engineConfiguration, 3);
 
 	setDefaultCrankingFuel(engineConfiguration);
+
+	boardConfiguration->malfunctionIndicatorPin = GPIOE_5;
+	boardConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT;
+
+	boardConfiguration->tunerStudioSerialSpeed = 9600;
+
+	setFrankenso0_1_joystick(engineConfiguration);
 }
 
 static void setMiata1994_common(engine_configuration_s *engineConfiguration,
@@ -306,14 +334,14 @@ static void setMiata1994_common(engine_configuration_s *engineConfiguration,
 	/**
 	 * Outputs
 	 */
-	// Frankenso low out #:
-	// Frankenso low out #:
+	// Frankenso low out #: PE6
+	// Frankenso low out #: PE5
 	// Frankenso low out #:
 	// Frankenso low out #:
 	// Frankenso low out #5: PE3
 	// Frankenso low out #6: PE4
 	// Frankenso low out #7: PE1 (do not use with discovery!)
-	// Frankenso low out #:
+	// Frankenso low out #8:
 	// Frankenso low out #9: PB9
 	// Frankenso low out #10: PE0 (do not use with discovery!)
 	// Frankenso low out #11: PB8
@@ -400,6 +428,9 @@ void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configura
 
 	engineConfiguration->tpsMin = 86;
 	engineConfiguration->tpsMax = 596;
+
+	boardConfiguration->malfunctionIndicatorPin = GPIOE_5;
+	boardConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT;
 }
 
 /**

firmware/controllers/algo/lcd_menu_tree.h

@@ -12,6 +12,8 @@ typedef enum {
 	LL_VERSION,
 	LL_CONFIG,
 	LL_ALGORITHM,
+	LL_INJECTION,
+	LL_IGNITION,
 
 	LL_RPM,
 	LL_TRIGGER_ERRORS,

firmware/controllers/lcd_controller.cpp

@@ -62,6 +62,8 @@ static MenuItem miTestInj4(&miBench, "test injector4");
 static MenuItem miVersion(&miAbout, LL_VERSION);
 static MenuItem miConfig(&miAbout, LL_CONFIG);
 static MenuItem miAlgo(&miAbout, LL_ALGORITHM);
+static MenuItem miInjection(&miAbout, LL_INJECTION);
+static MenuItem miIgnition(&miAbout, LL_IGNITION);
 
 #define DISP_LINES (engineConfiguration->HD44780height - 1)
 
@@ -203,6 +205,12 @@ static void showLine(lcd_line_e line) {
 	case LL_ALGORITHM:
 		lcdPrintf(getEngine_load_mode_e(engineConfiguration->algorithm));
 		return;
+	case LL_INJECTION:
+		lcdPrintf(getInjection_mode_e(engineConfiguration->injectionMode));
+		return;
+	case LL_IGNITION:
+		lcdPrintf(getIgnition_mode_e(engineConfiguration->ignitionMode));
+		return;
 	case LL_TPS:
 		lcdPrintf("Throttle %f%%", getTPS());
 		return;

firmware/controllers/settings.cpp

@@ -208,7 +208,8 @@ void printConfiguration(engine_configuration_s *engineConfiguration) {
 	scheduleMsg(&logger, "timingMode: %d", /*getTiming_mode_etodo*/(engineConfiguration->timingMode));
 	scheduleMsg(&logger, "fixedModeTiming: %d", (int) engineConfiguration->fixedModeTiming);
 	scheduleMsg(&logger, "ignitionOffset=%f", engineConfiguration->ignitionBaseAngle);
-	scheduleMsg(&logger, "injectionOffset=%f/enabled=%s", (double) engineConfiguration->injectionAngle,
+	scheduleMsg(&logger, "injection %s offset=%f/enabled=%s", getInjection_mode_e(engineConfiguration->injectionMode),
+			(double) engineConfiguration->injectionAngle,
 			boolToString(engineConfiguration->isInjectionEnabled));
 
 	scheduleMsg(&logger, "map_avg=%s/mil=%s/fp=%s/ts=%s/wa=%s/it=%s/fastAdc=%s",

firmware/tunerstudio/rusefi.ini

@@ -1009,9 +1009,9 @@ fileVersion = { 20150127 }
 		field = "digipot CS #2", 						digitalPotentiometerChipSelect3
 		field = "digipot CS #3", 						digitalPotentiometerChipSelect4
 		field = ""
-		field = "trigger stimulator pin #1", 			triggerSimulatorPins0
-		field = "trigger stimulator pin #2", 			triggerSimulatorPins1
-		field = "trigger stimulator pin #3", 			triggerSimulatorPins2
+		field = "trigger stimulator pin #1", 			triggerSimulatorPins1
+		field = "trigger stimulator pin #2", 			triggerSimulatorPins2
+		field = "trigger stimulator pin #3", 			triggerSimulatorPins3
 		field = ""
 	    field = "Logic input channel 1", 				logicAnalyzerPins1
 	    field = "Logic input channel 2", 				logicAnalyzerPins2

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

@@ -23,7 +23,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
  * @see WavePanel
  */
 public class Launcher extends FrameHelper {
-    public static final int CONSOLE_VERSION = 20150125;
+    public static final int CONSOLE_VERSION = 20150130;
     public static final boolean SHOW_STIMULATOR = true;
     public static final String TAB_INDEX = "main_tab";
     private final String port;

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

@@ -29,6 +29,9 @@ public class RecentCommands {
 
     private boolean reentrant;
 
+    private final JScrollPane messagesScroll = new JScrollPane(content, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+
+
     public RecentCommands() {
 
         CommandQueue.getInstance().addListener(new CommandQueue.CommandQueueListener() {
@@ -76,7 +79,7 @@ public class RecentCommands {
 
     private JComponent createButton(final Entry entry) {
         JButton button = new JButton(entry.command);
-        button.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        button.setBorder(BorderFactory.createEmptyBorder(3, 5, 0, 5));
 
         button.addActionListener(new ActionListener() {
             @Override
@@ -91,7 +94,7 @@ public class RecentCommands {
     }
 
     public Component getContent() {
-        return content;
+        return messagesScroll;
     }
 
     static class Entry {

unit_tests/main.cpp

@@ -112,6 +112,7 @@ int main(void) {
 	testMisc();
 	testFuelMap();
 	testEngineMath();
+	testIgnitionPlanning();
 	testEventRegistry();
 	testSensors();
 	testCyclicBuffer();

unit_tests/test_engine_math.cpp

@@ -11,9 +11,18 @@
 #include "engine_configuration.h"
 #include "map.h"
 #include "speed_density.h"
+#include "engine_test_helper.h"
+
+void testIgnitionPlanning(void) {
+	printf("*************************************************** testIgnitionPlanning\r\n");
+	EngineTestHelper eth(FORD_ESCORT_GT);
+	Engine * engine = &eth.engine;
+	engine_configuration_s *engineConfiguration = engine->engineConfiguration;
+
+	assertEquals(IM_BATCH, engineConfiguration->injectionMode);
+}
 
 extern engine_configuration_s *engineConfiguration;
-extern engine_configuration2_s *engineConfiguration2;
 
 void testEngineMath(void) {
 	printf("*************************************************** testEngineMath\r\n");
@@ -32,7 +41,6 @@ void testEngineMath(void) {
 	assertEquals(312.5, getTCharge(4000, 0, 300, 350));
 	assertEquals(320.0833, getTCharge(4000, 50, 300, 350));
 	assertEquals(327.6667, getTCharge(4000, 100, 300, 350));
-
 }
 
 float getMap(void) {

unit_tests/test_engine_math.h

@@ -9,5 +9,6 @@
 #define TEST_ENGINE_MATH_H_
 
 void testEngineMath(void);
+void testIgnitionPlanning(void);
 
 #endif /* TEST_ENGINE_MATH_H_ */

unit_tests/test_fuel_map.cpp

@@ -102,7 +102,6 @@ void testFuelMap(void) {
 }
 
 extern engine_configuration_s *engineConfiguration;
-extern engine_configuration2_s *engineConfiguration2;
 
 static void confgiureFordAspireTriggerShape(TriggerShape * s) {
 	s->reset(FOUR_STROKE_CAM_SENSOR);

unit_tests/test_trigger_decoder.cpp

@@ -400,8 +400,6 @@ static void testRpmCalculator(void) {
 	Engine *engine = &eth.engine;
 	engine_configuration_s *engineConfiguration = &eth.persistentConfig.engineConfiguration;
 
-	engine_configuration2_s *ec2 = &eth.ec2;
-
 	engineConfiguration->trigger.customTotalToothCount = 8;
 	engineConfiguration->globalFuelCorrection = 3;
 	eth.initTriggerShapeAndRpmCalculator();