rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-02-23 10:07:18 -06:00
parent be05c8154b
commit 68438213ae
6 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/algo/engine.cpp
View File

@ -59,6 +59,7 @@ Engine::Engine() {
engineCycleEventCount = 0; engineCycleEventCount = 0;
stopEngineRequestTimeNt = 0; stopEngineRequestTimeNt = 0;
isRunningPwmTest = false; isRunningPwmTest = false;
isTestMode = false;
addConfigurationListener(invokeEnginePreCalculate); addConfigurationListener(invokeEnginePreCalculate);
} }

6
firmware/controllers/algo/engine.h
View File

@ -150,6 +150,12 @@ public:
bool_t isRunningPwmTest; bool_t isRunningPwmTest;
/**
* are we running any kind of functional test? this affect
* some areas
*/
bool_t isTestMode;
TriggerShape triggerShape; TriggerShape triggerShape;
/** /**

2
firmware/controllers/settings.cpp
View File

@ -767,6 +767,8 @@ static void enableOrDisable(const char *param, bool isEnabled) {
boardConfiguration->isSdCardEnabled = isEnabled; boardConfiguration->isSdCardEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "can")) { } else if (strEqualCaseInsensitive(param, "can")) {
engineConfiguration->isCanEnabled = isEnabled; engineConfiguration->isCanEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "test_mode")) {
engine->isTestMode = isEnabled;
} else if (strEqualCaseInsensitive(param, "can_read")) { } else if (strEqualCaseInsensitive(param, "can_read")) {
engineConfiguration->canReadEnabled = isEnabled; engineConfiguration->canReadEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "can_write")) { } else if (strEqualCaseInsensitive(param, "can_write")) {

2
firmware/rusefi.cpp
View File

@ -278,5 +278,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE == 0) if (UNUSED_CCM_SIZE == 0)
return 1; // this is here to make the compiler happy about the unused array return 1; // this is here to make the compiler happy about the unused array
return 20150222; return 20150223;
} }

28
java_console/.idea/runConfigurations/RealHwTest.xml Normal file
View File

@ -0,0 +1,28 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RealHwTest" type="Application" factoryName="Application" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="com.rusefi.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="MAIN_CLASS_NAME" value="com.rusefi.RealHwTest" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
<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="autotest" />
<envs />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<ConfigurationWrapper RunnerId="Debug" />
<method />
</configuration>
</component>

3
java_console/autotest/src/com/rusefi/AutoTest.java
View File

@ -300,6 +300,7 @@ public class AutoTest {
} }
public static void main(String[] args) throws InterruptedException { public static void main(String[] args) throws InterruptedException {
long start = System.currentTimeMillis();
FileLog.SIMULATOR_CONSOLE.start(); FileLog.SIMULATOR_CONSOLE.start();
FileLog.MAIN.start(); FileLog.MAIN.start();
@ -318,6 +319,8 @@ public class AutoTest {
FileLog.MAIN.logLine("*******************************************************************************"); FileLog.MAIN.logLine("*******************************************************************************");
FileLog.MAIN.logLine("************************************ Looks good! *****************************"); FileLog.MAIN.logLine("************************************ Looks good! *****************************");
FileLog.MAIN.logLine("*******************************************************************************"); FileLog.MAIN.logLine("*******************************************************************************");
long time = (System.currentTimeMillis() - start) / 1000;
FileLog.MAIN.logLine("Done in " + time + "secs");
System.exit(0); // this is a safer method eliminating the issue of non-daemon threads System.exit(0); // this is a safer method eliminating the issue of non-daemon threads
} }
} }