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-01-26 17:05:43 -06:00
parent 5162ce2363
commit b86934dd78
8 changed files with 81 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/engines/engines.mk
View File

@ -22,5 +22,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
$(PROJECT_DIR)/config/engines/mazda_323.cpp \
$(PROJECT_DIR)/config/engines/mazda_626.cpp \
$(PROJECT_DIR)/config/engines/saturn_ion.cpp \
$(PROJECT_DIR)/config/engines/sachs.cpp \
$(PROJECT_DIR)/config/engines/test_engine.cpp \
$(PROJECT_DIR)/config/engines/mitsubishi.cpp

46
firmware/config/engines/sachs.cpp Normal file
View File

@ -0,0 +1,46 @@
/**
* @file sachs.cpp
*
* set_engine_type 29
* http://rusefi.com/forum/viewtopic.php?f=3&t=396
*
* @date Jan 26, 2015
* @author Andrey Belomutskiy, (c) 2012-2014
*/
#include "sachs.h"
void setSachs(engine_configuration_s *engineConfiguration) {
engineConfiguration->displacement = 0.1; // 100cc
// Frankenstein analog input #1: PA1 adc1
// Frankenstein analog input #2: PA3 adc3
// Frankenstein analog input #3: PC3 adc13
// Frankenstein analog input #4: PC1 adc11
// Frankenstein analog input #5: PA0 adc0
// Frankenstein analog input #6: PC2 adc12
// Frankenstein analog input #7: PA4 adc4
// Frankenstein analog input #8: PA2 adc2
// Frankenstein analog input #9: PA6 adc6
// Frankenstein analog input #10: PA7 adc7
// Frankenstein analog input #11: PC4 adc14
// Frankenstein analog input #12: PC5 adc15
// Frankenstein: low side - out #1: PC14
// Frankenstein: low side - out #2: PC15
// Frankenstein: low side - out #3: PE6
// Frankenstein: low side - out #4: PC13
// Frankenstein: low side - out #5: PE4
// Frankenstein: low side - out #6: PE5
// Frankenstein: low side - out #7: PE2
// Frankenstein: low side - out #8: PE3
// Frankenstein: low side - out #9: PE0
// Frankenstein: low side - out #10: PE1
// Frankenstein: low side - out #11: PB8
// Frankenstein: low side - out #12: PB9
}

14
firmware/config/engines/sachs.h Normal file
View File

@ -0,0 +1,14 @@
/**
* @file sachs.h
*
* @date Jan 26, 2015
* @author Andrey Belomutskiy, (c) 2012-2014
*/
#ifndef CONFIG_ENGINES_SACHS_H_
#define CONFIG_ENGINES_SACHS_H_
#include "engine_configuration.h"
void setSachs(engine_configuration_s *engineConfiguration);
#endif /* CONFIG_ENGINES_SACHS_H_ */

2
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -14,6 +14,8 @@ case ACURA_RSX:
return "ACURA_RSX";
case AUDI_AAN:
return "AUDI_AAN";
case SACHS:
return "SACHS";
case BMW_E34:
return "BMW_E34";
case CITROEN_TU3JP:

4
firmware/controllers/algo/engine_configuration.cpp
View File

@ -52,6 +52,7 @@
#include "mitsubishi.h"
#include "subaru.h"
#include "test_engine.h"
#include "sachs.h"
#if EFI_TUNER_STUDIO
#include "tunerstudio.h"
@ -636,6 +637,9 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType, Engine *e
case TEST_ENGINE:
setTestEngineConfiguration(engineConfiguration);
break;
case SACHS:
setSachs(engineConfiguration);
break;
default:
firmwareError("Unexpected engine type: %d", engineType);
}

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

@ -103,7 +103,9 @@ typedef enum {
MAZDA_626 = 28,
ET_UNUSED = 29,
SACHS = 29,
ET_UNUSED = 30,
Force_4b_engine_type = ENUM_32_BITS,
} engine_type_e;

6
firmware/iar/ch.ewp
View File

@ -2021,6 +2021,12 @@
<file>
<name>$PROJ_DIR$\..\config\engines\rover_v8.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\config\engines\sachs.cpp</name>
</file>
<file>
<name>$PROJ_DIR$\..\config\engines\sachs.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\config\engines\saturn_ion.cpp</name>
</file>

10
firmware/tunerstudio/rusefi.ini
View File

@ -463,7 +463,7 @@ fileVersion = { 20150112 }
rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0
egoCorrection = { 1 }
time = { timeNow }
engineLoad = { fuelAlgorithm == 0 ? MAF : TPS }
engineLoad = { algorithm == 0 ? MAF : TPS }
[CurveEditor]
curve = dwellCorrection, "Dwell time RPM based"
@ -692,11 +692,11 @@ fileVersion = { 20150112 }
subMenu = crankingFuelCurve, "Cranking Coolant Temp correction"
subMenu = crankingDurationCurve, "Cranking Duration correction"
subMenu = std_separator
subMenu = fuelTableTbl, "Fuel Table", {fuelAlgorithm != 3}
subMenu = fuelTableTbl, "Fuel Table", {algorithm != 3}
subMenu = iatFuelCorrCurve, "Intake air temp fuel correction"
subMenu = cltFuelCorrCurve, "Coolant temp fuel correction"
subMenu = veTableTbl, "VE Table", {fuelAlgorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", {fuelAlgorithm == 3}
subMenu = veTableTbl, "VE Table", {algorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", {algorithm == 3}
subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Table"
subMenu = std_separator
@ -1000,7 +1000,7 @@ fileVersion = { 20150112 }
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "RPM Hard Limit", rpmHardLimit
field = ""
field = "Fuel Algorithm", fuelAlgorithm
field = "Fuel Algorithm", algorithm
field = ""
field = "analog chart", analogChartMode
field = "#System ON/OFF"