diff --git a/firmware/config/engines/honda_k_dbc.cpp b/firmware/config/engines/honda_k_dbc.cpp index 2af0e26f05..55b862fb48 100644 --- a/firmware/config/engines/honda_k_dbc.cpp +++ b/firmware/config/engines/honda_k_dbc.cpp @@ -19,7 +19,9 @@ void setHondaK() { engineConfiguration->trigger.type = TT_HONDA_K_CRANK_12_1; engineConfiguration->globalTriggerAngleOffset = 675; + // also known as 'CAM sync' just single tooth? and we do not even use it!? engineConfiguration->vvtMode[0] = VVT_HONDA_K_INTAKE; + // VVT is here engineConfiguration->vvtMode[1] = VVT_HONDA_K_EXHAUST; engineConfiguration->vvtOffsets[0] = -41; engineConfiguration->vvtOffsets[1] = 171; diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index e05f63998f..d1397deefb 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -297,8 +297,10 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2 uint32_t triggerPrimaryRise;;"", 1, 0, -10000, 10000, 3 uint32_t triggerSecondaryFall;;"", 1, 0, -10000, 10000, 3 uint32_t triggerSecondaryRise;;"", 1, 0, -10000, 10000, 3 - uint32_t triggerVvtFall;;"", 1, 0, -10000, 10000, 3 - uint32_t triggerVvtRise;;"", 1, 0, -10000, 10000, 3 + uint16_t triggerVvtFall;;"", 1, 0, 0, 3000, 0 + uint16_t triggerVvtRise;;"", 1, 0, 0, 3000, 0 + uint16_t triggerVvt2Fall;;"", 1, 0, 0, 3000, 0, @@GAUGE_CATEGORY_SYNC@@ + uint16_t triggerVvt2Rise;;"", 1, 0, 0, 3000, 0, @@GAUGE_CATEGORY_SYNC@@ uint8_t starterState;;"", 1, 0, -10000, 10000, 3 diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 0e3fc685a3..3ffebef107 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -787,6 +787,8 @@ DcHardware *getdcHardware(); tsOutputChannels->triggerVvtRise = engine->triggerCentral.vvtEventRiseCounter[0]; tsOutputChannels->triggerVvtFall = engine->triggerCentral.vvtEventFallCounter[0]; + tsOutputChannels->triggerVvt2Fall = engine->triggerCentral.vvtEventRiseCounter[1]; + tsOutputChannels->triggerVvt2Rise = engine->triggerCentral.vvtEventFallCounter[1]; #endif // EFI_SHAFT_POSITION_INPUT #if HAL_USE_PAL && EFI_PROD_CODE diff --git a/firmware/controllers/trigger/trigger_central.txt b/firmware/controllers/trigger/trigger_central.txt index 6dc3a0c455..5c319c7613 100644 --- a/firmware/controllers/trigger/trigger_central.txt +++ b/firmware/controllers/trigger/trigger_central.txt @@ -4,16 +4,16 @@ struct_no_prefix trigger_central_s uint32_t[HW_EVENT_TYPES iterate] hwEventCounters;Hardware events since boot -uint32_t vvtCamCounter;Sync: CAM front counter +uint32_t vvtCamCounter;Sync: total cams front counter float mapVvt_MAP_AT_SPECIAL_POINT;;"", 1, 0, -10000, 10000, 3 float mapVvt_MAP_AT_DIFF;;"", 1, 0, -10000, 10000, 3 uint8_t mapVvt_MAP_AT_CYCLE_COUNT;;"", 1, 0, -10000, 10000, 3 uint8_t mapVvt_map_peak;;"", 1, 0, -10000, 10000, 3 - float currentEngineDecodedPhase;Sync: Engine Phase;"deg",1, 0, 0, 0, 0 + float currentEngineDecodedPhase;Sync: Engine Phase;"deg",1, 0, 0, 0, 0, @@GAUGE_CATEGORY_SYNC@@ - float triggerToothAngleError;;"deg", 1, 0, -30, 30, 2 + float triggerToothAngleError;Sync: trigger angle error;"deg", 1, 0, -30, 30, 2 uint8_t triggerIgnoredToothCount diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 373ddfa8b6..de7ffb42da 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1839,6 +1839,7 @@ end_struct #define GAUGE_NAME_TRG_GAP "Sync: Trigger Latest Ratio" #define GAUGE_CATEGORY_TIMING "Timing" +#define GAUGE_CATEGORY_SYNC "Sync" #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_BOOST_CONTROL "Boost Control" #define GAUGE_CATEGORY_ETB "ETB more"