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

automation around outputs section #197 

datalog toolset
This commit is contained in:
rusefillc 2021-11-28 14:40:03 -05:00
parent a0c69408ca
commit 1bbe587716
6 changed files with 60 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
firmware/console/binary/output_channels.txt
View File

@ -68,28 +68,28 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
uint16_t autoscale oilPressure;@@GAUGE_NAME_OIL_PRESSURE@@;"kPa",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0 uint16_t autoscale oilPressure;@@GAUGE_NAME_OIL_PRESSURE@@;"kPa",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB1I;@@GAUGE_NAME_VVT_B1I@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 uint16_t autoscale vvtPositionB1I;@@GAUGE_NAME_VVT_B1I@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale chargeAirMass;;"g",{1/1000}, 0, 0, 0, 0 uint16_t autoscale chargeAirMass;@@GAUGE_NAME_AIR_MASS@@;"g",{1/1000}, 0, 0, 0, 0
uint16_t autoscale crankingFuelMs;airmass in mg, 0-65 grams;"ms",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 uint16_t autoscale crankingFuelMs;crankingFuelMs\nairmass in mg, 0-65 grams;"ms",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0
uint16_t autoscale currentTargetAfr;;"ratio",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0 uint16_t autoscale currentTargetAfr;@@GAUGE_NAME_TARGET_AFR@@;"ratio",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0
uint16_t autoscale baseFuel;This is the raw value we take from the fuel map or base fuel algorithm, before the corrections;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 uint16_t autoscale baseFuel;@@GAUGE_NAME_FUEL_BASE@@\nThis is the raw value we take from the fuel map or base fuel algorithm, before the corrections;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0
uint16_t autoscale fuelRunning;Total fuel with CLT IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 uint16_t autoscale fuelRunning;@@GAUGE_NAME_FUEL_RUNNING@@\nTotal fuel with CLT IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0
uint16_t autoscale actualLastInjection;Actual last injection time - including all compensation and injection mode;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0 uint16_t autoscale actualLastInjection;@@GAUGE_NAME_FUEL_LAST_INJECTION@@\nActual last injection time - including all compensation and injection mode;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0
uint8_t autoscale injectorDutyCycle;;"%",{1/2}, 0, 0, 0, 0 uint8_t autoscale injectorDutyCycle;@@GAUGE_NAME_FUEL_INJ_DUTY@@;"%",{1/2}, 0, 0, 0, 0
uint8_t autoscale veValue;;"ratio",{1/2}, 0, 0, 0, 0 uint8_t autoscale veValue;@@GAUGE_NAME_FUEL_VE@@;"ratio",{1/2}, 0, 0, 0, 0
uint16_t autoscale injectionOffset;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 uint16_t autoscale injectionOffset;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale tCharge;;"deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0 uint16_t autoscale tCharge;;"deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 0
! Corrections ! Corrections
uint16_t autoscale injectorLagMs;;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0 uint16_t autoscale injectorLagMs;@@GAUGE_NAME_INJECTOR_LAG@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0
uint16_t autoscale iatCorrection;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint16_t autoscale iatCorrection;@@GAUGE_NAME_FUEL_IAT_CORR@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale cltCorrection;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint16_t autoscale cltCorrection;@@GAUGE_NAME_FUEL_CLT_CORR@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale baroCorrection;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint16_t autoscale baroCorrection;@@GAUGE_NAME_FUEL_BARO_CORR@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale currentEnginePhase;;"deg",1, 0, 0, 0, 0 uint16_t autoscale currentEnginePhase;"Engine Phase";"deg",1, 0, 0, 0, 0
! Wall model AE ! Wall model AE
uint16_t autoscale wallFuelAmount;;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 uint16_t autoscale wallFuelAmount;;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0
uint16_t autoscale wallFuelCorrection;;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 uint16_t autoscale wallFuelCorrection;;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0
@ -180,7 +180,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
uint16_t[EGT_CHANNEL_COUNT iterate] egt;;"deg C", 1, 0, 0, 0, 0 uint16_t[EGT_CHANNEL_COUNT iterate] egt;;"deg C", 1, 0, 0, 0, 0
uint16_t autoscale TPS2Value;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint16_t autoscale TPS2Value;@@GAUGE_NAME_TPS2@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t autoscale rawTps1Primary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 uint16_t autoscale rawTps1Primary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
uint16_t autoscale rawPpsPrimary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0 uint16_t autoscale rawPpsPrimary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
@ -212,12 +212,12 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
uint16_t autoscale highFuelPressure;;"bar",{1/@@PACK_MULT_HIGH_PRESSURE@@}, 0, 0, 0, 0 uint16_t autoscale highFuelPressure;;"bar",{1/@@PACK_MULT_HIGH_PRESSURE@@}, 0, 0, 0, 0
uint16_t autoscale targetLambda;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0 uint16_t autoscale targetLambda;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0
uint16_t autoscale AFRValue;;"AFR",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0 uint16_t autoscale AFRValue;@@GAUGE_NAME_AFR@@;"AFR",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0
uint16_t autoscale VssAcceleration;;"m/s2",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0 uint16_t autoscale VssAcceleration;"Vss Accel";"m/s2",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0
uint16_t autoscale lambdaValue2;;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0 uint16_t autoscale lambdaValue2;@@GAUGE_NAME_LAMBDA2@@;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0
uint16_t autoscale AFRValue2;;"AFR",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0 uint16_t autoscale AFRValue2;@@GAUGE_NAME_AFR2@@;"AFR",{1/@@PACK_MULT_AFR@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB1E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 uint16_t autoscale vvtPositionB1E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB2I;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 uint16_t autoscale vvtPositionB2I;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0
uint16_t autoscale vvtPositionB2E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 uint16_t autoscale vvtPositionB2E;;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0

22
firmware/console/binary/ts_outputs_generated.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 28 14:09:25 EST 2021 // this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 28 14:39:28 EST 2021
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -226,45 +226,53 @@ struct ts_outputs_s {
*/ */
scaled_channel<uint16_t, 50, 1> vvtPositionB1I = (uint16_t)0; scaled_channel<uint16_t, 50, 1> vvtPositionB1I = (uint16_t)0;
/** /**
* @@GAUGE_NAME_AIR_MASS@@
g g
* offset 44 * offset 44
*/ */
scaled_channel<uint16_t, 1000, 1> chargeAirMass = (uint16_t)0; scaled_channel<uint16_t, 1000, 1> chargeAirMass = (uint16_t)0;
/** /**
* crankingFuelMs
* airmass in mg, 0-65 grams * airmass in mg, 0-65 grams
ms ms
* offset 46 * offset 46
*/ */
scaled_channel<uint16_t, 100, 1> crankingFuelMs = (uint16_t)0; scaled_channel<uint16_t, 100, 1> crankingFuelMs = (uint16_t)0;
/** /**
* @@GAUGE_NAME_TARGET_AFR@@
ratio ratio
* offset 48 * offset 48
*/ */
scaled_channel<uint16_t, 1000, 1> currentTargetAfr = (uint16_t)0; scaled_channel<uint16_t, 1000, 1> currentTargetAfr = (uint16_t)0;
/** /**
* @@GAUGE_NAME_FUEL_BASE@@
* This is the raw value we take from the fuel map or base fuel algorithm, before the corrections * This is the raw value we take from the fuel map or base fuel algorithm, before the corrections
mg mg
* offset 50 * offset 50
*/ */
scaled_channel<uint16_t, 100, 1> baseFuel = (uint16_t)0; scaled_channel<uint16_t, 100, 1> baseFuel = (uint16_t)0;
/** /**
* @@GAUGE_NAME_FUEL_RUNNING@@
* Total fuel with CLT IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle * Total fuel with CLT IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle
mg mg
* offset 52 * offset 52
*/ */
scaled_channel<uint16_t, 100, 1> fuelRunning = (uint16_t)0; scaled_channel<uint16_t, 100, 1> fuelRunning = (uint16_t)0;
/** /**
* @@GAUGE_NAME_FUEL_LAST_INJECTION@@
* Actual last injection time - including all compensation and injection mode * Actual last injection time - including all compensation and injection mode
ms ms
* offset 54 * offset 54
*/ */
scaled_channel<uint16_t, 300, 1> actualLastInjection = (uint16_t)0; scaled_channel<uint16_t, 300, 1> actualLastInjection = (uint16_t)0;
/** /**
* @@GAUGE_NAME_FUEL_INJ_DUTY@@
% %
* offset 56 * offset 56
*/ */
scaled_channel<uint8_t, 2, 1> injectorDutyCycle = (uint8_t)0; scaled_channel<uint8_t, 2, 1> injectorDutyCycle = (uint8_t)0;
/** /**
* @@GAUGE_NAME_FUEL_VE@@
ratio ratio
* offset 57 * offset 57
*/ */
@ -280,26 +288,31 @@ struct ts_outputs_s {
*/ */
scaled_channel<uint16_t, 100, 1> tCharge = (uint16_t)0; scaled_channel<uint16_t, 100, 1> tCharge = (uint16_t)0;
/** /**
* @@GAUGE_NAME_INJECTOR_LAG@@
ms ms
* offset 62 * offset 62
*/ */
scaled_channel<uint16_t, 300, 1> injectorLagMs = (uint16_t)0; scaled_channel<uint16_t, 300, 1> injectorLagMs = (uint16_t)0;
/** /**
* @@GAUGE_NAME_FUEL_IAT_CORR@@
% %
* offset 64 * offset 64
*/ */
scaled_channel<uint16_t, 100, 1> iatCorrection = (uint16_t)0; scaled_channel<uint16_t, 100, 1> iatCorrection = (uint16_t)0;
/** /**
* @@GAUGE_NAME_FUEL_CLT_CORR@@
% %
* offset 66 * offset 66
*/ */
scaled_channel<uint16_t, 100, 1> cltCorrection = (uint16_t)0; scaled_channel<uint16_t, 100, 1> cltCorrection = (uint16_t)0;
/** /**
* @@GAUGE_NAME_FUEL_BARO_CORR@@
% %
* offset 68 * offset 68
*/ */
scaled_channel<uint16_t, 100, 1> baroCorrection = (uint16_t)0; scaled_channel<uint16_t, 100, 1> baroCorrection = (uint16_t)0;
/** /**
* "Engine Phase"
deg deg
* offset 70 * offset 70
*/ */
@ -546,6 +559,7 @@ struct ts_outputs_s {
*/ */
uint16_t egt[EGT_CHANNEL_COUNT]; uint16_t egt[EGT_CHANNEL_COUNT];
/** /**
* @@GAUGE_NAME_TPS2@@
% %
* offset 232 * offset 232
*/ */
@ -653,20 +667,24 @@ struct ts_outputs_s {
*/ */
scaled_channel<uint16_t, 10000, 1> targetLambda = (uint16_t)0; scaled_channel<uint16_t, 10000, 1> targetLambda = (uint16_t)0;
/** /**
* @@GAUGE_NAME_AFR@@
AFR AFR
* offset 282 * offset 282
*/ */
scaled_channel<uint16_t, 1000, 1> AFRValue = (uint16_t)0; scaled_channel<uint16_t, 1000, 1> AFRValue = (uint16_t)0;
/** /**
* "Vss Accel"
m/s2 m/s2
* offset 284 * offset 284
*/ */
scaled_channel<uint16_t, 300, 1> VssAcceleration = (uint16_t)0; scaled_channel<uint16_t, 300, 1> VssAcceleration = (uint16_t)0;
/** /**
* @@GAUGE_NAME_LAMBDA2@@
* offset 286 * offset 286
*/ */
scaled_channel<uint16_t, 10000, 1> lambdaValue2 = (uint16_t)0; scaled_channel<uint16_t, 10000, 1> lambdaValue2 = (uint16_t)0;
/** /**
* @@GAUGE_NAME_AFR2@@
AFR AFR
* offset 288 * offset 288
*/ */
@ -741,4 +759,4 @@ struct ts_outputs_s {
}; };
// end // end
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 28 14:09:25 EST 2021 // this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Nov 28 14:39:28 EST 2021

31
firmware/tunerstudio/rusefi.input
View File

@ -1299,6 +1299,20 @@ entry = knockRetard, "knockRetard", float, "%.3f"
entry = VBatt, "VBatt", float, "%.3f" entry = VBatt, "VBatt", float, "%.3f"
entry = oilPressure, "Oil Pressure", float, "%.3f" entry = oilPressure, "Oil Pressure", float, "%.3f"
entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f"
entry = chargeAirMass, "air mass", float, "%.3f"
entry = crankingFuelMs, "crankingFuelMs", float, "%.3f"
entry = currentTargetAfr, "fuel: target AFR", float, "%.3f"
entry = baseFuel, "fuel: base mass", float, "%.3f"
entry = fuelRunning, "fuel: running", float, "%.3f"
entry = actualLastInjection, "fuel: Last injection", float, "%.3f"
entry = injectorDutyCycle, "fuel: injector duty cycle", float, "%.3f"
entry = veValue, "fuel: VE", float, "%.3f"
entry = injectionOffset, "injectionOffset", float, "%.3f"
entry = tCharge, "tCharge", float, "%.3f"
entry = iatCorrection, "fuel: IAT correction", float, "%.3f"
entry = cltCorrection, "fuel: CLT correction", float, "%.3f"
entry = baroCorrection, "fuel: Barometric pressure correction", float, "%.3f"
entry = currentEnginePhase, "Engine Phase", int, "%d"
entry = TPS2Value, @@GAUGE_NAME_TPS2@@, float, "%.2f" entry = TPS2Value, @@GAUGE_NAME_TPS2@@, float, "%.2f"
entry = AFRValue, @@GAUGE_NAME_AFR@@, float, "%.2f" entry = AFRValue, @@GAUGE_NAME_AFR@@, float, "%.2f"
entry = AFRValue2, @@GAUGE_NAME_AFR2@@, float, "%.2f" entry = AFRValue2, @@GAUGE_NAME_AFR2@@, float, "%.2f"
@ -1311,7 +1325,6 @@ entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f"
entry = turboSpeed, @@GAUGE_NAME_TURBO_SPEED@@ int, "%d" entry = turboSpeed, @@GAUGE_NAME_TURBO_SPEED@@ int, "%d"
entry = speedToRpmRatio, "s2rpm", float, "%.3f" entry = speedToRpmRatio, "s2rpm", float, "%.3f"
entry = massAirFlowValue,@@GAUGE_NAME_AIR_FLOW@@, float, "%.3f" entry = massAirFlowValue,@@GAUGE_NAME_AIR_FLOW@@, float, "%.3f"
entry = chargeAirMass, @@GAUGE_NAME_AIR_MASS@@, float, "%.3f"
entry = wastegatePositionSensor, @@GAUGE_NAME_WG_POSITION@@, float, "%.3f" entry = wastegatePositionSensor, @@GAUGE_NAME_WG_POSITION@@, float, "%.3f"
entry = totalTriggerErrorCounter, @@GAUGE_NAME_TRG_ERR@@,int, "%d" entry = totalTriggerErrorCounter, @@GAUGE_NAME_TRG_ERR@@,int, "%d"
entry = idleAirValvePosition, @@GAUGE_NAME_IAC@@, float, "%.3f" entry = idleAirValvePosition, @@GAUGE_NAME_IAC@@, float, "%.3f"
@ -1320,16 +1333,10 @@ entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f"
entry = highFuelPressure, @@GAUGE_NAME_FUEL_PRESSURE_HIGH@@, float, "%.3f" entry = highFuelPressure, @@GAUGE_NAME_FUEL_PRESSURE_HIGH@@, float, "%.3f"
; entry = rawHighFuelPressure, @@GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH@@, float, "%.3f" ; entry = rawHighFuelPressure, @@GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH@@, float, "%.3f"
entry = injectorLagMs, @@GAUGE_NAME_INJECTOR_LAG@@, float, "%.3f" entry = injectorLagMs, , float, "%.3f"
entry = fuelRunning, @@GAUGE_NAME_FUEL_RUNNING@@, float, "%.3f"
entry = actualLastInjection, @@GAUGE_NAME_FUEL_LAST_INJECTION@@, float, "%.3f"
entry = baseFuel, @@GAUGE_NAME_FUEL_BASE@@, float, "%.2f"
entry = fuelPidCorrection1,@@GAUGE_NAME_FUEL_TRIM@@, float, "%.2f" entry = fuelPidCorrection1,@@GAUGE_NAME_FUEL_TRIM@@, float, "%.2f"
entry = fuelPidCorrection2,@@GAUGE_NAME_FUEL_TRIM_2@@, float, "%.2f" entry = fuelPidCorrection2,@@GAUGE_NAME_FUEL_TRIM_2@@, float, "%.2f"
entry = veValue, @@GAUGE_NAME_FUEL_VE@@, float, "%.3f"
entry = injectorDutyCycle,@@GAUGE_NAME_FUEL_INJ_DUTY@@,float,"%.3f"
entry = coilDutyCycle, @@GAUGE_NAME_DWELL_DUTY@@, float,"%.3f" entry = coilDutyCycle, @@GAUGE_NAME_DWELL_DUTY@@, float,"%.3f"
entry = currentTargetAfr,@@GAUGE_NAME_TARGET_AFR@@, float,"%.3f"
entry = targetLambda, @@GAUGE_NAME_TARGET_LAMBDA@@, float,"%.4f" entry = targetLambda, @@GAUGE_NAME_TARGET_LAMBDA@@, float,"%.4f"
entry = totalFuelConsumption, @@GAUGE_NAME_FUEL_CONSUMPTION@@, int, "%d" entry = totalFuelConsumption, @@GAUGE_NAME_FUEL_CONSUMPTION@@, int, "%d"
entry = fuelFlowRate, @@GAUGE_NAME_FUEL_FLOW@@, float, "%.2f" entry = fuelFlowRate, @@GAUGE_NAME_FUEL_FLOW@@, float, "%.2f"
@ -1354,10 +1361,6 @@ entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f"
entry = wallFuelCorrection,@@GAUGE_NAME_FUEL_WALL_CORRECTION@@, float, "%.3f" entry = wallFuelCorrection,@@GAUGE_NAME_FUEL_WALL_CORRECTION@@, float, "%.3f"
entry = wallFuelAmount, @@GAUGE_NAME_FUEL_WALL_AMOUNT@@, float, "%.3f" entry = wallFuelAmount, @@GAUGE_NAME_FUEL_WALL_AMOUNT@@, float, "%.3f"
entry = baroCorrection, @@GAUGE_NAME_FUEL_BARO_CORR@@,float,"%.3f"
entry = iatCorrection, @@GAUGE_NAME_FUEL_IAT_CORR@@, float, "%.3f"
entry = cltCorrection, @@GAUGE_NAME_FUEL_CLT_CORR@@, float,"%.3f"
entry = sparkDwellValue, @@GAUGE_COIL_DWELL_TIME@@, float,"%.3f" entry = sparkDwellValue, @@GAUGE_COIL_DWELL_TIME@@, float,"%.3f"
entry = vvtPositionB1E, @@GAUGE_NAME_VVT_B1E@@, float, "%.1f" entry = vvtPositionB1E, @@GAUGE_NAME_VVT_B1E@@, float, "%.1f"
@ -1367,7 +1370,6 @@ entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f"
entry = vvtTargets2, @@GAUGE_NAME_VVT_TARGET_B1E@@, int, "%d" entry = vvtTargets2, @@GAUGE_NAME_VVT_TARGET_B1E@@, int, "%d"
entry = vvtTargets3, @@GAUGE_NAME_VVT_TARGET_B2I@@, int, "%d" entry = vvtTargets3, @@GAUGE_NAME_VVT_TARGET_B2I@@, int, "%d"
entry = vvtTargets4, @@GAUGE_NAME_VVT_TARGET_B2E@@, int, "%d" entry = vvtTargets4, @@GAUGE_NAME_VVT_TARGET_B2E@@, int, "%d"
entry = injectionOffset, "injOffset" , float, "%.2F"
; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d"
entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels } entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels }
@ -1399,8 +1401,6 @@ entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f"
entry = recentErrorCode7, "error 7",int,"%d", { !enableLogErrorList } entry = recentErrorCode7, "error 7",int,"%d", { !enableLogErrorList }
entry = recentErrorCode8, "error 8",int,"%d", { !enableLogErrorList } entry = recentErrorCode8, "error 8",int,"%d", { !enableLogErrorList }
entry = tCharge, "tCharge",float,"%.3f"
entry = clutchUpState, @@INDICATOR_NAME_CLUTCH_UP@@,int,"%d" entry = clutchUpState, @@INDICATOR_NAME_CLUTCH_UP@@,int,"%d"
entry = clutchDownState, @@INDICATOR_NAME_CLUTCH_DOWN@@,int,"%d" entry = clutchDownState, @@INDICATOR_NAME_CLUTCH_DOWN@@,int,"%d"
entry = brakePedalState, @@INDICATOR_NAME_BRAKE_DOWN@@,int,"%d" entry = brakePedalState, @@INDICATOR_NAME_BRAKE_DOWN@@,int,"%d"
@ -1428,7 +1428,6 @@ entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f"
entry = VssAcceleration, "Vss Accel", float, "%.3f" entry = VssAcceleration, "Vss Accel", float, "%.3f"
entry = flexPercent, @@GAUGE_NAME_FLEX@@, int, "%d" entry = flexPercent, @@GAUGE_NAME_FLEX@@, int, "%d"
entry = currentEnginePhase, "Engine Phase", int, "%d"
[Menu] [Menu]

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

3
java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java
View File

@ -77,6 +77,9 @@ public class DataLogConsumer implements ConfigurationConsumer {
} }
String comment = state.variableRegistry.applyVariables(configField.getComment()); String comment = state.variableRegistry.applyVariables(configField.getComment());
String[] comments = comment.split("\\\\n");
comment = comments[0];
if (comment.isEmpty()) if (comment.isEmpty())
comment = configField.getName(); comment = configField.getName();

5
java_tools/configuration_definition/src/main/java/com/rusefi/test/OutputsTest.java
View File

@ -67,6 +67,7 @@ public class OutputsTest {
@Test @Test
public void generateDataLog() throws IOException { public void generateDataLog() throws IOException {
String test = "struct total\n" + String test = "struct total\n" +
"\tuint16_t autoscale baseFuel;@@GAUGE_NAME_FUEL_BASE@@\\nThis is the raw value we take from the fuel map or base fuel algorithm, before the corrections;\"mg\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" +
"float afr_type;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" + "float afr_type;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" +
"uint16_t autoscale speedToRpmRatio;s2rpm;\"value\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" + "uint16_t autoscale speedToRpmRatio;s2rpm;\"value\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" +
"uint8_t afr_typet;;\"ms\", 1, 0, 0, 3000, 0\n" + "uint8_t afr_typet;;\"ms\", 1, 0, 0, 3000, 0\n" +
@ -77,11 +78,13 @@ public class OutputsTest {
"end_struct\n"; "end_struct\n";
ReaderState state = new ReaderState(); ReaderState state = new ReaderState();
state.variableRegistry.register("PACK_MULT_PERCENT", 100); state.variableRegistry.register("PACK_MULT_PERCENT", 100);
state.variableRegistry.register("GAUGE_NAME_FUEL_BASE", "hello");
BufferedReader reader = new BufferedReader(new StringReader(test)); BufferedReader reader = new BufferedReader(new StringReader(test));
DataLogConsumer dataLogConsumer = new DataLogConsumer(null, state); DataLogConsumer dataLogConsumer = new DataLogConsumer(null, state);
state.readBufferedReader(reader, Collections.singletonList(dataLogConsumer)); state.readBufferedReader(reader, Collections.singletonList(dataLogConsumer));
assertEquals("entry = afr_type, \"PID dTime\", float, \"%.3f\"\n" + assertEquals("entry = baseFuel, \"hello\", float, \"%.3f\"\n" +
"entry = afr_type, \"PID dTime\", float, \"%.3f\"\n" +
"entry = speedToRpmRatio, \"s2rpm\", float, \"%.3f\"\n" + "entry = speedToRpmRatio, \"s2rpm\", float, \"%.3f\"\n" +
"entry = afr_typet, \"afr_typet\", int, \"%d\"\n" + "entry = afr_typet, \"afr_typet\", int, \"%d\"\n" +
"entry = vehicleSpeedKph, \"vehicleSpeedKph\", int, \"%d\"\n", new String(dataLogConsumer.getTsWriter().toCharArray())); "entry = vehicleSpeedKph, \"vehicleSpeedKph\", int, \"%d\"\n", new String(dataLogConsumer.getTsWriter().toCharArray()));