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-24 22:04:21 -06:00
parent 2ae8edf14a
commit f26a1eef6d
5 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/console/status_loop.cpp
View File

@ -486,13 +486,13 @@ static void blinkingThread(void *arg) {
initialLedsBlink(); initialLedsBlink();
while (true) { while (true) {
int delay; int delay = isConsoleReady() ? 3 * blinkingPeriod : blinkingPeriod;
#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__)
if (getNeedToWriteConfiguration()) { if (getNeedToWriteConfiguration()) {
delay = isConsoleReady() ? 6 * blinkingPeriod : 2 * blinkingPeriod; delay = 2 * delay;
} else {
delay = isConsoleReady() ? 3 * blinkingPeriod : blinkingPeriod;
} }
#endif
communicationPin.setValue(0); communicationPin.setValue(0);
warningPin.setValue(0); warningPin.setValue(0);
@ -574,7 +574,9 @@ void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputC
tsOutputChannels->egtValues.values[i] = getEgtValue(i); tsOutputChannels->egtValues.values[i] = getEgtValue(i);
#endif /* EFI_MAX_31855 */ #endif /* EFI_MAX_31855 */
#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__)
tsOutputChannels->needBurn = getNeedToWriteConfiguration(); tsOutputChannels->needBurn = getNeedToWriteConfiguration();
#endif
tsOutputChannels->hasSdCard = isSdCardAlive(); tsOutputChannels->hasSdCard = isSdCardAlive();
tsOutputChannels->isFuelPumpOn = enginePins.fuelPumpRelay.getLogicValue(); tsOutputChannels->isFuelPumpOn = enginePins.fuelPumpRelay.getLogicValue();
tsOutputChannels->isFanOn = enginePins.fanRelay.getLogicValue(); tsOutputChannels->isFanOn = enginePins.fanRelay.getLogicValue();

5
firmware/controllers/engine_controller.cpp
View File

@ -224,9 +224,10 @@ static void onEvenyGeneralMilliseconds(Engine *engine) {
} }
#endif #endif
#if (EFI_PROD_CODE && EFI_ENGINE_CONTROL )|| defined(__DOXYGEN__) #if (EFI_PROD_CODE && EFI_ENGINE_CONTROL && EFI_INTERNAL_FLASH) || defined(__DOXYGEN__)
if (!engine->rpmCalculator.isRunning()) if (!engine->rpmCalculator.isRunning()) {
writeToFlashIfPending(); writeToFlashIfPending();
}
#endif #endif
if (versionForConfigurationListeners.isOld()) { if (versionForConfigurationListeners.isOld()) {

2
firmware/controllers/flash_main.cpp
View File

@ -18,7 +18,7 @@
#include "tunerstudio.h" #include "tunerstudio.h"
#endif #endif
#if EFI_INTERNAL_FLASH #if EFI_INTERNAL_FLASH || defined(__DOXYGEN__)
#include "engine_controller.h" #include "engine_controller.h"

2
firmware/hw_layer/hardware.cpp
View File

@ -238,7 +238,7 @@ void initHardware(Logging *l, Engine *engine) {
} }
#else #else
engineConfiguration->engineType = DEFAULT_ENGINE_TYPE; engineConfiguration->engineType = DEFAULT_ENGINE_TYPE;
resetConfigurationExt(logger, engineConfiguration->engineType, engine); resetConfigurationExt(sharedLogger, engineConfiguration->engineType, engine);
#endif /* EFI_INTERNAL_FLASH */ #endif /* EFI_INTERNAL_FLASH */
if (hasFirmwareError()) { if (hasFirmwareError()) {

26
java_console/autotest/src/com/rusefi/EnduranceTest.java
View File

@ -1,11 +1,15 @@
package com.rusefi; package com.rusefi;
import static com.rusefi.AutoTest.setEngineType; import static com.rusefi.IoUtil.sendCommand;
import static com.rusefi.IoUtil.sleep;
import static com.rusefi.RealHwTest.startRealHardwareTest; import static com.rusefi.RealHwTest.startRealHardwareTest;
public class EnduranceTest { public class EnduranceTest {
public static void main(String[] args) {
private static final int COUNT = 200;
public static void main(String[] args) {
long start = System.currentTimeMillis();
try { try {
String port = startRealHardwareTest(args); String port = startRealHardwareTest(args);
@ -13,11 +17,15 @@ public class EnduranceTest {
return; return;
IoUtil.realHardwareConnect(port); IoUtil.realHardwareConnect(port);
for (int i = 0; i < 1000; i++) { for (int i = 0; i < COUNT; i++) {
setEngineType(3); AutoTest.currentEngineType = 3;
IoUtil.changeRpm(1200); sendCommand("set_engine_type " + 3, AutoTest.COMPLEX_COMMAND_RETRY, 600);
setEngineType(28); sleep(2);
IoUtil.changeRpm(2400); sendCommand("enable self_stimulation");
// IoUtil.changeRpm(1200);
AutoTest.currentEngineType = 28;
sendCommand("set_engine_type " + 28, AutoTest.COMPLEX_COMMAND_RETRY, 600);
sleep(2);
FileLog.MAIN.logLine("++++++++++++++++++++++++++++++++++++ " + i + " +++++++++++++++"); FileLog.MAIN.logLine("++++++++++++++++++++++++++++++++++++ " + i + " +++++++++++++++");
} }
@ -25,5 +33,9 @@ public class EnduranceTest {
e.printStackTrace(); e.printStackTrace();
System.exit(-1); System.exit(-1);
} }
FileLog.MAIN.logLine("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
FileLog.MAIN.logLine("++++++++++++++++++++++++++++++++++++ YES YES YES " + COUNT + " +++++++++++++++");
FileLog.MAIN.logLine("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
FileLog.MAIN.logLine("In " + (System.currentTimeMillis() - start) + "ms");
} }
} }