From ee8a80fb9d34875d9ef500056a7047635db4332d Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 23 Apr 2016 23:07:45 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/custom_engine.cpp | 1 + firmware/config/engines/ford_festiva.cpp | 18 ++++++++++++++++++ firmware/config/engines/mazda_626.cpp | 1 - firmware/config/engines/mazda_miata_1_6.cpp | 1 - firmware/controllers/algo/lcd_menu_tree.cpp | 9 +++++++++ firmware/controllers/algo/rusefi_enums.h | 12 ++++++------ firmware/controllers/engine_controller.cpp | 2 +- firmware/controllers/injector_central.h | 1 + firmware/controllers/lcd_controller.cpp | 5 +++++ firmware/hw_layer/adc_inputs.cpp | 2 +- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 1 + 12 files changed, 44 insertions(+), 11 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index d8902f9da5..d276254fac 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/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); /** diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 7e5d07808d..5dee55d905 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/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; diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp index ac7e4282b8..8a1970c5d8 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/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; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index ec9e20180f..85af70f433 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/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; diff --git a/firmware/controllers/algo/lcd_menu_tree.cpp b/firmware/controllers/algo/lcd_menu_tree.cpp index 79d79112ec..f65c47526f 100644 --- a/firmware/controllers/algo/lcd_menu_tree.cpp +++ b/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); } diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 5be305549a..3f550b362b 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/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, diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 4360f35f26..ba51552c26 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/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 } diff --git a/firmware/controllers/injector_central.h b/firmware/controllers/injector_central.h index 3a8afe6bd5..b81a0ecf40 100644 --- a/firmware/controllers/injector_central.h +++ b/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); diff --git a/firmware/controllers/lcd_controller.cpp b/firmware/controllers/lcd_controller.cpp index 7a05e776e2..e96778dd68 100644 --- a/firmware/controllers/lcd_controller.cpp +++ b/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"); diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 2c1282de8a..1c16095d26 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/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; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 6b4da19d17..a71cab5308 100644 --- a/firmware/rusefi.cpp +++ b/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; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 7dabf91e16..ca066f4d77 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/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"