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

Merge branch 'master' of https://github.com/rusefi/rusefi

This commit is contained in:
rusefi 2017-07-26 20:30:14 -04:00
parent c81e7a5bae 43fbfe0543
commit 3d68370a84
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/controllers/injector_central.cpp
View File

@ -32,6 +32,7 @@
#include "engine_configuration.h" #include "engine_configuration.h"
#include "pin_repository.h" #include "pin_repository.h"
#include "efiGpio.h" #include "efiGpio.h"
#include "settings.h"
EXTERN_ENGINE EXTERN_ENGINE
; ;
@ -254,6 +255,10 @@ void runIoTest(int subsystem, int index) {
milBench(); milBench();
} else if (subsystem == 0x17) { } else if (subsystem == 0x17) {
} else if (subsystem == 0x20 && index == 0x3456) { } else if (subsystem == 0x20 && index == 0x3456) {
// call to pit
setCallFromPitStop(30000);
} else if (subsystem == 0x99) {
stopEngine();
} }
} }

2
firmware/controllers/settings.cpp
View File

@ -441,7 +441,7 @@ static void printTemperatureInfo(void) {
#endif /* EFI_ANALOG_SENSORS */ #endif /* EFI_ANALOG_SENSORS */
} }
static void setCallFromPitStop(int durationMs) { void setCallFromPitStop(int durationMs) {
engine->callFromPitStopEndTime = currentTimeMillis() + durationMs; engine->callFromPitStopEndTime = currentTimeMillis() + durationMs;
} }

1
firmware/controllers/settings.h
View File

@ -15,6 +15,7 @@ void initSettings(void);
void printSpiState(Logging *logger, board_configuration_s *boardConfiguration); void printSpiState(Logging *logger, board_configuration_s *boardConfiguration);
void printConfiguration(const engine_configuration_s *engineConfiguration); void printConfiguration(const engine_configuration_s *engineConfiguration);
void stopEngine(void); void stopEngine(void);
void setCallFromPitStop(int durationMs);
void setEngineType(int value); void setEngineType(int value);
const char* getConfigurationName(engine_type_e engineType); const char* getConfigurationName(engine_type_e engineType);

2
firmware/tunerstudio/rusefi.input
View File

@ -886,6 +886,7 @@ cmd_test_radiator_fan = "w\x00\x15\x00\x01"
cmd_test_check_engine_light = "w\x00\x16\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01"
cmd_test_idle_valve = "w\x00\x17\x00\x01" cmd_test_idle_valve = "w\x00\x17\x00\x01"
cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_call_from_pit = "w\x00\x20\x34\x56"
cmd_stop_engine = "w\x00\x99\x00\x00"
[UserDefined] [UserDefined]
@ -1781,6 +1782,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56"
commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Radiator Fan", cmd_test_radiator_fan
commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Check Engine", cmd_test_check_engine_light
commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Idle Air Valve", cmd_test_idle_valve
commandButton = "Stop Engine", cmd_stop_engine
; bench test ; bench test
dialog = ioTest, "I-O Test", border dialog = ioTest, "I-O Test", border