From 92ea344201d28cf833a004e04f7a16fc2b0ca9bb Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 16 May 2016 00:02:01 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata_1_6.cpp | 6 +++--- firmware/console/status_loop.cpp | 7 +++++++ firmware/controllers/algo/rusefi_enums.h | 2 +- firmware/controllers/engine_controller.cpp | 7 +++++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 578962c483..03d4a34e47 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -40,7 +40,7 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) { * oil pressure line * adc4/pa4/W47 */ - //engineConfiguration->fsioAdc[0] = + engineConfiguration->fsioAdc[0] = EFI_ADC_4; // warning light @@ -53,9 +53,9 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) { * 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[0] = 6200; // RPM threshold + engineConfiguration->bc.fsio_setting[0] = 6000; // RPM threshold engineConfiguration->bc.fsio_setting[1] = 90; // CLT threshold - engineConfiguration->bc.fsio_setting[2] = 13.5; // voltage threshold + engineConfiguration->bc.fsio_setting[2] = 13.0; // voltage threshold setFsio(0, GPIOC_13, "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" PASS_ENGINE_PARAMETER); diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 49d554185d..c15e7b1423 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -632,6 +632,13 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->debugIntField1 = engine->triggerCentral.getHwEventCounter(0); tsOutputChannels->debugIntField2 = engine->triggerCentral.getHwEventCounter(1); tsOutputChannels->debugIntField3 = engine->triggerCentral.getHwEventCounter(2); + } else if (engineConfiguration->debugMode == FSIO_ADC) { + // todo: implement a proper loop + if (engineConfiguration->fsioAdc[0] != EFI_ADC_NONE) { + strcpy(buf, "adcX"); + tsOutputChannels->debugFloatField1 = getVoltage("fsio", engineConfiguration->fsioAdc[0]); + } + } tsOutputChannels->wallFuelAmount = ENGINE(wallFuel).getWallFuel(0); diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 87d119271c..557d36533a 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -589,7 +589,7 @@ typedef enum { IDLE = 3, DBG_EL_ACCEL = 4, TRIGGER_COUNT = 5, - VALUE_6 = 6, + FSIO_ADC = 6, Force_4b_debug_mode_e = ENUM_32_BITS, } debug_mode_e; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index ba51552c26..864cbadb8f 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -325,6 +325,13 @@ static void printAnalogInfo(void) { if (hasMafSensor()) { printAnalogChannelInfo("MAF", engineConfiguration->mafAdcChannel); } + for (int i = 0; i < FSIO_ADC_COUNT ; i++) { + adc_channel_e ch = engineConfiguration->fsioAdc[i]; + if (ch != EFI_ADC_NONE) { + printAnalogChannelInfo("fsio", ch); + } + } + printAnalogChannelInfo("AFR", engineConfiguration->afr.hwChannel); if (engineConfiguration->hasMapSensor) { printAnalogChannelInfo("MAP", engineConfiguration->map.sensor.hwChannel);