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 2016-09-15 14:02:45 -04:00
parent c5db30c7ea
commit 27b5126ddf
5 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/injector_central.cpp
View File

@ -39,7 +39,7 @@ EXTERN_ENGINE
static Logging * logger; static Logging * logger;
static bool isRunningBench = false; static bool isRunningBench = false;
static int is_injector_enabled[MAX_INJECTOR_COUNT]; static int is_injector_enabled[INJECTION_PIN_COUNT];
extern engine_pins_s enginePins; extern engine_pins_s enginePins;

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

@ -632,7 +632,7 @@ void initMainEventListener(Logging *sharedLogger, Engine *engine) {
addConsoleActionP("maininfo", (VoidPtr) showMainInfo, engine); addConsoleActionP("maininfo", (VoidPtr) showMainInfo, engine);
printMsg(logger, "initMainLoop: %d", currentTimeMillis()); printMsg(logger, "initMainLoop: %d", currentTimeMillis());
if (!isInjectionEnabled(mainTriggerCallbackInstance.engine->engineConfiguration)) if (!isInjectionEnabled(engine->engineConfiguration))
printMsg(logger, "!!!!!!!!!!!!!!!!!!! injection disabled"); printMsg(logger, "!!!!!!!!!!!!!!!!!!! injection disabled");
#endif #endif

16
firmware/controllers/trigger/main_trigger_callback.h
View File

@ -12,10 +12,6 @@
#include "main.h" #include "main.h"
#define MAX_INJECTOR_COUNT 12
#define MAX_IGNITER_COUNT 4
#ifdef __cplusplus
#include "event_registry.h" #include "event_registry.h"
#include "engine.h" #include "engine.h"
@ -26,23 +22,13 @@ public:
Engine *engine; Engine *engine;
}; };
void initMainEventListener(Logging *sharedLogger, Engine *engine); void initMainEventListener(Logging *sharedLogger, Engine *engine);
void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECLARE_ENGINE_PARAMETER_S); void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECLARE_ENGINE_PARAMETER_S);
#endif
int isIgnitionTimingError(void); int isIgnitionTimingError(void);
#ifdef __cplusplus
extern "C"
{
#endif /* __cplusplus */
void showMainHistogram(void); void showMainHistogram(void);
void onEveryMillisecondTimerSignal(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
float getFuel(int rpm, float key); float getFuel(int rpm, float key);
#endif /* MAIN_LOOP_H_ */ #endif /* MAIN_LOOP_H_ */

2
unit_tests/engine_test_helper.cpp
View File

@ -61,8 +61,6 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
engine->updateSlowSensors(PASS_ENGINE_PARAMETER_F); engine->updateSlowSensors(PASS_ENGINE_PARAMETER_F);
prepareTimingMap(PASS_ENGINE_PARAMETER_F); prepareTimingMap(PASS_ENGINE_PARAMETER_F);
triggerCallbackInstance.init(engine);
engine_configuration_s *engineConfiguration = engine->engineConfiguration; engine_configuration_s *engineConfiguration = engine->engineConfiguration;
engine->triggerShape.initializeTriggerShape(NULL PASS_ENGINE_PARAMETER); engine->triggerShape.initializeTriggerShape(NULL PASS_ENGINE_PARAMETER);

2
unit_tests/engine_test_helper.h
View File

@ -25,8 +25,6 @@ public:
engine_configuration2_s ec2; engine_configuration2_s ec2;
Engine engine; Engine engine;
MainTriggerCallback triggerCallbackInstance;
engine_configuration_s *ec; engine_configuration_s *ec;
engine_configuration_s *engineConfiguration; engine_configuration_s *engineConfiguration;