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

defined(__DOXYGEN__) ? fix #748

This commit is contained in:
rusefi 2019-04-12 22:10:57 -04:00
parent 541c445a2d
commit d8281626df
45 changed files with 200 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/bootloader/bootloader_storage.c
View File

@ -2,7 +2,7 @@
#include "global.h" #include "global.h"
#include "bootloader/bootloader.h" #include "bootloader/bootloader.h"
#if defined(EFI_BOOTLOADER_INCLUDE_CODE) || defined(__DOXYGEN__) #if defined(EFI_BOOTLOADER_INCLUDE_CODE)
#if defined __GNUC__ #if defined __GNUC__
#define BOOTLOADER_SECTION __attribute__((section(".bl"))) /* todo: add 'used'? */ #define BOOTLOADER_SECTION __attribute__((section(".bl"))) /* todo: add 'used'? */

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

@ -22,7 +22,7 @@
#include "global.h" #include "global.h"
#if EFI_ENGINE_AUDI_AAN || defined(__DOXYGEN__) #if EFI_ENGINE_AUDI_AAN
#include "engine_controller.h" #include "engine_controller.h"

8
firmware/config/engines/custom_engine.cpp
View File

@ -18,7 +18,7 @@
#include "engine_math.h" #include "engine_math.h"
#include "fsio_impl.h" #include "fsio_impl.h"
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
#include "can_hw.h" #include "can_hw.h"
#include "scheduler.h" #include "scheduler.h"
#include "electronic_throttle.h" #include "electronic_throttle.h"
@ -27,7 +27,7 @@
EXTERN_ENGINE; EXTERN_ENGINE;
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
static int periodIndex = 0; static int periodIndex = 0;
static OutputPin testPin; static OutputPin testPin;
@ -206,7 +206,7 @@ void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// todo: 8.2 or 10k? // todo: 8.2 or 10k?
engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2; engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2;
#if EFI_CAN_SUPPORT || defined(__DOXYGEN__) #if EFI_CAN_SUPPORT
enableFrankensoCan(); enableFrankensoCan();
#endif /* EFI_CAN_SUPPORT */ #endif /* EFI_CAN_SUPPORT */
} }
@ -284,7 +284,7 @@ void setEtbTestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
CONFIGB(etb1.directionPin2) = GPIOC_9; CONFIGB(etb1.directionPin2) = GPIOC_9;
CONFIGB(etb1.controlPin1) = GPIOE_14; CONFIGB(etb1.controlPin1) = GPIOE_14;
#if EFI_ELECTRONIC_THROTTLE_BODY || defined(__DOXYGEN__) #if EFI_ELECTRONIC_THROTTLE_BODY
setDefaultEtbParameters(PASS_ENGINE_PARAMETER_SIGNATURE); setDefaultEtbParameters(PASS_ENGINE_PARAMETER_SIGNATURE);
// values are above 100% since we have feedforward part of the total summation // values are above 100% since we have feedforward part of the total summation
engineConfiguration->etb.minValue = -200; engineConfiguration->etb.minValue = -200;

4
firmware/config/engines/dodge_neon.cpp
View File

@ -16,7 +16,7 @@
#include "global.h" #include "global.h"
#if EFI_SUPPORT_DODGE_NEON || defined(__DOXYGEN__) #if EFI_SUPPORT_DODGE_NEON
#include "dodge_neon.h" #include "dodge_neon.h"
#include "engine_configuration.h" #include "engine_configuration.h"
@ -454,7 +454,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->auxPid[0].dFactor = 0.1; engineConfiguration->auxPid[0].dFactor = 0.1;
#if EFI_FSIO || defined(__DOXYGEN__) #if EFI_FSIO
// /** // /**
// * set_fsio_setting 1 0.55 // * set_fsio_setting 1 0.55
// */ // */

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

@ -18,7 +18,7 @@
#include "engine_math.h" #include "engine_math.h"
#include "allsensors.h" #include "allsensors.h"
#if EFI_SUPPORT_1995_FORD_INLINE_6 || defined(__DOXYGEN__) #if EFI_SUPPORT_1995_FORD_INLINE_6
EXTERN_ENGINE; EXTERN_ENGINE;

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

@ -18,7 +18,7 @@
#include "advance_map.h" #include "advance_map.h"
#include "engine_configuration.h" #include "engine_configuration.h"
#if EFI_SUPPORT_FORD_ASPIRE || defined(__DOXYGEN__) #if EFI_SUPPORT_FORD_ASPIRE
/** /**
* This is just the default map which is stored into flash memory in case flash is empty * This is just the default map which is stored into flash memory in case flash is empty

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

@ -224,7 +224,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2; engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2;
// VICS solenoid // VICS solenoid
#if EFI_FSIO || defined(__DOXYGEN__) #if EFI_FSIO
/** /**
* to test * to test
* set_fsio_setting 1 5000 * set_fsio_setting 1 5000

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

@ -11,7 +11,7 @@
#include "global.h" #include "global.h"
#if EFI_SUPPORT_FORD_FIESTA || defined(__DOXYGEN__) #if EFI_SUPPORT_FORD_FIESTA
#include "ford_fiesta.h" #include "ford_fiesta.h"
#include "engine_math.h" #include "engine_math.h"

2
firmware/config/engines/ford_fiesta.h
View File

@ -7,7 +7,7 @@
#ifndef FORD_FIESTA_H_ #ifndef FORD_FIESTA_H_
#define FORD_FIESTA_H_ #define FORD_FIESTA_H_
#if EFI_SUPPORT_FORD_FIESTA || defined(__DOXYGEN__) #if EFI_SUPPORT_FORD_FIESTA
#include "engine.h" #include "engine.h"

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

@ -164,7 +164,7 @@ void setHonda600(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// todo: 8.2 or 10k? // todo: 8.2 or 10k?
engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2; engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2;
#if EFI_CAN_SUPPORT || defined(__DOXYGEN__) #if EFI_CAN_SUPPORT
enableFrankensoCan(); enableFrankensoCan();
#endif /* EFI_CAN_SUPPORT */ #endif /* EFI_CAN_SUPPORT */
} }

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

@ -50,7 +50,7 @@ void setLadaKalina(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// starter relay solenoid // starter relay solenoid
#if EFI_FSIO || defined(__DOXYGEN__) #if EFI_FSIO
/** /**
* to test * to test
* set_fsio_setting 1 5000 * set_fsio_setting 1 5000

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

@ -97,7 +97,7 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setEgoSensor(ES_Innovate_MTX_L PASS_ENGINE_PARAMETER_SUFFIX); setEgoSensor(ES_Innovate_MTX_L PASS_ENGINE_PARAMETER_SUFFIX);
//#if EFI_FSIO || defined(__DOXYGEN__) //#if EFI_FSIO
// // backup main relay pin // // backup main relay pin
// setFsio(0, GPIOE_6, "1" PASS_ENGINE_PARAMETER_SUFFIX); // setFsio(0, GPIOE_6, "1" PASS_ENGINE_PARAMETER_SUFFIX);
//#endif //#endif

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

@ -230,7 +230,7 @@ void setMiataNA6_MAP_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// set_fsio_expression 0 "((rpm > fsio_setting(4) & (fsio_analog_input < fsio_setting(5)) | rpm > fsio_setting(1) | (coolant > fsio_setting(2) > | (vbatt < fsio_setting(3)" // set_fsio_expression 0 "((rpm > fsio_setting(4) & (fsio_analog_input < fsio_setting(5)) | rpm > fsio_setting(1) | (coolant > fsio_setting(2) > | (vbatt < fsio_setting(3)"
#if EFI_FSIO || defined(__DOXYGEN__) #if EFI_FSIO
// todo: convert // todo: convert
setFsio(0, GPIOC_13, COMBINED_WARNING_LIGHT PASS_ENGINE_PARAMETER_SUFFIX); setFsio(0, GPIOC_13, COMBINED_WARNING_LIGHT PASS_ENGINE_PARAMETER_SUFFIX);
#endif /* EFI_FSIO */ #endif /* EFI_FSIO */

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

@ -84,7 +84,7 @@ void setMitsubishiConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->HD44780height = 4; engineConfiguration->HD44780height = 4;
setEgoSensor(ES_Innovate_MTX_L PASS_ENGINE_PARAMETER_SUFFIX); setEgoSensor(ES_Innovate_MTX_L PASS_ENGINE_PARAMETER_SUFFIX);
#if EFI_FSIO || defined(__DOXYGEN__) #if EFI_FSIO
setFsioExt(0, GPIOC_9, RPM_ABOVE_6000_SOLENOID_80_DUTY, 200 PASS_ENGINE_PARAMETER_SUFFIX); setFsioExt(0, GPIOC_9, RPM_ABOVE_6000_SOLENOID_80_DUTY, 200 PASS_ENGINE_PARAMETER_SUFFIX);
setFsioExt(1, GPIOC_7, RPM_ABOVE_2000_SOLENOID_50_DUTY, 200 PASS_ENGINE_PARAMETER_SUFFIX); setFsioExt(1, GPIOC_7, RPM_ABOVE_2000_SOLENOID_50_DUTY, 200 PASS_ENGINE_PARAMETER_SUFFIX);
#endif /* EFI_FSIO */ #endif /* EFI_FSIO */

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

@ -9,7 +9,7 @@
#include "global.h" #include "global.h"
#if EFI_SUPPORT_NISSAN_PRIMERA || defined(__DOXYGEN__) #if EFI_SUPPORT_NISSAN_PRIMERA
#include "nissan_primera.h" #include "nissan_primera.h"
void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfiguration) { void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfiguration) {

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

@ -73,7 +73,7 @@ void setTestVVTEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->debugMode = DBG_VVT; engineConfiguration->debugMode = DBG_VVT;
} }
#if EFI_UNIT_TEST || defined(__DOXYGEN__) #if EFI_UNIT_TEST
void setTestEngineIssue366both(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setTestEngineIssue366both(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setTestEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); setTestEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);

6
firmware/config/stm32f4ems/efifeatures.h
View File

@ -38,11 +38,11 @@
* in chconf.h * in chconf.h
* *
*/ */
#if !defined(EFI_ENABLE_ASSERTS) || defined(__DOXYGEN__) #if !defined(EFI_ENABLE_ASSERTS)
#define EFI_ENABLE_ASSERTS TRUE #define EFI_ENABLE_ASSERTS TRUE
#endif /* EFI_ENABLE_ASSERTS */ #endif /* EFI_ENABLE_ASSERTS */
#if !defined(EFI_ENABLE_MOCK_ADC) || defined(__DOXYGEN__) #if !defined(EFI_ENABLE_MOCK_ADC)
#define EFI_ENABLE_MOCK_ADC TRUE #define EFI_ENABLE_MOCK_ADC TRUE
#endif /* EFI_ENABLE_MOCK_ADC */ #endif /* EFI_ENABLE_MOCK_ADC */
@ -141,7 +141,7 @@
#define EFI_CJ125 TRUE #define EFI_CJ125 TRUE
#endif #endif
#if !defined(EFI_MEMS) || defined(__DOXYGEN__) #if !defined(EFI_MEMS)
#define EFI_MEMS FALSE #define EFI_MEMS FALSE
#endif #endif

2
firmware/console/binary/bluetooth.cpp
View File

@ -7,7 +7,7 @@
#include "bluetooth.h" #include "bluetooth.h"
#include "engine_configuration.h" #include "engine_configuration.h"
#if EFI_BLUETOOTH_SETUP || defined(__DOXYGEN__) #if EFI_BLUETOOTH_SETUP
static bool btProcessIsStarted = false; static bool btProcessIsStarted = false;
static bool btProcessIsRunning = false; static bool btProcessIsRunning = false;

50
firmware/console/binary/tunerstudio.cpp
View File

@ -82,11 +82,11 @@
#include "loggingcentral.h" #include "loggingcentral.h"
#include "status_loop.h" #include "status_loop.h"
#include "mmc_card.h" #include "mmc_card.h"
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
#include "rusEfiFunctionalTest.h" #include "rusEfiFunctionalTest.h"
#endif #endif
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO
EXTERN_ENGINE EXTERN_ENGINE
; ;
@ -101,7 +101,7 @@ extern short currentPageId;
*/ */
LoggingWithStorage tsLogger("binary"); LoggingWithStorage tsLogger("binary");
#if !defined(EFI_NO_CONFIG_WORKING_COPY) || defined(__DOXYGEN__) #if !defined(EFI_NO_CONFIG_WORKING_COPY)
/** /**
* this is a local copy of the configuration. Any changes to this copy * this is a local copy of the configuration. Any changes to this copy
* have no effect until this copy is explicitly propagated to the main working copy * have no effect until this copy is explicitly propagated to the main working copy
@ -139,7 +139,7 @@ static void printErrorCounters(void) {
} }
void printTsStats(void) { void printTsStats(void) {
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
if (false) { if (false) {
// todo: is this code needed somewhere else? // todo: is this code needed somewhere else?
scheduleMsg(&tsLogger, "TS RX on %s", hwPortname(engineConfiguration->binarySerialRxPin)); scheduleMsg(&tsLogger, "TS RX on %s", hwPortname(engineConfiguration->binarySerialRxPin));
@ -172,7 +172,7 @@ static void setTsSpeed(int value) {
printTsStats(); printTsStats();
} }
#if EFI_BLUETOOTH_SETUP || defined(__DOXYGEN__) #if EFI_BLUETOOTH_SETUP
// Bluetooth HC-05 module initialization start (it waits for disconnect and then communicates to the module) // Bluetooth HC-05 module initialization start (it waits for disconnect and then communicates to the module)
static void bluetoothHC05(const char *baudRate, const char *name, const char *pinCode) { static void bluetoothHC05(const char *baudRate, const char *name, const char *pinCode) {
bluetoothStart(&tsChannel, BLUETOOTH_HC_05, baudRate, name, pinCode); bluetoothStart(&tsChannel, BLUETOOTH_HC_05, baudRate, name, pinCode);
@ -188,7 +188,7 @@ static void bluetoothSPP(const char *baudRate, const char *name, const char *pin
#endif /* EFI_BLUETOOTH_SETUP */ #endif /* EFI_BLUETOOTH_SETUP */
void tunerStudioDebug(const char *msg) { void tunerStudioDebug(const char *msg) {
#if EFI_TUNER_STUDIO_VERBOSE || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO_VERBOSE
scheduleMsg(&tsLogger, "%s", msg); scheduleMsg(&tsLogger, "%s", msg);
#endif #endif
} }
@ -196,7 +196,7 @@ void tunerStudioDebug(const char *msg) {
char *getWorkingPageAddr(int pageIndex) { char *getWorkingPageAddr(int pageIndex) {
switch (pageIndex) { switch (pageIndex) {
case 0: case 0:
#if !defined(EFI_NO_CONFIG_WORKING_COPY) || defined(__DOXYGEN__) #if !defined(EFI_NO_CONFIG_WORKING_COPY)
return (char*) &configWorkingCopy.engineConfiguration; return (char*) &configWorkingCopy.engineConfiguration;
#else #else
return (char*) &engineConfiguration; return (char*) &engineConfiguration;
@ -274,7 +274,7 @@ static void onlineApplyWorkingCopyBytes(int currentPageId, uint32_t offset, int
return; return;
} }
scheduleMsg(&tsLogger, "applying soft change from %d length %d", offset, count); scheduleMsg(&tsLogger, "applying soft change from %d length %d", offset, count);
#if !defined(EFI_NO_CONFIG_WORKING_COPY) || defined(__DOXYGEN__) #if !defined(EFI_NO_CONFIG_WORKING_COPY)
memcpy(((char*) &persistentState.persistentConfiguration) + offset, ((char*) &configWorkingCopy) + offset, memcpy(((char*) &persistentState.persistentConfiguration) + offset, ((char*) &configWorkingCopy) + offset,
count); count);
#endif /* EFI_NO_CONFIG_WORKING_COPY */ #endif /* EFI_NO_CONFIG_WORKING_COPY */
@ -285,7 +285,7 @@ static void onlineApplyWorkingCopyBytes(int currentPageId, uint32_t offset, int
* read log file content for rusEfi console * read log file content for rusEfi console
*/ */
static void handleReadFileContent(ts_channel_s *tsChannel, short fileId, short offset, short length) { static void handleReadFileContent(ts_channel_s *tsChannel, short fileId, short offset, short length) {
#if EFI_FILE_LOGGING || defined(__DOXYGEN__) #if EFI_FILE_LOGGING
readLogFileContent(tsChannel->crcReadBuffer, fileId, offset, length); readLogFileContent(tsChannel->crcReadBuffer, fileId, offset, length);
#endif /* EFI_FILE_LOGGING */ #endif /* EFI_FILE_LOGGING */
} }
@ -350,7 +350,7 @@ void handleWriteValueCommand(ts_channel_s *tsChannel, ts_response_format_e mode,
tunerStudioDebug("got W (Write)"); // we can get a lot of these tunerStudioDebug("got W (Write)"); // we can get a lot of these
#if EFI_TUNER_STUDIO_VERBOSE || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO_VERBOSE
// scheduleMsg(logger, "Page number %d\r\n", pageId); // we can get a lot of these // scheduleMsg(logger, "Page number %d\r\n", pageId); // we can get a lot of these
#endif #endif
@ -386,7 +386,7 @@ void handlePageReadCommand(ts_channel_s *tsChannel, ts_response_format_e mode, u
tsState.readPageCommandsCounter++; tsState.readPageCommandsCounter++;
currentPageId = pageId; currentPageId = pageId;
#if EFI_TUNER_STUDIO_VERBOSE || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO_VERBOSE
scheduleMsg(&tsLogger, "READ mode=%d page=%d offset=%d size=%d", mode, (int) currentPageId, offset, count); scheduleMsg(&tsLogger, "READ mode=%d page=%d offset=%d size=%d", mode, (int) currentPageId, offset, count);
#endif #endif
@ -407,13 +407,13 @@ void handlePageReadCommand(ts_channel_s *tsChannel, ts_response_format_e mode, u
const uint8_t *addr = (const uint8_t *) (getWorkingPageAddr(currentPageId) + offset); const uint8_t *addr = (const uint8_t *) (getWorkingPageAddr(currentPageId) + offset);
sr5SendResponse(tsChannel, mode, addr, count); sr5SendResponse(tsChannel, mode, addr, count);
#if EFI_TUNER_STUDIO_VERBOSE || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO_VERBOSE
// scheduleMsg(&tsLogger, "Sending %d done", count); // scheduleMsg(&tsLogger, "Sending %d done", count);
#endif #endif
} }
void requestBurn(void) { void requestBurn(void) {
#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__) #if EFI_INTERNAL_FLASH
setNeedToWriteConfiguration(); setNeedToWriteConfiguration();
#endif #endif
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE);
@ -436,13 +436,13 @@ void handleBurnCommand(ts_channel_s *tsChannel, ts_response_format_e mode, uint1
currentPageId = page; currentPageId = page;
#if EFI_TUNER_STUDIO_VERBOSE || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO_VERBOSE
// pointless since we only have one page now // pointless since we only have one page now
// scheduleMsg(logger, "Page number %d", currentPageId); // scheduleMsg(logger, "Page number %d", currentPageId);
#endif #endif
// todo: how about some multi-threading? // todo: how about some multi-threading?
#if !defined(EFI_NO_CONFIG_WORKING_COPY) || defined(__DOXYGEN__) #if !defined(EFI_NO_CONFIG_WORKING_COPY)
memcpy(&persistentState.persistentConfiguration, &configWorkingCopy, sizeof(persistent_config_s)); memcpy(&persistentState.persistentConfiguration, &configWorkingCopy, sizeof(persistent_config_s));
#endif /* EFI_NO_CONFIG_WORKING_COPY */ #endif /* EFI_NO_CONFIG_WORKING_COPY */
@ -483,14 +483,14 @@ void runBinaryProtocolLoop(ts_channel_s *tsChannel) {
uint8_t firstByte; uint8_t firstByte;
int received = sr5ReadData(tsChannel, &firstByte, 1); int received = sr5ReadData(tsChannel, &firstByte, 1);
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
logMsg("received %d\r\n", received); logMsg("received %d\r\n", received);
#endif #endif
if (received != 1) { if (received != 1) {
// tunerStudioError("ERROR: no command"); // tunerStudioError("ERROR: no command");
#if EFI_BLUETOOTH_SETUP || defined(__DOXYGEN__) #if EFI_BLUETOOTH_SETUP
// assume there's connection loss and notify the bluetooth init code // assume there's connection loss and notify the bluetooth init code
bluetoothSoftwareDisconnectNotify(); bluetoothSoftwareDisconnectNotify();
#endif /* EFI_BLUETOOTH_SETUP */ #endif /* EFI_BLUETOOTH_SETUP */
@ -538,7 +538,7 @@ void runBinaryProtocolLoop(ts_channel_s *tsChannel) {
continue; continue;
} }
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
logMsg("command %c\r\n", command); logMsg("command %c\r\n", command);
#endif #endif
@ -595,7 +595,7 @@ static THD_FUNCTION(tsThreadEntryPoint, arg) {
* Copy real configuration into the communications layer working copy * Copy real configuration into the communications layer working copy
*/ */
void syncTunerStudioCopy(void) { void syncTunerStudioCopy(void) {
#if !defined(EFI_NO_CONFIG_WORKING_COPY) || defined(__DOXYGEN__) #if !defined(EFI_NO_CONFIG_WORKING_COPY)
memcpy(&configWorkingCopy, &persistentState.persistentConfiguration, sizeof(persistent_config_s)); memcpy(&configWorkingCopy, &persistentState.persistentConfiguration, sizeof(persistent_config_s));
#endif /* EFI_NO_CONFIG_WORKING_COPY */ #endif /* EFI_NO_CONFIG_WORKING_COPY */
} }
@ -617,7 +617,7 @@ void tunerStudioError(const char *msg) {
*/ */
void handleQueryCommand(ts_channel_s *tsChannel, ts_response_format_e mode) { void handleQueryCommand(ts_channel_s *tsChannel, ts_response_format_e mode) {
tsState.queryCommandCounter++; tsState.queryCommandCounter++;
#if EFI_TUNER_STUDIO_VERBOSE || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO_VERBOSE
scheduleMsg(&tsLogger, "got S/H (queryCommand) mode=%d", mode); scheduleMsg(&tsLogger, "got S/H (queryCommand) mode=%d", mode);
printTsStats(); printTsStats();
#endif #endif
@ -675,12 +675,12 @@ static void handleGetText(ts_channel_s *tsChannel) {
int outputSize; int outputSize;
char *output = swapOutputBuffers(&outputSize); char *output = swapOutputBuffers(&outputSize);
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
logMsg("get test sending [%d]\r\n", outputSize); logMsg("get test sending [%d]\r\n", outputSize);
#endif #endif
sr5WriteCrcPacket(tsChannel, TS_RESPONSE_COMMAND_OK, output, outputSize); sr5WriteCrcPacket(tsChannel, TS_RESPONSE_COMMAND_OK, output, outputSize);
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
logMsg("sent [%d]\r\n", outputSize); logMsg("sent [%d]\r\n", outputSize);
#endif #endif
} }
@ -689,7 +689,7 @@ static void handleExecuteCommand(ts_channel_s *tsChannel, char *data, int incomi
sr5WriteCrcPacket(tsChannel, TS_RESPONSE_COMMAND_OK, NULL, 0); sr5WriteCrcPacket(tsChannel, TS_RESPONSE_COMMAND_OK, NULL, 0);
data[incomingPacketSize] = 0; data[incomingPacketSize] = 0;
char *trimmed = efiTrim(data); char *trimmed = efiTrim(data);
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
logMsg("execute [%s]\r\n", trimmed); logMsg("execute [%s]\r\n", trimmed);
#endif #endif
(console_line_callback)(trimmed); (console_line_callback)(trimmed);
@ -792,7 +792,7 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin
} }
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
executeTSCommand(subsystem, index); executeTSCommand(subsystem, index);
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
sendOkResponse(tsChannel, TS_CRC); sendOkResponse(tsChannel, TS_CRC);
@ -817,7 +817,7 @@ void startTunerStudioConnectivity(void) {
addConsoleAction("reset_ts", resetTs); addConsoleAction("reset_ts", resetTs);
addConsoleActionI("set_ts_speed", setTsSpeed); addConsoleActionI("set_ts_speed", setTsSpeed);
#if EFI_BLUETOOTH_SETUP || defined(__DOXYGEN__) #if EFI_BLUETOOTH_SETUP
// Usage: "bluetooth_hc06 <baud> <name> <pincode>" // Usage: "bluetooth_hc06 <baud> <name> <pincode>"
// Example: "bluetooth_hc06 38400 rusefi 1234" // Example: "bluetooth_hc06 38400 rusefi 1234"
addConsoleActionSSS("bluetooth_hc05", bluetoothHC05); addConsoleActionSSS("bluetooth_hc05", bluetoothHC05);

24
firmware/console/binary/tunerstudio_io.cpp
View File

@ -9,7 +9,7 @@
#include "tunerstudio_io.h" #include "tunerstudio_io.h"
#include "console_io.h" #include "console_io.h"
#include "engine.h" #include "engine.h"
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
#include "rusEfiFunctionalTest.h" #include "rusEfiFunctionalTest.h"
#endif #endif
@ -17,11 +17,11 @@ EXTERN_ENGINE;
extern LoggingWithStorage tsLogger; extern LoggingWithStorage tsLogger;
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
#include "pin_repository.h" #include "pin_repository.h"
#include "usbconsole.h" #include "usbconsole.h"
#if HAL_USE_SERIAL_USB || defined(__DOXYGEN__) #if HAL_USE_SERIAL_USB
extern SerialUSBDriver SDU1; extern SerialUSBDriver SDU1;
#endif /* HAL_USE_SERIAL_USB */ #endif /* HAL_USE_SERIAL_USB */
@ -84,8 +84,8 @@ static SerialConfig tsSerialConfig = { 0, 0, USART_CR2_STOP1_BITS | USART_CR2_LI
void startTsPort(ts_channel_s *tsChannel) { void startTsPort(ts_channel_s *tsChannel) {
tsChannel->channel = (BaseChannel *) NULL; tsChannel->channel = (BaseChannel *) NULL;
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
#if defined(CONSOLE_USB_DEVICE) || defined(__DOXYGEN__) #if defined(CONSOLE_USB_DEVICE)
print("TunerStudio over USB serial"); print("TunerStudio over USB serial");
/** /**
* This method contains a long delay, that's the reason why this is not done on the main thread * This method contains a long delay, that's the reason why this is not done on the main thread
@ -135,8 +135,8 @@ void startTsPort(ts_channel_s *tsChannel) {
} }
bool stopTsPort(ts_channel_s *tsChannel) { bool stopTsPort(ts_channel_s *tsChannel) {
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
#if EFI_USB_SERIAL || defined(__DOXYGEN__) #if EFI_USB_SERIAL
// don't stop USB! // don't stop USB!
//usb_serial_stop(); //usb_serial_stop();
return false; return false;
@ -160,7 +160,7 @@ bool stopTsPort(ts_channel_s *tsChannel) {
void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) { void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) {
efiAssertVoid(CUSTOM_ERR_6570, getCurrentRemainingStack() > 64, "tunerStudioWriteData"); efiAssertVoid(CUSTOM_ERR_6570, getCurrentRemainingStack() > 64, "tunerStudioWriteData");
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
logMsg("chSequentialStreamWrite [%d]\r\n", size); logMsg("chSequentialStreamWrite [%d]\r\n", size);
#endif #endif
@ -186,11 +186,11 @@ void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) {
#endif #endif
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
logMsg("transferred [%d]\r\n", transferred); logMsg("transferred [%d]\r\n", transferred);
#endif #endif
if (transferred != size) { if (transferred != size) {
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
logMsg("!!! NOT ACCEPTED %d out of %d !!!", transferred, size); logMsg("!!! NOT ACCEPTED %d out of %d !!!", transferred, size);
#endif /* EFI_SIMULATOR */ #endif /* EFI_SIMULATOR */
scheduleMsg(&tsLogger, "!!! NOT ACCEPTED %d out of %d !!!", transferred, size); scheduleMsg(&tsLogger, "!!! NOT ACCEPTED %d out of %d !!!", transferred, size);
@ -198,7 +198,7 @@ void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) {
} }
int sr5ReadDataTimeout(ts_channel_s *tsChannel, uint8_t * buffer, int size, int timeout) { int sr5ReadDataTimeout(ts_channel_s *tsChannel, uint8_t * buffer, int size, int timeout) {
#if TS_UART_DMA_MODE || defined(__DOXYGEN__) #if TS_UART_DMA_MODE
UNUSED(tsChannel); UNUSED(tsChannel);
return (int)iqReadTimeout(&tsUartDma.fifoRxQueue, (uint8_t * )buffer, (size_t)size, timeout); return (int)iqReadTimeout(&tsUartDma.fifoRxQueue, (uint8_t * )buffer, (size_t)size, timeout);
#elif TS_UART_MODE #elif TS_UART_MODE
@ -251,7 +251,7 @@ void sr5SendResponse(ts_channel_s *tsChannel, ts_response_format_e mode, const u
} }
bool sr5IsReady(ts_channel_s *tsChannel) { bool sr5IsReady(ts_channel_s *tsChannel) {
#if EFI_USB_SERIAL || defined(__DOXYGEN__) #if EFI_USB_SERIAL
if (isUsbSerial(tsChannel->channel)) { if (isUsbSerial(tsChannel->channel)) {
// TS uses USB when console uses serial // TS uses USB when console uses serial
return is_usb_serial_ready(); return is_usb_serial_ready();

2
firmware/console/binary/tunerstudio_io.h
View File

@ -85,7 +85,7 @@ typedef struct {
// todo: double-check this // todo: double-check this
#define CRC_WRAPPING_SIZE (CRC_VALUE_SIZE + 3) #define CRC_WRAPPING_SIZE (CRC_VALUE_SIZE + 3)
#if HAL_USE_SERIAL_USB || defined(__DOXYGEN__) #if HAL_USE_SERIAL_USB
#define CONSOLE_USB_DEVICE SDU1 #define CONSOLE_USB_DEVICE SDU1
#endif /* HAL_USE_SERIAL_USB */ #endif /* HAL_USE_SERIAL_USB */

24
firmware/console/console_io.cpp
View File

@ -24,13 +24,13 @@
#include "rfiutil.h" #include "rfiutil.h"
#include "tunerstudio.h" #include "tunerstudio.h"
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
#include "rusEfiFunctionalTest.h" #include "rusEfiFunctionalTest.h"
#endif /*EFI_SIMULATOR */ #endif /*EFI_SIMULATOR */
EXTERN_ENGINE; EXTERN_ENGINE;
#if HAL_USE_SERIAL_USB || defined(__DOXYGEN__) #if HAL_USE_SERIAL_USB
#include "usbcfg.h" #include "usbcfg.h"
#include "usbconsole.h" #include "usbconsole.h"
extern SerialUSBDriver SDU1; extern SerialUSBDriver SDU1;
@ -73,7 +73,7 @@ static bool getConsoleLine(BaseSequentialStream *chp, char *line, unsigned size)
short c = (short) streamGet(chp); short c = (short) streamGet(chp);
onDataArrived(); onDataArrived();
#if defined(EFI_CONSOLE_UART_DEVICE) || defined(__DOXYGEN__) #if defined(EFI_CONSOLE_UART_DEVICE)
uint32_t flags; uint32_t flags;
chSysLock() chSysLock()
@ -132,14 +132,14 @@ static bool getConsoleLine(BaseSequentialStream *chp, char *line, unsigned size)
CommandHandler console_line_callback; CommandHandler console_line_callback;
#if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR ) || defined(__DOXYGEN__) #if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR )
static SerialConfig serialConfig = { 0, 0, USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0 }; static SerialConfig serialConfig = { 0, 0, USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0 };
#endif #endif
#if EFI_PROD_CODE || EFI_EGT || defined(__DOXYGEN__) #if EFI_PROD_CODE || EFI_EGT
bool isUsbSerial(BaseChannel * channel) { bool isUsbSerial(BaseChannel * channel) {
#if HAL_USE_SERIAL_USB || defined(__DOXYGEN__) #if HAL_USE_SERIAL_USB
return channel == (BaseChannel *) &CONSOLE_USB_DEVICE; return channel == (BaseChannel *) &CONSOLE_USB_DEVICE;
#else #else
return false; return false;
@ -147,11 +147,11 @@ bool isUsbSerial(BaseChannel * channel) {
} }
BaseChannel * getConsoleChannel(void) { BaseChannel * getConsoleChannel(void) {
#if defined(EFI_CONSOLE_UART_DEVICE) || defined(__DOXYGEN__) #if defined(EFI_CONSOLE_UART_DEVICE)
return (BaseChannel *) EFI_CONSOLE_UART_DEVICE; return (BaseChannel *) EFI_CONSOLE_UART_DEVICE;
#endif /* EFI_CONSOLE_UART_DEVICE */ #endif /* EFI_CONSOLE_UART_DEVICE */
#if HAL_USE_SERIAL_USB || defined(__DOXYGEN__) #if HAL_USE_SERIAL_USB
return (BaseChannel *) &CONSOLE_USB_DEVICE; return (BaseChannel *) &CONSOLE_USB_DEVICE;
#else #else
return NULL; return NULL;
@ -163,7 +163,7 @@ bool isCommandLineConsoleReady(void) {
} }
#endif /* EFI_PROD_CODE || EFI_EGT */ #endif /* EFI_PROD_CODE || EFI_EGT */
#if !defined(EFI_CONSOLE_NO_THREAD) || defined(__DOXYGEN__) #if !defined(EFI_CONSOLE_NO_THREAD)
ts_channel_s binaryConsole; ts_channel_s binaryConsole;
@ -174,7 +174,7 @@ static THD_FUNCTION(consoleThreadEntryPoint, arg) {
binaryConsole.channel = (BaseChannel *) getConsoleChannel(); binaryConsole.channel = (BaseChannel *) getConsoleChannel();
if (binaryConsole.channel != NULL) { if (binaryConsole.channel != NULL) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO
runBinaryProtocolLoop(&binaryConsole); runBinaryProtocolLoop(&binaryConsole);
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */
} }
@ -204,7 +204,7 @@ void startConsole(Logging *sharedLogger, CommandHandler console_line_callback_p)
logger = sharedLogger; logger = sharedLogger;
console_line_callback = console_line_callback_p; console_line_callback = console_line_callback_p;
#if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR) || defined(__DOXYGEN__) #if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR)
/* /*
* Activates the serial * Activates the serial
* it is important to set 'NONE' as flow control! in terminal application on the PC * it is important to set 'NONE' as flow control! in terminal application on the PC
@ -221,7 +221,7 @@ void startConsole(Logging *sharedLogger, CommandHandler console_line_callback_p)
chEvtRegisterMask((event_source_t *) chnGetEventSource(EFI_CONSOLE_UART_DEVICE), &consoleEventListener, 1); chEvtRegisterMask((event_source_t *) chnGetEventSource(EFI_CONSOLE_UART_DEVICE), &consoleEventListener, 1);
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
#if !defined(EFI_CONSOLE_NO_THREAD) || defined(__DOXYGEN__) #if !defined(EFI_CONSOLE_NO_THREAD)
chThdCreateStatic(consoleThreadStack, sizeof(consoleThreadStack), NORMALPRIO, (tfunc_t)consoleThreadEntryPoint, NULL); chThdCreateStatic(consoleThreadStack, sizeof(consoleThreadStack), NORMALPRIO, (tfunc_t)consoleThreadEntryPoint, NULL);
#endif /* EFI_CONSOLE_NO_THREAD */ #endif /* EFI_CONSOLE_NO_THREAD */

4
firmware/console/eficonsole.cpp
View File

@ -96,7 +96,7 @@ static void sayHello(void) {
scheduleMsg(&logger, "EFI_SIGNAL_EXECUTOR_HW_TIMER=%d", EFI_SIGNAL_EXECUTOR_HW_TIMER); scheduleMsg(&logger, "EFI_SIGNAL_EXECUTOR_HW_TIMER=%d", EFI_SIGNAL_EXECUTOR_HW_TIMER);
#endif #endif
#if defined(EFI_SHAFT_POSITION_INPUT) || defined(__DOXYGEN__) #if defined(EFI_SHAFT_POSITION_INPUT)
scheduleMsg(&logger, "EFI_SHAFT_POSITION_INPUT=%d", EFI_SHAFT_POSITION_INPUT); scheduleMsg(&logger, "EFI_SHAFT_POSITION_INPUT=%d", EFI_SHAFT_POSITION_INPUT);
#endif #endif
#ifdef EFI_INTERNAL_ADC #ifdef EFI_INTERNAL_ADC
@ -116,7 +116,7 @@ static void sayHello(void) {
* This methods prints all threads and their total times * This methods prints all threads and their total times
*/ */
static void cmd_threads(void) { static void cmd_threads(void) {
#if CH_DBG_THREADS_PROFILING || defined(__DOXYGEN__) #if CH_DBG_THREADS_PROFILING
/* todo: fix this code to work with fresh chibios /* todo: fix this code to work with fresh chibios
static const char *states[] = { CH_STATE_NAMES }; static const char *states[] = { CH_STATE_NAMES };
thread_t *tp; thread_t *tp;

106
firmware/console/status_loop.cpp
View File

@ -30,7 +30,7 @@
#include "engine_controller.h" #include "engine_controller.h"
#include "adc_inputs.h" #include "adc_inputs.h"
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) #if EFI_WAVE_ANALYZER
#include "wave_analyzer.h" #include "wave_analyzer.h"
#endif /* EFI_WAVE_ANALYZER */ #endif /* EFI_WAVE_ANALYZER */
@ -63,7 +63,7 @@
extern afr_Map3D_t afrMap; extern afr_Map3D_t afrMap;
extern bool main_loop_started; extern bool main_loop_started;
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
// todo: move this logic to algo folder! // todo: move this logic to algo folder!
#include "rtc_helper.h" #include "rtc_helper.h"
#include "lcd_HD44780.h" #include "lcd_HD44780.h"
@ -75,7 +75,7 @@ extern bool main_loop_started;
#include "single_timer_executor.h" #include "single_timer_executor.h"
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
#if EFI_CJ125 || defined(__DOXYGEN__) #if EFI_CJ125
#include "cj125.h" #include "cj125.h"
#endif /* EFI_CJ125 */ #endif /* EFI_CJ125 */
@ -83,7 +83,7 @@ extern bool main_loop_started;
#include "map_averaging.h" #include "map_averaging.h"
#endif #endif
#if EFI_FSIO || defined(__DOXYGEN__) #if EFI_FSIO
#include "fsio_impl.h" #include "fsio_impl.h"
#endif /* EFI_FSIO */ #endif /* EFI_FSIO */
@ -92,7 +92,7 @@ static volatile bool fullLog = true;
int warningEnabled = true; int warningEnabled = true;
//int warningEnabled = FALSE; //int warningEnabled = FALSE;
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO
extern TunerStudioOutputChannels tsOutputChannels; extern TunerStudioOutputChannels tsOutputChannels;
extern tunerstudio_counters_s tsState; extern tunerstudio_counters_s tsState;
#endif #endif
@ -102,7 +102,7 @@ extern int maxTriggerReentraint;
extern uint32_t maxLockedDuration; extern uint32_t maxLockedDuration;
#define FULL_LOGGING_KEY "fl" #define FULL_LOGGING_KEY "fl"
#if !defined(STATUS_LOGGING_BUFFER_SIZE) || defined(__DOXYGEN__) #if !defined(STATUS_LOGGING_BUFFER_SIZE)
#define STATUS_LOGGING_BUFFER_SIZE 1800 #define STATUS_LOGGING_BUFFER_SIZE 1800
#endif /* STATUS_LOGGING_BUFFER_SIZE */ #endif /* STATUS_LOGGING_BUFFER_SIZE */
@ -113,7 +113,7 @@ static void setWarningEnabled(int value) {
warningEnabled = value; warningEnabled = value;
} }
#if EFI_FILE_LOGGING || defined(__DOXYGEN__) #if EFI_FILE_LOGGING
// this one needs to be in main ram so that SD card SPI DMA works fine // this one needs to be in main ram so that SD card SPI DMA works fine
static char FILE_LOGGER[1000] MAIN_RAM; static char FILE_LOGGER[1000] MAIN_RAM;
static Logging fileLogger("file logger", FILE_LOGGER, sizeof(FILE_LOGGER)); static Logging fileLogger("file logger", FILE_LOGGER, sizeof(FILE_LOGGER));
@ -125,12 +125,12 @@ static int logFileLineIndex = 0;
static void reportSensorF(Logging *log, bool isLogFileFormatting, const char *caption, const char *units, float value, static void reportSensorF(Logging *log, bool isLogFileFormatting, const char *caption, const char *units, float value,
int precision) { int precision) {
if (!isLogFileFormatting) { if (!isLogFileFormatting) {
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if EFI_PROD_CODE || EFI_SIMULATOR
debugFloat(log, caption, value, precision); debugFloat(log, caption, value, precision);
#endif /* EFI_PROD_CODE || EFI_SIMULATOR */ #endif /* EFI_PROD_CODE || EFI_SIMULATOR */
} else { } else {
#if EFI_FILE_LOGGING || defined(__DOXYGEN__) #if EFI_FILE_LOGGING
if (logFileLineIndex == 0) { if (logFileLineIndex == 0) {
append(log, caption); append(log, caption);
append(log, TAB); append(log, TAB);
@ -148,11 +148,11 @@ static void reportSensorF(Logging *log, bool isLogFileFormatting, const char *ca
static void reportSensorI(Logging *log, bool fileFormat, const char *caption, const char *units, int value) { static void reportSensorI(Logging *log, bool fileFormat, const char *caption, const char *units, int value) {
if (!fileFormat) { if (!fileFormat) {
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if EFI_PROD_CODE || EFI_SIMULATOR
debugInt(log, caption, value); debugInt(log, caption, value);
#endif /* EFI_PROD_CODE || EFI_SIMULATOR */ #endif /* EFI_PROD_CODE || EFI_SIMULATOR */
} else { } else {
#if EFI_FILE_LOGGING || defined(__DOXYGEN__) #if EFI_FILE_LOGGING
if (logFileLineIndex == 0) { if (logFileLineIndex == 0) {
append(log, caption); append(log, caption);
append(log, TAB); append(log, TAB);
@ -188,7 +188,7 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorF(log, fileFormat, "time", "", sec, 3); // log column 1 reportSensorF(log, fileFormat, "time", "", sec, 3); // log column 1
int rpm = 0; int rpm = 0;
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) #if EFI_SHAFT_POSITION_INPUT
rpm = GET_RPM(); rpm = GET_RPM();
reportSensorI(log, fileFormat, "rpm", "RPM", rpm); // log column 2 reportSensorI(log, fileFormat, "rpm", "RPM", rpm); // log column 2
#endif #endif
@ -208,13 +208,13 @@ static void printSensors(Logging *log, bool fileFormat) {
if (hasVBatt(PASS_ENGINE_PARAMETER_SIGNATURE)) { if (hasVBatt(PASS_ENGINE_PARAMETER_SIGNATURE)) {
reportSensorF(log, fileFormat, GAUGE_NAME_VBAT, "V", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE), 2); // log column #6 reportSensorF(log, fileFormat, GAUGE_NAME_VBAT, "V", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE), 2); // log column #6
} }
#if EFI_ANALOG_SENSORS || defined(__DOXYGEN__) #if EFI_ANALOG_SENSORS
if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) { if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
reportSensorF(log, fileFormat, "MAP", "kPa", getMap(), 2); reportSensorF(log, fileFormat, "MAP", "kPa", getMap(), 2);
// reportSensorF(log, fileFormat, "map_r", "V", getRawMap(), 2); // reportSensorF(log, fileFormat, "map_r", "V", getRawMap(), 2);
} }
#endif /* EFI_ANALOG_SENSORS */ #endif /* EFI_ANALOG_SENSORS */
#if EFI_ANALOG_SENSORS || defined(__DOXYGEN__) #if EFI_ANALOG_SENSORS
if (hasBaroSensor()) { if (hasBaroSensor()) {
reportSensorF(log, fileFormat, "baro", "kPa", getBaroPressure(), 2); reportSensorF(log, fileFormat, "baro", "kPa", getBaroPressure(), 2);
} }
@ -232,7 +232,7 @@ static void printSensors(Logging *log, bool fileFormat) {
// below are the more advanced data points which only go into log file // below are the more advanced data points which only go into log file
#if HAL_USE_ADC || defined(__DOXYGEN__) #if HAL_USE_ADC
reportSensorF(log, fileFormat, GAUGE_NAME_CPU_TEMP, "C", getMCUInternalTemperature(), 2); // log column #3 reportSensorF(log, fileFormat, GAUGE_NAME_CPU_TEMP, "C", getMCUInternalTemperature(), 2); // log column #3
#endif #endif
@ -246,18 +246,18 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorF(log, fileFormat, "mafr", "kg/hr", getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE), 2); reportSensorF(log, fileFormat, "mafr", "kg/hr", getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE), 2);
} }
#if EFI_IDLE_CONTROL || defined(__DOXYGEN__) #if EFI_IDLE_CONTROL
reportSensorF(log, fileFormat, GAUGE_NAME_IAC, "%", getIdlePosition(), 2); reportSensorF(log, fileFormat, GAUGE_NAME_IAC, "%", getIdlePosition(), 2);
#endif /* EFI_IDLE_CONTROL */ #endif /* EFI_IDLE_CONTROL */
#if EFI_ANALOG_SENSORS || defined(__DOXYGEN__) #if EFI_ANALOG_SENSORS
reportSensorF(log, fileFormat, GAUGE_NAME_TARGET_AFR, "AFR", engine->engineState.targetAFR, 2); reportSensorF(log, fileFormat, GAUGE_NAME_TARGET_AFR, "AFR", engine->engineState.targetAFR, 2);
#endif /* EFI_ANALOG_SENSORS */ #endif /* EFI_ANALOG_SENSORS */
#define DEBUG_F_PRECISION 6 #define DEBUG_F_PRECISION 6
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField1, DEBUG_F_PRECISION); reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField1, DEBUG_F_PRECISION);
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField2, DEBUG_F_PRECISION); reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField2, DEBUG_F_PRECISION);
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField3, DEBUG_F_PRECISION); reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField3, DEBUG_F_PRECISION);
@ -297,7 +297,7 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorI(log, fileFormat, GAUGE_NAME_VERSION, "#", getRusEfiVersion()); reportSensorI(log, fileFormat, GAUGE_NAME_VERSION, "#", getRusEfiVersion());
#if EFI_VEHICLE_SPEED || defined(__DOXYGEN__) #if EFI_VEHICLE_SPEED
if (hasVehicleSpeedSensor()) { if (hasVehicleSpeedSensor()) {
float vehicleSpeed = getVehicleSpeed(); float vehicleSpeed = getVehicleSpeed();
reportSensorF(log, fileFormat, GAUGE_NAME_VVS, "kph", vehicleSpeed, 2); reportSensorF(log, fileFormat, GAUGE_NAME_VVS, "kph", vehicleSpeed, 2);
@ -347,7 +347,7 @@ static void printSensors(Logging *log, bool fileFormat) {
void writeLogLine(void) { void writeLogLine(void) {
#if EFI_FILE_LOGGING || defined(__DOXYGEN__) #if EFI_FILE_LOGGING
if (!main_loop_started) if (!main_loop_started)
return; return;
resetLogging(&fileLogger); resetLogging(&fileLogger);
@ -379,7 +379,7 @@ static void printStatus(void) {
*/ */
static systime_t timeOfPreviousPrintVersion = (systime_t) -1; static systime_t timeOfPreviousPrintVersion = (systime_t) -1;
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
static void printOutPin(const char *pinName, brain_pin_e hwPin) { static void printOutPin(const char *pinName, brain_pin_e hwPin) {
if (hwPin != GPIO_UNASSIGNED) { if (hwPin != GPIO_UNASSIGNED) {
appendPrintf(&logger, "outpin%s%s@%s%s", DELIMETER, pinName, hwPortname(hwPin), DELIMETER); appendPrintf(&logger, "outpin%s%s@%s%s", DELIMETER, pinName, hwPortname(hwPin), DELIMETER);
@ -398,14 +398,14 @@ void printOverallStatus(systime_t nowSeconds) {
timeOfPreviousPrintVersion = nowSeconds; timeOfPreviousPrintVersion = nowSeconds;
int seconds = getTimeNowSeconds(); int seconds = getTimeNowSeconds();
printCurrentState(&logger, seconds, getConfigurationName(engineConfiguration->engineType)); printCurrentState(&logger, seconds, getConfigurationName(engineConfiguration->engineType));
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
printOutPin(CRANK1, CONFIGB(triggerInputPins)[0]); printOutPin(CRANK1, CONFIGB(triggerInputPins)[0]);
printOutPin(CRANK2, CONFIGB(triggerInputPins)[1]); printOutPin(CRANK2, CONFIGB(triggerInputPins)[1]);
printOutPin(VVT_NAME, engineConfiguration->camInput); printOutPin(VVT_NAME, engineConfiguration->camInput);
printOutPin(HIP_NAME, CONFIGB(hip9011IntHoldPin)); printOutPin(HIP_NAME, CONFIGB(hip9011IntHoldPin));
printOutPin(TACH_NAME, CONFIGB(tachOutputPin)); printOutPin(TACH_NAME, CONFIGB(tachOutputPin));
printOutPin(DIZZY_NAME, engineConfiguration->dizzySparkOutputPin); printOutPin(DIZZY_NAME, engineConfiguration->dizzySparkOutputPin);
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) #if EFI_WAVE_ANALYZER
printOutPin(WA_CHANNEL_1, CONFIGB(logicAnalyzerPins)[0]); printOutPin(WA_CHANNEL_1, CONFIGB(logicAnalyzerPins)[0]);
printOutPin(WA_CHANNEL_2, CONFIGB(logicAnalyzerPins)[1]); printOutPin(WA_CHANNEL_2, CONFIGB(logicAnalyzerPins)[1]);
#endif /* EFI_WAVE_ANALYZER */ #endif /* EFI_WAVE_ANALYZER */
@ -448,7 +448,7 @@ void updateDevConsoleState(void) {
*/ */
printSensors(&logger, false); printSensors(&logger, false);
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
// todo: unify with simulator! // todo: unify with simulator!
if (hasFirmwareError()) { if (hasFirmwareError()) {
scheduleMsg(&logger, "FATAL error: %s", getFirmwareError()); scheduleMsg(&logger, "FATAL error: %s", getFirmwareError());
@ -458,7 +458,7 @@ void updateDevConsoleState(void) {
} }
#endif #endif
#if (EFI_PROD_CODE && HAL_USE_ADC) || defined(__DOXYGEN__) #if EFI_PROD_CODE && HAL_USE_ADC
printFullAdcReportIfNeeded(&logger); printFullAdcReportIfNeeded(&logger);
#endif #endif
@ -468,7 +468,7 @@ void updateDevConsoleState(void) {
systime_t nowSeconds = getTimeNowSeconds(); systime_t nowSeconds = getTimeNowSeconds();
#if (EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT) || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
int currentCkpEventCounter = engine->triggerCentral.triggerState.getTotalEventCounter(); int currentCkpEventCounter = engine->triggerCentral.triggerState.getTotalEventCounter();
if (prevCkpEventCounter == currentCkpEventCounter && timeOfPreviousReport == nowSeconds) { if (prevCkpEventCounter == currentCkpEventCounter && timeOfPreviousReport == nowSeconds) {
return; return;
@ -510,7 +510,7 @@ static void showFuelInfo2(float rpm, float engineLoad) {
scheduleMsg(&logger2, "baro correction=%.2f", engine->engineState.baroCorrection); scheduleMsg(&logger2, "baro correction=%.2f", engine->engineState.baroCorrection);
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL
scheduleMsg(&logger, "base cranking fuel %.2f", engineConfiguration->cranking.baseFuel); scheduleMsg(&logger, "base cranking fuel %.2f", engineConfiguration->cranking.baseFuel);
scheduleMsg(&logger2, "cranking fuel: %.2f", getCrankingFuel(PASS_ENGINE_PARAMETER_SIGNATURE)); scheduleMsg(&logger2, "cranking fuel: %.2f", getCrankingFuel(PASS_ENGINE_PARAMETER_SIGNATURE));
@ -530,7 +530,7 @@ static void showFuelInfo2(float rpm, float engineLoad) {
#endif #endif
} }
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL
static void showFuelInfo(void) { static void showFuelInfo(void) {
showFuelInfo2((float) GET_RPM(), getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE)); showFuelInfo2((float) GET_RPM(), getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE));
} }
@ -584,10 +584,10 @@ static void setBlinkingPeriod(int value) {
blinkingPeriodMs = value; blinkingPeriodMs = value;
} }
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
static bool isTriggerErrorNow() { static bool isTriggerErrorNow() {
#if (EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT) || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
// todo: WAT? how is communication LED blinkingPeriodMs part of trigger error condition?! // todo: WAT? how is communication LED blinkingPeriodMs part of trigger error condition?!
bool justHadError = (getTimeNowNt() - engine->triggerCentral.triggerState.lastDecodingErrorTime) < US2NT(2 * 1000 * 3 * blinkingPeriodMs); bool justHadError = (getTimeNowNt() - engine->triggerCentral.triggerState.lastDecodingErrorTime) < US2NT(2 * 1000 * 3 * blinkingPeriodMs);
return justHadError || isTriggerDecoderError(); return justHadError || isTriggerDecoderError();
@ -610,7 +610,7 @@ static void blinkingThread(void *arg) {
while (true) { while (true) {
int onTimeMs = is_usb_serial_ready() ? 3 * blinkingPeriodMs : blinkingPeriodMs; int onTimeMs = is_usb_serial_ready() ? 3 * blinkingPeriodMs : blinkingPeriodMs;
#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__) #if EFI_INTERNAL_FLASH
if (getNeedToWriteConfiguration()) { if (getNeedToWriteConfiguration()) {
onTimeMs = 2 * onTimeMs; onTimeMs = 2 * onTimeMs;
} }
@ -630,7 +630,7 @@ static void blinkingThread(void *arg) {
chThdSleepMilliseconds(offTimeMs); chThdSleepMilliseconds(offTimeMs);
enginePins.communicationLedPin.setValue(1); enginePins.communicationLedPin.setValue(1);
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL
if (isTriggerErrorNow() || isIgnitionTimingError() || consoleByteArrived) { if (isTriggerErrorNow() || isIgnitionTimingError() || consoleByteArrived) {
consoleByteArrived = false; consoleByteArrived = false;
enginePins.warningLedPin.setValue(1); enginePins.warningLedPin.setValue(1);
@ -643,7 +643,7 @@ static void blinkingThread(void *arg) {
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
#if EFI_LCD || defined(__DOXYGEN__) #if EFI_LCD
class LcdController : public PeriodicController<UTILITY_THREAD_STACK_SIZE> { class LcdController : public PeriodicController<UTILITY_THREAD_STACK_SIZE> {
public: public:
LcdController() : PeriodicController("BenchThread") { } LcdController() : PeriodicController("BenchThread") { }
@ -662,20 +662,20 @@ private:
static LcdController lcdInstance; static LcdController lcdInstance;
#endif /* EFI_LCD */ #endif /* EFI_LCD */
#if EFI_HIP_9011 || defined(__DOXYGEN__) #if EFI_HIP_9011
extern HIP9011 instance; extern HIP9011 instance;
#endif /* EFI_HIP_9011 */ #endif /* EFI_HIP_9011 */
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO
void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_SUFFIX) { void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) #if EFI_SHAFT_POSITION_INPUT
int rpm = GET_RPM(); int rpm = GET_RPM();
#else /* EFI_SHAFT_POSITION_INPUT */ #else /* EFI_SHAFT_POSITION_INPUT */
int rpm = 0; int rpm = 0;
#endif /* EFI_SHAFT_POSITION_INPUT */ #endif /* EFI_SHAFT_POSITION_INPUT */
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
executorStatistics(); executorStatistics();
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
@ -717,7 +717,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->vBatt = getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE); tsOutputChannels->vBatt = getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE);
} }
tsOutputChannels->tpsADC = getTPS12bitAdc(PASS_ENGINE_PARAMETER_SIGNATURE) / TPS_TS_CONVERSION; tsOutputChannels->tpsADC = getTPS12bitAdc(PASS_ENGINE_PARAMETER_SIGNATURE) / TPS_TS_CONVERSION;
#if EFI_ANALOG_SENSORS || defined(__DOXYGEN__) #if EFI_ANALOG_SENSORS
tsOutputChannels->baroPressure = hasBaroSensor() ? getBaroPressure() : 0; tsOutputChannels->baroPressure = hasBaroSensor() ? getBaroPressure() : 0;
#endif /* EFI_ANALOG_SENSORS */ #endif /* EFI_ANALOG_SENSORS */
tsOutputChannels->engineLoad = engineLoad; tsOutputChannels->engineLoad = engineLoad;
@ -747,7 +747,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->isWarnNow = engine->engineState.warnings.isWarningNow(timeSeconds, true); tsOutputChannels->isWarnNow = engine->engineState.warnings.isWarningNow(timeSeconds, true);
tsOutputChannels->isCltBroken = engine->isCltBroken; tsOutputChannels->isCltBroken = engine->isCltBroken;
#if EFI_HIP_9011 || defined(__DOXYGEN__) #if EFI_HIP_9011
tsOutputChannels->isKnockChipOk = (instance.invalidHip9011ResponsesCount == 0); tsOutputChannels->isKnockChipOk = (instance.invalidHip9011ResponsesCount == 0);
#endif /* EFI_HIP_9011 */ #endif /* EFI_HIP_9011 */
@ -757,7 +757,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->debugIntField1 = atoi(VCS_VERSION); tsOutputChannels->debugIntField1 = atoi(VCS_VERSION);
break; break;
case DBG_METRICS: case DBG_METRICS:
#if EFI_CLOCK_LOCKS || defined(__DOXYGEN__) #if EFI_CLOCK_LOCKS
tsOutputChannels->debugIntField1 = maxLockedDuration; tsOutputChannels->debugIntField1 = maxLockedDuration;
tsOutputChannels->debugIntField2 = maxTriggerReentraint; tsOutputChannels->debugIntField2 = maxTriggerReentraint;
#endif /* EFI_CLOCK_LOCKS */ #endif /* EFI_CLOCK_LOCKS */
@ -794,7 +794,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
} }
break; break;
case DBG_FSIO_EXPRESSION: case DBG_FSIO_EXPRESSION:
#if EFI_PROD_CODE && EFI_FSIO || defined(__DOXYGEN__) #if EFI_PROD_CODE && EFI_FSIO
tsOutputChannels->debugFloatField1 = getFsioOutputValue(0 PASS_ENGINE_PARAMETER_SUFFIX); tsOutputChannels->debugFloatField1 = getFsioOutputValue(0 PASS_ENGINE_PARAMETER_SUFFIX);
tsOutputChannels->debugFloatField2 = getFsioOutputValue(1 PASS_ENGINE_PARAMETER_SUFFIX); tsOutputChannels->debugFloatField2 = getFsioOutputValue(1 PASS_ENGINE_PARAMETER_SUFFIX);
tsOutputChannels->debugFloatField3 = getFsioOutputValue(2 PASS_ENGINE_PARAMETER_SUFFIX); tsOutputChannels->debugFloatField3 = getFsioOutputValue(2 PASS_ENGINE_PARAMETER_SUFFIX);
@ -813,14 +813,14 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
case DBG_CRANKING_DETAILS: case DBG_CRANKING_DETAILS:
tsOutputChannels->debugIntField1 = engine->rpmCalculator.getRevolutionCounterSinceStart(); tsOutputChannels->debugIntField1 = engine->rpmCalculator.getRevolutionCounterSinceStart();
break; break;
#if EFI_HIP_9011 || defined(__DOXYGEN__) #if EFI_HIP_9011
case DBG_KNOCK: case DBG_KNOCK:
// todo: maybe extract hipPostState(tsOutputChannels); // todo: maybe extract hipPostState(tsOutputChannels);
tsOutputChannels->debugIntField1 = instance.correctResponsesCount; tsOutputChannels->debugIntField1 = instance.correctResponsesCount;
tsOutputChannels->debugIntField2 = instance.invalidHip9011ResponsesCount; tsOutputChannels->debugIntField2 = instance.invalidHip9011ResponsesCount;
break; break;
#endif /* EFI_HIP_9011 */ #endif /* EFI_HIP_9011 */
#if (EFI_CJ125 && HAL_USE_SPI) || defined(__DOXYGEN__) #if EFI_CJ125 && HAL_USE_SPI
case DBG_CJ125: case DBG_CJ125:
cjPostState(tsOutputChannels); cjPostState(tsOutputChannels);
break; break;
@ -830,7 +830,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
postMapState(tsOutputChannels); postMapState(tsOutputChannels);
break; break;
#endif /* EFI_MAP_AVERAGING */ #endif /* EFI_MAP_AVERAGING */
#if EFI_CAN_SUPPORT || defined(__DOXYGEN__) #if EFI_CAN_SUPPORT
case DBG_CAN: case DBG_CAN:
postCanState(tsOutputChannels); postCanState(tsOutputChannels);
break; break;
@ -883,7 +883,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->internalMcuTemperature = getMCUInternalTemperature(); tsOutputChannels->internalMcuTemperature = getMCUInternalTemperature();
#endif /* HAL_USE_ADC */ #endif /* HAL_USE_ADC */
#if EFI_MAX_31855 || defined(__DOXYGEN__) #if EFI_MAX_31855
for (int i = 0; i < EGT_CHANNEL_COUNT; i++) for (int i = 0; i < EGT_CHANNEL_COUNT; i++)
tsOutputChannels->egtValues.values[i] = getEgtValue(i); tsOutputChannels->egtValues.values[i] = getEgtValue(i);
#endif /* EFI_MAX_31855 */ #endif /* EFI_MAX_31855 */
@ -892,14 +892,14 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->idlePosition = getIdlePosition(); tsOutputChannels->idlePosition = getIdlePosition();
#endif #endif
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
tsOutputChannels->isTriggerError = isTriggerErrorNow(); tsOutputChannels->isTriggerError = isTriggerErrorNow();
#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__) #if EFI_INTERNAL_FLASH
tsOutputChannels->needBurn = getNeedToWriteConfiguration(); tsOutputChannels->needBurn = getNeedToWriteConfiguration();
#endif /* EFI_INTERNAL_FLASH */ #endif /* EFI_INTERNAL_FLASH */
#if EFI_FILE_LOGGING || defined(__DOXYGEN__) #if EFI_FILE_LOGGING
tsOutputChannels->hasSdCard = isSdCardAlive(); tsOutputChannels->hasSdCard = isSdCardAlive();
#endif /* EFI_FILE_LOGGING */ #endif /* EFI_FILE_LOGGING */
@ -911,7 +911,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->isCylinderCleanupEnabled = engineConfiguration->isCylinderCleanupEnabled; tsOutputChannels->isCylinderCleanupEnabled = engineConfiguration->isCylinderCleanupEnabled;
tsOutputChannels->isCylinderCleanupActivated = engine->isCylinderCleanupMode; tsOutputChannels->isCylinderCleanupActivated = engine->isCylinderCleanupMode;
tsOutputChannels->secondTriggerChannelEnabled = engineConfiguration->secondTriggerChannelEnabled; tsOutputChannels->secondTriggerChannelEnabled = engineConfiguration->secondTriggerChannelEnabled;
#if EFI_VEHICLE_SPEED || defined(__DOXYGEN__) #if EFI_VEHICLE_SPEED
float vehicleSpeed = getVehicleSpeed(); float vehicleSpeed = getVehicleSpeed();
tsOutputChannels->vehicleSpeedKph = vehicleSpeed; tsOutputChannels->vehicleSpeedKph = vehicleSpeed;
tsOutputChannels->speedToRpmRatio = vehicleSpeed / rpm; tsOutputChannels->speedToRpmRatio = vehicleSpeed / rpm;
@ -960,12 +960,12 @@ void initStatusLoop(void) {
addConsoleActionI(FULL_LOGGING_KEY, setFullLog); addConsoleActionI(FULL_LOGGING_KEY, setFullLog);
addConsoleActionI("warn", setWarningEnabled); addConsoleActionI("warn", setWarningEnabled);
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) #if EFI_ENGINE_CONTROL
addConsoleActionFF("fuelinfo2", (VoidFloatFloat) showFuelInfo2); addConsoleActionFF("fuelinfo2", (VoidFloatFloat) showFuelInfo2);
addConsoleAction("fuelinfo", showFuelInfo); addConsoleAction("fuelinfo", showFuelInfo);
#endif #endif
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
addConsoleActionI("set_led_blinking_period", setBlinkingPeriod); addConsoleActionI("set_led_blinking_period", setBlinkingPeriod);
@ -975,11 +975,11 @@ void initStatusLoop(void) {
void startStatusThreads(void) { void startStatusThreads(void) {
// todo: refactoring needed, this file should probably be split into pieces // todo: refactoring needed, this file should probably be split into pieces
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
initStatusLeds(); initStatusLeds();
chThdCreateStatic(blinkingStack, sizeof(blinkingStack), NORMALPRIO, (tfunc_t) blinkingThread, NULL); chThdCreateStatic(blinkingStack, sizeof(blinkingStack), NORMALPRIO, (tfunc_t) blinkingThread, NULL);
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
#if EFI_LCD || defined(__DOXYGEN__) #if EFI_LCD
lcdInstance.Start(); lcdInstance.Start();
#endif /* EFI_LCD */ #endif /* EFI_LCD */
} }

2
firmware/development/engine_emulator.cpp
View File

@ -99,7 +99,7 @@ void initEngineEmulator(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
return; return;
#if EFI_POTENTIOMETER #if EFI_POTENTIOMETER
#if HAL_USE_SPI || defined(__DOXYGEN__) #if HAL_USE_SPI
initPotentiometers(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); initPotentiometers(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
#endif /* HAL_USE_SPI */ #endif /* HAL_USE_SPI */
#endif /* EFI_POTENTIOMETER */ #endif /* EFI_POTENTIOMETER */

18
firmware/development/engine_sniffer.cpp
View File

@ -28,7 +28,7 @@
#include "engine_sniffer.h" #include "engine_sniffer.h"
#include "adc_inputs.h" #include "adc_inputs.h"
#if EFI_ENGINE_SNIFFER || defined(__DOXYGEN__) #if EFI_ENGINE_SNIFFER
#include "engine_configuration.h" #include "engine_configuration.h"
#include "eficonsole.h" #include "eficonsole.h"
@ -36,7 +36,7 @@
#define CHART_DELIMETER '!' #define CHART_DELIMETER '!'
#if EFI_HISTOGRAMS || defined(__DOXYGEN__) #if EFI_HISTOGRAMS
#include "rfiutil.h" #include "rfiutil.h"
#include "histogram.h" #include "histogram.h"
static histogram_s engineSnifferHisto; static histogram_s engineSnifferHisto;
@ -71,7 +71,7 @@ static LoggingWithStorage logger("wave info");
*/ */
static uint32_t skipUntilEngineCycle = 0; static uint32_t skipUntilEngineCycle = 0;
#if ! EFI_UNIT_TEST || defined(__DOXYGEN__) #if ! EFI_UNIT_TEST
extern WaveChart waveChart; extern WaveChart waveChart;
static void resetNow(void) { static void resetNow(void) {
skipUntilEngineCycle = engine->rpmCalculator.getRevolutionCounter() + 3; skipUntilEngineCycle = engine->rpmCalculator.getRevolutionCounter() + 3;
@ -114,7 +114,7 @@ static void printStatus(void) {
static void setChartActive(int value) { static void setChartActive(int value) {
engineConfiguration->isEngineChartEnabled = value; engineConfiguration->isEngineChartEnabled = value;
printStatus(); printStatus();
#if EFI_CLOCK_LOCKS || defined(__DOXYGEN__) #if EFI_CLOCK_LOCKS
maxLockedDuration = 0; // todo: why do we reset this here? why only this and not all metrics? maxLockedDuration = 0; // todo: why do we reset this here? why only this and not all metrics?
#endif /* EFI_CLOCK_LOCKS */ #endif /* EFI_CLOCK_LOCKS */
} }
@ -163,7 +163,7 @@ void WaveChart::publish() {
* @brief Register an event for digital sniffer * @brief Register an event for digital sniffer
*/ */
void WaveChart::addEvent3(const char *name, const char * msg) { void WaveChart::addEvent3(const char *name, const char * msg) {
#if EFI_TEXT_LOGGING || defined(__DOXYGEN__) #if EFI_TEXT_LOGGING
if (!ENGINE(isEngineChartEnabled)) { if (!ENGINE(isEngineChartEnabled)) {
return; return;
} }
@ -237,7 +237,7 @@ void WaveChart::addEvent3(const char *name, const char * msg) {
} }
void showWaveChartHistogram(void) { void showWaveChartHistogram(void) {
#if (EFI_HISTOGRAMS && EFI_PROD_CODE) || defined(__DOXYGEN__) #if EFI_HISTOGRAMS && EFI_PROD_CODE
printHistogram(&logger, &engineSnifferHisto); printHistogram(&logger, &engineSnifferHisto);
#endif #endif
} }
@ -250,17 +250,17 @@ void initWaveChart(WaveChart *chart) {
printStatus(); printStatus();
#if DEBUG_WAVE || defined(__DOXYGEN__) #if DEBUG_WAVE
initLoggingExt(&debugLogging, "wave chart debug", &debugLogging.DEFAULT_BUFFER, sizeof(debugLogging.DEFAULT_BUFFER)); initLoggingExt(&debugLogging, "wave chart debug", &debugLogging.DEFAULT_BUFFER, sizeof(debugLogging.DEFAULT_BUFFER));
#endif #endif
#if EFI_HISTOGRAMS || defined(__DOXYGEN__) #if EFI_HISTOGRAMS
initHistogram(&engineSnifferHisto, "wave chart"); initHistogram(&engineSnifferHisto, "wave chart");
#endif /* EFI_HISTOGRAMS */ #endif /* EFI_HISTOGRAMS */
addConsoleActionI("chartsize", setChartSize); addConsoleActionI("chartsize", setChartSize);
addConsoleActionI("chart", setChartActive); addConsoleActionI("chart", setChartActive);
#if ! EFI_UNIT_TEST || defined(__DOXYGEN__) #if ! EFI_UNIT_TEST
addConsoleAction("reset_engine_chart", resetNow); addConsoleAction("reset_engine_chart", resetNow);
#endif #endif
} }

2
firmware/development/engine_sniffer.h
View File

@ -11,7 +11,7 @@
#include "global.h" #include "global.h"
#if EFI_ENGINE_SNIFFER || defined(__DOXYGEN__) #if EFI_ENGINE_SNIFFER
#include "datalogging.h" #include "datalogging.h"
/** /**

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

@ -15,7 +15,7 @@
#include "hardware.h" #include "hardware.h"
#include "mpu_util.h" #include "mpu_util.h"
#if HAL_USE_SPI || defined(__DOXYGEN__) #if HAL_USE_SPI
EXTERN_ENGINE; EXTERN_ENGINE;
@ -52,7 +52,7 @@ EXTERN_ENGINE;
static Logging * logger; static Logging * logger;
#if EFI_POTENTIOMETER || defined(__DOXYGEN__) #if EFI_POTENTIOMETER
static Mcp42010Driver potConfig[DIGIPOT_COUNT]; static Mcp42010Driver potConfig[DIGIPOT_COUNT];
void initPotentiometer(Mcp42010Driver *driver, SPIDriver *spi, brain_pin_e csPin) { void initPotentiometer(Mcp42010Driver *driver, SPIDriver *spi, brain_pin_e csPin) {

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

@ -11,7 +11,7 @@
#include "global.h" #include "global.h"
#if HAL_USE_SPI || defined(__DOXYGEN__) #if HAL_USE_SPI
#include "engine_configuration.h" #include "engine_configuration.h"

8
firmware/development/rfi_perftest.cpp
View File

@ -17,7 +17,7 @@
#include "console_io.h" #include "console_io.h"
#include "engine.h" #include "engine.h"
#if EFI_PERF_METRICS || defined(__DOXYGEN__) #if EFI_PERF_METRICS
#include "test.h" #include "test.h"
static Logging* logger; static Logging* logger;
@ -261,7 +261,7 @@ static void runTests(const int count) {
extern Overflow64Counter halTime; extern Overflow64Counter halTime;
#if EFI_RTC || defined(__DOXYGEN__) #if EFI_RTC
static int rtcStartTime; static int rtcStartTime;
#endif #endif
@ -271,7 +271,7 @@ static void timeInfo(void) {
scheduleMsg(logger, "chTimeNow as seconds = %d", getTimeNowSeconds()); scheduleMsg(logger, "chTimeNow as seconds = %d", getTimeNowSeconds());
scheduleMsg(logger, "hal seconds = %d", halTime.get() / (long)CORE_CLOCK); scheduleMsg(logger, "hal seconds = %d", halTime.get() / (long)CORE_CLOCK);
#if EFI_RTC || defined(__DOXYGEN__) #if EFI_RTC
int unix = rtcGetTimeUnixSec(&RTCD1) - rtcStartTime; int unix = rtcGetTimeUnixSec(&RTCD1) - rtcStartTime;
scheduleMsg(logger, "unix seconds = %d", unix); scheduleMsg(logger, "unix seconds = %d", unix);
#endif #endif
@ -299,7 +299,7 @@ static void runChibioTest(void) {
void initTimePerfActions(Logging *sharedLogger) { void initTimePerfActions(Logging *sharedLogger) {
logger = sharedLogger; logger = sharedLogger;
#if EFI_RTC || defined(__DOXYGEN__) #if EFI_RTC
rtcStartTime = rtcGetTimeUnixSec(&RTCD1); rtcStartTime = rtcGetTimeUnixSec(&RTCD1);
#endif #endif

6
firmware/development/sensor_chart.cpp
View File

@ -10,10 +10,10 @@
#include "engine.h" #include "engine.h"
#include "rpm_calculator.h" #include "rpm_calculator.h"
#if EFI_SENSOR_CHART || defined(__DOXYGEN__) #if EFI_SENSOR_CHART
#include "status_loop.h" #include "status_loop.h"
#if EFI_TEXT_LOGGING || defined(__DOXYGEN__) #if EFI_TEXT_LOGGING
static char LOGGING_BUFFER[5000] CCM_OPTIONAL; static char LOGGING_BUFFER[5000] CCM_OPTIONAL;
static Logging scLogging("analog chart", LOGGING_BUFFER, sizeof(LOGGING_BUFFER)); static Logging scLogging("analog chart", LOGGING_BUFFER, sizeof(LOGGING_BUFFER));
#endif /* EFI_TEXT_LOGGING */ #endif /* EFI_TEXT_LOGGING */
@ -24,7 +24,7 @@ static int initialized = false;
EXTERN_ENGINE; EXTERN_ENGINE;
void scAddData(float angle, float value) { void scAddData(float angle, float value) {
#if EFI_TEXT_LOGGING || defined(__DOXYGEN__) #if EFI_TEXT_LOGGING
if (!initialized) { if (!initialized) {
return; // this is possible because of initialization sequence return; // this is possible because of initialization sequence
} }

2
firmware/development/test/test.c
View File

@ -24,7 +24,7 @@
#include "global.h" #include "global.h"
#if EFI_PERF_METRICS || defined(__DOXYGEN__) #if EFI_PERF_METRICS
#include "test.h" #include "test.h"
#include "testbmk.h" #include "testbmk.h"

4
firmware/development/test/test.h
View File

@ -28,14 +28,14 @@
/** /**
* @brief Delay inserted between test cases. * @brief Delay inserted between test cases.
*/ */
#if !defined(DELAY_BETWEEN_TESTS) || defined(__DOXYGEN__) #if !defined(DELAY_BETWEEN_TESTS)
#define DELAY_BETWEEN_TESTS 200 #define DELAY_BETWEEN_TESTS 200
#endif #endif
/** /**
* @brief If @p TRUE then benchmarks are not included. * @brief If @p TRUE then benchmarks are not included.
*/ */
#if !defined(TEST_NO_BENCHMARKS) || defined(__DOXYGEN__) #if !defined(TEST_NO_BENCHMARKS)
#define TEST_NO_BENCHMARKS FALSE #define TEST_NO_BENCHMARKS FALSE
#endif #endif

26
firmware/development/test/testbmk.c
View File

@ -59,7 +59,7 @@
*/ */
static Semaphore sem1; static Semaphore sem1;
#if CH_USE_MUTEXES || defined(__DOXYGEN__) #if CH_USE_MUTEXES
static Mutex mtx1; static Mutex mtx1;
#endif #endif
@ -443,7 +443,7 @@ ROMCONST struct testcase testbmk8 = {
bmk8_execute bmk8_execute
}; };
#if CH_USE_QUEUES || defined(__DOXYGEN__) #if CH_USE_QUEUES
/** /**
* @page test_benchmarks_009 I/O Queues throughput * @page test_benchmarks_009 I/O Queues throughput
* *
@ -533,7 +533,7 @@ ROMCONST struct testcase testbmk10 = {
bmk10_execute bmk10_execute
}; };
#if CH_USE_SEMAPHORES || defined(__DOXYGEN__) #if CH_USE_SEMAPHORES
/** /**
* @page test_benchmarks_011 Semaphores wait/signal performance * @page test_benchmarks_011 Semaphores wait/signal performance
* *
@ -581,7 +581,7 @@ ROMCONST struct testcase testbmk11 = {
}; };
#endif /* CH_USE_SEMAPHORES */ #endif /* CH_USE_SEMAPHORES */
#if CH_USE_MUTEXES || defined(__DOXYGEN__) #if CH_USE_MUTEXES
/** /**
* @page test_benchmarks_012 Mutexes lock/unlock performance * @page test_benchmarks_012 Mutexes lock/unlock performance
* *
@ -651,12 +651,12 @@ static void bmk13_execute(void) {
test_print("--- Timer : "); test_print("--- Timer : ");
test_printn(sizeof(VirtualTimer)); test_printn(sizeof(VirtualTimer));
test_println(" bytes"); test_println(" bytes");
#if CH_USE_SEMAPHORES || defined(__DOXYGEN__) #if CH_USE_SEMAPHORES
test_print("--- Semaph: "); test_print("--- Semaph: ");
test_printn(sizeof(Semaphore)); test_printn(sizeof(Semaphore));
test_println(" bytes"); test_println(" bytes");
#endif #endif
#if CH_USE_EVENTS || defined(__DOXYGEN__) #if CH_USE_EVENTS
test_print("--- EventS: "); test_print("--- EventS: ");
test_printn(sizeof(EventSource)); test_printn(sizeof(EventSource));
test_println(" bytes"); test_println(" bytes");
@ -664,22 +664,22 @@ static void bmk13_execute(void) {
test_printn(sizeof(EventListener)); test_printn(sizeof(EventListener));
test_println(" bytes"); test_println(" bytes");
#endif #endif
#if CH_USE_MUTEXES || defined(__DOXYGEN__) #if CH_USE_MUTEXES
test_print("--- Mutex : "); test_print("--- Mutex : ");
test_printn(sizeof(Mutex)); test_printn(sizeof(Mutex));
test_println(" bytes"); test_println(" bytes");
#endif #endif
#if CH_USE_CONDVARS || defined(__DOXYGEN__) #if CH_USE_CONDVARS
test_print("--- CondV.: "); test_print("--- CondV.: ");
test_printn(sizeof(CondVar)); test_printn(sizeof(CondVar));
test_println(" bytes"); test_println(" bytes");
#endif #endif
#if CH_USE_QUEUES || defined(__DOXYGEN__) #if CH_USE_QUEUES
test_print("--- Queue : "); test_print("--- Queue : ");
test_printn(sizeof(GenericQueue)); test_printn(sizeof(GenericQueue));
test_println(" bytes"); test_println(" bytes");
#endif #endif
#if CH_USE_MAILBOXES || defined(__DOXYGEN__) #if CH_USE_MAILBOXES
test_print("--- MailB.: "); test_print("--- MailB.: ");
test_printn(sizeof(Mailbox)); test_printn(sizeof(Mailbox));
test_println(" bytes"); test_println(" bytes");
@ -706,14 +706,14 @@ ROMCONST struct testcase * ROMCONST patternbmk[] = {
&testbmk6, &testbmk6,
&testbmk7, &testbmk7,
&testbmk8, &testbmk8,
#if CH_USE_QUEUES || defined(__DOXYGEN__) #if CH_USE_QUEUES
&testbmk9, &testbmk9,
#endif #endif
&testbmk10, &testbmk10,
#if CH_USE_SEMAPHORES || defined(__DOXYGEN__) #if CH_USE_SEMAPHORES
&testbmk11, &testbmk11,
#endif #endif
#if CH_USE_MUTEXES || defined(__DOXYGEN__) #if CH_USE_MUTEXES
&testbmk12, &testbmk12,
#endif #endif
&testbmk13, &testbmk13,

6
firmware/development/trigger_emulator.cpp
View File

@ -17,7 +17,7 @@
#include "trigger_central.h" #include "trigger_central.h"
#include "settings.h" #include "settings.h"
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
#include "pwm_generator.h" #include "pwm_generator.h"
#include "pin_repository.h" #include "pin_repository.h"
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
@ -39,14 +39,14 @@ void onConfigurationChangeRpmEmulatorCallback(engine_configuration_s *previousCo
void initTriggerEmulator(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { void initTriggerEmulator(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__) #if EFI_EMULATE_POSITION_SENSORS
print("Emulating %s\r\n", getConfigurationName(engineConfiguration->engineType)); print("Emulating %s\r\n", getConfigurationName(engineConfiguration->engineType));
triggerSignal.outputPins[0] = &emulatorOutputs[0]; triggerSignal.outputPins[0] = &emulatorOutputs[0];
triggerSignal.outputPins[1] = &emulatorOutputs[1]; triggerSignal.outputPins[1] = &emulatorOutputs[1];
triggerSignal.outputPins[2] = &emulatorOutputs[2]; triggerSignal.outputPins[2] = &emulatorOutputs[2];
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE
// todo: refactor, make this a loop // todo: refactor, make this a loop
triggerSignal.outputPins[0]->initPin("trg emulator ch1", CONFIGB(triggerSimulatorPins)[0], triggerSignal.outputPins[0]->initPin("trg emulator ch1", CONFIGB(triggerSimulatorPins)[0],
&CONFIGB(triggerSimulatorPinModes)[0]); &CONFIGB(triggerSimulatorPinModes)[0]);

8
firmware/development/wave_analyzer.cpp
View File

@ -26,14 +26,14 @@
#include "rpm_calculator.h" #include "rpm_calculator.h"
#include "engine_sniffer.h" #include "engine_sniffer.h"
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) #if EFI_WAVE_ANALYZER
EXTERN_ENGINE; EXTERN_ENGINE;
#define CHART_RESET_DELAY 1 #define CHART_RESET_DELAY 1
#define MAX_ICU_COUNT 5 #define MAX_ICU_COUNT 5
#if EFI_ENGINE_SNIFFER || defined(__DOXYGEN__) #if EFI_ENGINE_SNIFFER
extern WaveChart waveChart; extern WaveChart waveChart;
#endif #endif
extern bool hasFirmwareErrorFlag; extern bool hasFirmwareErrorFlag;
@ -55,7 +55,7 @@ static void ensureInitialized(WaveReader *reader) {
efiAssertVoid(CUSTOM_ERR_6654, reader->hw != NULL && reader->hw->started, "wave analyzer NOT INITIALIZED"); efiAssertVoid(CUSTOM_ERR_6654, reader->hw != NULL && reader->hw->started, "wave analyzer NOT INITIALIZED");
} }
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) #if EFI_WAVE_ANALYZER
static void waAnaWidthCallback(WaveReader *reader) { static void waAnaWidthCallback(WaveReader *reader) {
efitick_t nowUs = getTimeNowUs(); efitick_t nowUs = getTimeNowUs();
@ -274,7 +274,7 @@ void initWaveAnalyzer(Logging *sharedLogger) {
if (hasFirmwareError()) { if (hasFirmwareError()) {
return; return;
} }
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) #if EFI_WAVE_ANALYZER
initWave(WA_CHANNEL_1, 0); initWave(WA_CHANNEL_1, 0);
initWave(WA_CHANNEL_2, 1); initWave(WA_CHANNEL_2, 1);

2
firmware/development/wave_analyzer.h
View File

@ -12,7 +12,7 @@
#include "global.h" #include "global.h"
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) #if EFI_WAVE_ANALYZER
#include "digital_input_hw.h" #include "digital_input_hw.h"
#include "engine_sniffer.h" #include "engine_sniffer.h"

14
firmware/rusefi.cpp
View File

@ -126,7 +126,7 @@
#include "lcd_HD44780.h" #include "lcd_HD44780.h"
#endif /* EFI_HD44780_LCD */ #endif /* EFI_HD44780_LCD */
#if EFI_ENGINE_EMULATOR || defined(__DOXYGEN__) #if EFI_ENGINE_EMULATOR
#include "engine_emulator.h" #include "engine_emulator.h"
#endif /* EFI_ENGINE_EMULATOR */ #endif /* EFI_ENGINE_EMULATOR */
@ -168,7 +168,7 @@ void runRusEfi(void) {
initErrorHandling(); initErrorHandling();
addConsoleAction("reboot", scheduleReboot); addConsoleAction("reboot", scheduleReboot);
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) #if EFI_SHAFT_POSITION_INPUT
/** /**
* This is so early because we want to init logger * This is so early because we want to init logger
* which would be used while finding trigger sync index * which would be used while finding trigger sync index
@ -187,7 +187,7 @@ void runRusEfi(void) {
*/ */
initPinRepository(); initPinRepository();
#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__) #if EFI_INTERNAL_FLASH
/** /**
* First thing is reading configuration from flash memory. * First thing is reading configuration from flash memory.
* In order to have complete flexibility configuration has to go before anything else. * In order to have complete flexibility configuration has to go before anything else.
@ -215,11 +215,11 @@ void runRusEfi(void) {
initEngineContoller(&sharedLogger PASS_ENGINE_PARAMETER_SIGNATURE); initEngineContoller(&sharedLogger PASS_ENGINE_PARAMETER_SIGNATURE);
rememberCurrentConfiguration(); rememberCurrentConfiguration();
#if EFI_PERF_METRICS || defined(__DOXYGEN__) #if EFI_PERF_METRICS
initTimePerfActions(&sharedLogger); initTimePerfActions(&sharedLogger);
#endif #endif
#if EFI_ENGINE_EMULATOR || defined(__DOXYGEN__) #if EFI_ENGINE_EMULATOR
initEngineEmulator(&sharedLogger PASS_ENGINE_PARAMETER_SIGNATURE); initEngineEmulator(&sharedLogger PASS_ENGINE_PARAMETER_SIGNATURE);
#endif #endif
startStatusThreads(); startStatusThreads();
@ -235,7 +235,7 @@ void runRusEfi(void) {
while (true) { while (true) {
efiAssertVoid(CUSTOM_RM_STACK, getCurrentRemainingStack() > 128, "stack#1"); efiAssertVoid(CUSTOM_RM_STACK, getCurrentRemainingStack() > 128, "stack#1");
#if (EFI_CLI_SUPPORT && !EFI_UART_ECHO_TEST_MODE) || defined(__DOXYGEN__) #if EFI_CLI_SUPPORT && !EFI_UART_ECHO_TEST_MODE
// sensor state + all pending messages for our own dev console // sensor state + all pending messages for our own dev console
updateDevConsoleState(); updateDevConsoleState();
#endif /* EFI_CLI_SUPPORT */ #endif /* EFI_CLI_SUPPORT */
@ -256,7 +256,7 @@ void runRusEfi(void) {
void chDbgStackOverflowPanic(thread_t *otp) { void chDbgStackOverflowPanic(thread_t *otp) {
(void)otp; (void)otp;
strcpy(panicMessage, "stack overflow: "); strcpy(panicMessage, "stack overflow: ");
#if defined(CH_USE_REGISTRY) || defined(__DOXYGEN__) #if defined(CH_USE_REGISTRY)
int p_name_len = strlen(otp->p_name); int p_name_len = strlen(otp->p_name);
if (p_name_len < sizeof(panicMessage) - 2) if (p_name_len < sizeof(panicMessage) - 2)
strcat(panicMessage, otp->p_name); strcat(panicMessage, otp->p_name);

14
firmware/util/cli_registry.cpp
View File

@ -43,7 +43,7 @@ void resetConsoleActions(void) {
} }
static void doAddAction(const char *token, action_type_e type, Void callback, void *param) { static void doAddAction(const char *token, action_type_e type, Void callback, void *param) {
#if !defined(EFI_DISABLE_CONSOLE_ACTIONS) || defined(__DOXYGEN__) #if !defined(EFI_DISABLE_CONSOLE_ACTIONS)
for (uint32_t i = 0; i < efiStrlen(token);i++) { for (uint32_t i = 0; i < efiStrlen(token);i++) {
char ch = token[i]; char ch = token[i];
if (ch != mytolower(ch)) { if (ch != mytolower(ch)) {
@ -168,14 +168,14 @@ static int getParameterCount(action_type_e parameterType) {
* @brief This function prints out a list of all available commands * @brief This function prints out a list of all available commands
*/ */
void helpCommand(void) { void helpCommand(void) {
#if EFI_BOARD_TEST || defined(__DOXYGEN__) #if EFI_BOARD_TEST
if (isBoardTestMode()) { if (isBoardTestMode()) {
printBoardTestState(); printBoardTestState();
return; return;
} }
#endif /* EFI_BOARD_TEST */ #endif /* EFI_BOARD_TEST */
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if EFI_PROD_CODE || EFI_SIMULATOR
scheduleMsg(logging, "%d actions available", consoleActionCount); scheduleMsg(logging, "%d actions available", consoleActionCount);
for (int i = 0; i < consoleActionCount; i++) { for (int i = 0; i < consoleActionCount; i++) {
TokenCallback *current = &consoleActions[i]; TokenCallback *current = &consoleActions[i];
@ -347,7 +347,7 @@ void handleActionWithParameter(TokenCallback *current, char *parameter) {
REPLACE_SPACES_WITH_ZERO; REPLACE_SPACES_WITH_ZERO;
int value1 = atoi(parameter); int value1 = atoi(parameter);
if (absI(value1) == ERROR_CODE) { if (absI(value1) == ERROR_CODE) {
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if EFI_PROD_CODE || EFI_SIMULATOR
scheduleMsg(logging, "not an integer [%s]", parameter); scheduleMsg(logging, "not an integer [%s]", parameter);
#endif #endif
return; return;
@ -355,7 +355,7 @@ void handleActionWithParameter(TokenCallback *current, char *parameter) {
parameter += spaceIndex + 1; parameter += spaceIndex + 1;
int value2 = atoi(parameter); int value2 = atoi(parameter);
if (absI(value2) == ERROR_CODE) { if (absI(value2) == ERROR_CODE) {
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if EFI_PROD_CODE || EFI_SIMULATOR
scheduleMsg(logging, "not an integer [%s]", parameter); scheduleMsg(logging, "not an integer [%s]", parameter);
#endif #endif
return; return;
@ -531,7 +531,7 @@ static bool handleConsoleLineInternal(const char *commandLine, int lineLength) {
return false; return false;
} }
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if EFI_PROD_CODE || EFI_SIMULATOR
static void sendOutConfirmation(const char *command, int length) { static void sendOutConfirmation(const char *command, int length) {
scheduleMsg(logging, "%s%d", command, length); scheduleMsg(logging, "%s%d", command, length);
} }
@ -561,7 +561,7 @@ void handleConsoleLine(char *line) {
sendOutConfirmation(confirmation, lineLength); sendOutConfirmation(confirmation, lineLength);
#endif #endif
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR
printf("handleConsoleLine [%s]\r\n", line); printf("handleConsoleLine [%s]\r\n", line);
#endif /* EFI_SIMULATOR */ #endif /* EFI_SIMULATOR */

2
firmware/util/datalogging.cpp
View File

@ -32,7 +32,7 @@
#include "global.h" #include "global.h"
#if ! EFI_UNIT_TEST || defined(__DOXYGEN__) #if ! EFI_UNIT_TEST
#include "chprintf.h" #include "chprintf.h"
#include "chmtx.h" #include "chmtx.h"
#include "memstreams.h" #include "memstreams.h"

12
firmware/util/loggingcentral.cpp
View File

@ -8,7 +8,7 @@
#include "global.h" #include "global.h"
#include "efilib.h" #include "efilib.h"
#if ! EFI_UNIT_TEST || defined(__DOXYGEN__) #if ! EFI_UNIT_TEST
typedef char log_buf_t[DL_OUTPUT_BUFFER]; typedef char log_buf_t[DL_OUTPUT_BUFFER];
@ -41,7 +41,7 @@ static char * outputBuffer;
* of logging content * of logging content
*/ */
void scheduleLogging(Logging *logging) { void scheduleLogging(Logging *logging) {
#if EFI_TEXT_LOGGING || defined(__DOXYGEN__) #if EFI_TEXT_LOGGING
// this could be done without locking // this could be done without locking
int newLength = efiStrlen(logging->buffer); int newLength = efiStrlen(logging->buffer);
@ -71,7 +71,7 @@ void scheduleLogging(Logging *logging) {
* this method should always be invoked from the same thread! * this method should always be invoked from the same thread!
*/ */
char * swapOutputBuffers(int *actualOutputBufferSize) { char * swapOutputBuffers(int *actualOutputBufferSize) {
#if EFI_ENABLE_ASSERTS || defined(__DOXYGEN__) #if EFI_ENABLE_ASSERTS
int expectedOutputSize; int expectedOutputSize;
#endif /* EFI_ENABLE_ASSERTS */ #endif /* EFI_ENABLE_ASSERTS */
{ // start of critical section { // start of critical section
@ -81,7 +81,7 @@ char * swapOutputBuffers(int *actualOutputBufferSize) {
*/ */
char *temp = outputBuffer; char *temp = outputBuffer;
#if EFI_ENABLE_ASSERTS || defined(__DOXYGEN__) #if EFI_ENABLE_ASSERTS
expectedOutputSize = accumulatedSize; expectedOutputSize = accumulatedSize;
#endif /* EFI_ENABLE_ASSERTS */ #endif /* EFI_ENABLE_ASSERTS */
outputBuffer = accumulationBuffer; outputBuffer = accumulationBuffer;
@ -96,7 +96,7 @@ char * swapOutputBuffers(int *actualOutputBufferSize) {
} // end of critical section } // end of critical section
*actualOutputBufferSize = efiStrlen(outputBuffer); *actualOutputBufferSize = efiStrlen(outputBuffer);
#if EFI_ENABLE_ASSERTS || defined(__DOXYGEN__) #if EFI_ENABLE_ASSERTS
if (*actualOutputBufferSize != expectedOutputSize) { if (*actualOutputBufferSize != expectedOutputSize) {
int sizeToShow = minI(10, *actualOutputBufferSize); int sizeToShow = minI(10, *actualOutputBufferSize);
int offsetToShow = *actualOutputBufferSize - sizeToShow; int offsetToShow = *actualOutputBufferSize - sizeToShow;
@ -121,7 +121,7 @@ void initLoggingCentral(void) {
* in order to reduce memory usage * in order to reduce memory usage
*/ */
void scheduleMsg(Logging *logging, const char *fmt, ...) { void scheduleMsg(Logging *logging, const char *fmt, ...) {
#if EFI_TEXT_LOGGING || defined(__DOXYGEN__) #if EFI_TEXT_LOGGING
if (logging == NULL) { if (logging == NULL) {
warning(CUSTOM_ERR_LOGGING_NULL, "logging NULL"); warning(CUSTOM_ERR_LOGGING_NULL, "logging NULL");
return; return;

2
firmware/util/math/interpolation.cpp
View File

@ -211,7 +211,7 @@ int findIndexMsg(const char *msg, const float array[], int size, float value) {
break; break;
if (middle != 0 && array[middle - 1] > array[middle]) { if (middle != 0 && array[middle - 1] > array[middle]) {
#if EFI_UNIT_TEST || defined(__DOXYGEN__) #if EFI_UNIT_TEST
firmwareError(CUSTOM_ERR_6610, "%s: out of order %.2f %.2f", msg, array[middle - 1], array[middle]); firmwareError(CUSTOM_ERR_6610, "%s: out of order %.2f %.2f", msg, array[middle - 1], array[middle]);
#else #else
warning(CUSTOM_ERR_OUT_OF_ORDER, "%s: out of order %.2f %.2f", msg, array[middle - 1], array[middle]); warning(CUSTOM_ERR_OUT_OF_ORDER, "%s: out of order %.2f %.2f", msg, array[middle - 1], array[middle]);

4
firmware/util/math/pid.cpp
View File

@ -110,7 +110,7 @@ void Pid::setErrorAmplification(float coef) {
errorAmplificationCoef = coef; errorAmplificationCoef = coef;
} }
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO
void Pid::postState(TunerStudioOutputChannels *tsOutputChannels) { void Pid::postState(TunerStudioOutputChannels *tsOutputChannels) {
postState(tsOutputChannels, 1); postState(tsOutputChannels, 1);
} }
@ -135,7 +135,7 @@ void Pid::postState(TunerStudioOutputChannels *tsOutputChannels, int pMult) {
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */
void Pid::sleep() { void Pid::sleep() {
#if !EFI_UNIT_TEST || defined(__DOXYGEN__) #if !EFI_UNIT_TEST
int periodMs = maxI(10, pid->periodMs); int periodMs = maxI(10, pid->periodMs);
chThdSleepMilliseconds(periodMs); chThdSleepMilliseconds(periodMs);
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */

2
firmware/util/math/pid.h
View File

@ -45,7 +45,7 @@ public:
float getIntegration(void); float getIntegration(void);
float getPrevError(void); float getPrevError(void);
void setErrorAmplification(float coef); void setErrorAmplification(float coef);
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO
void postState(TunerStudioOutputChannels *tsOutputChannels); void postState(TunerStudioOutputChannels *tsOutputChannels);
void postState(TunerStudioOutputChannels *tsOutputChannels, int pMult); void postState(TunerStudioOutputChannels *tsOutputChannels, int pMult);
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */

2
simulator/simulator/rusEfiFunctionalTest.cpp
View File

@ -119,7 +119,7 @@ void rusEfiFunctionalTest(void) {
initTriggerCentral(&sharedLogger); initTriggerCentral(&sharedLogger);
initTriggerEmulator(&sharedLogger PASS_ENGINE_PARAMETER_SUFFIX); initTriggerEmulator(&sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
#if EFI_MAP_AVERAGING || defined(__DOXYGEN__) #if EFI_MAP_AVERAGING
initMapAveraging(&sharedLogger, engine); initMapAveraging(&sharedLogger, engine);
#endif /* EFI_MAP_AVERAGING */ #endif /* EFI_MAP_AVERAGING */