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

auto-sync

This commit is contained in:
rusEfi 2015-01-13 21:04:02 -06:00
parent eb4f7c5962
commit a81741dbbc
51 changed files with 115 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/console/console.mk
View File

@ -2,4 +2,5 @@
CONSOLESRC = $(PROJECT_DIR)/console/console_io.c CONSOLESRC = $(PROJECT_DIR)/console/console_io.c
CONSOLE_SRC_CPP = $(PROJECT_DIR)/console/status_loop.cpp \ CONSOLE_SRC_CPP = $(PROJECT_DIR)/console/status_loop.cpp \
$(PROJECT_DIR)/controllers/error_handling.cpp $(PROJECT_DIR)/console/eficonsole.cpp

4
firmware/console/eficonsole.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file eficonsole.c * @file eficonsole.cpp
* @brief Console package entry point code * @brief Console package entry point code
* *
* *
@ -29,7 +29,7 @@
#include "console_io.h" #include "console_io.h"
#include "svnversion.h" #include "svnversion.h"
static Logging logger; static LoggingWithStorage logger;
static char fatalErrorMessage[200]; static char fatalErrorMessage[200];

4
firmware/console/status_loop.cpp
View File

@ -83,7 +83,7 @@ static void setWarningEnabled(int value) {
} }
#if EFI_FILE_LOGGING || defined(__DOXYGEN__) #if EFI_FILE_LOGGING || defined(__DOXYGEN__)
static Logging fileLogger; static LoggingWithStorage fileLogger;
#endif /* EFI_FILE_LOGGING */ #endif /* EFI_FILE_LOGGING */
static int logFileLineIndex = 0; static int logFileLineIndex = 0;
@ -232,7 +232,7 @@ static char LOGGING_BUFFER[700];
volatile int needToReportStatus = FALSE; volatile int needToReportStatus = FALSE;
static int prevCkpEventCounter = -1; static int prevCkpEventCounter = -1;
static Logging logger2; static LoggingWithStorage logger2;
static void printStatus(void) { static void printStatus(void) {
needToReportStatus = TRUE; needToReportStatus = TRUE;

2
firmware/console/tunerstudio/tunerstudio.cpp
View File

@ -72,7 +72,7 @@ BaseChannel * getTsSerialDevice(void) {
#endif #endif
} }
static Logging logger; static LoggingWithStorage logger;
extern persistent_config_s configWorkingCopy; extern persistent_config_s configWorkingCopy;
extern persistent_config_container_s persistentState; extern persistent_config_container_s persistentState;

19
firmware/console_util/rfiutil.c
View File

@ -93,22 +93,3 @@ void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par
; ;
} }
} }
/**
* @brief This function knows how to print a histogram_s summary
*/
void printHistogram(Logging *logging, histogram_s *histogram) {
#if EFI_HISTOGRAMS
int report[5];
int len = hsReport(histogram, report);
resetLogging(logging);
appendMsgPrefix(logging);
appendPrintf(logging, "histogram %s *", histogram->name);
for (int i = 0; i < len; i++)
appendPrintf(logging, "%d ", report[i]);
appendPrintf(logging, "*");
appendMsgPostfix(logging);
scheduleLogging(logging);
#endif /* EFI_HISTOGRAMS */
}

3
firmware/console_util/rfiutil.h
View File

@ -11,7 +11,6 @@
#include "global.h" #include "global.h"
#include "histogram.h" #include "histogram.h"
#include "datalogging.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
@ -22,10 +21,10 @@ char hexC(int v);
int isIsrContext(void); int isIsrContext(void);
int isLocked(void); int isLocked(void);
void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par); void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par);
void printHistogram(Logging *logging, histogram_s *histogram);
#ifdef __cplusplus #ifdef __cplusplus
} }
void printHistogram(Logging *logging, histogram_s *histogram);
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* RFIUTIL_H_ */ #endif /* RFIUTIL_H_ */

2
firmware/controllers/algo/engine.cpp
View File

@ -21,7 +21,7 @@
#define isRunningBenchTest() true #define isRunningBenchTest() true
#endif #endif
static Logging logger; static LoggingWithStorage logger;
extern engine_pins_s enginePins; extern engine_pins_s enginePins;

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

@ -41,7 +41,7 @@ extern WaveChart waveChart;
#include "efiGpio.h" #include "efiGpio.h"
static Logging logger; static LoggingWithStorage logger;
extern engine_pins_s enginePins; extern engine_pins_s enginePins;

2
firmware/controllers/core/fsio_impl.cpp
View File

@ -58,7 +58,7 @@ EXTERN_ENGINE;
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
static Logging logger; static LoggingWithStorage logger;
float getLEValue(Engine *engine, calc_stack_t *s, le_action_e action) { float getLEValue(Engine *engine, calc_stack_t *s, le_action_e action) {
efiAssert(engine!=NULL, "getLEValue", NAN); efiAssert(engine!=NULL, "getLEValue", NAN);

2
firmware/controllers/engine_controller.cpp
View File

@ -73,7 +73,7 @@ board_configuration_s *boardConfiguration = &persistentState.persistentConfigura
static VirtualTimer everyMsTimer; static VirtualTimer everyMsTimer;
static Logging logger; static LoggingWithStorage logger;
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
static engine_configuration2_s ec2 CCM_OPTIONAL; static engine_configuration2_s ec2 CCM_OPTIONAL;

2
firmware/controllers/error_handling.cpp
View File

@ -15,7 +15,7 @@
#endif /* EFI_HD44780_LCD */ #endif /* EFI_HD44780_LCD */
static time_t timeOfPreviousWarning = -10; static time_t timeOfPreviousWarning = -10;
static Logging logger; static LoggingWithStorage logger;
#define WARNING_PREFIX "WARNING: " #define WARNING_PREFIX "WARNING: "

2
firmware/controllers/flash_main.cpp
View File

@ -26,7 +26,7 @@
static bool needToWriteConfiguration = false; static bool needToWriteConfiguration = false;
EXTERN_ENGINE; EXTERN_ENGINE;
static Logging logger; static LoggingWithStorage logger;
extern persistent_config_container_s persistentState; extern persistent_config_container_s persistentState;

2
firmware/controllers/idle_thread.cpp
View File

@ -36,7 +36,7 @@
static THD_WORKING_AREA(ivThreadStack, UTILITY_THREAD_STACK_SIZE); static THD_WORKING_AREA(ivThreadStack, UTILITY_THREAD_STACK_SIZE);
static Logging logger; static LoggingWithStorage logger;
EXTERN_ENGINE EXTERN_ENGINE
; ;

2
firmware/controllers/injector_central.cpp
View File

@ -34,7 +34,7 @@
#include "pin_repository.h" #include "pin_repository.h"
#include "efiGpio.h" #include "efiGpio.h"
static Logging logger; static LoggingWithStorage logger;
EXTERN_ENGINE EXTERN_ENGINE
; ;

2
firmware/controllers/map_averaging.cpp
View File

@ -39,7 +39,7 @@
#define FAST_MAP_CHART_SKIP_FACTOR 16 #define FAST_MAP_CHART_SKIP_FACTOR 16
static Logging logger; static LoggingWithStorage logger;
/** /**
* Running counter of measurements per revolution * Running counter of measurements per revolution

2
firmware/controllers/math/engine_math.h
View File

@ -19,7 +19,7 @@
typedef ArrayList<OutputSignal, OUTPUT_SIGNAL_MAX_SIZE> OutputSignalList; typedef ArrayList<OutputSignal, OUTPUT_SIGNAL_MAX_SIZE> OutputSignalList;
void findTriggerPosition( void findTriggerPosition(
event_trigger_position_s *position, float angleOffset DECLARE_ENGINE_PARAMETER_S); event_trigger_position_s *position, angle_t angleOffset DECLARE_ENGINE_PARAMETER_S);
int isInjectionEnabled(engine_configuration_s *engineConfiguration); int isInjectionEnabled(engine_configuration_s *engineConfiguration);

1
firmware/controllers/system/signal_executor_sleep.c
View File

@ -24,7 +24,6 @@
#include "main.h" #include "main.h"
#include "scheduler.h" #include "scheduler.h"
#include "datalogging.h"
#if EFI_SIGNAL_EXECUTOR_SLEEP || defined(__DOXYGEN__) #if EFI_SIGNAL_EXECUTOR_SLEEP || defined(__DOXYGEN__)

2
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -78,7 +78,7 @@ static IgnitionEvent *iHead = NULL;
static cyclic_buffer ignitionErrorDetection; static cyclic_buffer ignitionErrorDetection;
static Logging logger; static LoggingWithStorage logger;
// todo: figure out if this even helps? // todo: figure out if this even helps?
//#if defined __GNUC__ //#if defined __GNUC__

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

@ -37,7 +37,7 @@ extern WaveChart waveChart;
EXTERN_ENGINE; EXTERN_ENGINE;
static Logging logger; static LoggingWithStorage logger;
RpmCalculator::RpmCalculator() { RpmCalculator::RpmCalculator() {
#if !EFI_PROD_CODE #if !EFI_PROD_CODE

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

@ -38,7 +38,7 @@ static volatile uint64_t previousShaftEventTimeNt = (efitimems_t) -10 * US2NT(US
TriggerCentral triggerCentral; TriggerCentral triggerCentral;
static Logging logger; static LoggingWithStorage logger;
uint64_t getCrankEventCounter() { uint64_t getCrankEventCounter() {
return triggerCentral.triggerState.getTotalEventCounter(); return triggerCentral.triggerState.getTotalEventCounter();

2
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -51,7 +51,7 @@ float actualSynchGap;
#endif /* ! EFI_PROD_CODE */ #endif /* ! EFI_PROD_CODE */
#if (EFI_PROD_CODE || EFI_SIMULATOR) #if (EFI_PROD_CODE || EFI_SIMULATOR)
static Logging logger; static LoggingWithStorage logger;
#endif #endif
/** /**

2
firmware/controllers/trigger/trigger_emulator_algo.cpp
View File

@ -68,7 +68,7 @@ PwmConfig triggerSignal(swtchTms, sr);
static int stopEmulationAtIndex = DO_NOT_STOP; static int stopEmulationAtIndex = DO_NOT_STOP;
static bool isEmulating = true; static bool isEmulating = true;
static Logging logger; static LoggingWithStorage logger;
static LocalVersionHolder localVersion; static LocalVersionHolder localVersion;
EXTERN_ENGINE; EXTERN_ENGINE;

2
firmware/development/hw_layer/poten.cpp
View File

@ -40,7 +40,7 @@
/* Low speed SPI configuration (281.250kHz, CPHA=0, CPOL=0, MSb first).*/ /* Low speed SPI configuration (281.250kHz, CPHA=0, CPOL=0, MSb first).*/
#define SPI_POT_CONFIG SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_DFF #define SPI_POT_CONFIG SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_DFF
static Logging logger; static LoggingWithStorage logger;
#if EFI_POTENTIOMETER || defined(__DOXYGEN__) #if EFI_POTENTIOMETER || defined(__DOXYGEN__)
Mcp42010Driver config[DIGIPOT_COUNT]; Mcp42010Driver config[DIGIPOT_COUNT];

2
firmware/development/rfi_perftest.cpp
View File

@ -20,7 +20,7 @@
#if EFI_PERF_METRICS || defined(__DOXYGEN__) #if EFI_PERF_METRICS || defined(__DOXYGEN__)
static Logging logger; static LoggingWithStorage logger;
static void testSystemCalls(const int count) { static void testSystemCalls(const int count) {
time_t start, time; time_t start, time;

2
firmware/development/wave_analyzer.cpp
View File

@ -45,7 +45,7 @@ static int waveReaderCount = 0;
static WaveReader readers[MAX_ICU_COUNT]; static WaveReader readers[MAX_ICU_COUNT];
static THD_WORKING_AREA(waThreadStack, UTILITY_THREAD_STACK_SIZE); static THD_WORKING_AREA(waThreadStack, UTILITY_THREAD_STACK_SIZE);
static Logging logger; static LoggingWithStorage logger;
static void ensureInitialized(WaveReader *reader) { static void ensureInitialized(WaveReader *reader) {
efiAssertVoid(reader->hw.started, "wave analyzer NOT INITIALIZED"); efiAssertVoid(reader->hw.started, "wave analyzer NOT INITIALIZED");

2
firmware/development/wave_chart.cpp
View File

@ -62,7 +62,7 @@ int waveChartUsedSize;
static Logging debugLogging; static Logging debugLogging;
#endif /* DEBUG_WAVE */ #endif /* DEBUG_WAVE */
static Logging logger; static LoggingWithStorage logger;
void WaveChart::resetWaveChart() { void WaveChart::resetWaveChart() {
#if DEBUG_WAVE #if DEBUG_WAVE

2
firmware/hw_layer/HIP9011.cpp
View File

@ -61,7 +61,7 @@ static bool_t isSendingSpiCommand = false;
static scheduling_s startTimer[2]; static scheduling_s startTimer[2];
static scheduling_s endTimer[2]; static scheduling_s endTimer[2];
static Logging logger; static LoggingWithStorage logger;
// SPI_CR1_BR_1 // 5MHz // SPI_CR1_BR_1 // 5MHz
// SPI_CR1_CPHA Clock Phase // SPI_CR1_CPHA Clock Phase

2
firmware/hw_layer/can_hw.cpp
View File

@ -30,7 +30,7 @@ EXTERN_ENGINE
static int canReadCounter = 0; static int canReadCounter = 0;
static int can_write_ok = 0; static int can_write_ok = 0;
static int can_write_not_ok = 0; static int can_write_not_ok = 0;
static Logging logger; static LoggingWithStorage logger;
static THD_WORKING_AREA(canTreadStack, UTILITY_THREAD_STACK_SIZE); static THD_WORKING_AREA(canTreadStack, UTILITY_THREAD_STACK_SIZE);
/* /*

2
firmware/hw_layer/hardware.cpp
View File

@ -261,7 +261,7 @@ void initHardware(Logging *l, Engine *engine) {
#if EFI_HD44780_LCD #if EFI_HD44780_LCD
// initI2Cmodule(); // initI2Cmodule();
lcd_HD44780_init(); lcd_HD44780_init(sharedLogger);
if (hasFirmwareError()) if (hasFirmwareError())
return; return;

2
firmware/hw_layer/io_pins.cpp
View File

@ -23,7 +23,7 @@
extern board_configuration_s *boardConfiguration; extern board_configuration_s *boardConfiguration;
static Logging logger; static LoggingWithStorage logger;
static OutputPin sdCsPin; static OutputPin sdCsPin;

16
firmware/hw_layer/lcd/lcd_HD44780.cpp
View File

@ -20,7 +20,7 @@
extern engine_configuration_s *engineConfiguration; extern engine_configuration_s *engineConfiguration;
extern board_configuration_s *boardConfiguration; extern board_configuration_s *boardConfiguration;
static Logging logger; static Logging *logger;
enum { enum {
LCD_HD44780_DISPLAY_CLEAR = 0x01, LCD_HD44780_DISPLAY_CLEAR = 0x01,
@ -166,16 +166,16 @@ void lcd_HD44780_print_string(const char* string) {
} }
//getHwPin(boardConfiguration->HD44780_db7) //getHwPin(boardConfiguration->HD44780_db7)
static void lcdInfo(void) { static void lcdInfo(void) {
scheduleMsg(&logger, "HD44780 RS=%s E=%s", hwPortname(boardConfiguration->HD44780_rs), scheduleMsg(logger, "HD44780 RS=%s E=%s", hwPortname(boardConfiguration->HD44780_rs),
hwPortname(boardConfiguration->HD44780_e)); hwPortname(boardConfiguration->HD44780_e));
scheduleMsg(&logger, "HD44780 D4=%s D5=%s", hwPortname(boardConfiguration->HD44780_db4), scheduleMsg(logger, "HD44780 D4=%s D5=%s", hwPortname(boardConfiguration->HD44780_db4),
hwPortname(boardConfiguration->HD44780_db5)); hwPortname(boardConfiguration->HD44780_db5));
scheduleMsg(&logger, "HD44780 D6=%s D7=%s", hwPortname(boardConfiguration->HD44780_db6), scheduleMsg(logger, "HD44780 D6=%s D7=%s", hwPortname(boardConfiguration->HD44780_db6),
hwPortname(boardConfiguration->HD44780_db7)); hwPortname(boardConfiguration->HD44780_db7));
} }
void lcd_HD44780_init(void) { void lcd_HD44780_init(Logging *sharedLogger) {
initLogging(&logger, "HD44780 driver"); logger = sharedLogger;
addConsoleAction("lcdinfo", lcdInfo); addConsoleAction("lcdinfo", lcdInfo);
@ -184,7 +184,7 @@ void lcd_HD44780_init(void) {
return; return;
} }
printMsg(&logger, "lcd_HD44780_init %d", engineConfiguration->displayMode); printMsg(logger, "lcd_HD44780_init %d", engineConfiguration->displayMode);
if (engineConfiguration->displayMode == DM_HD44780) { if (engineConfiguration->displayMode == DM_HD44780) {
// initialize hardware lines // initialize hardware lines
@ -228,7 +228,7 @@ void lcd_HD44780_init(void) {
lcd_HD44780_write_command(LCD_HD44780_DISPLAY_ON); lcd_HD44780_write_command(LCD_HD44780_DISPLAY_ON);
lcd_HD44780_set_position(0, 0); lcd_HD44780_set_position(0, 0);
printMsg(&logger, "lcd_HD44780_init() done"); printMsg(logger, "lcd_HD44780_init() done");
} }
void lcdShowFatalMessage(char *message) { void lcdShowFatalMessage(char *message) {

2
firmware/hw_layer/lcd/lcd_HD44780.h
View File

@ -13,7 +13,7 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
void lcd_HD44780_init(void); void lcd_HD44780_init(Logging *sharedLogger);
void lcd_HD44780_set_position(uint8_t row, uint8_t column); void lcd_HD44780_set_position(uint8_t row, uint8_t column);
void lcd_HD44780_print_char(char data); void lcd_HD44780_print_char(char data);
void lcd_HD44780_print_string(const char *string); void lcd_HD44780_print_string(const char *string);

2
firmware/hw_layer/max31855.cpp
View File

@ -29,7 +29,7 @@
static SPIDriver *driver; static SPIDriver *driver;
static Logging logger; static LoggingWithStorage logger;
static SPIConfig spiConfig[MAX31855_CS_COUNT]; static SPIConfig spiConfig[MAX31855_CS_COUNT];

4
firmware/hw_layer/mmc_card.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file mmc_card.c * @file mmc_card.cpp
* *
* @date Dec 28, 2013 * @date Dec 28, 2013
* @author Kot_dnz * @author Kot_dnz
@ -52,7 +52,7 @@ static bool fs_ready = false;
*/ */
static FATFS MMC_FS; static FATFS MMC_FS;
static Logging logger; static LoggingWithStorage logger;
// print FAT error function // print FAT error function
static void printError(const char *str, FRESULT f_error) { static void printError(const char *str, FRESULT f_error) {

4
firmware/hw_layer/neo6m.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file neo6m.c * @file neo6m.cpp
* @brief Ublox 6M hardware UART driver * @brief Ublox 6M hardware UART driver
* *
* http://www.u-blox.com/en/gps-modules/pvt-modules/previous-generations/neo-6-family.html * http://www.u-blox.com/en/gps-modules/pvt-modules/previous-generations/neo-6-family.html
@ -29,7 +29,7 @@
extern board_configuration_s *boardConfiguration; extern board_configuration_s *boardConfiguration;
extern engine_configuration_s *engineConfiguration; extern engine_configuration_s *engineConfiguration;
static Logging logging; static LoggingWithStorage logging;
static SerialConfig GPSserialConfig = { GPS_SERIAL_SPEED, 0, USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0 }; static SerialConfig GPSserialConfig = { GPS_SERIAL_SPEED, 0, USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0 };
static THD_WORKING_AREA(gpsThreadStack, UTILITY_THREAD_STACK_SIZE); static THD_WORKING_AREA(gpsThreadStack, UTILITY_THREAD_STACK_SIZE);

6
firmware/hw_layer/pin_repository.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file pin_repository.c * @file pin_repository.cpp
* @brief I/O pin registry code * @brief I/O pin registry code
* *
* This job of this class is to make sure that we are not using same hardware pin for two * This job of this class is to make sure that we are not using same hardware pin for two
@ -20,7 +20,7 @@
const char *PIN_USED[PIN_REPO_SIZE]; const char *PIN_USED[PIN_REPO_SIZE];
static int initialized = FALSE; static int initialized = FALSE;
static Logging logger; static LoggingWithStorage logger;
static int totalPinsUsed = 0; static int totalPinsUsed = 0;
/** /**
@ -106,7 +106,7 @@ brain_pin_e parseBrainPin(const char *str) {
return (brain_pin_e)(basePin + pin); return (brain_pin_e)(basePin + pin);
} }
char *hwPortname(brain_pin_e brainPin) { const char *hwPortname(brain_pin_e brainPin) {
if (brainPin == GPIO_INVALID) { if (brainPin == GPIO_INVALID) {
return "INVALID"; return "INVALID";
} }

2
firmware/hw_layer/pin_repository.h
View File

@ -27,7 +27,7 @@ extern "C"
#endif /* __cplusplus */ #endif /* __cplusplus */
void initPinRepository(void); void initPinRepository(void);
char *hwPortname(brain_pin_e brainPin); const char *hwPortname(brain_pin_e brainPin);
brain_pin_e parseBrainPin(const char *str); brain_pin_e parseBrainPin(const char *str);
void mySetPadMode(const char *msg, ioportid_t port, ioportmask_t pin, iomode_t mode); void mySetPadMode(const char *msg, ioportid_t port, ioportmask_t pin, iomode_t mode);
void mySetPadMode2(const char *msg, brain_pin_e pin, iomode_t mode); void mySetPadMode2(const char *msg, brain_pin_e pin, iomode_t mode);

22
firmware/iar/ch.ewp
View File

@ -2071,7 +2071,7 @@
<name>$PROJ_DIR$\..\console\console_io.h</name> <name>$PROJ_DIR$\..\console\console_io.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\console\eficonsole.c</name> <name>$PROJ_DIR$\..\console\eficonsole.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\console\eficonsole.h</name> <name>$PROJ_DIR$\..\console\eficonsole.h</name>
@ -2443,13 +2443,7 @@
<name>$PROJ_DIR$\..\controllers\engine_controller.h</name> <name>$PROJ_DIR$\..\controllers\engine_controller.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\controllers\algo\enum_strings.cpp</name> <name>$PROJ_DIR$\..\controllers\error_handling.cpp</name>
</file>
<file>
<name>$PROJ_DIR$\..\controllers\algo\enum_strings.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\controllers\error_handling.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\controllers\flash_main.cpp</name> <name>$PROJ_DIR$\..\controllers\flash_main.cpp</name>
@ -2508,7 +2502,7 @@
<group> <group>
<name>hw_layer</name> <name>hw_layer</name>
<file> <file>
<name>$PROJ_DIR$\..\development\hw_layer\poten.c</name> <name>$PROJ_DIR$\..\development\hw_layer\poten.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\development\hw_layer\poten.h</name> <name>$PROJ_DIR$\..\development\hw_layer\poten.h</name>
@ -2704,19 +2698,19 @@
<name>$PROJ_DIR$\..\hw_layer\microsecond_timer.h</name> <name>$PROJ_DIR$\..\hw_layer\microsecond_timer.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\hw_layer\mmc_card.c</name> <name>$PROJ_DIR$\..\hw_layer\mmc_card.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\hw_layer\mmc_card.h</name> <name>$PROJ_DIR$\..\hw_layer\mmc_card.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\hw_layer\neo6m.c</name> <name>$PROJ_DIR$\..\hw_layer\neo6m.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\hw_layer\neo6m.h</name> <name>$PROJ_DIR$\..\hw_layer\neo6m.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\hw_layer\pin_repository.c</name> <name>$PROJ_DIR$\..\hw_layer\pin_repository.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\hw_layer\pin_repository.h</name> <name>$PROJ_DIR$\..\hw_layer\pin_repository.h</name>
@ -3190,7 +3184,7 @@
<group> <group>
<name>util</name> <name>util</name>
<file> <file>
<name>$PROJ_DIR$\..\util\cli_registry.c</name> <name>$PROJ_DIR$\..\util\cli_registry.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\util\cli_registry.h</name> <name>$PROJ_DIR$\..\util\cli_registry.h</name>
@ -3214,7 +3208,7 @@
<name>$PROJ_DIR$\..\util\data_buffer.h</name> <name>$PROJ_DIR$\..\util\data_buffer.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\util\datalogging.c</name> <name>$PROJ_DIR$\..\util\datalogging.cpp</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\util\datalogging.h</name> <name>$PROJ_DIR$\..\util\datalogging.h</name>

4
firmware/rusefi.cpp
View File

@ -120,7 +120,7 @@ extern "C" {
#include "engine_emulator.h" #include "engine_emulator.h"
#endif /* EFI_ENGINE_EMULATOR */ #endif /* EFI_ENGINE_EMULATOR */
static Logging logging; static LoggingWithStorage logging;
int main_loop_started = FALSE; int main_loop_started = FALSE;
@ -256,7 +256,7 @@ void firmwareError(const char *fmt, ...) {
} }
} }
static char UNUSED_RAM_SIZE[3000]; static char UNUSED_RAM_SIZE[3500];
static char UNUSED_CCM_SIZE[8000] CCM_OPTIONAL; static char UNUSED_CCM_SIZE[8000] CCM_OPTIONAL;

4
firmware/svnversion.h
View File

@ -1,5 +1,5 @@
// This file was generated by Version2Header // This file was generated by Version2Header
// Sat Jan 10 10:38:47 EST 2015 // Tue Jan 13 21:00:28 EST 2015
#ifndef VCS_VERSION #ifndef VCS_VERSION
#define VCS_VERSION "6259" #define VCS_VERSION "6353"
#endif #endif

4
firmware/util/cli_registry.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file cli_registry.c * @file cli_registry.cpp
* @brief Command-line interface commands registry * @brief Command-line interface commands registry
* *
* Here we have a data structure which holds all the dynamically-registered * Here we have a data structure which holds all the dynamically-registered
@ -27,7 +27,7 @@
#if ! EFI_UNIT_TEST #if ! EFI_UNIT_TEST
#include "eficonsole.h" #include "eficonsole.h"
static Logging logging; static LoggingWithStorage logging;
#endif /* ! EFI_UNIT_TEST */ #endif /* ! EFI_UNIT_TEST */
static int consoleActionCount = 0; static int consoleActionCount = 0;

12
firmware/util/datalogging.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file datalogging.c * @file datalogging.cpp
* @brief Buffered console output stream code * @brief Buffered console output stream code
* *
* Here we have a memory buffer and method related to * Here we have a memory buffer and method related to
@ -32,6 +32,8 @@
#include <stdbool.h> #include <stdbool.h>
#include "main.h" #include "main.h"
#if ! EFI_UNIT_TEST
#include "chprintf.h" #include "chprintf.h"
#include "chmtx.h" #include "chmtx.h"
#include "memstreams.h" #include "memstreams.h"
@ -184,7 +186,7 @@ int isInitialized(Logging *logging) {
return logging->isInitialized == MAGIC_LOGGING_FLAG; return logging->isInitialized == MAGIC_LOGGING_FLAG;
} }
void initLogging(Logging *logging, const char *name) { void initLogging(LoggingWithStorage *logging, const char *name) {
initLoggingExt(logging, name, logging->DEFAULT_BUFFER, sizeof(logging->DEFAULT_BUFFER)); initLoggingExt(logging, name, logging->DEFAULT_BUFFER, sizeof(logging->DEFAULT_BUFFER));
} }
@ -388,3 +390,9 @@ void initIntermediateLoggingBuffer(void) {
msObjectInit(&intermediateLoggingBuffer, intermediateLoggingBufferData, INTERMEDIATE_LOGGING_BUFFER_SIZE, 0); msObjectInit(&intermediateLoggingBuffer, intermediateLoggingBufferData, INTERMEDIATE_LOGGING_BUFFER_SIZE, 0);
intermediateLoggingBufferInited = TRUE; intermediateLoggingBufferInited = TRUE;
} }
#endif /* ! EFI_UNIT_TEST */
LoggingWithStorage::LoggingWithStorage() {
}

17
firmware/util/datalogging.h
View File

@ -37,15 +37,14 @@ typedef enum {
// todo: migrate to external buffer so that different instances have different // todo: migrate to external buffer so that different instances have different
// size of buffers? // size of buffers?
typedef struct { class Logging {
public:
const char *name; const char *name;
char SMALL_BUFFER[40]; char SMALL_BUFFER[40];
// todo: explicitly default buffer externally so that we do not have default_buffer where we do not need it?
char DEFAULT_BUFFER[200];
/** /**
* Zero-terminated buffer of pending debug message * Zero-terminated buffer of pending debug message
* *
* Unless a larger exteran buffer is specified, this is just a pointer to DEFAULT_BUFFER * Unless a larger external buffer is specified, this is just a pointer to DEFAULT_BUFFER
*/ */
char *buffer; char *buffer;
/** /**
@ -55,7 +54,13 @@ typedef struct {
char *linePointer; char *linePointer;
int bufferSize; int bufferSize;
volatile int isInitialized; volatile int isInitialized;
} Logging; };
class LoggingWithStorage : public Logging {
public:
LoggingWithStorage();
char DEFAULT_BUFFER[200];
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
@ -72,7 +77,7 @@ uint32_t remainingSize(Logging *logging);
int isInitialized(Logging *logging); int isInitialized(Logging *logging);
void initLogging(Logging *logging, const char *name); void initLogging(LoggingWithStorage *logging, const char *name);
void initLoggingExt(Logging *logging, const char *name, char *buffer, int bufferSize); void initLoggingExt(Logging *logging, const char *name, char *buffer, int bufferSize);
void debugInt(Logging *logging, const char *caption, int value); void debugInt(Logging *logging, const char *caption, int value);

22
firmware/util/efilib.cpp
View File

@ -10,6 +10,8 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "efilib.h" #include "efilib.h"
#include "datalogging.h"
#include "histogram.h"
#define _MAX_FILLER 11 #define _MAX_FILLER 11
@ -242,3 +244,23 @@ bool strEqual(const char *str1, const char *str2) {
return false; return false;
return true; return true;
} }
/**
* @brief This function knows how to print a histogram_s summary
*/
void printHistogram(Logging *logging, histogram_s *histogram) {
#if EFI_HISTOGRAMS && ! EFI_UNIT_TEST
int report[5];
int len = hsReport(histogram, report);
resetLogging(logging);
appendMsgPrefix(logging);
appendPrintf(logging, "histogram %s *", histogram->name);
for (int i = 0; i < len; i++)
appendPrintf(logging, "%d ", report[i]);
appendPrintf(logging, "*");
appendMsgPostfix(logging);
scheduleLogging(logging);
#endif /* EFI_HISTOGRAMS */
}

3
firmware/util/histogram.h
View File

@ -16,14 +16,11 @@
#ifndef HISTOGRAM_H_ #ifndef HISTOGRAM_H_
#define HISTOGRAM_H_ #define HISTOGRAM_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <stdint.h> #include <stdint.h>
#define BOUND_LENGTH 895 #define BOUND_LENGTH 895

3
firmware/util/util.mk
View File

@ -2,10 +2,11 @@
UTIL_TEST_SRC = $(PROJECT_DIR)/util/crc.c \ UTIL_TEST_SRC = $(PROJECT_DIR)/util/crc.c \
$(PROJECT_DIR)/util/data_buffer.c \ $(PROJECT_DIR)/util/data_buffer.c \
$(PROJECT_DIR)/util/histogram.c $(PROJECT_DIR)/util/histogram.c
UTILSRC = $(UTIL_TEST_SRC) UTILSRC = $(UTIL_TEST_SRC)
UTILSRC_CPP = $(PROJECT_DIR)/util/cyclic_buffer.cpp \ UTILSRC_CPP = $(PROJECT_DIR)/util/cyclic_buffer.cpp \
$(PROJECT_DIR)/console_util/datalogging.cpp \ $(PROJECT_DIR)/console_util/datalogging.cpp \
$(PROJECT_DIR)/util/listener_array.cpp \ $(PROJECT_DIR)/util/listener_array.cpp \
$(PROJECT_DIR)/util/cli_registry.cpp \ $(PROJECT_DIR)/util/cli_registry.cpp \
$(PROJECT_DIR)/util/efilib.cpp \ $(PROJECT_DIR)/util/efilib.cpp \

2
unit_tests/main.cpp
View File

@ -179,7 +179,7 @@ bool isCranking(void) {
return 0; return 0;
} }
void initLogging(Logging *logging, const char *name) { void initLogging(LoggingWithStorage *logging, const char *name) {
} }
void scheduleMsg(Logging *logging, const char *fmt, ...) { void scheduleMsg(Logging *logging, const char *fmt, ...) {

3
unit_tests/main.h
View File

@ -15,7 +15,6 @@
#include "global.h" #include "global.h"
#include "error_handling.h" #include "error_handling.h"
#include "efifeatures.h" #include "efifeatures.h"
#include "datalogging.h"
#include "efilib.h" #include "efilib.h"
#include "efitime.h" #include "efitime.h"
@ -23,6 +22,8 @@
#include "boards.h" #include "boards.h"
#ifdef __cplusplus #ifdef __cplusplus
#include "datalogging.h"
extern "C" extern "C"
{ {
#endif #endif

2
win32_functional_tests/Makefile
View File

@ -113,7 +113,6 @@ CSRC = ${PORTSRC} \
${CHIBIOS}/os/various/chprintf.c \ ${CHIBIOS}/os/various/chprintf.c \
${CHIBIOS}/os/various/memstreams.c \ ${CHIBIOS}/os/various/memstreams.c \
$(UTILSRC) \ $(UTILSRC) \
simulator/boards.c \
main.c main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -135,6 +134,7 @@ CPPSRC = $(UTILSRC_CPP) \
$(PROJECT_DIR)/simulator/rusEfiFunctionalTest.cpp \ $(PROJECT_DIR)/simulator/rusEfiFunctionalTest.cpp \
$(PROJECT_DIR)/simulator/framework.cpp \ $(PROJECT_DIR)/simulator/framework.cpp \
$(PROJECT_DIR)/development/trigger_emulator.cpp \ $(PROJECT_DIR)/development/trigger_emulator.cpp \
simulator/boards.cpp \
$(TEST_SRC_CPP) $(TEST_SRC_CPP)
# C sources to be compiled in ARM mode regardless of the global setting. # C sources to be compiled in ARM mode regardless of the global setting.
# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

4
win32_functional_tests/simulator/boards.c → win32_functional_tests/simulator/boards.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @file board.c * @file board.cpp
* *
* @date Nov 15, 2013 * @date Nov 15, 2013
* @author Andrey Belomutskiy, (c) 2012-2015 * @author Andrey Belomutskiy, (c) 2012-2015
@ -10,7 +10,7 @@
#include "engine_configuration.h" #include "engine_configuration.h"
#include "adc_math.h" #include "adc_math.h"
static Logging logger; static LoggingWithStorage logger;
extern engine_configuration_s *engineConfiguration; extern engine_configuration_s *engineConfiguration;
static float fakeAdcValues[16]; static float fakeAdcValues[16];

2
win32_functional_tests/simulator/global.h
View File

@ -12,7 +12,6 @@
#include "boards.h" #include "boards.h"
#include "eficonsole.h" #include "eficonsole.h"
#include "efilib.h" #include "efilib.h"
#include "datalogging.h"
#include "efitime.h" #include "efitime.h"
#define US_TO_NT_MULTIPLIER 100 #define US_TO_NT_MULTIPLIER 100
@ -58,6 +57,7 @@ extern TestStream testStream;
#endif /* GLOBAL_FT_H_ */ #endif /* GLOBAL_FT_H_ */
#ifdef __cplusplus #ifdef __cplusplus
#include "datalogging.h"
extern "C" extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */