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

auto-sync

This commit is contained in:
rusEfi 2014-09-11 09:04:31 -05:00
parent 9cd4327788
commit 0ca94f4a10
5 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/mazda_miata.cpp
View File

@ -313,7 +313,7 @@ void setMiata1996(engine_configuration_s *engineConfiguration, board_configurati
engineConfiguration->mafAdcChannel = EFI_ADC_1; engineConfiguration->mafAdcChannel = EFI_ADC_1;
engineConfiguration->cltAdcChannel = EFI_ADC_3; engineConfiguration->cltAdcChannel = EFI_ADC_11;
engineConfiguration->tpsAdcChannel = EFI_ADC_13; engineConfiguration->tpsAdcChannel = EFI_ADC_13;
boardConfiguration->ignitionPins[0] = GPIOE_12; // Frankenstein: high side #3 boardConfiguration->ignitionPins[0] = GPIOE_12; // Frankenstein: high side #3

2
firmware/controllers/algo/algo.mk
View File

@ -3,7 +3,6 @@ CONTROLLERS_ALGO_SRC = $(PROJECT_DIR)/controllers/algo/map_adjuster.c \
$(PROJECT_DIR)/controllers/algo/signal_executor.c \ $(PROJECT_DIR)/controllers/algo/signal_executor.c \
$(PROJECT_DIR)/controllers/algo/malfunction_central.c \ $(PROJECT_DIR)/controllers/algo/malfunction_central.c \
$(PROJECT_DIR)/controllers/algo/idle_controller.c \ $(PROJECT_DIR)/controllers/algo/idle_controller.c \
$(PROJECT_DIR)/controllers/algo/wave_chart.c \
$(PROJECT_DIR)/controllers/algo/nmea.c $(PROJECT_DIR)/controllers/algo/nmea.c
CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/OutputSignalArray.cpp \ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/OutputSignalArray.cpp \
@ -14,5 +13,6 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/OutputSignalArray.cpp
$(PROJECT_DIR)/controllers/algo/engine.cpp \ $(PROJECT_DIR)/controllers/algo/engine.cpp \
$(PROJECT_DIR)/controllers/algo/event_registry.cpp \ $(PROJECT_DIR)/controllers/algo/event_registry.cpp \
$(PROJECT_DIR)/controllers/algo/algo.cpp \ $(PROJECT_DIR)/controllers/algo/algo.cpp \
$(PROJECT_DIR)/controllers/algo/wave_chart.cpp \
$(PROJECT_DIR)/controllers/algo/enum_strings.cpp $(PROJECT_DIR)/controllers/algo/enum_strings.cpp

2
firmware/controllers/algo/wave_chart.c → firmware/controllers/algo/wave_chart.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file wave_chart.c * @file wave_chart.cpp
* @brief Dev console wave sniffer logic * @brief Dev console wave sniffer logic
* *
* Here we have our own build-in logic analyzer. The data we aggregate here is sent to the * Here we have our own build-in logic analyzer. The data we aggregate here is sent to the

15
firmware/controllers/algo/wave_chart.h
View File

@ -18,19 +18,15 @@
/** /**
* @brief Dev console sniffer data buffer * @brief Dev console sniffer data buffer
*/ */
typedef struct { class WaveChart {
public:
#if EFI_WAVE_CHART #if EFI_WAVE_CHART
Logging logging; Logging logging;
#endif /* EFI_WAVE_CHART */ #endif /* EFI_WAVE_CHART */
int counter; int counter;
int startTime; int startTime;
volatile int isInitialized; volatile int isInitialized;
} WaveChart; };
#ifdef __cplusplus
extern "C"
{
#endif /* __cplusplus */
void addWaveChartEvent3(WaveChart *chart, const char *name, const char *msg, const char *msg2); void addWaveChartEvent3(WaveChart *chart, const char *name, const char *msg, const char *msg2);
void publishChart(WaveChart *chart); void publishChart(WaveChart *chart);
@ -38,11 +34,6 @@ void initWaveChart(WaveChart *chart);
void showWaveChartHistogram(void); void showWaveChartHistogram(void);
void resetWaveChart(WaveChart *chart); void resetWaveChart(WaveChart *chart);
void setChartSize(int newSize); void setChartSize(int newSize);
//int isWaveChartFull(WaveChart *chart);
void publishChartIfFull(WaveChart *chart); void publishChartIfFull(WaveChart *chart);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* WAVE_CHART_H_ */ #endif /* WAVE_CHART_H_ */

2
firmware/iar/ch.ewp
View File

@ -2197,7 +2197,7 @@
<name>$PROJ_DIR$\..\controllers\algo\signal_executor.h</name> <name>$PROJ_DIR$\..\controllers\algo\signal_executor.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\controllers\algo\wave_chart.c</name> <name>$PROJ_DIR$\..\controllers\algo\wave_chart.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\controllers\algo\wave_chart.h</name> <name>$PROJ_DIR$\..\controllers\algo\wave_chart.h</name>