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

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefi 2020-09-12 04:03:23 -04:00
parent 958538e5aa bb9db5b935
commit 893de62fe6
46 changed files with 209 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Sep 11 02:18:01 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 07:37:06 UTC 2020
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -3159,11 +3159,7 @@ struct engine_configuration_s {
/** /**
* offset 3288 * offset 3288
*/ */
uint8_t unused3288[512]; uint8_t unused3288[576];
/**
* offset 3800
*/
float ignitionTpsBins[IGN_TPS_COUNT];
/** /**
* offset 3864 * offset 3864
*/ */
@ -3698,4 +3694,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s; typedef struct persistent_config_s persistent_config_s;
// end // end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Sep 11 02:18:01 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 07:37:06 UTC 2020

8
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -831,7 +831,6 @@
#define idleVeBins_offset 6608 #define idleVeBins_offset 6608
#define IGN_LOAD_COUNT 16 #define IGN_LOAD_COUNT 16
#define IGN_RPM_COUNT 16 #define IGN_RPM_COUNT 16
#define IGN_TPS_COUNT 16
#define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS"
#define IGNITION_PIN_COUNT 12 #define IGNITION_PIN_COUNT 12
#define ignitionDwellForCrankingMs_offset 100 #define ignitionDwellForCrankingMs_offset 100
@ -856,7 +855,6 @@
#define ignitionPins9_offset 644 #define ignitionPins9_offset 644
#define ignitionRpmBins_offset 17376 #define ignitionRpmBins_offset 17376
#define ignitionTable_offset 16288 #define ignitionTable_offset 16288
#define ignitionTpsBins_offset 3800
#define ignMathCalculateAtIndex_offset 1488 #define ignMathCalculateAtIndex_offset 1488
#define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_AC_SWITCH "AC switch"
#define INDICATOR_NAME_BRAKE_DOWN "brake: down" #define INDICATOR_NAME_BRAKE_DOWN "brake: down"
@ -1168,8 +1166,8 @@
#define showHumanReadableWarning_offset 976 #define showHumanReadableWarning_offset 976
#define showSdCardWarning_offset 76 #define showSdCardWarning_offset 76
#define SIGNATURE_BOARD kin #define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 4166548158 #define SIGNATURE_HASH 1697619300
#define silentTriggerError_offset 1464 #define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088 #define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332 #define sparkDwellRpmBins_offset 332
@ -1480,7 +1478,7 @@
#define ts_show_spi true #define ts_show_spi true
#define ts_show_trigger_comparator true #define ts_show_trigger_comparator true
#define ts_show_tunerstudio_port true #define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.09.11.kin.4166548158" #define TS_SIGNATURE "rusEFI 2020.09.12.kin.1697619300"
#define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W #define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74 #define TS_TEST_COMMAND 't' // 0x74

2
firmware/console/status_loop.cpp
View File

@ -176,7 +176,7 @@ static systime_t timeOfPreviousPrintVersion = (systime_t) -1;
#if EFI_PROD_CODE #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, "%s%s%s@%s%s", PROTOCOL_OUTPIN, DELIMETER, pinName, hwPortname(hwPin), DELIMETER); logger.appendPrintf("%s%s%s@%s%s", PROTOCOL_OUTPIN, DELIMETER, pinName, hwPortname(hwPin), DELIMETER);
} }
} }
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */

4
firmware/controllers/core/error_handling.cpp
View File

@ -119,7 +119,7 @@ static void printToStream(MemoryStream *stream, const char *fmt, va_list ap) {
} }
static void printWarning(const char *fmt, va_list ap) { static void printWarning(const char *fmt, va_list ap) {
resetLogging(&logger); // todo: is 'reset' really needed here? logger.reset(); // todo: is 'reset' really needed here?
appendMsgPrefix(&logger); appendMsgPrefix(&logger);
logger.append(WARNING_PREFIX); logger.append(WARNING_PREFIX);
@ -137,7 +137,7 @@ static void printWarning(const char *fmt, va_list ap) {
} }
logger.append(warningBuffer); logger.append(warningBuffer);
append(&logger, DELIMETER); logger.append(DELIMETER);
scheduleLogging(&logger); scheduleLogging(&logger);
} }

2
firmware/controllers/date_stamp.h
View File

@ -1,2 +1,2 @@
#pragma once #pragma once
#define VCS_DATE 20200911 #define VCS_DATE 20200912

