mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-26 01:35:41 +03:00
Merge pull request #4850 from bkeinert/filter_pt1_opt
PT1 filter size optimizations, remove unsed func & vars from struct
This commit is contained in:
commit
0efbb3fc6b
2 changed files with 2 additions and 20 deletions
|
@ -44,9 +44,8 @@ FAST_CODE float nullFilterApply(void *filter, float input)
|
||||||
|
|
||||||
void pt1FilterInit(pt1Filter_t *filter, uint8_t f_cut, float dT)
|
void pt1FilterInit(pt1Filter_t *filter, uint8_t f_cut, float dT)
|
||||||
{
|
{
|
||||||
filter->RC = 1.0f / ( 2.0f * M_PI_FLOAT * f_cut );
|
float RC = 1.0f / ( 2.0f * M_PI_FLOAT * f_cut );
|
||||||
filter->dT = dT;
|
filter->k = dT / (RC + dT);
|
||||||
filter->k = filter->dT / (filter->RC + filter->dT);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
FAST_CODE float pt1FilterApply(pt1Filter_t *filter, float input)
|
FAST_CODE float pt1FilterApply(pt1Filter_t *filter, float input)
|
||||||
|
@ -55,20 +54,6 @@ FAST_CODE float pt1FilterApply(pt1Filter_t *filter, float input)
|
||||||
return filter->state;
|
return filter->state;
|
||||||
}
|
}
|
||||||
|
|
||||||
FAST_CODE float pt1FilterApply4(pt1Filter_t *filter, float input, uint8_t f_cut, float dT)
|
|
||||||
{
|
|
||||||
// Pre calculate and store RC
|
|
||||||
if (!filter->RC) {
|
|
||||||
filter->RC = 1.0f / ( 2.0f * M_PI_FLOAT * f_cut );
|
|
||||||
filter->dT = dT;
|
|
||||||
filter->k = filter->dT / (filter->RC + filter->dT);
|
|
||||||
}
|
|
||||||
|
|
||||||
filter->state = filter->state + filter->k * (input - filter->state);
|
|
||||||
|
|
||||||
return filter->state;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Slew filter with limit
|
// Slew filter with limit
|
||||||
|
|
||||||
void slewFilterInit(slewFilter_t *filter, float slewLimit, float threshold)
|
void slewFilterInit(slewFilter_t *filter, float slewLimit, float threshold)
|
||||||
|
|
|
@ -28,8 +28,6 @@
|
||||||
typedef struct pt1Filter_s {
|
typedef struct pt1Filter_s {
|
||||||
float state;
|
float state;
|
||||||
float k;
|
float k;
|
||||||
float RC;
|
|
||||||
float dT;
|
|
||||||
} pt1Filter_t;
|
} pt1Filter_t;
|
||||||
|
|
||||||
typedef struct slewFilter_s {
|
typedef struct slewFilter_s {
|
||||||
|
@ -91,7 +89,6 @@ float filterGetNotchQ(uint16_t centerFreq, uint16_t cutoff);
|
||||||
|
|
||||||
void pt1FilterInit(pt1Filter_t *filter, uint8_t f_cut, float dT);
|
void pt1FilterInit(pt1Filter_t *filter, uint8_t f_cut, float dT);
|
||||||
float pt1FilterApply(pt1Filter_t *filter, float input);
|
float pt1FilterApply(pt1Filter_t *filter, float input);
|
||||||
float pt1FilterApply4(pt1Filter_t *filter, float input, uint8_t f_cut, float dT);
|
|
||||||
|
|
||||||
void slewFilterInit(slewFilter_t *filter, float slewLimit, float threshold);
|
void slewFilterInit(slewFilter_t *filter, float slewLimit, float threshold);
|
||||||
float slewFilterApply(slewFilter_t *filter, float input);
|
float slewFilterApply(slewFilter_t *filter, float input);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue