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

auto-sync

This commit is contained in:
rusEfi 2015-02-01 19:05:19 -06:00
parent d4ff699ff2
commit 5463eb5758
5 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
firmware/config/engines/mazda_miata.cpp
View File

@ -257,20 +257,8 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur
engineConfiguration->map.sensor.type = MT_DENSO183; engineConfiguration->map.sensor.type = MT_DENSO183;
// set_global_trigger_offset_angle 76
/** engineConfiguration->globalTriggerAngleOffset = 76;
* W53 Frankenso input #3 / PA0 / ADC_0
*/
engineConfiguration->mafAdcChannel = EFI_ADC_0;
engineConfiguration->tpsAdcChannel = EFI_ADC_3;
/**
* W55 Frankenso input #1 / PC2 / ADC_1
*/
engineConfiguration->cltAdcChannel = EFI_ADC_1;
// set_global_trigger_offset_angle 256
engineConfiguration->globalTriggerAngleOffset = 256;
// set_ignition_offset 170 // set_ignition_offset 170
engineConfiguration->ignitionBaseAngle = 170; engineConfiguration->ignitionBaseAngle = 170;
// set_injection_offset 510 // set_injection_offset 510
@ -282,7 +270,6 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur
boardConfiguration->triggerSimulatorPinModes[0] = OM_OPENDRAIN; boardConfiguration->triggerSimulatorPinModes[0] = OM_OPENDRAIN;
boardConfiguration->triggerSimulatorPinModes[1] = OM_OPENDRAIN; boardConfiguration->triggerSimulatorPinModes[1] = OM_OPENDRAIN;
boardConfiguration->ignitionPins[0] = GPIOE_14; // Frankenso high side - pin 1G boardConfiguration->ignitionPins[0] = GPIOE_14; // Frankenso high side - pin 1G
boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
boardConfiguration->ignitionPins[2] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[2] = GPIO_UNASSIGNED;
@ -308,11 +295,13 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur
boardConfiguration->injectionPins[0] = GPIOD_5; boardConfiguration->injectionPins[0] = GPIOD_5;
boardConfiguration->injectionPins[1] = GPIOE_2; boardConfiguration->injectionPins[1] = GPIOE_2;
// set_whole_fuel_map 3 // set_whole_fuel_map 5
setWholeFuelMap(engineConfiguration, 3); setWholeFuelMap(engineConfiguration, 5);
setDefaultCrankingFuel(engineConfiguration); //setDefaultCrankingFuel(engineConfiguration);
engineConfiguration->cranking.baseFuel = 5;
// 40% idle is good default
boardConfiguration->idleSolenoidFrequency = 300; boardConfiguration->idleSolenoidFrequency = 300;
boardConfiguration->idleValvePin = GPIOB_9; boardConfiguration->idleValvePin = GPIOB_9;
@ -332,6 +321,11 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur
engineConfiguration->mafAdcChannel = EFI_ADC_0; engineConfiguration->mafAdcChannel = EFI_ADC_0;
engineConfiguration->cltAdcChannel = EFI_ADC_12; engineConfiguration->cltAdcChannel = EFI_ADC_12;
engineConfiguration->iatAdcChannel = EFI_ADC_11; engineConfiguration->iatAdcChannel = EFI_ADC_11;
// todo: 8.2 or 10k?
engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2;
// end of Ford Escort GT config
} }
static void setMiata1994_common(engine_configuration_s *engineConfiguration, static void setMiata1994_common(engine_configuration_s *engineConfiguration,
@ -402,6 +396,7 @@ static void setMiata1994_common(engine_configuration_s *engineConfiguration,
engineConfiguration->mafAdcChannel = EFI_ADC_0; engineConfiguration->mafAdcChannel = EFI_ADC_0;
engineConfiguration->cltAdcChannel = EFI_ADC_12; engineConfiguration->cltAdcChannel = EFI_ADC_12;
engineConfiguration->iatAdcChannel = EFI_ADC_11; engineConfiguration->iatAdcChannel = EFI_ADC_11;
// end of 1994 commond
} }
/** /**

4
firmware/controllers/trigger/trigger_central.cpp
View File

@ -311,8 +311,8 @@ void initTriggerCentral(Logging *sharedLogger, Engine *engine) {
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
addConsoleActionP("triggerinfo", (VoidPtr) triggerInfo, engine); addConsoleActionP("triggerinfo", (VoidPtr) triggerInfo, engine);
addConsoleActionP("triggershapeinfo", (VoidPtr) triggerShapeInfo, engine); addConsoleActionP("trigger_shape_info", (VoidPtr) triggerShapeInfo, engine);
addConsoleAction("reset_running_counters", resetRunningTriggerCounters); addConsoleAction("reset_trigger", resetRunningTriggerCounters);
#endif #endif
#if EFI_HISTOGRAMS #if EFI_HISTOGRAMS

5
firmware/controllers/trigger/trigger_mazda.cpp
View File

@ -137,12 +137,13 @@ void configureMazdaProtegeLx(TriggerShape *s) {
float z = 0.093; // 67 deg float z = 0.093; // 67 deg
s->addEvent(100, T_PRIMARY, TV_HIGH);
a = 180; a = 180;
s->addEvent(a - z * 720, T_SECONDARY, TV_HIGH); s->addEvent(a - z * 720, T_SECONDARY, TV_HIGH);
s->addEvent(a, T_SECONDARY, TV_LOW); s->addEvent(a, T_SECONDARY, TV_LOW);
s->addEvent(a + 10, T_PRIMARY, TV_HIGH); s->addEvent(a + 40, T_PRIMARY, TV_LOW);
s->addEvent(a + 80, T_PRIMARY, TV_LOW);
a += 180; a += 180;

7
firmware/tunerstudio/rusefi.ini
View File

@ -487,8 +487,7 @@ fileVersion = { 20150127 }
ochBlockSize = 116 ochBlockSize = 116
; name = class, type, offset, shape, units, scale, translate, lo, hi, digits rpm = scalar, U32, 0, "RPM", 1, 0.00000
rpm = scalar, U32, 0, "RPM", 1, 0.00000, 0.00, 3000.0, 0 ; * ( 4 bytes)
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "°C", 1, 0.0 coolant = scalar, F32, 4, "°C", 1, 0.0
#else #else
@ -501,9 +500,9 @@ fileVersion = { 20150127 }
#endif #endif
TPS = scalar, F32, 12, "%", 1, 0 TPS = scalar, F32, 12, "%", 1, 0
MAF = scalar, F32, 16, "V", 1, 0 MAF = scalar, F32, 16, "V", 1, 0
AFRactual = scalar, F32, 20, "AFR", 1, 0.0, 0.00, 25.5, 1 ; AFRactual = scalar, F32, 20, "AFR", 1, 0.0
engineload = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm engineload = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0, 8, 21; VBatt = scalar, F32, 28, "V", 1, 0.0
; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale)
tpsADC = scalar, U16, 32, "ADC", 1, 0.0; tpsADC = scalar, U16, 32, "ADC", 1, 0.0;
alignmet = scalar, U16, 34, "al", 1, 0.0; alignmet = scalar, U16, 34, "al", 1, 0.0;

2
unit_tests/test_trigger_decoder.cpp
View File

@ -518,7 +518,7 @@ void testTriggerDecoder(void) {
test1995FordInline6TriggerDecoder(); test1995FordInline6TriggerDecoder();
testMazdaMianaNbDecoder(); testMazdaMianaNbDecoder();
testGY6_139QMB(); testGY6_139QMB();
testTriggerDecoder2("testFordEscortGt", FORD_ESCORT_GT, 2, 0.9028, 0.3720); testTriggerDecoder2("testFordEscortGt", FORD_ESCORT_GT, 0, 0.8333, 0.3720);
testTriggerDecoder2("testMiniCooper", MINI_COOPER_R50, 121, 0.5222, 0.4959); testTriggerDecoder2("testMiniCooper", MINI_COOPER_R50, 121, 0.5222, 0.4959);
testTriggerDecoder2("testRoverV8", ROVER_V8, 0, 0.4861, 0); testTriggerDecoder2("testRoverV8", ROVER_V8, 0, 0.4861, 0);
testTriggerDecoder2("testCitroen", CITROEN_TU3JP, 0, 0.4833, 0); testTriggerDecoder2("testCitroen", CITROEN_TU3JP, 0, 0.4833, 0);