10
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:42 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -3159,11 +3159,7 @@ struct engine_configuration_s {
/** /**
* offset 3288 * offset 3288
*/ */
uint8_t unused3288[512]; uint8_t unused3288[576];
/**
* offset 3800
*/
float ignitionTpsBins[IGN_TPS_COUNT];
/** /**
* offset 3864 * offset 3864
*/ */
@ -3698,4 +3694,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s; typedef struct persistent_config_s persistent_config_s;
// end // end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:42 UTC 2020 // this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020

2
firmware/controllers/generated/fsio_enums_generated.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:42 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer // by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000, FSIO_SETTING_FANONTEMPERATURE = 1000,

2
firmware/controllers/generated/fsio_getters.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:42 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer // by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE: case FSIO_SETTING_FANONTEMPERATURE:

2
firmware/controllers/generated/fsio_names.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:42 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer // by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

2
firmware/controllers/generated/fsio_strings.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:42 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer // by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE: case FSIO_SETTING_FANONTEMPERATURE:

8
firmware/controllers/generated/rusefi_generated.h
View File

@ -831,7 +831,6 @@
#define idleVeBins_offset 6608 #define idleVeBins_offset 6608
#define IGN_LOAD_COUNT 16 #define IGN_LOAD_COUNT 16
#define IGN_RPM_COUNT 16 #define IGN_RPM_COUNT 16
#define IGN_TPS_COUNT 16
#define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS"
#define IGNITION_PIN_COUNT 12 #define IGNITION_PIN_COUNT 12
#define ignitionDwellForCrankingMs_offset 100 #define ignitionDwellForCrankingMs_offset 100
@ -856,7 +855,6 @@
#define ignitionPins9_offset 644 #define ignitionPins9_offset 644
#define ignitionRpmBins_offset 17376 #define ignitionRpmBins_offset 17376
#define ignitionTable_offset 16288 #define ignitionTable_offset 16288
#define ignitionTpsBins_offset 3800
#define ignMathCalculateAtIndex_offset 1488 #define ignMathCalculateAtIndex_offset 1488
#define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_AC_SWITCH "AC switch"
#define INDICATOR_NAME_BRAKE_DOWN "brake: down" #define INDICATOR_NAME_BRAKE_DOWN "brake: down"
@ -1168,8 +1166,8 @@
#define showHumanReadableWarning_offset 976 #define showHumanReadableWarning_offset 976
#define showSdCardWarning_offset 76 #define showSdCardWarning_offset 76
#define SIGNATURE_BOARD all #define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 327369018 #define SIGNATURE_HASH 2398398176
#define silentTriggerError_offset 1464 #define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088 #define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332 #define sparkDwellRpmBins_offset 332
@ -1480,7 +1478,7 @@
#define ts_show_spi true #define ts_show_spi true
#define ts_show_trigger_comparator false #define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true #define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.09.11.all.327369018" #define TS_SIGNATURE "rusEFI 2020.09.12.all.2398398176"
#define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W #define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74 #define TS_TEST_COMMAND 't' // 0x74

6
firmware/controllers/generated/signature_all.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD all #define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 327369018 #define SIGNATURE_HASH 2398398176
#define TS_SIGNATURE "rusEFI 2020.09.11.all.327369018" #define TS_SIGNATURE "rusEFI 2020.09.12.all.2398398176"

6
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 3021481729 #define SIGNATURE_HASH 695189723
#define TS_SIGNATURE "rusEFI 2020.09.11.frankenso_na6.3021481729" #define TS_SIGNATURE "rusEFI 2020.09.12.frankenso_na6.695189723"

6
firmware/controllers/generated/signature_kin.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD kin #define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 4166548158 #define SIGNATURE_HASH 1697619300
#define TS_SIGNATURE "rusEFI 2020.09.11.kin.4166548158" #define TS_SIGNATURE "rusEFI 2020.09.12.kin.1697619300"

6
firmware/controllers/generated/signature_mre_f4.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD mre_f4 #define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 40297872 #define SIGNATURE_HASH 2668692042
#define TS_SIGNATURE "rusEFI 2020.09.11.mre_f4.40297872" #define TS_SIGNATURE "rusEFI 2020.09.12.mre_f4.2668692042"

6
firmware/controllers/generated/signature_mre_f7.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD mre_f7 #define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 40297872 #define SIGNATURE_HASH 2668692042
#define TS_SIGNATURE "rusEFI 2020.09.11.mre_f7.40297872" #define TS_SIGNATURE "rusEFI 2020.09.12.mre_f7.2668692042"

6
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 2796333129 #define SIGNATURE_HASH 1004228499
#define TS_SIGNATURE "rusEFI 2020.09.11.prometheus_405.2796333129" #define TS_SIGNATURE "rusEFI 2020.09.12.prometheus_405.1004228499"

6
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 2796333129 #define SIGNATURE_HASH 1004228499
#define TS_SIGNATURE "rusEFI 2020.09.11.prometheus_469.2796333129" #define TS_SIGNATURE "rusEFI 2020.09.12.prometheus_469.1004228499"

6
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 4031945258 #define SIGNATURE_HASH 1831173616
#define TS_SIGNATURE "rusEFI 2020.09.11.proteus_f4.4031945258" #define TS_SIGNATURE "rusEFI 2020.09.12.proteus_f4.1831173616"

6
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.09.11 #define SIGNATURE_DATE 2020.09.12
#define SIGNATURE_HASH 4031945258 #define SIGNATURE_HASH 1831173616
#define TS_SIGNATURE "rusEFI 2020.09.11.proteus_f7.4031945258" #define TS_SIGNATURE "rusEFI 2020.09.12.proteus_f7.1831173616"

33
firmware/development/engine_sniffer.cpp
View File

@ -58,7 +58,7 @@ int waveChartUsedSize;
//#define DEBUG_WAVE 1 //#define DEBUG_WAVE 1
#if DEBUG_WAVE #if DEBUG_WAVE
static Logging debugLogging; static LoggingWithStorage debugLogging("debug");
#endif /* DEBUG_WAVE */ #endif /* DEBUG_WAVE */
static LoggingWithStorage logger("wave info"); static LoggingWithStorage logger("wave info");
@ -76,11 +76,10 @@ static void resetNow(void) {
} }
#endif #endif
WaveChart::WaveChart() { WaveChart::WaveChart() : logging("wave chart", WAVE_LOGGING_BUFFER, sizeof(WAVE_LOGGING_BUFFER)) {
} }
void WaveChart::init() { void WaveChart::init() {
logging.initLoggingExt("wave chart", WAVE_LOGGING_BUFFER, sizeof(WAVE_LOGGING_BUFFER));
isInitialized = true; isInitialized = true;
reset(); reset();
} }
@ -89,11 +88,11 @@ void WaveChart::reset() {
#if DEBUG_WAVE #if DEBUG_WAVE
scheduleSimpleMsg(&debugLogging, "reset while at ", counter); scheduleSimpleMsg(&debugLogging, "reset while at ", counter);
#endif /* DEBUG_WAVE */ #endif /* DEBUG_WAVE */
resetLogging(&logging); logging.reset();
counter = 0; counter = 0;
startTimeNt = 0; startTimeNt = 0;
collectingData = false; collectingData = false;
appendPrintf(&logging, "%s%s", PROTOCOL_ENGINE_SNIFFER, DELIMETER); logging.appendPrintf( "%s%s", PROTOCOL_ENGINE_SNIFFER, DELIMETER);
} }
void WaveChart::startDataCollection() { void WaveChart::startDataCollection() {
@ -144,8 +143,8 @@ void WaveChart::publishIfFull() {
} }
void WaveChart::publish() { void WaveChart::publish() {
appendPrintf(&logging, DELIMETER); logging.appendPrintf( DELIMETER);
waveChartUsedSize = loggingSize(&logging); waveChartUsedSize = logging.loggingSize();
#if DEBUG_WAVE #if DEBUG_WAVE
Logging *l = &chart->logging; Logging *l = &chart->logging;
scheduleSimpleMsg(&debugLogging, "IT'S TIME", strlen(l->buffer)); scheduleSimpleMsg(&debugLogging, "IT'S TIME", strlen(l->buffer));
@ -211,20 +210,20 @@ void WaveChart::addEvent3(const char *name, const char * msg) {
uint32_t diffNt = nowNt - startTimeNt; uint32_t diffNt = nowNt - startTimeNt;
uint32_t time100 = NT2US(diffNt / ENGINE_SNIFFER_UNIT_US); uint32_t time100 = NT2US(diffNt / ENGINE_SNIFFER_UNIT_US);
if (remainingSize(&logging) > 35) { if (logging.remainingSize() > 35) {
/** /**
* printf is a heavy method, append is used here as a performance optimization * printf is a heavy method, append is used here as a performance optimization
*/ */
appendFast(&logging, name); logging.appendFast(name);
appendChar(&logging, CHART_DELIMETER); logging.appendChar(CHART_DELIMETER);
appendFast(&logging, msg); logging.appendFast(msg);
appendChar(&logging, CHART_DELIMETER); logging.appendChar(CHART_DELIMETER);
// time100 -= startTime100; // time100 -= startTime100;
itoa10(timeBuffer, time100); itoa10(timeBuffer, time100);
appendFast(&logging, timeBuffer); logging.appendFast(timeBuffer);
appendChar(&logging, CHART_DELIMETER); logging.appendChar(CHART_DELIMETER);
logging.linePointer[0] = 0; logging.appendChar('\0');
} }
if (!alreadyLocked) { if (!alreadyLocked) {
unlockOutputBuffer(); unlockOutputBuffer();
@ -240,10 +239,6 @@ void initWaveChart(WaveChart *chart) {
printStatus(); printStatus();
#if DEBUG_WAVE
initLoggingExt(&debugLogging, "wave chart debug", &debugLogging.DEFAULT_BUFFER, sizeof(debugLogging.DEFAULT_BUFFER));
#endif
#if EFI_HISTOGRAMS #if EFI_HISTOGRAMS
initHistogram(&engineSnifferHisto, "wave chart"); initHistogram(&engineSnifferHisto, "wave chart");
#endif /* EFI_HISTOGRAMS */ #endif /* EFI_HISTOGRAMS */

30
firmware/development/logic_analyzer.cpp
View File

@ -171,38 +171,38 @@ static void reportWave(Logging *logging, int index) {
float dwellMs = getSignalOnTime(index); float dwellMs = getSignalOnTime(index);
float periodMs = getSignalPeriodMs(index); float periodMs = getSignalPeriodMs(index);
appendPrintf(logging, "duty%d%s", index, DELIMETER); logging->appendPrintf("duty%d%s", index, DELIMETER);
appendFloat(logging, 100.0f * dwellMs / periodMs, 2); logging->appendFloat(100.0f * dwellMs / periodMs, 2);
appendPrintf(logging, "%s", DELIMETER); logging->appendPrintf("%s", DELIMETER);
/** /**
* that's the ON time of the LAST signal * that's the ON time of the LAST signal
*/ */
appendPrintf(logging, "dwell%d%s", index, DELIMETER); logging->appendPrintf("dwell%d%s", index, DELIMETER);
appendFloat(logging, dwellMs, 2); logging->appendFloat(dwellMs, 2);
appendPrintf(logging, "%s", DELIMETER); logging->appendPrintf("%s", DELIMETER);
/** /**
* that's the total ON time during the previous engine cycle * that's the total ON time during the previous engine cycle
*/ */
appendPrintf(logging, "total_dwell%d%s", index, DELIMETER); logging->appendPrintf("total_dwell%d%s", index, DELIMETER);
appendFloat(logging, readers[index].prevTotalOnTimeUs / 1000.0f, 2); logging->appendFloat(readers[index].prevTotalOnTimeUs / 1000.0f, 2);
appendPrintf(logging, "%s", DELIMETER); logging->appendPrintf("%s", DELIMETER);
appendPrintf(logging, "period%d%s", index, DELIMETER); logging->appendPrintf("period%d%s", index, DELIMETER);
appendFloat(logging, periodMs, 2); logging->appendFloat(periodMs, 2);
appendPrintf(logging, "%s", DELIMETER); logging->appendPrintf("%s", DELIMETER);
uint32_t offsetUs = getWaveOffset(index); uint32_t offsetUs = getWaveOffset(index);
int rpm = GET_RPM(); int rpm = GET_RPM();
if (rpm != 0) { if (rpm != 0) {
float oneDegreeUs = getOneDegreeTimeUs(rpm); float oneDegreeUs = getOneDegreeTimeUs(rpm);
appendPrintf(logging, "advance%d%s", index, DELIMETER); logging->appendPrintf("advance%d%s", index, DELIMETER);
float angle = (offsetUs / oneDegreeUs) - tdcPosition(); float angle = (offsetUs / oneDegreeUs) - tdcPosition();
fixAngle(angle, "waveAn", CUSTOM_ERR_6564); fixAngle(angle, "waveAn", CUSTOM_ERR_6564);
appendFloat(logging, angle, 3); logging->appendFloat(angle, 3);
appendPrintf(logging, "%s", DELIMETER); logging->appendPrintf("%s", DELIMETER);
} }
} }
} }

10
firmware/development/sensor_chart.cpp
View File

@ -49,7 +49,7 @@ void scAddData(float angle, float value) {
* data after we have added some data - meaning it's time to flush * data after we have added some data - meaning it's time to flush
*/ */
// message terminator // message terminator
appendPrintf(&scLogging, DELIMETER); scLogging.appendPrintf(DELIMETER);
// output pending data // output pending data
scheduleLogging(&scLogging); scheduleLogging(&scLogging);
pendingData = false; pendingData = false;
@ -58,13 +58,13 @@ void scAddData(float angle, float value) {
} }
if (!pendingData) { if (!pendingData) {
pendingData = true; pendingData = true;
resetLogging(&scLogging); scLogging.reset();
// message header // message header
appendPrintf(&scLogging, "%s%s", PROTOCOL_ANALOG_CHART, DELIMETER); scLogging.appendPrintf( "%s%s", PROTOCOL_ANALOG_CHART, DELIMETER);
} }
if (remainingSize(&scLogging) > 100) { if (scLogging.remainingSize() > 100) {
appendPrintf(&scLogging, "%.2f|%.2f|", angle, value); scLogging.appendPrintf( "%.2f|%.2f|", angle, value);
} }
#endif /* EFI_TEXT_LOGGING */ #endif /* EFI_TEXT_LOGGING */
} }

12
firmware/hw_layer/adc/adc_inputs.cpp
View File

@ -385,10 +385,10 @@ static void printFullAdcReport(Logging *logger) {
int pin = getAdcChannelPin(hwIndex); int pin = getAdcChannelPin(hwIndex);
int adcValue = getAvgAdcValue(hwIndex, fastAdc.samples, ADC_BUF_DEPTH_FAST, fastAdc.size()); int adcValue = getAvgAdcValue(hwIndex, fastAdc.samples, ADC_BUF_DEPTH_FAST, fastAdc.size());
appendPrintf(logger, " F ch%d %s%d", index, portname(port), pin); logger->appendPrintf(" F ch%d %s%d", index, portname(port), pin);
appendPrintf(logger, " ADC%d 12bit=%d", hwIndex, adcValue); logger->appendPrintf(" ADC%d 12bit=%d", hwIndex, adcValue);
float volts = adcToVolts(adcValue); float volts = adcToVolts(adcValue);
appendPrintf(logger, " v=%.2f", volts); logger->appendPrintf(" v=%.2f", volts);
appendMsgPostfix(logger); appendMsgPostfix(logger);
scheduleLogging(logger); scheduleLogging(logger);
@ -405,10 +405,10 @@ static void printFullAdcReport(Logging *logger) {
int pin = getAdcChannelPin(hwIndex); int pin = getAdcChannelPin(hwIndex);
int adcValue = slowAdc.getAdcValueByIndex(index); int adcValue = slowAdc.getAdcValueByIndex(index);
appendPrintf(logger, " S ch%d %s%d", index, portname(port), pin); logger->appendPrintf(" S ch%d %s%d", index, portname(port), pin);
appendPrintf(logger, " ADC%d 12bit=%d", hwIndex, adcValue); logger->appendPrintf(" ADC%d 12bit=%d", hwIndex, adcValue);
float volts = adcToVolts(adcValue); float volts = adcToVolts(adcValue);
appendPrintf(logger, " v=%.2f", volts); logger->appendPrintf(" v=%.2f", volts);
appendMsgPostfix(logger); appendMsgPostfix(logger);
scheduleLogging(logger); scheduleLogging(logger);

2
firmware/hw_layer/rtc_helper.cpp
View File

@ -145,7 +145,7 @@ void printDateTime(void) {
date_get_tm(&timp); date_get_tm(&timp);
appendMsgPrefix(&logger); appendMsgPrefix(&logger);
appendPrintf(&logger, "Current RTC localtime is: %04u-%02u-%02u %02u:%02u:%02u w=%d", timp.tm_year + 1900, timp.tm_mon + 1, timp.tm_mday, timp.tm_hour, logger.appendPrintf( "Current RTC localtime is: %04u-%02u-%02u %02u:%02u:%02u w=%d", timp.tm_year + 1900, timp.tm_mon + 1, timp.tm_mday, timp.tm_hour,
timp.tm_min, timp.tm_sec, rtcWorks); timp.tm_min, timp.tm_sec, rtcWorks);
appendMsgPostfix(&logger); appendMsgPostfix(&logger);
scheduleLogging(&logger); scheduleLogging(&logger);

6
firmware/integration/rusefi_config.txt
View File

@ -7,7 +7,7 @@
! rusEfi configuration consists of two parts: ! rusEfi configuration consists of two parts:
! First part is engine_configuration_s area, followed by a few tuning tables ! First part is engine_configuration_s area, followed by a few tuning tables
! !
! The only difference her is that engine_configuration_s area does not support hot modification while tuning tables could ! The only difference here is that engine_configuration_s area does not support hot modification while tuning tables could
! be modified without burning changes ! be modified without burning changes
! !
! !
@ -132,7 +132,6 @@ struct_no_prefix engine_configuration_s
#define CRANKING_CURVE_SIZE 8 #define CRANKING_CURVE_SIZE 8
#define IGN_LOAD_COUNT 16 #define IGN_LOAD_COUNT 16
#define IGN_TPS_COUNT 16
#define IGN_RPM_COUNT 16 #define IGN_RPM_COUNT 16
#define INJECTION_PIN_COUNT 12 #define INJECTION_PIN_COUNT 12
@ -1308,8 +1307,7 @@ float[CRANKING_ADVANCE_CURVE_SIZE] crankingAdvance ;+Optional timing advance
float[CLT_CURVE_SIZE] iacCoastingBins;CLT-based idle position for coasting (used in Auto-PID Idle mode);"C", 1, 0, -100.0, 250.0, 2 float[CLT_CURVE_SIZE] iacCoastingBins;CLT-based idle position for coasting (used in Auto-PID Idle mode);"C", 1, 0, -100.0, 250.0, 2
float[CLT_CURVE_SIZE] iacCoasting; CLT-based idle position for coasting (used in Auto-PID Idle mode);"%", 1, 0, 0.0, 100.0, 2 float[CLT_CURVE_SIZE] iacCoasting; CLT-based idle position for coasting (used in Auto-PID Idle mode);"%", 1, 0, 0.0, 100.0, 2
uint8_t[512] unused3288;;"units", 1, 0, -20, 100, 0 uint8_t[576] unused3288;;"units", 1, 0, -20, 100, 0
float[IGN_TPS_COUNT] ignitionTpsBins;;"TPS", 1, 0.0, 0, 100.0, 2
float tChargeAirCoefMin;;"Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 float tChargeAirCoefMin;;"Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4
float tChargeAirCoefMax;;"Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 float tChargeAirCoefMax;;"Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4

14
firmware/rusefi.cpp
View File

@ -12,7 +12,7 @@
* *
* For version see engine_controller.cpp getRusEfiVersion * For version see engine_controller.cpp getRusEfiVersion
* *
* @section sec_into * @section sec_intro Intro
* *
* rusEfi is implemented based on the idea that with modern 100+ MHz microprocessors the relatively * rusEfi is implemented based on the idea that with modern 100+ MHz microprocessors the relatively
* undemanding task of internal combustion engine control could be implemented in a high-level, processor-independent * undemanding task of internal combustion engine control could be implemented in a high-level, processor-independent
@ -50,11 +50,11 @@
* *
* @section sec_timers Timers * @section sec_timers Timers
* At the moment rusEfi is build using 5 times: * At the moment rusEfi is build using 5 times:
* 1) 1MHz microsecond_timer.cpp * <BR>1) 1MHz microsecond_timer.cpp
* 2) 10KHz fast ADC callback pwmpcb_fast adc_inputs.cpp * <BR>2) 10KHz fast ADC callback pwmpcb_fast adc_inputs.cpp
* 3) slow ADC callback pwmpcb_slow adc_inputs.cpp * <BR>3) slow ADC callback pwmpcb_slow adc_inputs.cpp
* 4) periodicFastTimer engine_controller.cpp * <BR>4) periodicFastTimer engine_controller.cpp
* 5) periodicSlowTimer engine_controller.cpp * <BR>5) periodicSlowTimer engine_controller.cpp
* *
* *
* *
@ -96,7 +96,7 @@
* @section sec_fuel_injection Fuel Injection * @section sec_fuel_injection Fuel Injection
* *
* *
* @sectuion sec_misc Misc * @section sec_misc Misc
* *
* <BR>See main_trigger_callback.cpp for main trigger event handler * <BR>See main_trigger_callback.cpp for main trigger event handler
* <BR>See fuel_math.cpp for details on fuel amount logic * <BR>See fuel_math.cpp for details on fuel amount logic

BIN
firmware/tunerstudio/generated/cache.zip
View File

Binary file not shown.

9
firmware/tunerstudio/generated/rusefi.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.all.327369018" signature = "rusEFI 2020.09.12.all.2398398176"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.all.327369018" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.all.2398398176" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:42 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

9
firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.frankenso_na6.3021481729" signature = "rusEFI 2020.09.12.frankenso_na6.695189723"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.frankenso_na6.3021481729" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.frankenso_na6.695189723" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:53 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:56 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

9
firmware/tunerstudio/generated/rusefi_kinetis.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.kin.4166548158" signature = "rusEFI 2020.09.12.kin.1697619300"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.kin.4166548158" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.kin.1697619300" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Sep 11 02:18:01 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 07:37:06 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

9
firmware/tunerstudio/generated/rusefi_mre_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.mre_f4.40297872" signature = "rusEFI 2020.09.12.mre_f4.2668692042"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.mre_f4.40297872" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.mre_f4.2668692042" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:51 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:53 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

9
firmware/tunerstudio/generated/rusefi_mre_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.mre_f7.40297872" signature = "rusEFI 2020.09.12.mre_f7.2668692042"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.mre_f7.40297872" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.mre_f7.2668692042" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:49 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:50 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

9
firmware/tunerstudio/generated/rusefi_prometheus_405.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.prometheus_405.2796333129" signature = "rusEFI 2020.09.12.prometheus_405.1004228499"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.prometheus_405.2796333129" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.prometheus_405.1004228499" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:56 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:37:01 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

9
firmware/tunerstudio/generated/rusefi_prometheus_469.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.prometheus_469.2796333129" signature = "rusEFI 2020.09.12.prometheus_469.1004228499"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.prometheus_469.2796333129" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.prometheus_469.1004228499" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:55 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:59 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

9
firmware/tunerstudio/generated/rusefi_proteus_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.proteus_f4.4031945258" signature = "rusEFI 2020.09.12.proteus_f4.1831173616"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.proteus_f4.4031945258" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.proteus_f4.1831173616" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:18:00 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:37:04 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

9
firmware/tunerstudio/generated/rusefi_proteus_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune] [MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.09.11.proteus_f7.4031945258" signature = "rusEFI 2020.09.12.proteus_f7.1831173616"
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.09.11.proteus_f7.4031945258" ; signature is expected to be 7 or more characters. signature = "rusEFI 2020.09.12.proteus_f7.1831173616" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:58 UTC 2020 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:37:02 UTC 2020
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1033,8 +1033,7 @@ page = 1
coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0
iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2
iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2
unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0
ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2
tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4
tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1

103
firmware/util/datalogging.cpp
View File

@ -73,26 +73,22 @@ static IntermediateLogging intermediateLogging;
/** /**
* @returns true if data does not fit into this buffer * @returns true if data does not fit into this buffer
*/ */
static ALWAYS_INLINE bool validateBuffer(Logging *logging, const char *text, uint32_t extraLen) { bool Logging::validateBuffer(const char *text, uint32_t extraLen) {
if (logging->buffer == NULL) { if (remainingSize() < extraLen + 1) {
firmwareError(CUSTOM_ERR_LOGGING_NOT_READY, "Logging not initialized: %s", logging->name);
return true;
}
if (remainingSize(logging) < extraLen + 1) {
#if EFI_PROD_CODE #if EFI_PROD_CODE
const char * msg = extraLen > 50 ? "(long)" : text; const char * msg = extraLen > 50 ? "(long)" : text;
warning(CUSTOM_LOGGING_BUFFER_OVERFLOW, "output overflow %s %d [%s]", logging->name, extraLen, msg); warning(CUSTOM_LOGGING_BUFFER_OVERFLOW, "output overflow %s %d [%s]", name, extraLen, msg);
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
return true; return true;
} }
return false; return false;
} }
void Logging::append(const char *text) { void Logging::append(const char *text) {
efiAssertVoid(CUSTOM_APPEND_NULL, text != NULL, "append NULL"); efiAssertVoid(CUSTOM_APPEND_NULL, text != NULL, "append NULL");
uint32_t extraLen = efiStrlen(text); uint32_t extraLen = efiStrlen(text);
bool isCapacityProblem = validateBuffer(this, text, extraLen); bool isCapacityProblem = validateBuffer(text, extraLen);
if (isCapacityProblem) { if (isCapacityProblem) {
return; return;
} }
@ -103,20 +99,14 @@ void Logging::append(const char *text) {
linePointer += extraLen; linePointer += extraLen;
} }
// todo: inline
void append(Logging *logging, const char *text) {
logging->append(text);
}
/** /**
* @note This method if fast because it does not validate much, be sure what you are doing * @note This method if fast because it does not validate much, be sure what you are doing
*/ */
void appendFast(Logging *logging, const char *text) { void Logging::appendFast(const char *text) {
char *s; char *s = linePointer;
s = logging->linePointer;
while ((*s++ = *text++) != 0) while ((*s++ = *text++) != 0)
; ;
logging->linePointer = s - 1; linePointer = s - 1;
} }
/** /**
@ -138,15 +128,6 @@ void Logging::vappendPrintf(const char *fmt, va_list arg) {
#endif // EFI_UNIT_TEST #endif // EFI_UNIT_TEST
} }
// todo: replace with logging->appendPrintf
void appendPrintf(Logging *logging, const char *fmt, ...) {
efiAssertVoid(CUSTOM_APPEND_STACK, getCurrentRemainingStack() > 128, "lowstck#4");
va_list ap;
va_start(ap, fmt);
logging->vappendPrintf(fmt, ap);
va_end(ap);
}
void Logging::appendPrintf(const char *fmt, ...) { void Logging::appendPrintf(const char *fmt, ...) {
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
va_list ap; va_list ap;
@ -162,19 +143,7 @@ void Logging::appendPrintf(const char *fmt, ...) {
#endif // EFI_UNIT_TEST #endif // EFI_UNIT_TEST
} }
void Logging::initLoggingExt(const char *name, char *buffer, int bufferSize) { void Logging::appendFloat(float value, int precision) {
this->name = name;
this->buffer = buffer;
this->bufferSize = bufferSize;
resetLogging(this);
this->isInitialized = true;
}
int isInitialized(Logging *logging) {
return logging->isInitialized;
}
void appendFloat(Logging *logging, float value, int precision) {
/** /**
* todo: #1 this implementation is less than perfect * todo: #1 this implementation is less than perfect
* todo: #2 The only way to avoid double promotion would probably be using *float instead of float * todo: #2 The only way to avoid double promotion would probably be using *float instead of float
@ -182,26 +151,26 @@ void appendFloat(Logging *logging, float value, int precision) {
*/ */
switch (precision) { switch (precision) {
case 1: case 1:
appendPrintf(logging, "%.1f", value); appendPrintf("%.1f", value);
break; break;
case 2: case 2:
appendPrintf(logging, "%.2f", value); appendPrintf("%.2f", value);
break; break;
case 3: case 3:
appendPrintf(logging, "%.3f", value); appendPrintf("%.3f", value);
break; break;
case 4: case 4:
appendPrintf(logging, "%.4f", value); appendPrintf("%.4f", value);
break; break;
case 5: case 5:
appendPrintf(logging, "%.5f", value); appendPrintf("%.5f", value);
break; break;
case 6: case 6:
appendPrintf(logging, "%.6f", value); appendPrintf("%.6f", value);
break; break;
default: default:
appendPrintf(logging, "%.2f", value); appendPrintf("%.2f", value);
} }
} }
@ -210,7 +179,7 @@ static char header[16];
/** /**
* this method should invoked on the main thread only * this method should invoked on the main thread only
*/ */
void printWithLength(char *line) { static void printWithLength(char *line) {
#if ! EFI_UNIT_TEST #if ! EFI_UNIT_TEST
int len; int len;
char *p; char *p;
@ -248,21 +217,16 @@ void printWithLength(char *line) {
} }
void appendMsgPrefix(Logging *logging) { void appendMsgPrefix(Logging *logging) {
append(logging, PROTOCOL_MSG DELIMETER); logging->append(PROTOCOL_MSG DELIMETER);
} }
void appendMsgPostfix(Logging *logging) { void appendMsgPostfix(Logging *logging) {
append(logging, DELIMETER); logging->append(DELIMETER);
} }
void resetLogging(Logging *logging) { void Logging::reset() {
char *buffer = logging->buffer; linePointer = buffer;
if (buffer == NULL) { *linePointer = 0;
firmwareError(ERROR_NULL_BUFFER, "Null buffer: %s", logging->name);
return;
}
logging->linePointer = buffer;
logging->linePointer[0] = 0;
} }
/** /**
@ -279,24 +243,17 @@ void printMsg(Logging *logger, const char *fmt, ...) {
logger->vappendPrintf(fmt, ap); logger->vappendPrintf(fmt, ap);
va_end(ap); va_end(ap);
append(logger, DELIMETER); logger->append(DELIMETER);
printWithLength(logger->buffer); printWithLength(logger->buffer);
resetLogging(logger); logger->reset();
} }
uint32_t remainingSize(Logging *logging) { Logging::Logging(char const *name, char *buffer, int bufferSize)
return logging->bufferSize - loggingSize(logging); : name(name)
} , buffer(buffer)
, bufferSize(bufferSize)
Logging::Logging() { {
} reset();
Logging::Logging(char const *name, char *buffer, int bufferSize) : Logging() {
#if ! EFI_UNIT_TEST
initLoggingExt(name, buffer, bufferSize);
#else
this->buffer = buffer;
#endif /* ! EFI_UNIT_TEST */
} }
LoggingWithStorage::LoggingWithStorage(const char *name) : Logging(name, DEFAULT_BUFFER, sizeof(DEFAULT_BUFFER)) { LoggingWithStorage::LoggingWithStorage(const char *name) : Logging(name, DEFAULT_BUFFER, sizeof(DEFAULT_BUFFER)) {

58
firmware/util/datalogging.h
View File

@ -17,28 +17,51 @@
// size of buffers? // size of buffers?
class Logging { class Logging {
public: public:
Logging(); Logging() = delete;
Logging(const char *name, char *buffer, int bufferSize); Logging(const char *name, char *buffer, int bufferSize);
void initLoggingExt(const char *name, char *buffer, int bufferSize);
void reset();
void vappendPrintf(const char *fmt, va_list arg); void vappendPrintf(const char *fmt, va_list arg);
void append(const char *text); void append(const char *text);
void appendFast(const char *text); void appendFast(const char *text);
void appendPrintf(const char *fmt, ...); void appendPrintf(const char *fmt, ...);
const char *name = nullptr; void appendFloat(float value, int precision);
char SMALL_BUFFER[40];
/**
* This macro breaks the normal zero=termination constraint, please take care of this outside of this function
*/
void appendChar(char c) {
*linePointer = c;
linePointer++;
}
size_t loggingSize() const {
return (uintptr_t)linePointer - (uintptr_t)buffer;
}
size_t remainingSize() const {
return bufferSize - loggingSize();
}
//private:
bool validateBuffer(const char *text, uint32_t extraLen);
const char* const name = nullptr;
/** /**
* Zero-terminated buffer of pending debug message * Zero-terminated buffer of pending debug message
* *
* Unless a larger external 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 = nullptr; char* const buffer = nullptr;
const int bufferSize = 0;
/** /**
* This pointer is always pointing at the position within the buffer into which next * This pointer is always pointing at the position within the buffer into which next
* write operation would append additional data * write operation would append additional data
*/ */
char *linePointer = nullptr; char *linePointer = nullptr;
int bufferSize = 0;
volatile bool isInitialized = false;
}; };
class LoggingWithStorage : public Logging { class LoggingWithStorage : public Logging {
@ -47,14 +70,8 @@ public:
char DEFAULT_BUFFER[200]; char DEFAULT_BUFFER[200];
}; };
int isInitialized(Logging *logging);
void initLoggingExt(Logging *logging, const char *name, char *buffer, int bufferSize); void initLoggingExt(Logging *logging, const char *name, char *buffer, int bufferSize);
void appendFloat(Logging *logging, float value, int precision);
void resetLogging(Logging *logging);
void appendMsgPrefix(Logging *logging); void appendMsgPrefix(Logging *logging);
void appendMsgPostfix(Logging *logging); void appendMsgPostfix(Logging *logging);
@ -67,20 +84,7 @@ extern "C"
#define lockOutputBuffer lockAnyContext #define lockOutputBuffer lockAnyContext
#define unlockOutputBuffer unlockAnyContext #define unlockOutputBuffer unlockAnyContext
uint32_t remainingSize(Logging *logging);
#define loggingSize(logging) ((int) (logging)->linePointer - (int) ((logging)->buffer))
void printMsg(Logging *logging, const char *fmt, ...); void printMsg(Logging *logging, const char *fmt, ...);
void appendPrintf(Logging *logging, const char *fmt, ...);
void append(Logging *logging, const char *text);
void appendFast(Logging *logging, const char *text);
/**
* This macro breaks the normal zero=termination constraint, please take care of this outside of this macro
*/
#define appendChar(logging, symbol) {(logging)->linePointer[0] = (symbol);(logging)->linePointer++;}
/** /**
* this method copies the line into the intermediate buffer for later output by * this method copies the line into the intermediate buffer for later output by
@ -91,5 +95,3 @@ void scheduleLogging(Logging *logging);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
void printWithLength(char *line);

8
firmware/util/efilib.cpp
View File

@ -312,12 +312,12 @@ void printHistogram(Logging *logging, histogram_s *histogram) {
int report[5]; int report[5];
int len = hsReport(histogram, report); int len = hsReport(histogram, report);
resetLogging(logging); logging->reset();
appendMsgPrefix(logging); appendMsgPrefix(logging);
appendPrintf(logging, "histogram %s *", histogram->name); logging.appendPrintf("histogram %s *", histogram->name);
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
appendPrintf(logging, "%d ", report[i]); logging.appendPrintf("%d ", report[i]);
appendPrintf(logging, "*"); logging.appendPrintf("*");
appendMsgPostfix(logging); appendMsgPostfix(logging);
scheduleLogging(logging); scheduleLogging(logging);
#else #else

6
firmware/util/loggingcentral.cpp
View File

@ -82,7 +82,7 @@ void scheduleLogging(Logging *logging) {
if (!alreadyLocked) { if (!alreadyLocked) {
unlockOutputBuffer(); unlockOutputBuffer();
} }
resetLogging(logging); logging->reset();
return; return;
} }
// memcpy is faster then strcpy because it is not looking for line terminator // memcpy is faster then strcpy because it is not looking for line terminator
@ -91,7 +91,7 @@ void scheduleLogging(Logging *logging) {
if (!alreadyLocked) { if (!alreadyLocked) {
unlockOutputBuffer(); unlockOutputBuffer();
} }
resetLogging(logging); logging->reset();
#endif /* EFI_TEXT_LOGGING */ #endif /* EFI_TEXT_LOGGING */
} }
@ -167,7 +167,7 @@ void scheduleMsg(Logging *logging, const char *format, ...) {
return; return;
} }
int wasLocked = lockAnyContext(); int wasLocked = lockAnyContext();
resetLogging(logging); // todo: is 'reset' really needed here? logging->reset(); // todo: is 'reset' really needed here?
appendMsgPrefix(logging); appendMsgPrefix(logging);
va_list ap; va_list ap;

7
java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated; package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 11 02:17:42 UTC 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020
// by class com.rusefi.output.FileJavaFieldsConsumer // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; import com.rusefi.config.*;
@ -810,7 +810,6 @@ public class Fields {
public static final int idleVeBins_offset = 6608; public static final int idleVeBins_offset = 6608;
public static final int IGN_LOAD_COUNT = 16; public static final int IGN_LOAD_COUNT = 16;
public static final int IGN_RPM_COUNT = 16; public static final int IGN_RPM_COUNT = 16;
public static final int IGN_TPS_COUNT = 16;
public static final int IGNITION_PIN_COUNT = 12; public static final int IGNITION_PIN_COUNT = 12;
public static final int ignitionDwellForCrankingMs_offset = 100; public static final int ignitionDwellForCrankingMs_offset = 100;
public static final int ignitionIatCorrLoadBins_offset = 13856; public static final int ignitionIatCorrLoadBins_offset = 13856;
@ -834,7 +833,6 @@ public class Fields {
public static final int ignitionPins9_offset = 644; public static final int ignitionPins9_offset = 644;
public static final int ignitionRpmBins_offset = 17376; public static final int ignitionRpmBins_offset = 17376;
public static final int ignitionTable_offset = 16288; public static final int ignitionTable_offset = 16288;
public static final int ignitionTpsBins_offset = 3800;
public static final int ignMathCalculateAtIndex_offset = 1488; public static final int ignMathCalculateAtIndex_offset = 1488;
public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch";
public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down";
@ -1124,7 +1122,6 @@ public class Fields {
public static final int servoOutputPins8_offset = 3147; public static final int servoOutputPins8_offset = 3147;
public static final int showHumanReadableWarning_offset = 976; public static final int showHumanReadableWarning_offset = 976;
public static final int showSdCardWarning_offset = 76; public static final int showSdCardWarning_offset = 76;
public static final int SIGNATURE_HASH = 327369018;
public static final int silentTriggerError_offset = 1464; public static final int silentTriggerError_offset = 1464;
public static final int slowAdcAlpha_offset = 2088; public static final int slowAdcAlpha_offset = 2088;
public static final int sparkDwellRpmBins_offset = 332; public static final int sparkDwellRpmBins_offset = 332;
@ -1385,7 +1382,7 @@ public class Fields {
public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_R_COMMAND = 'r';
public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SD_W_COMMAND = 'w';
public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SET_LOGGER_SWITCH = 'l';
public static final String TS_SIGNATURE = "rusEFI 2020.09.11.all.327369018"; public static final String TS_SIGNATURE = "rusEFI 2020.09.12.all.2398398176";
public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_SINGLE_WRITE_COMMAND = 'W';
public static final int tunerStudioSerialSpeed_offset = 728; public static final int tunerStudioSerialSpeed_offset = 728;
public static final int twoWireBatchIgnition_offset = 1476; public static final int twoWireBatchIgnition_offset = 1476;

2
java_console/rusefi.xml
View File

@ -1,6 +1,6 @@
<roms> <roms>
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Fri Sep 11 02:17:45 UTC 2020 --> <!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sat Sep 12 07:36:49 UTC 2020 -->
<rom> <rom>
<romid> <romid>

8
simulator/simulator/rusEfiFunctionalTest.cpp
View File

@ -69,20 +69,20 @@ static void runChprintfTest() {
{ {
LoggingWithStorage testLogging("test"); LoggingWithStorage testLogging("test");
appendFloat(&testLogging, 1.23, 5); testLogging.appendFloat(1.23, 5);
appendFloat(&testLogging, 1.234, 2); testLogging.appendFloat(1.234, 2);
assertString(testLogging.buffer, "1.230001.23"); assertString(testLogging.buffer, "1.230001.23");
} }
{ {
LoggingWithStorage testLogging("test"); LoggingWithStorage testLogging("test");
appendFloat(&testLogging, -1.23, 5); testLogging.appendFloat(-1.23, 5);
assertString(testLogging.buffer, "-1.23000"); assertString(testLogging.buffer, "-1.23000");
} }
{ {
LoggingWithStorage testLogging("test"); LoggingWithStorage testLogging("test");
appendPrintf(&testLogging, "a%.2fb%fc", -1.2, -3.4); testLogging.appendPrintf( "a%.2fb%fc", -1.2, -3.4);
assertString(testLogging.buffer, "a-1.20b-3.400000095c"); assertString(testLogging.buffer, "a-1.20b-3.400000095c");
} }

2
unit_tests/tests/test_accel_enrichment.cpp
View File

@ -104,7 +104,7 @@ TEST(fuel, testAccelEnrichmentFractionalTps) {
} }
} }
Logging logger; LoggingWithStorage logger("test");
initAccelEnrichment(&logger PASS_ENGINE_PARAMETER_SUFFIX); initAccelEnrichment(&logger PASS_ENGINE_PARAMETER_SUFFIX);
engine->rpmCalculator.setRpmValue(600); engine->rpmCalculator.setRpmValue(600);

2
unit_tests/tests/test_pid_auto.cpp
View File

@ -16,7 +16,7 @@ efitimems_t currentTimeMillis(void) {
return mockTimeMs; return mockTimeMs;
} }
Logging logging; LoggingWithStorage logging("test");
static float zigZagOffset = 0; static float zigZagOffset = 0;