diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index c5698c745c..83372f9c69 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -560,4 +560,5 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index a03e19d6ee..47eb50e888 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -376,5 +376,6 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 674d0f1f90..140a950c84 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -743,5 +743,6 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 diff --git a/firmware/controllers/actuators/vvt_generated.h b/firmware/controllers/actuators/vvt_generated.h index 8be014b9e5..722cbff171 100644 --- a/firmware/controllers/actuators/vvt_generated.h +++ b/firmware/controllers/actuators/vvt_generated.h @@ -1,8 +1,18 @@ #pragma once #include "rusefi_types.h" struct vvt_s { + // deg // offset 0 - int vvt_placeholder = (int)0; + scaled_channel vvtTarget = (uint16_t)0; + + // % + // offset 2 + scaled_channel vvtOutput = (uint8_t)0; + + // need 4 byte alignment + // units + // offset 3 + uint8_t alignmentFill_at_3[1]; }; static_assert(sizeof(vvt_s) == 4); diff --git a/firmware/tunerstudio/generated/fome.ini b/firmware/tunerstudio/generated/fome.ini index d5e8b410c4..820cc53932 100644 --- a/firmware/tunerstudio/generated/fome.ini +++ b/firmware/tunerstudio/generated/fome.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5772,7 +5774,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_48way.ini b/firmware/tunerstudio/generated/fome_48way.ini index 5207aa2d55..4d5068742d 100644 --- a/firmware/tunerstudio/generated/fome_48way.ini +++ b/firmware/tunerstudio/generated/fome_48way.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5772,7 +5774,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_alphax-2chan.ini b/firmware/tunerstudio/generated/fome_alphax-2chan.ini index 87de68894d..4c3eca4749 100644 --- a/firmware/tunerstudio/generated/fome_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-2chan.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5768,7 +5770,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_alphax-4chan.ini b/firmware/tunerstudio/generated/fome_alphax-4chan.ini index 19f01e3b63..e0b864316b 100644 --- a/firmware/tunerstudio/generated/fome_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-4chan.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_alphax-8chan.ini b/firmware/tunerstudio/generated/fome_alphax-8chan.ini index 38f43161dc..ed0fbf8a37 100644 --- a/firmware/tunerstudio/generated/fome_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-8chan.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_atlas.ini b/firmware/tunerstudio/generated/fome_atlas.ini index 55325b22bb..e3a4acfd66 100644 --- a/firmware/tunerstudio/generated/fome_atlas.ini +++ b/firmware/tunerstudio/generated/fome_atlas.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5770,7 +5772,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_core8.ini b/firmware/tunerstudio/generated/fome_core8.ini index 2dc6904871..cceed6153b 100644 --- a/firmware/tunerstudio/generated/fome_core8.ini +++ b/firmware/tunerstudio/generated/fome_core8.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5772,7 +5774,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_f407-discovery.ini b/firmware/tunerstudio/generated/fome_f407-discovery.ini index d5e8b410c4..820cc53932 100644 --- a/firmware/tunerstudio/generated/fome_f407-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f407-discovery.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5772,7 +5774,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_f429-discovery.ini b/firmware/tunerstudio/generated/fome_f429-discovery.ini index f30b807f3d..064c26a1c6 100644 --- a/firmware/tunerstudio/generated/fome_f429-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f429-discovery.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5770,7 +5772,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_frankenso_na6.ini b/firmware/tunerstudio/generated/fome_frankenso_na6.ini index 072e81372f..54db245872 100644 --- a/firmware/tunerstudio/generated/fome_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/fome_frankenso_na6.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5770,7 +5772,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_harley81.ini b/firmware/tunerstudio/generated/fome_harley81.ini index f7314f28c2..b2c1a207c2 100644 --- a/firmware/tunerstudio/generated/fome_harley81.ini +++ b/firmware/tunerstudio/generated/fome_harley81.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini index c523177d05..7b952a5b25 100644 --- a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini index dc5d752fc9..87d543388c 100644 --- a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen-nb1.ini b/firmware/tunerstudio/generated/fome_hellen-nb1.ini index ce8c22fc65..e90c9e31ab 100644 --- a/firmware/tunerstudio/generated/fome_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/fome_hellen-nb1.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen121nissan.ini b/firmware/tunerstudio/generated/fome_hellen121nissan.ini index ced4c42fa6..b2e586f397 100644 --- a/firmware/tunerstudio/generated/fome_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/fome_hellen121nissan.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen121vag.ini b/firmware/tunerstudio/generated/fome_hellen121vag.ini index 5d8c173e69..5f0ac6d90b 100644 --- a/firmware/tunerstudio/generated/fome_hellen121vag.ini +++ b/firmware/tunerstudio/generated/fome_hellen121vag.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen128mercedes.ini b/firmware/tunerstudio/generated/fome_hellen128mercedes.ini index 0fbd015f61..bbdd35820c 100644 --- a/firmware/tunerstudio/generated/fome_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/fome_hellen128mercedes.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini index 0ea5f585b9..09c3321948 100644 --- a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen72.ini b/firmware/tunerstudio/generated/fome_hellen72.ini index 5f61f32a78..932c40f17f 100644 --- a/firmware/tunerstudio/generated/fome_hellen72.ini +++ b/firmware/tunerstudio/generated/fome_hellen72.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen81.ini b/firmware/tunerstudio/generated/fome_hellen81.ini index 6150034197..4e9b716009 100644 --- a/firmware/tunerstudio/generated/fome_hellen81.ini +++ b/firmware/tunerstudio/generated/fome_hellen81.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5769,7 +5771,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellen88bmw.ini b/firmware/tunerstudio/generated/fome_hellen88bmw.ini index c0fc21d79b..50a68758ec 100644 --- a/firmware/tunerstudio/generated/fome_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/fome_hellen88bmw.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellenNA6.ini b/firmware/tunerstudio/generated/fome_hellenNA6.ini index e07580735a..df51cea758 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA6.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA6.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini index d6a85565d5..89a0f3652a 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5771,7 +5773,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_mre_f4.ini b/firmware/tunerstudio/generated/fome_mre_f4.ini index db882cf7c4..51bb9fdd93 100644 --- a/firmware/tunerstudio/generated/fome_mre_f4.ini +++ b/firmware/tunerstudio/generated/fome_mre_f4.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4887,7 +4888,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5773,7 +5775,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_mre_f7.ini b/firmware/tunerstudio/generated/fome_mre_f7.ini index 755c9d3b5f..a0b9e55411 100644 --- a/firmware/tunerstudio/generated/fome_mre_f7.ini +++ b/firmware/tunerstudio/generated/fome_mre_f7.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4887,7 +4888,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5773,7 +5775,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_prometheus_405.ini b/firmware/tunerstudio/generated/fome_prometheus_405.ini index b2eda85bf8..63a5fb7165 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_405.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_405.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5765,7 +5767,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_prometheus_469.ini b/firmware/tunerstudio/generated/fome_prometheus_469.ini index df2d8f5ce9..13dafe4c7f 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_469.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_469.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5765,7 +5767,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_proteus_f4.ini b/firmware/tunerstudio/generated/fome_proteus_f4.ini index 5ab359777e..a0e856033e 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f4.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f4.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5768,7 +5770,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_proteus_f7.ini b/firmware/tunerstudio/generated/fome_proteus_f7.ini index 28395c9c8e..21c1edb290 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f7.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5768,7 +5770,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_proteus_h7.ini b/firmware/tunerstudio/generated/fome_proteus_h7.ini index f893b03fe3..2378106da2 100644 --- a/firmware/tunerstudio/generated/fome_proteus_h7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_h7.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5768,7 +5770,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini index 0b52aaa423..cd080e9601 100644 --- a/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5769,7 +5771,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini index 25184728ad..8cefda7544 100644 --- a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini @@ -2873,7 +2873,8 @@ throttleUseWotModel = bits, U32, 1360, [0:0] throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 ; total TS size = 1372 -vvt_placeholder = scalar, S32, 1372, "", 1, 0 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 @@ -4886,7 +4887,8 @@ entry = errorRate, "ETB: SENT error rate", float, "%.3f" entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvt_placeholder, "vvt_placeholder", int, "%d" +entry = vvtTarget, "vvtTarget", float, "%.3f" +entry = vvtOutput, "vvtOutput", float, "%.3f" [Menu] @@ -5770,7 +5772,8 @@ dialog = throttle_modelDialog, "throttle_model" dialog = vvtDialog, "vvt" liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvt_placeholder + graphLine = vvtTarget + graphLine = vvtOutput diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java index 369885c6ee..6b7e41dd66 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java @@ -3,8 +3,12 @@ package com.rusefi.config.generated; import com.rusefi.config.*; public class VvtState { - public static final Field VVT_PLACEHOLDER = Field.create("VVT_PLACEHOLDER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1372); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1372); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1372); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1372); public static final Field[] VALUES = { - VVT_PLACEHOLDER, + VVTTARGET, + VVTOUTPUT, + ALIGNMENTFILL_AT_3, }; }