FF Interpolate to CMS
This commit is contained in:
parent
f96f9cb6e7
commit
d51b150585
|
@ -472,7 +472,7 @@ static const char * const lookupTableOffOnAuto[] = {
|
||||||
"OFF", "ON", "AUTO"
|
"OFF", "ON", "AUTO"
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* const lookupTableInterpolatedSetpoint[] = {
|
const char* const lookupTableInterpolatedSetpoint[] = {
|
||||||
"OFF", "ON", "AVERAGED_2", "AVERAGED_3", "AVERAGED_4"
|
"OFF", "ON", "AVERAGED_2", "AVERAGED_3", "AVERAGED_4"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -256,3 +256,5 @@ extern const char * const lookupTableItermRelax[];
|
||||||
extern const char * const lookupTableItermRelaxType[];
|
extern const char * const lookupTableItermRelaxType[];
|
||||||
|
|
||||||
extern const char * const lookupTableOsdDisplayPortDevice[];
|
extern const char * const lookupTableOsdDisplayPortDevice[];
|
||||||
|
|
||||||
|
extern const char * const lookupTableInterpolatedSetpoint[];
|
||||||
|
|
|
@ -370,6 +370,11 @@ static uint8_t cmsx_iterm_relax_type;
|
||||||
static uint8_t cmsx_iterm_relax_cutoff;
|
static uint8_t cmsx_iterm_relax_cutoff;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_INTERPOLATED_SP
|
||||||
|
static uint8_t cmsx_ff_interpolate_sp;
|
||||||
|
static uint8_t cmsx_ff_smooth_factor;
|
||||||
|
#endif
|
||||||
|
|
||||||
static const void *cmsx_profileOtherOnEnter(void)
|
static const void *cmsx_profileOtherOnEnter(void)
|
||||||
{
|
{
|
||||||
setProfileIndexString(pidProfileIndexString, pidProfileIndex, currentPidProfile->profileName);
|
setProfileIndexString(pidProfileIndexString, pidProfileIndex, currentPidProfile->profileName);
|
||||||
|
@ -404,6 +409,11 @@ static const void *cmsx_profileOtherOnEnter(void)
|
||||||
cmsx_iterm_relax_cutoff = pidProfile->iterm_relax_cutoff;
|
cmsx_iterm_relax_cutoff = pidProfile->iterm_relax_cutoff;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_INTERPOLATED_SP
|
||||||
|
cmsx_ff_interpolate_sp = pidProfile->ff_interpolate_sp;
|
||||||
|
cmsx_ff_smooth_factor = pidProfile->ff_smooth_factor;
|
||||||
|
#endif
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -441,6 +451,11 @@ static const void *cmsx_profileOtherOnExit(const OSD_Entry *self)
|
||||||
pidProfile->iterm_relax_cutoff = cmsx_iterm_relax_cutoff;
|
pidProfile->iterm_relax_cutoff = cmsx_iterm_relax_cutoff;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_INTERPOLATED_SP
|
||||||
|
pidProfile->ff_interpolate_sp = cmsx_ff_interpolate_sp;
|
||||||
|
pidProfile->ff_smooth_factor = cmsx_ff_smooth_factor;
|
||||||
|
#endif
|
||||||
|
|
||||||
initEscEndpoints();
|
initEscEndpoints();
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -448,7 +463,11 @@ static const void *cmsx_profileOtherOnExit(const OSD_Entry *self)
|
||||||
static const OSD_Entry cmsx_menuProfileOtherEntries[] = {
|
static const OSD_Entry cmsx_menuProfileOtherEntries[] = {
|
||||||
{ "-- OTHER PP --", OME_Label, NULL, pidProfileIndexString, 0 },
|
{ "-- OTHER PP --", OME_Label, NULL, pidProfileIndexString, 0 },
|
||||||
|
|
||||||
{ "FF TRANS", OME_FLOAT, NULL, &(OSD_FLOAT_t) { &cmsx_feedForwardTransition, 0, 100, 1, 10 }, 0 },
|
{ "FF TRANS", OME_FLOAT, NULL, &(OSD_FLOAT_t) { &cmsx_feedForwardTransition, 0, 100, 1, 10 }, 0 },
|
||||||
|
#ifdef USE_INTERPOLATED_SP
|
||||||
|
{ "FF MODE", OME_TAB, NULL, &(OSD_TAB_t) { &cmsx_ff_interpolate_sp, 4, lookupTableInterpolatedSetpoint}, 0 },
|
||||||
|
{ "FF SMOOTHNESS", OME_UINT8, NULL, &(OSD_UINT8_t) { &cmsx_ff_smooth_factor, 0, 75, 1 } , 0 },
|
||||||
|
#endif
|
||||||
{ "FF BOOST", OME_UINT8, NULL, &(OSD_UINT8_t) { &cmsx_ff_boost, 0, 50, 1 } , 0 },
|
{ "FF BOOST", OME_UINT8, NULL, &(OSD_UINT8_t) { &cmsx_ff_boost, 0, 50, 1 } , 0 },
|
||||||
{ "ANGLE STR", OME_UINT8, NULL, &(OSD_UINT8_t) { &cmsx_angleStrength, 0, 200, 1 } , 0 },
|
{ "ANGLE STR", OME_UINT8, NULL, &(OSD_UINT8_t) { &cmsx_angleStrength, 0, 200, 1 } , 0 },
|
||||||
{ "HORZN STR", OME_UINT8, NULL, &(OSD_UINT8_t) { &cmsx_horizonStrength, 0, 200, 1 } , 0 },
|
{ "HORZN STR", OME_UINT8, NULL, &(OSD_UINT8_t) { &cmsx_horizonStrength, 0, 200, 1 } , 0 },
|
||||||
|
|
Loading…
Reference in New Issue