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

dead FSIO

This commit is contained in:
rusefillc 2021-08-14 11:52:20 -04:00
parent 2f57dcee33
commit 063ab4af35
4 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/advance_map.cpp
View File

@ -94,14 +94,12 @@ angle_t getAdvanceCorrections(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
tsOutputChannels.debugFloatField1 = iatCorrection; tsOutputChannels.debugFloatField1 = iatCorrection;
tsOutputChannels.debugFloatField2 = engine->engineState.cltTimingCorrection; tsOutputChannels.debugFloatField2 = engine->engineState.cltTimingCorrection;
tsOutputChannels.debugFloatField3 = engine->fsioState.fsioTimingAdjustment;
tsOutputChannels.debugFloatField4 = pidTimingCorrection; tsOutputChannels.debugFloatField4 = pidTimingCorrection;
tsOutputChannels.debugIntField1 = engine->engineState.multispark.count; tsOutputChannels.debugIntField1 = engine->engineState.multispark.count;
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */
} }
return iatCorrection return iatCorrection
+ engine->fsioState.fsioTimingAdjustment
+ engine->engineState.cltTimingCorrection + engine->engineState.cltTimingCorrection
+ pidTimingCorrection + pidTimingCorrection
// todo: uncomment once we get usable knock - engine->knockCount // todo: uncomment once we get usable knock - engine->knockCount

2
firmware/controllers/algo/engine_parts.h
View File

@ -73,8 +73,6 @@ public:
class FsioState { class FsioState {
public: public:
FsioState(); FsioState();
float fsioTimingAdjustment = 0;
float servoValues[SERVO_COUNT];
float fsioLastValue[FSIO_COMMAND_COUNT]; float fsioLastValue[FSIO_COMMAND_COUNT];
float fsioRpmHardLimit; float fsioRpmHardLimit;

25
firmware/controllers/core/fsio_impl.cpp
View File

@ -446,10 +446,6 @@ static bool updateValueOrWarning(int humanIndex, const char *msg, float *value D
} }
} }
static void useFsioForServo(int servoIndex DECLARE_ENGINE_PARAMETER_SUFFIX) {
updateValueOrWarning(8 + servoIndex, "servo", &engine->fsioState.servoValues[servoIndex] PASS_ENGINE_PARAMETER_SUFFIX);
}
/** /**
* this method should be invoked periodically to calculate FSIO and toggle corresponding FSIO outputs * this method should be invoked periodically to calculate FSIO and toggle corresponding FSIO outputs
*/ */
@ -501,30 +497,9 @@ void runFsio(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
} }
#endif /* EFI_ENABLE_CRITICAL_ENGINE_STOP */ #endif /* EFI_ENABLE_CRITICAL_ENGINE_STOP */
if (engineConfiguration->useFSIO16ForTimingAdjustment) {
updateValueOrWarning(MAGIC_OFFSET_FOR_TIMING_FSIO, "timing", &ENGINE(fsioState.fsioTimingAdjustment) PASS_ENGINE_PARAMETER_SUFFIX);
}
if (engineConfiguration->useFSIO6ForRevLimiter) { if (engineConfiguration->useFSIO6ForRevLimiter) {
updateValueOrWarning(6, "rpm limit", &ENGINE(fsioState.fsioRpmHardLimit) PASS_ENGINE_PARAMETER_SUFFIX); updateValueOrWarning(6, "rpm limit", &ENGINE(fsioState.fsioRpmHardLimit) PASS_ENGINE_PARAMETER_SUFFIX);
} }
if (engineConfiguration->useFSIO8ForServo1) {
useFsioForServo(0 PASS_ENGINE_PARAMETER_SUFFIX);
}
if (engineConfiguration->useFSIO9ForServo2) {
useFsioForServo(1 PASS_ENGINE_PARAMETER_SUFFIX);
}
if (engineConfiguration->useFSIO10ForServo3) {
useFsioForServo(2 PASS_ENGINE_PARAMETER_SUFFIX);
}
if (engineConfiguration->useFSIO11ForServo4) {
useFsioForServo(3 PASS_ENGINE_PARAMETER_SUFFIX);
}
if (engineConfiguration->useFSIO12ForServo5) {
useFsioForServo(4 PASS_ENGINE_PARAMETER_SUFFIX);
}
} }

2
firmware/controllers/core/fsio_impl.h
View File

@ -16,8 +16,6 @@
#define MAGIC_OFFSET_FOR_ENGINE_WARNING 4 #define MAGIC_OFFSET_FOR_ENGINE_WARNING 4
// see useFSIO5ForCriticalIssueEngineStop // see useFSIO5ForCriticalIssueEngineStop
#define MAGIC_OFFSET_FOR_CRITICAL_ENGINE 5 #define MAGIC_OFFSET_FOR_CRITICAL_ENGINE 5
// see useFSIO16ForTimingAdjustment
#define MAGIC_OFFSET_FOR_TIMING_FSIO 16
typedef Map3D<FSIO_TABLE_8, FSIO_TABLE_8, float, float> fsio8_Map3D_f32t; typedef Map3D<FSIO_TABLE_8, FSIO_TABLE_8, float, float> fsio8_Map3D_f32t;
typedef Map3D<FSIO_TABLE_8, FSIO_TABLE_8, uint8_t, float> fsio8_Map3D_u8t; typedef Map3D<FSIO_TABLE_8, FSIO_TABLE_8, uint8_t, float> fsio8_Map3D_u8t;