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

fixes #2

This commit is contained in:
rusefi 2017-02-20 14:58:46 -05:00
parent 28bcd995ee
commit f38cdfcf0d
3 changed files with 886 additions and 868 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/console/status_loop.cpp
View File

@ -80,6 +80,10 @@ static volatile bool fullLog = true;
int warningEnabled = true;
//int warningEnabled = FALSE;
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
extern TunerStudioOutputChannels tsOutputChannels;
#endif
extern bool hasFirmwareErrorFlag;
#define FULL_LOGGING_KEY "fl"
@ -224,6 +228,21 @@ static void printSensors(Logging *log, bool fileFormat) {
#endif /* EFI_ANALOG_SENSORS */
if (fileFormat) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
reportSensorF(log, fileFormat, "debugF1", "v", tsOutputChannels.debugFloatField1, 4);
reportSensorF(log, fileFormat, "debugF2", "v", tsOutputChannels.debugFloatField2, 4);
reportSensorF(log, fileFormat, "debugF3", "v", tsOutputChannels.debugFloatField3, 4);
reportSensorF(log, fileFormat, "debugF4", "v", tsOutputChannels.debugFloatField4, 4);
reportSensorF(log, fileFormat, "debugF5", "v", tsOutputChannels.debugFloatField5, 4);
reportSensorF(log, fileFormat, "debugF6", "v", tsOutputChannels.debugFloatField6, 4);
reportSensorF(log, fileFormat, "debugF7", "v", tsOutputChannels.debugFloatField7, 4);
reportSensorI(log, fileFormat, "debugInt1", "v", tsOutputChannels.debugIntField1);
reportSensorI(log, fileFormat, "debugInt2", "v", tsOutputChannels.debugIntField2);
reportSensorI(log, fileFormat, "debugInt3", "v", tsOutputChannels.debugIntField3);
#endif /* EFI_TUNER_STUDIO */
reportSensorF(log, fileFormat, "tCharge", "K", engine->engineState.tChargeK, 2); // log column #8
reportSensorF(log, fileFormat, "curVE", "%", veMap.getValue(rpm, getMap()), 2);
reportSensorF(log, fileFormat, "VVT", "deg", engine->triggerCentral.vvtPosition, 1);

2
firmware/rusefi.cpp
View File

@ -249,5 +249,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array
return 20170218;
return 20170220;
}

5
firmware/svnversion.h
View File

@ -1,5 +1,4 @@
// This file was generated by Version2Header
// Sat Feb 18 17:30:53 EST 2017
#ifndef VCS_VERSION
#define VCS_VERSION "11558"
#ifndef SVN_VERSION
#define SVN_VERSION 2922
#endif