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-05-14 23:10:04 -04:00
parent 021aeefcae
commit 2183ddca20
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,8 +70,8 @@ float getBaseAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S) {
return result; return result;
} }
float getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S) { angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S) {
float angle; angle_t angle;
if (isCrankingR(rpm)) { if (isCrankingR(rpm)) {
angle = engineConfiguration->crankingTimingAngle; angle = engineConfiguration->crankingTimingAngle;
} else { } else {

2
firmware/controllers/algo/advance_map.h
View File

@ -10,7 +10,7 @@
#include "engine.h" #include "engine.h"
float getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S); angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_S);
void setDefaultIatTimingCorrection(DECLARE_ENGINE_PARAMETER_F); void setDefaultIatTimingCorrection(DECLARE_ENGINE_PARAMETER_F);
void prepareTimingMap(DECLARE_ENGINE_PARAMETER_F); void prepareTimingMap(DECLARE_ENGINE_PARAMETER_F);

10
firmware/controllers/system/event_queue.cpp
View File

@ -103,7 +103,7 @@ uint64_t EventQueue::getNextEventTime(uint64_t nowX) {
return EMPTY_QUEUE; return EMPTY_QUEUE;
} }
// static scheduling_s * longScheduling; static scheduling_s * longScheduling;
uint32_t maxEventQueueTime = 0; uint32_t maxEventQueueTime = 0;
uint32_t lastEventQueueTime; uint32_t lastEventQueueTime;
@ -158,10 +158,10 @@ int EventQueue::executeAll(uint64_t now) {
lastEventQueueTime = GET_TIMESTAMP() - before; lastEventQueueTime = GET_TIMESTAMP() - before;
if (lastEventQueueTime > maxEventQueueTime) if (lastEventQueueTime > maxEventQueueTime)
maxEventQueueTime = lastEventQueueTime; maxEventQueueTime = lastEventQueueTime;
// if (cost > 2000) { if (lastEventQueueTime > 2000) {
// longScheduling = current; longScheduling = current;
// cost++; lastEventQueueTime++;
// } }
} }
return executionCounter; return executionCounter;
} }

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

@ -295,7 +295,7 @@ void triggerInfo(Engine *engine) {
scheduleMsg(logger, "zeroTestTime=%d maxHowFarOff=%d", engine->m.zeroTestTime, maxHowFarOff); scheduleMsg(logger, "zeroTestTime=%d maxHowFarOff=%d", engine->m.zeroTestTime, maxHowFarOff);
maxHowFarOff = 0; maxHowFarOff = 0;
scheduleMsg(logger, "advanceLookupTime=%d t=%d fuelCalcTime=%d", scheduleMsg(logger, "advanceLookupTime=%d now=%d fuelCalcTime=%d",
engine->m.advanceLookupTime, *cyccnt, engine->m.advanceLookupTime, *cyccnt,
engine->m.fuelCalcTime); engine->m.fuelCalcTime);

2
java_console/ui/src/com/rusefi/ui/util/DefaultExceptionHandler.java
View File

@ -20,6 +20,8 @@ public class DefaultExceptionHandler implements Thread.UncaughtExceptionHandler
} }
public static void handleException(Throwable e) { public static void handleException(Throwable e) {
if (e == null)
throw new NullPointerException("Throwable e");
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos); PrintStream ps = new PrintStream(baos);
e.printStackTrace(ps); e.printStackTrace(ps);