andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-11-26 09:03:13 -06:00
parent 31bd25483e
commit 1288067e74
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/config/system/mcuconf.h
View File

@ -137,7 +137,7 @@
#define STM32_GPT_TIM2_IRQ_PRIORITY 7 #define STM32_GPT_TIM2_IRQ_PRIORITY 7
#define STM32_GPT_TIM3_IRQ_PRIORITY 7 #define STM32_GPT_TIM3_IRQ_PRIORITY 7
#define STM32_GPT_TIM4_IRQ_PRIORITY 7 #define STM32_GPT_TIM4_IRQ_PRIORITY 7
#define STM32_GPT_TIM5_IRQ_PRIORITY 3 #define STM32_GPT_TIM5_IRQ_PRIORITY 4
#define STM32_GPT_TIM6_IRQ_PRIORITY 7 #define STM32_GPT_TIM6_IRQ_PRIORITY 7
#define STM32_GPT_TIM7_IRQ_PRIORITY 7 #define STM32_GPT_TIM7_IRQ_PRIORITY 7
#define STM32_GPT_TIM8_IRQ_PRIORITY 7 #define STM32_GPT_TIM8_IRQ_PRIORITY 7
@ -169,13 +169,13 @@
/* /*
* ICU driver system settings. * ICU driver system settings.
*/ */
#define STM32_ICU_TIM1_IRQ_PRIORITY 7 #define STM32_ICU_TIM1_IRQ_PRIORITY 3
#define STM32_ICU_TIM2_IRQ_PRIORITY 7 #define STM32_ICU_TIM2_IRQ_PRIORITY 3
#define STM32_ICU_TIM3_IRQ_PRIORITY 7 #define STM32_ICU_TIM3_IRQ_PRIORITY 3
#define STM32_ICU_TIM4_IRQ_PRIORITY 7 #define STM32_ICU_TIM4_IRQ_PRIORITY 3
#define STM32_ICU_TIM5_IRQ_PRIORITY 7 #define STM32_ICU_TIM5_IRQ_PRIORITY 3
#define STM32_ICU_TIM8_IRQ_PRIORITY 7 #define STM32_ICU_TIM8_IRQ_PRIORITY 3
#define STM32_ICU_TIM9_IRQ_PRIORITY 7 #define STM32_ICU_TIM9_IRQ_PRIORITY 3
/* /*
* MAC driver system settings. * MAC driver system settings.

2
firmware/controllers/map_averaging.cpp
View File

@ -180,7 +180,7 @@ void initMapAveraging(void) {
endTimer[0].name = "map end0"; endTimer[0].name = "map end0";
endTimer[1].name = "map end1"; endTimer[1].name = "map end1";
addTriggerEventListener(&shaftPositionCallback, "rpm reporter", NULL); // addTriggerEventListener(&shaftPositionCallback, "rpm reporter", NULL);
addConsoleAction("faststat", showMapStats); addConsoleAction("faststat", showMapStats);
} }

4
firmware/controllers/trigger/rpm_calculator.cpp
View File

@ -34,6 +34,8 @@ extern WaveChart waveChart;
#include "analog_chart.h" #include "analog_chart.h"
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
#include "efilib2.h"
#define TOP_DEAD_CENTER_MESSAGE "r" #define TOP_DEAD_CENTER_MESSAGE "r"
EXTERN_ENGINE; EXTERN_ENGINE;
@ -120,6 +122,8 @@ bool isCranking(void) {
} }
#endif #endif
extern uint32_t triggerHanlderEntryTime;
/** /**
* @brief Shaft position callback used by RPM calculation logic. * @brief Shaft position callback used by RPM calculation logic.
* *

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

@ -59,20 +59,21 @@ void addTriggerEventListener(ShaftPositionListener listener, const char *name, E
triggerCentral.addEventListener(listener, name, engine); triggerCentral.addEventListener(listener, name, engine);
} }
uint32_t triggerHanlderEntryTime;
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
EXTERN_ENGINE EXTERN_ENGINE
; ;
int triggerReentraint = 0; int triggerReentraint = 0;
int maxTriggerReentraint = 0; int maxTriggerReentraint = 0;
uint32_t triggerBegin;
uint32_t triggerDuration; uint32_t triggerDuration;
uint32_t triggerMaxDuration = 0; uint32_t triggerMaxDuration = 0;
extern bool isInsideTriggerHandler; extern bool isInsideTriggerHandler;
void hwHandleShaftSignal(trigger_event_e signal) { void hwHandleShaftSignal(trigger_event_e signal) {
triggerBegin = GET_TIMESTAMP(); triggerHanlderEntryTime = GET_TIMESTAMP();
isInsideTriggerHandler = true; isInsideTriggerHandler = true;
if (triggerReentraint > maxTriggerReentraint) if (triggerReentraint > maxTriggerReentraint)
maxTriggerReentraint = triggerReentraint; maxTriggerReentraint = triggerReentraint;
@ -80,7 +81,7 @@ void hwHandleShaftSignal(trigger_event_e signal) {
efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "lowstck#8"); efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "lowstck#8");
triggerCentral.handleShaftSignal(signal, engine, engine->engineConfiguration); triggerCentral.handleShaftSignal(signal, engine, engine->engineConfiguration);
triggerReentraint--; triggerReentraint--;
triggerDuration = GET_TIMESTAMP() - triggerBegin; triggerDuration = GET_TIMESTAMP() - triggerHanlderEntryTime;
isInsideTriggerHandler = false; isInsideTriggerHandler = false;
if (triggerDuration > triggerMaxDuration) if (triggerDuration > triggerMaxDuration)
triggerMaxDuration = triggerDuration; triggerMaxDuration = triggerDuration;

2
firmware/emulation/wave_analyzer.cpp
View File

@ -247,7 +247,7 @@ void initWaveAnalyzer(void) {
initWave(WA_CHANNEL_1, 0); initWave(WA_CHANNEL_1, 0);
initWave(WA_CHANNEL_2, 1); initWave(WA_CHANNEL_2, 1);
addTriggerEventListener(waTriggerEventListener, "wave analyzer", NULL); // addTriggerEventListener(waTriggerEventListener, "wave analyzer", NULL);
addConsoleActionII("set_logic_input_mode", setWaveModeSilent); addConsoleActionII("set_logic_input_mode", setWaveModeSilent);