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

Remove value copy from controller into outputChannels #4095

This commit is contained in:
rusefillc 2022-04-23 19:53:05 -04:00
parent b9de06a275
commit d1173219b6
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,13 +307,13 @@ uint8_t unusedWat
bit dfcoActive bit dfcoActive
bit tpsAccelActive bit tpsAccelActive
uint8_t TEMPLOG_MAP_AT_CYCLE_COUNT;;"", 1, 0, -10000, 10000, 3 uint8_t unused_8_1
uint8_t TEMPLOG_map_peak;;"", 1, 0, -10000, 10000, 3 uint8_t unused_8_2
uint8_t autoscale boostControllerOutput;@@GAUGE_NAME_BOOST_OUTPUT@@;"%", 0.5, 0, 0, 100, 1 uint8_t autoscale boostControllerOutput;@@GAUGE_NAME_BOOST_OUTPUT@@;"%", 0.5, 0, 0, 100, 1
uint8_t autoscale boostControllerOpenLoopPart;@@GAUGE_NAME_BOOST_OPEN_LOOP@@;"%", 0.5, 0, 0, 100, 1 uint8_t autoscale boostControllerOpenLoopPart;@@GAUGE_NAME_BOOST_OPEN_LOOP@@;"%", 0.5, 0, 0, 100, 1
float autoscale TEMPLOG_MAP_AT_SPECIAL_POINT;;"", 1, 0, -10000, 10000, 3 float unused_32_1
float autoscale TEMPLOG_MAP_AT_DIFF;;"", 1, 0, -10000, 10000, 3 float unused_32_2
float autoscale vvtSyncGapRatio;;"", 1, 0, -10000, 10000, 3 float autoscale vvtSyncGapRatio;;"", 1, 0, -10000, 10000, 3
float autoscale vvtCurrentPosition;;"", 1, 0, -10000, 10000, 3 float autoscale vvtCurrentPosition;;"", 1, 0, -10000, 10000, 3

12
firmware/console/binary/output_channels_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 Sat Apr 23 11:38:35 UTC 2022 // this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Sat Apr 23 19:49:37 EDT 2022
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
@ -1188,11 +1188,11 @@ struct output_channels_s {
/** /**
* offset 412 * offset 412
*/ */
uint8_t TEMPLOG_MAP_AT_CYCLE_COUNT = (uint8_t)0; uint8_t unused_8_1 = (uint8_t)0;
/** /**
* offset 413 * offset 413
*/ */
uint8_t TEMPLOG_map_peak = (uint8_t)0; uint8_t unused_8_2 = (uint8_t)0;
/** /**
* @@GAUGE_NAME_BOOST_OUTPUT@@ * @@GAUGE_NAME_BOOST_OUTPUT@@
% %
@ -1208,11 +1208,11 @@ struct output_channels_s {
/** /**
* offset 416 * offset 416
*/ */
scaled_channel<float, 1, 1> TEMPLOG_MAP_AT_SPECIAL_POINT = (float)0; float unused_32_1 = (float)0;
/** /**
* offset 420 * offset 420
*/ */
scaled_channel<float, 1, 1> TEMPLOG_MAP_AT_DIFF = (float)0; float unused_32_2 = (float)0;
/** /**
* offset 424 * offset 424
*/ */
@ -1403,4 +1403,4 @@ struct output_channels_s {
static_assert(sizeof(output_channels_s) == 640); static_assert(sizeof(output_channels_s) == 640);
// end // end
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Apr 23 11:38:35 UTC 2022 // this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Sat Apr 23 19:49:37 EDT 2022

8
firmware/controllers/trigger/trigger_central.cpp
View File

@ -700,9 +700,9 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta
mapCamPrevCycleValue = map; mapCamPrevCycleValue = map;
if (diff > 0) { if (diff > 0) {
engine->outputChannels.TEMPLOG_map_peak++; mapVvt_map_peak++;
int revolutionCounter = engine->triggerCentral.triggerState.getTotalRevolutionCounter(); int revolutionCounter = engine->triggerCentral.triggerState.getTotalRevolutionCounter();
engine->outputChannels.TEMPLOG_MAP_AT_CYCLE_COUNT = revolutionCounter - prevChangeAtCycle; mapVvt_MAP_AT_CYCLE_COUNT = revolutionCounter - prevChangeAtCycle;
prevChangeAtCycle = revolutionCounter; prevChangeAtCycle = revolutionCounter;
hwHandleVvtCamSignal(TV_RISE, timestamp, /*index*/0); hwHandleVvtCamSignal(TV_RISE, timestamp, /*index*/0);
@ -716,8 +716,8 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta
#endif // EFI_UNIT_TEST #endif // EFI_UNIT_TEST
} }
engine->outputChannels.TEMPLOG_MAP_AT_SPECIAL_POINT = map; mapVvt_MAP_AT_SPECIAL_POINT = map;
engine->outputChannels.TEMPLOG_MAP_AT_DIFF = diff; mapVvt_MAP_AT_DIFF = diff;
} }
mapCamPrevToothAngle = toothAngle360; mapCamPrevToothAngle = toothAngle360;