auto-sync

firmware/config/engines/custom_engine.cpp

@@ -40,6 +40,7 @@ void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 	engineConfiguration->trigger.type = TT_ONE_PLUS_ONE;
 
 	setFrankenso_01_LCD(boardConfiguration);
+	commonFrankensoAnalogInputs(engineConfiguration);
 	setFrankenso0_1_joystick(engineConfiguration);
 
 	/**

firmware/config/engines/ford_festiva.cpp

@@ -231,6 +231,24 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
 	// set_fsio_expression 1 "rpm 0 fsio_setting >"
 	setFsioExt(0, GPIOE_3, "rpm 0 fsio_setting >", 150 PASS_ENGINE_PARAMETER);
 
+
+	// warning light
+	/**
+	 * to test
+	 * set_fsio_setting 1 1800
+	 * set_fsio_setting 2 95
+	 * set_fsio_setting 3 14
+	 *
+	 * set_fsio_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
+	 * eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
+	 */
+	engineConfiguration->bc.fsio_setting[1] = 6200; // RPM threshold
+	engineConfiguration->bc.fsio_setting[2] = 90; // CLT threshold
+	engineConfiguration->bc.fsio_setting[3] = 13.5; // voltage threshold
+
+	setFsio(1, GPIOC_13, "rpm 1 fsio_setting > coolant 2 fsio_setting > | vbatt 3 fsio_setting < |" PASS_ENGINE_PARAMETER);
+
+
 	config->ignitionRpmBins[0] = 800;
 	config->ignitionRpmBins[1] = 1200;
 	config->ignitionRpmBins[2] = 1600;

firmware/config/engines/mazda_626.cpp

@@ -77,7 +77,6 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 	setThermistorConfiguration(&engineConfiguration->iat, 23, 1750, 41, 810, 97, 165);
 	engineConfiguration->iat.config.bias_resistor = 1820;
 
-	commonFrankensoAnalogInputs(engineConfiguration);
 //	engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
 	engineConfiguration->mafAdcChannel = EFI_ADC_NONE;
 

firmware/config/engines/mazda_miata_1_6.cpp

@@ -21,7 +21,6 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
 	engineConfiguration->specs.cylindersCount = 4;
 	engineConfiguration->specs.firingOrder = FO_1_THEN_3_THEN_4_THEN2;
 
-	commonFrankensoAnalogInputs(engineConfiguration);
 	engineConfiguration->vbattDividerCoeff = 9.75;// ((float) (8.2 + 33)) / 8.2 * 2;
 
 	boardConfiguration->idle.solenoidPin = GPIO_UNASSIGNED;

firmware/controllers/algo/lcd_menu_tree.cpp

@@ -47,14 +47,23 @@ void MenuTree::nextItem(void) {
 		topVisible = topVisible->next;
 }
 
+/**
+ * This constructor created a menu item and associates a callback with it
+ */
 MenuItem::MenuItem(MenuItem * parent, const char *text, VoidCallback callback) {
 	baseConstructor(parent, LL_STRING, text, callback);
 }
 
+/**
+ * Looks like this constructor is used to create
+ */
 MenuItem::MenuItem(MenuItem * parent, const char *text) {
 	baseConstructor(parent, LL_STRING, text, NULL);
 }
 
+/**
+ * This constructor is used for lines with dynamic content
+ */
 MenuItem::MenuItem(MenuItem * parent, lcd_line_e lcdLine)  {
 	baseConstructor(parent, lcdLine, NULL, NULL);
 }

firmware/controllers/algo/rusefi_enums.h

@@ -405,12 +405,12 @@ typedef enum {
 	EFI_ADC_7 = 7, // PA7
 	EFI_ADC_8 = 8,
 	EFI_ADC_9 = 9,
-	EFI_ADC_10 = 10,
-	EFI_ADC_11 = 11, // PC11
-	EFI_ADC_12 = 12, // PC12
-	EFI_ADC_13 = 13, // PC13
-	EFI_ADC_14 = 14, // PC14
-	EFI_ADC_15 = 15,
+	EFI_ADC_10 = 10, // PC0
+	EFI_ADC_11 = 11, // PC1
+	EFI_ADC_12 = 12, // PC2
+	EFI_ADC_13 = 13, // PC3
+	EFI_ADC_14 = 14, // PC4
+	EFI_ADC_15 = 15, // PC5
 
 	EFI_ADC_NONE = 16,
 	EFI_ADC_ERROR = 999,

firmware/controllers/engine_controller.cpp

@@ -300,7 +300,7 @@ static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel,
 	}
 
 	float voltage = adcVoltage * dividerCoeff;
-	scheduleMsg(&logger, "%s ADC%d %s %s rawValue=%f/divided=%fv/divider=%f", name, hwChannel, getAdcMode(hwChannel),
+	scheduleMsg(&logger, "%s ADC%d %s %s adc=%f/input=%fv/divider=%f", name, hwChannel, getAdcMode(hwChannel),
 			getPinNameByAdcChannel(hwChannel, pinNameBuffer), adcVoltage, voltage, dividerCoeff);
 #endif
 }

firmware/controllers/injector_central.h

@@ -16,6 +16,7 @@
 
 void fanBench(void);
 void fuelPumpBench(void);
+void milBench(void);
 void initInjectorCentral(Logging *sharedLogger);
 bool isRunningBenchTest(void);
 int isInjectorEnabled(int cylinderId);

firmware/controllers/lcd_controller.cpp

@@ -34,6 +34,9 @@ static MenuItem ROOT(NULL, NULL);
 
 static MenuTree tree(&ROOT);
 
+/**
+ * todo: add some comment explaining how this works
+ */
 static MenuItem miRpm(tree.root, LL_RPM);
 static MenuItem miSensors(tree.root, "sensors");
 static MenuItem miBench(tree.root, "bench test");
@@ -56,6 +59,8 @@ static MenuItem miKnock(&miSensors, LL_KNOCK);
 static MenuItem miStopEngine(&miBench, "stop engine", stopEngine);
 static MenuItem miTestFan(&miBench, "test fan", fanBench);
 static MenuItem miTestFuelPump(&miBench, "test pump", fuelPumpBench);
+static MenuItem miTestMIL(&miBench, "test MIL", milBench);
+// todo: looks like these are not finished yet?
 static MenuItem miTestSpark1(&miBench, "test spark1");
 static MenuItem miTestSpark2(&miBench, "test spark2");
 static MenuItem miTestSpark3(&miBench, "test spark3");

firmware/hw_layer/adc_inputs.cpp

@@ -484,7 +484,7 @@ static void addChannel(const char *name, adc_channel_e setting, adc_channel_mode
 	}
 	if (adcHwChannelEnabled[setting] != ADC_OFF) {
 		getPinNameByAdcChannel(setting, errorMsgBuff);
-		firmwareError("ADC mapping error: input %s for %s already used?", errorMsgBuff, name);
+		firmwareError("ADC mapping error: input %s for %s already used by %s?", errorMsgBuff, name, adcHwChannelUsage[setting]);
 	}
 
 	adcHwChannelUsage[setting] = name;

firmware/rusefi.cpp

@@ -298,5 +298,5 @@ int getRusEfiVersion(void) {
 		return 123; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] * 0 != 0)
 		return 3211; // this is here to make the compiler happy about the unused array
-	return 20160419;
+	return 20160423;
 }

firmware/tunerstudio/rusefi.ini

@@ -1113,6 +1113,7 @@ fileVersion = { 20160122 }
    entry = pulseWidth,      "fuel: pulse", float,  "%.3f"
    entry = baseFuel,	    "fuel: base",  float,  "%.2f"
    entry = veValue,         "fuel: VE",    float,  "%.3f"
+   entry = injectorDutyCycle,"fuel: duty cyc",float,"%.3f"
 
    entry = engineLoadAccelExtra, "fuel: load extra",float,  "%.3f"
    entry = engineLoadDelta, "fuel: load change",float,  "%.3f"