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 2016-01-07 21:02:35 -05:00
parent 57790c376f
commit bba88724d9
4 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/controllers/injector_central.cpp
View File

@ -157,8 +157,12 @@ void milBench(void) {
pinbench("0", "3000", "100", "1", &checkEnginePin, boardConfiguration->malfunctionIndicatorPin); pinbench("0", "3000", "100", "1", &checkEnginePin, boardConfiguration->malfunctionIndicatorPin);
} }
void fuelPumpBenchExt(const char *durationMs) {
pinbench("0", durationMs, "100", "1", &enginePins.fuelPumpRelay, boardConfiguration->fuelPumpPin);
}
void fuelPumpBench(void) { void fuelPumpBench(void) {
pinbench("0", "3000", "100", "1", &enginePins.fuelPumpRelay, boardConfiguration->fuelPumpPin); fuelPumpBenchExt("3000");
} }
// fuelbench 5 1000 2 // fuelbench 5 1000 2
@ -272,6 +276,7 @@ void initInjectorCentral(void) {
addConsoleActionII("injector", setInjectorEnabled); addConsoleActionII("injector", setInjectorEnabled);
addConsoleAction("fuelpumpbench", fuelPumpBench); addConsoleAction("fuelpumpbench", fuelPumpBench);
addConsoleActionS("fuelpumpbench2", fuelPumpBenchExt);
addConsoleAction("fanbench", fanBench); addConsoleAction("fanbench", fanBench);
addConsoleAction("milbench", milBench); addConsoleAction("milbench", milBench);

3
firmware/controllers/sensors/map.cpp
View File

@ -56,7 +56,8 @@ static FastInterpolation mpx4100(0.3, 20, 4.9, 105);
* https://books.google.com/books?id=3q85p56_PxIC page 132 * https://books.google.com/books?id=3q85p56_PxIC page 132
* https://books.google.com/books?id=3q85p56_PxIC&q=chrysler+map#v=snippet&q=chrysler%20map&f=false * https://books.google.com/books?id=3q85p56_PxIC&q=chrysler+map#v=snippet&q=chrysler%20map&f=false
*/ */
static FastInterpolation dodgeNeon2003(0.5, 0, 4.5, 100); //static FastInterpolation dodgeNeon2003(0.5 /* volts */, 0 /* kPa */, 4.5 /* volts */ , 100 /* kPa */);
static FastInterpolation dodgeNeon2003(0.4 /* volts */, 15.34 /* kPa */, 4.5 /* volts */ , 100 /* kPa */);
/** /**
* We hold a reference to current decoder to reduce code branching * We hold a reference to current decoder to reduce code branching

25
firmware/controllers/settings.cpp
View File

@ -914,26 +914,6 @@ static void disableSpi(int index) {
setSpiMode(index, false); setSpiMode(index, false);
} }
static void enableInjection(void) {
engineConfiguration->isInjectionEnabled = true;
scheduleMsg(&logger, "injection enabled");
}
static void disableInjection(void) {
engineConfiguration->isInjectionEnabled = false;
scheduleMsg(&logger, "injection disabled");
}
static void enableIgnition(void) {
engineConfiguration->isIgnitionEnabled = true;
scheduleMsg(&logger, "ignition enabled");
}
static void disableIgnition(void) {
engineConfiguration->isIgnitionEnabled = false;
scheduleMsg(&logger, "ignition disabled");
}
void stopEngine(void) { void stopEngine(void) {
engine->stopEngineRequestTimeNt = getTimeNowNt(); engine->stopEngineRequestTimeNt = getTimeNowNt();
} }
@ -1053,11 +1033,6 @@ void initSettings(engine_configuration_s *engineConfiguration) {
addConsoleAction("stopengine", (Void) stopEngine); addConsoleAction("stopengine", (Void) stopEngine);
// todo: refactor this - looks like all boolean flags should be controlled with less code duplication // todo: refactor this - looks like all boolean flags should be controlled with less code duplication
addConsoleAction("enable_injection", enableInjection);
addConsoleAction("disable_injection", disableInjection);
addConsoleAction("enable_ignition", enableIgnition);
addConsoleAction("disable_ignition", disableIgnition);
addConsoleActionI("enable_spi", enableSpi); addConsoleActionI("enable_spi", enableSpi);
addConsoleActionI("disable_spi", disableSpi); addConsoleActionI("disable_spi", disableSpi);

17
java_console/.idea/runConfigurations/Launcher_COM15.xml Normal file
View File

@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Launcher COM15" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="COM15" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="ui" />
<envs />
<method />
</configuration>
</component>