rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-05-16 00:02:01 -04:00
parent ef6fe8914c
commit 92ea344201
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -40,7 +40,7 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
* oil pressure line * oil pressure line
* adc4/pa4/W47 * adc4/pa4/W47
*/ */
//engineConfiguration->fsioAdc[0] = engineConfiguration->fsioAdc[0] = EFI_ADC_4;
// warning light // 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 < |" * 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 < |" * 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[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); setFsio(0, GPIOC_13, "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" PASS_ENGINE_PARAMETER);

7
firmware/console/status_loop.cpp
View File

@ -632,6 +632,13 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->debugIntField1 = engine->triggerCentral.getHwEventCounter(0); tsOutputChannels->debugIntField1 = engine->triggerCentral.getHwEventCounter(0);
tsOutputChannels->debugIntField2 = engine->triggerCentral.getHwEventCounter(1); tsOutputChannels->debugIntField2 = engine->triggerCentral.getHwEventCounter(1);
tsOutputChannels->debugIntField3 = engine->triggerCentral.getHwEventCounter(2); 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); tsOutputChannels->wallFuelAmount = ENGINE(wallFuel).getWallFuel(0);

2
firmware/controllers/algo/rusefi_enums.h
View File

@ -589,7 +589,7 @@ typedef enum {
IDLE = 3, IDLE = 3,
DBG_EL_ACCEL = 4, DBG_EL_ACCEL = 4,
TRIGGER_COUNT = 5, TRIGGER_COUNT = 5,
VALUE_6 = 6, FSIO_ADC = 6,
Force_4b_debug_mode_e = ENUM_32_BITS, Force_4b_debug_mode_e = ENUM_32_BITS,
} debug_mode_e; } debug_mode_e;

7
firmware/controllers/engine_controller.cpp
View File

@ -325,6 +325,13 @@ static void printAnalogInfo(void) {
if (hasMafSensor()) { if (hasMafSensor()) {
printAnalogChannelInfo("MAF", engineConfiguration->mafAdcChannel); 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); printAnalogChannelInfo("AFR", engineConfiguration->afr.hwChannel);
if (engineConfiguration->hasMapSensor) { if (engineConfiguration->hasMapSensor) {
printAnalogChannelInfo("MAP", engineConfiguration->map.sensor.hwChannel); printAnalogChannelInfo("MAP", engineConfiguration->map.sensor.hwChannel);