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-23 21:03:07 -06:00
parent c8903919ef
commit 138133c894
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/controllers/algo/signal_executor.cpp
View File

@ -31,9 +31,8 @@
*/
#include "rpm_calculator.h"
#if EFI_WAVE_ANALYZER
#endif /* EFI_WAVE_ANALYZER */
#include "wave_chart.h"
extern WaveChart waveChart;
#if EFI_PROD_CODE || EFI_SIMULATOR
static Logging logger;

4
firmware/controllers/algo/wave_chart.cpp
View File

@ -146,6 +146,10 @@ void WaveChart::addWaveChartEvent3(const char *name, const char * msg) {
return;
}
#if EFI_PROD_CODE
efiAssertVoid(getRemainingStack(chThdSelf()) > 32, "lowstck#2c");
#endif
efiAssertVoid(isInitialized, "chart not initialized");
#if DEBUG_WAVE
scheduleSimpleMsg(&debugLogging, "current", chart->counter);

18
firmware/controllers/system/efiGpio.cpp
View File

@ -97,17 +97,17 @@ extern uint32_t dbgDurr;
void setOutputPinValue(io_pin_e pin, int logicValue) {
#if EFI_PROD_CODE
if (outputs[pin].port == GPIO_NULL)
return;
efiAssertVoid(pinDefaultState[pin]!=NULL, "pin mode not initialized");
pin_output_mode_e mode = *pinDefaultState[pin];
efiAssertVoid(mode <= OM_OPENDRAIN_INVERTED, "invalid pin_output_mode_e");
if (outputs[pin].port != GPIO_NULL) {
efiAssertVoid(pinDefaultState[pin]!=NULL, "pin mode not initialized");
pin_output_mode_e mode = *pinDefaultState[pin];
efiAssertVoid(mode <= OM_OPENDRAIN_INVERTED, "invalid pin_output_mode_e");
#else
pin_output_mode_e mode = OM_DEFAULT;
pin_output_mode_e mode = OM_DEFAULT;
#endif
OutputPin *output = &outputs[pin];
int eValue = getElectricalValue(logicValue, mode);
setPinValue(output, eValue, logicValue);
OutputPin *output = &outputs[pin];
int eValue = getElectricalValue(logicValue, mode);
setPinValue(output, eValue, logicValue);
}
}
bool isPinAssigned(io_pin_e pin) {

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

@ -260,11 +260,3 @@ void scheduleByAngle(int rpm, scheduling_s *timer, float angle, schfunc_t callba
#endif /* EFI_SHAFT_POSITION_INPUT */
void addWaveChartEvent(const char *name, const char * msg) {
#if EFI_PROD_CODE
efiAssertVoid(getRemainingStack(chThdSelf()) > 32, "lowstck#2c");
#endif
#if EFI_WAVE_CHART
waveChart.addWaveChartEvent3(name, msg);
#endif /* EFI_WAVE_CHART */
}

8
firmware/controllers/trigger/rpm_calculator.h
View File

@ -79,7 +79,13 @@ bool isCranking(void);
int getRevolutionCounter(void);
#define isValidRpm(rpm) ((rpm) > 0 && (rpm) < UNREALISTIC_RPM)
void addWaveChartEvent(const char *name, const char *msg);
#if EFI_WAVE_CHART
#define addWaveChartEvent(name, msg) waveChart.addWaveChartEvent3((name), (msg))
#else
#define addWaveChartEvent(n, msg) {}
#endif /* EFI_WAVE_CHART */
#ifdef __cplusplus
}

1
firmware/emulation/wave_analyzer.cpp
View File

@ -23,6 +23,7 @@
#include "engine_math.h"
#include "engine.h"
#include "rpm_calculator.h"
#include "wave_chart.h"
EXTERN_ENGINE;