FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-11-16 19:03:13 -06:00
parent db21facb37
commit 7e6cff99bd
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/controllers/core/le_functions.cpp
View File

@ -9,6 +9,7 @@
#include "le_functions.h" #include "le_functions.h"
#include "allsensors.h" #include "allsensors.h"
#include "rpm_calculator.h" #include "rpm_calculator.h"
#include "efiGpio.h"
extern LENameOrdinalPair * LE_FIRST; extern LENameOrdinalPair * LE_FIRST;
@ -30,8 +31,8 @@ static LENameOrdinalPair leTimeSinceBoot(LE_METHOD_TIME_SINCE_BOOT, "time_since_
float getLEValue(Engine *engine, le_action_e action) { float getLEValue(Engine *engine, le_action_e action) {
efiAssert(engine!=NULL, "getLEValue", NAN); efiAssert(engine!=NULL, "getLEValue", NAN);
switch (action) { switch (action) {
// case LE_METHOD_FAN: case LE_METHOD_FAN:
// return ; return getOutputPinValue(FAN_RELAY);
case LE_METHOD_COOLANT: case LE_METHOD_COOLANT:
return getCoolantTemperature(engine); return getCoolantTemperature(engine);
case LE_METHOD_INTAKE_AIR: case LE_METHOD_INTAKE_AIR:

2
firmware/controllers/error_handling.c
View File

@ -88,7 +88,7 @@ char *getWarninig(void) {
} }
uint64_t lastLockTime; uint64_t lastLockTime;
uint64_t maxLockTime = 0; uint32_t maxLockTime = 0;
void onLockHook(void) { void onLockHook(void) {
lastLockTime = getTimeNowNt(); lastLockTime = getTimeNowNt();

4
firmware/controllers/settings.cpp
View File

@ -21,6 +21,7 @@
#include "trigger_decoder.h" #include "trigger_decoder.h"
#include "console_io.h" #include "console_io.h"
#include "engine.h" #include "engine.h"
#include "efiGpio.h"
#if EFI_PROD_CODE #if EFI_PROD_CODE
#include "rusefi.h" #include "rusefi.h"
@ -332,6 +333,9 @@ static void printTemperatureInfo(void) {
scheduleMsg(&logger, "IAT sensing error"); scheduleMsg(&logger, "IAT sensing error");
} }
scheduleMsg(&logger, "fan=%s @ %s", boolToString(getOutputPinValue(FAN_RELAY)),
hwPortname(boardConfiguration->fanPin));
#if EFI_ANALOG_INPUTS #if EFI_ANALOG_INPUTS
scheduleMsg(&logger, "base cranking fuel %f", engineConfiguration->crankingSettings.baseCrankingFuel); scheduleMsg(&logger, "base cranking fuel %f", engineConfiguration->crankingSettings.baseCrankingFuel);
#endif #endif

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

@ -199,6 +199,7 @@ static void triggerShapeInfo(Engine *engine) {
#if EFI_PROD_CODE #if EFI_PROD_CODE
extern PwmConfig triggerSignal; extern PwmConfig triggerSignal;
extern uint32_t maxLockTime;
#endif /* #if EFI_PROD_CODE */ #endif /* #if EFI_PROD_CODE */
static void triggerInfo(Engine *engine) { static void triggerInfo(Engine *engine) {
@ -228,10 +229,10 @@ static void triggerInfo(Engine *engine) {
triggerCentral.triggerState.orderingErrorCounter, triggerCentral.triggerState.orderingErrorCounter,
triggerCentral.triggerState.getTotalRevolutionCounter(), triggerCentral.triggerState.getTotalRevolutionCounter(),
boolToString(engineConfiguration->directSelfStimulation)); boolToString(engineConfiguration->directSelfStimulation));
#endif #endif
#if EFI_PROD_CODE #if EFI_PROD_CODE
scheduleMsg(&logger, "maxLockTime=%d", maxLockTime);
scheduleMsg(&logger, "primary trigger simulator: %s %s freq=%d", scheduleMsg(&logger, "primary trigger simulator: %s %s freq=%d",
hwPortname(boardConfiguration->triggerSimulatorPins[0]), hwPortname(boardConfiguration->triggerSimulatorPins[0]),
pinModeToString(boardConfiguration->triggerSimulatorPinModes[0]), pinModeToString(boardConfiguration->triggerSimulatorPinModes[0]),