debug fields for #568

firmware/console/status_loop.cpp

@@ -75,6 +75,10 @@ extern bool main_loop_started;
 #include "CJ125.h"
 #endif /* EFI_PROD_CODE */
 
+#if EFI_MAP_AVERAGING
+#include "map_averaging.h"
+#endif
+
 #if EFI_FSIO || defined(__DOXYGEN__)
 #include "fsio_impl.h"
 #endif /* EFI_FSIO */
@@ -808,6 +812,11 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
 		cjPostState(tsOutputChannels);
 		break;
 #endif /* EFI_CJ125 */
+#if EFI_MAP_AVERAGING
+		case DBG_MAP:
+		postMapState(tsOutputChannels);
+		break;
+#endif /* EFI_MAP_AVERAGING */
 #if EFI_CAN_SUPPORT || defined(__DOXYGEN__)
 	case DBG_CAN:
 		postCanState(tsOutputChannels);

firmware/controllers/algo/auto_generated_enums.cpp

@@ -713,8 +713,8 @@ case DBG_CJ125:
   return "DBG_CJ125";
 case DBG_CAN:
   return "DBG_CAN";
-case DBG_27:
-  return "DBG_27";
+case DBG_MAP:
+  return "DBG_MAP";
 case DBG_28:
   return "DBG_28";
 case DBG_29:

firmware/controllers/algo/rusefi_enums.h

@@ -763,7 +763,7 @@ typedef enum {
 	DBG_STATUS = 24,
 	DBG_CJ125 = 25,
 	DBG_CAN = 26,
-	DBG_27 = 27,
+	DBG_MAP = 27,
 	DBG_28 = 28,
 	DBG_29 = 29,
 

firmware/controllers/algo/rusefi_generated.h

@@ -55,7 +55,7 @@
 #define MAP_ACCEL_TAPER 8
 #define BARO_CORR_SIZE 4
 #define MAF_DECODING_COUNT 256
-#define debug_mode_e_enum "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "mode27", "mode28", "mode29"
+#define debug_mode_e_enum "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "mode28", "mode29"
 #define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"
 #define mass_storage_e_enum "Auto", "Always", "Never"
 #define brain_input_pin_e_enum "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"

firmware/controllers/map_averaging.cpp

@@ -69,7 +69,7 @@ static int counters[2];
 /**
  * Running MAP accumulator - sum of all measurements within averaging window
  */
-static volatile float mapAccumulator = 0;
+static volatile float mapAdcAccumulator = 0;
 /**
  * Running counter of measurements to consider for averaging
  */
@@ -110,7 +110,7 @@ static void startAveraging(void *arg) {
 	bool wasLocked = lockAnyContext();
 	;
 	// with locking we would have a consistent state
-	mapAccumulator = 0;
+	mapAdcAccumulator = 0;
 	mapMeasurementsCounter = 0;
 	isAveraging = true;
 	if (!wasLocked)
@@ -163,7 +163,7 @@ void mapAveragingAdcCallback(adcsample_t adcValue) {
 	;
 	// with locking we would have a consistent state
 
-	mapAccumulator += adcValue;
+	mapAdcAccumulator += adcValue;
 	mapMeasurementsCounter++;
 	if (!alreadyLocked)
 		unlockAnyContext();
@@ -177,8 +177,7 @@ static void endAveraging(void *arg) {
 	isAveraging = false;
 	// with locking we would have a consistent state
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
-	v_averagedMapValue = adcToVoltsDivided(
-			mapAccumulator / mapMeasurementsCounter);
+	v_averagedMapValue = adcToVoltsDivided(mapAdcAccumulator / mapMeasurementsCounter);
 	// todo: move out of locked context?
 	averagedMapRunningBuffer[averagedMapBufIdx] = getMapByVoltage(v_averagedMapValue);
 	// increment circular running buffer index
@@ -208,6 +207,12 @@ static void applyMapMinBufferLength() {
 	}
 }
 
+void postMapState(TunerStudioOutputChannels *tsOutputChannels) {
+	tsOutputChannels->debugFloatField1 = v_averagedMapValue;
+	tsOutputChannels->debugFloatField2 = engine->engineState.mapAveragingDuration;
+	tsOutputChannels->debugIntField1 = mapMeasurementsCounter;
+}
+
 void refreshMapAveragingPreCalc(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	int rpm = engine->rpmCalculator.rpmValue;
 	if (isValidRpm(rpm)) {
@@ -267,20 +272,25 @@ static void mapAveragingTriggerCallback(trigger_event_e ckpEventType,
 		}
 
 		angle_t samplingEnd = samplingStart + samplingDuration;
-		if (!cisnan(samplingEnd)) {
-			fixAngle(samplingEnd, "samplingEnd");
-			// only if value is already prepared
-			int structIndex = getRevolutionCounter() % 2;
-			// todo: schedule this based on closest trigger event, same as ignition works
-			scheduleByAngle(rpm, &startTimer[i][structIndex], samplingStart,
-					startAveraging, NULL, &engine->rpmCalculator);
-			scheduleByAngle(rpm, &endTimer[i][structIndex], samplingEnd,
-					endAveraging, NULL, &engine->rpmCalculator);
-			engine->m.mapAveragingCbTime = GET_TIMESTAMP()
-					- engine->m.beforeMapAveragingCb;
-		}
-	}
 
+		if (cisnan(samplingEnd)) {
+			// todo: when would this happen?
+			warning(CUSTOM_ERR_6549, "no map angles");
+			return;
+		}
+
+
+		fixAngle(samplingEnd, "samplingEnd");
+		// only if value is already prepared
+		int structIndex = getRevolutionCounter() % 2;
+		// todo: schedule this based on closest trigger event, same as ignition works
+		scheduleByAngle(rpm, &startTimer[i][structIndex], samplingStart,
+				startAveraging, NULL, &engine->rpmCalculator);
+		scheduleByAngle(rpm, &endTimer[i][structIndex], samplingEnd,
+				endAveraging, NULL, &engine->rpmCalculator);
+		engine->m.mapAveragingCbTime = GET_TIMESTAMP()
+				- engine->m.beforeMapAveragingCb;
+	}
 }
 
 static void showMapStats(void) {

firmware/controllers/map_averaging.h

@@ -18,6 +18,7 @@ void mapAveragingAdcCallback(adcsample_t newValue);
 
 void initMapAveraging(Logging *sharedLogger, Engine *engine);
 void refreshMapAveragingPreCalc(DECLARE_ENGINE_PARAMETER_SIGNATURE);
+void postMapState(TunerStudioOutputChannels *tsOutputChannels);
 
 #endif /* EFI_MAP_AVERAGING */
 

firmware/integration/rusefi_config.txt

@@ -148,7 +148,7 @@ float baseFuel;+Fuel squirt duration while cranking\nA number of curves adjust t
 int16_t rpm;+Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold\nset cranking_rpm X;"RPM",      1,     0,    0, 3000,      0
 end_struct
 
-#define debug_mode_e_enum "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "mode27", "mode28", "mode29"
+#define debug_mode_e_enum "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "mode28", "mode29"
 custom debug_mode_e 4 bits,    U32,   @OFFSET@, [0:4], @@debug_mode_e_enum@@
 
 #define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"

firmware/tunerstudio/rusefi.ini

@@ -63,7 +63,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Feb 01 08:34:19 EET 2018
+; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 07 00:08:15 MSK 2018
 
 pageSize            = 20000
 page = 1
@@ -618,7 +618,7 @@ page = 1
 	tpsDecelEnleanmentThreshold		= scalar, F32,	2208,	"roc", 1, 0, 0, 200, 3
 	tpsDecelEnleanmentMultiplier		= scalar, F32,	2212,	"coeff", 1, 0, 0, 200, 3
 	slowAdcAlpha					= scalar, F32,	2216,	"coeff", 1, 0, 0, 200, 3
-	debugMode					 = bits, U32, 2220, [0:4], "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "mode27", "mode28", "mode29"
+	debugMode					 = bits, U32, 2220, [0:4], "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "mode28", "mode29"
 	auxValves1					 = bits, U32, 2224, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	auxValves2					 = bits, U32, 2228, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	warmupTargetAfrBins				= array, F32,	2232,	[4],	"C", 1, 0, -100.0, 250.0, 2