mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
65c46cacd3
commit
cd1712457b
|
@ -386,6 +386,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels) {
|
||||||
tsOutputChannels->ignition_enabled = engineConfiguration->isIgnitionEnabled;
|
tsOutputChannels->ignition_enabled = engineConfiguration->isIgnitionEnabled;
|
||||||
tsOutputChannels->injection_enabled = engineConfiguration->isInjectionEnabled;
|
tsOutputChannels->injection_enabled = engineConfiguration->isInjectionEnabled;
|
||||||
tsOutputChannels->cylinder_cleanup_enabled = engineConfiguration->isCylinderCleanupEnabled;
|
tsOutputChannels->cylinder_cleanup_enabled = engineConfiguration->isCylinderCleanupEnabled;
|
||||||
|
tsOutputChannels->cylinder_cleanup_activated = engineConfiguration2->isCylinderCleanupMode;
|
||||||
tsOutputChannels->secondTriggerChannelEnabled = engineConfiguration->secondTriggerChannelEnabled;
|
tsOutputChannels->secondTriggerChannelEnabled = engineConfiguration->secondTriggerChannelEnabled;
|
||||||
|
|
||||||
tsOutputChannels->isCltError = !isValidCoolantTemperature(getCoolantTemperature(engineConfiguration2));
|
tsOutputChannels->isCltError = !isValidCoolantTemperature(getCoolantTemperature(engineConfiguration2));
|
||||||
|
|
|
@ -57,7 +57,7 @@ typedef struct {
|
||||||
unsigned int ignition_enabled : 1; // bit 1
|
unsigned int ignition_enabled : 1; // bit 1
|
||||||
unsigned int injection_enabled : 1; // bit 2
|
unsigned int injection_enabled : 1; // bit 2
|
||||||
unsigned int cylinder_cleanup_enabled : 1; // bit 3
|
unsigned int cylinder_cleanup_enabled : 1; // bit 3
|
||||||
unsigned int cylinder_cleanup : 1; // bit 4
|
unsigned int cylinder_cleanup_activated : 1; // bit 4
|
||||||
unsigned int isFuelPumpOn : 1; // bit 5
|
unsigned int isFuelPumpOn : 1; // bit 5
|
||||||
unsigned int isFanOn : 1; // bit 6
|
unsigned int isFanOn : 1; // bit 6
|
||||||
unsigned int isO2HeaterOn : 1; // bit 7
|
unsigned int isO2HeaterOn : 1; // bit 7
|
||||||
|
|
|
@ -171,7 +171,7 @@ int getTimeNowSeconds(void) {
|
||||||
static void cylinderCleanupControl(Engine *engine) {
|
static void cylinderCleanupControl(Engine *engine) {
|
||||||
bool newValue;
|
bool newValue;
|
||||||
if (engineConfiguration->isCylinderCleanupEnabled) {
|
if (engineConfiguration->isCylinderCleanupEnabled) {
|
||||||
newValue = !engine->rpmCalculator->isRunning() && getTPS() > 95;
|
newValue = isCrankingE(engine) && getTPS() > 95;
|
||||||
} else {
|
} else {
|
||||||
newValue = false;
|
newValue = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,8 +12,16 @@
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "signal_executor.h"
|
#include "signal_executor.h"
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
|
#include "engine.h"
|
||||||
|
|
||||||
char * getPinNameByAdcChannel(adc_channel_e hwChannel, char *buffer);
|
char * getPinNameByAdcChannel(adc_channel_e hwChannel, char *buffer);
|
||||||
void initEngineContoller(void);
|
void initEngineContoller(void);
|
||||||
|
|
||||||
|
class StartupFuelPumping {
|
||||||
|
public:
|
||||||
|
void update(Engine *engine);
|
||||||
|
bool isTpsAbove50;
|
||||||
|
int pumpsCounter;
|
||||||
|
};
|
||||||
|
|
||||||
#endif /* ENGINE_STATUS_H_ */
|
#endif /* ENGINE_STATUS_H_ */
|
||||||
|
|
|
@ -85,12 +85,16 @@ bool isValidRpm(int rpm) {
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
|
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
|
||||||
|
bool isCrankingE(Engine *engine) {
|
||||||
|
int rpm = getRpmE(engine);
|
||||||
|
return isCrankingR(rpm);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* WARNING: this is a heavy method because 'getRpm()' is relatively heavy
|
* WARNING: this is a heavy method because 'getRpm()' is relatively heavy
|
||||||
*/
|
*/
|
||||||
bool isCranking(void) {
|
bool isCranking(void) {
|
||||||
int rpm = getRpm();
|
return isCrankingE(&engine);
|
||||||
return isCrankingR(rpm);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@ public:
|
||||||
* @brief Current RPM
|
* @brief Current RPM
|
||||||
*/
|
*/
|
||||||
int getRpmE(Engine *engine);
|
int getRpmE(Engine *engine);
|
||||||
|
bool isCrankingE(Engine *engine);
|
||||||
void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index, RpmCalculator *rpmState);
|
void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index, RpmCalculator *rpmState);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -241,5 +241,5 @@ void firmwareError(const char *fmt, ...) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int getRusEfiVersion(void) {
|
int getRusEfiVersion(void) {
|
||||||
return 20141015;
|
return 20141016;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue