From e7849bcafd7fe29177291a840ca0e6cf6ac32eab Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 8 Dec 2014 09:07:14 -0600 Subject: [PATCH] auto-sync --- firmware/config/efifeatures.h | 2 +- firmware/controllers/trigger/main_trigger_callback.cpp | 2 +- firmware/rusefi.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/config/efifeatures.h b/firmware/config/efifeatures.h index 5c6f24c42f..bbb4ae8c22 100644 --- a/firmware/config/efifeatures.h +++ b/firmware/config/efifeatures.h @@ -119,7 +119,7 @@ #define EFI_WAVE_CHART TRUE -#define EFI_HISTOGRAMS FAPSE +#define EFI_HISTOGRAMS FALSE #define EFI_ANALOG_CHART TRUE #if defined __GNUC__ diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index 8cc048a32d..189570dfcd 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -358,7 +358,7 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECL * but we are already repurposing the output signals, but everything works because we * are not affecting that space in memory. todo: use two instances of 'ignitionSignals' */ - float maxAllowedDwellAngle = engineConfiguration->engineCycle / 2; + float maxAllowedDwellAngle = (int)(engineConfiguration->engineCycle / 2); // the cast is about making Coverity happy if (engineConfiguration->ignitionMode == IM_ONE_COIL) { maxAllowedDwellAngle = engineConfiguration->engineCycle / engineConfiguration->cylindersCount / 1.1; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 3cb0092777..842f163664 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -265,5 +265,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE == 0) return 1; // this is here to make the compiler happy about the unused array - return 20141207; + return 20141208; }