mirror of
https://github.com/iNavFlight/inav.git
synced 2025-07-26 01:35:35 +03:00
Fix a bunch more compilation warnings
This commit is contained in:
parent
d97c282c90
commit
1cef921c92
5 changed files with 37 additions and 21 deletions
|
@ -148,16 +148,18 @@ void biquadFilterInit(biquadFilter_t *filter, uint16_t filterFreq, uint32_t samp
|
||||||
|
|
||||||
float b0, b1, b2;
|
float b0, b1, b2;
|
||||||
switch (filterType) {
|
switch (filterType) {
|
||||||
case FILTER_LPF:
|
case FILTER_LPF:
|
||||||
b0 = (1 - cs) / 2;
|
b0 = (1 - cs) / 2;
|
||||||
b1 = 1 - cs;
|
b1 = 1 - cs;
|
||||||
b2 = (1 - cs) / 2;
|
b2 = (1 - cs) / 2;
|
||||||
break;
|
break;
|
||||||
case FILTER_NOTCH:
|
case FILTER_NOTCH:
|
||||||
b0 = 1;
|
b0 = 1;
|
||||||
b1 = -2 * cs;
|
b1 = -2 * cs;
|
||||||
b2 = 1;
|
b2 = 1;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
goto initError;
|
||||||
}
|
}
|
||||||
const float a0 = 1 + alpha;
|
const float a0 = 1 + alpha;
|
||||||
const float a1 = -2 * cs;
|
const float a1 = -2 * cs;
|
||||||
|
@ -172,16 +174,23 @@ void biquadFilterInit(biquadFilter_t *filter, uint16_t filterFreq, uint32_t samp
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Not possible to filter frequencies above Nyquist frequency - passthrough
|
// Not possible to filter frequencies above Nyquist frequency - passthrough
|
||||||
filter->b0 = 1.0f;
|
goto initError;
|
||||||
filter->b1 = 0.0f;
|
|
||||||
filter->b2 = 0.0f;
|
|
||||||
filter->a1 = 0.0f;
|
|
||||||
filter->a2 = 0.0f;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// zero initial samples
|
// zero initial samples
|
||||||
filter->x1 = filter->x2 = 0;
|
filter->x1 = filter->x2 = 0;
|
||||||
filter->y1 = filter->y2 = 0;
|
filter->y1 = filter->y2 = 0;
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
initError:
|
||||||
|
|
||||||
|
// passthrough
|
||||||
|
filter->b0 = 1.0f;
|
||||||
|
filter->b1 = 0.0f;
|
||||||
|
filter->b2 = 0.0f;
|
||||||
|
filter->a1 = 0.0f;
|
||||||
|
filter->a2 = 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
FAST_CODE float biquadFilterApplyDF1(biquadFilter_t *filter, float input)
|
FAST_CODE float biquadFilterApplyDF1(biquadFilter_t *filter, float input)
|
||||||
|
@ -231,4 +240,4 @@ FAST_CODE void biquadFilterUpdate(biquadFilter_t *filter, float filterFreq, uint
|
||||||
filter->x2 = x2;
|
filter->x2 = x2;
|
||||||
filter->y1 = y1;
|
filter->y1 = y1;
|
||||||
filter->y2 = y2;
|
filter->y2 = y2;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1694,6 +1694,8 @@ static afatfsOperationStatus_e afatfs_appendSuperclusterContinue(afatfsFile_t *f
|
||||||
// Update the fileSize/firstCluster in the directory entry for the file
|
// Update the fileSize/firstCluster in the directory entry for the file
|
||||||
status = afatfs_saveDirectoryEntry(file, AFATFS_SAVE_DIRECTORY_NORMAL);
|
status = afatfs_saveDirectoryEntry(file, AFATFS_SAVE_DIRECTORY_NORMAL);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
status = AFATFS_OPERATION_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((status == AFATFS_OPERATION_FAILURE || status == AFATFS_OPERATION_SUCCESS) && file->operation.operation == AFATFS_FILE_OPERATION_APPEND_SUPERCLUSTER) {
|
if ((status == AFATFS_OPERATION_FAILURE || status == AFATFS_OPERATION_SUCCESS) && file->operation.operation == AFATFS_FILE_OPERATION_APPEND_SUPERCLUSTER) {
|
||||||
|
@ -2487,6 +2489,8 @@ static afatfsOperationStatus_e afatfs_ftruncateContinue(afatfsFilePtr_t file, bo
|
||||||
|
|
||||||
return AFATFS_OPERATION_SUCCESS;
|
return AFATFS_OPERATION_SUCCESS;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
status = AFATFS_OPERATION_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status == AFATFS_OPERATION_FAILURE && file->operation.operation == AFATFS_FILE_OPERATION_TRUNCATE) {
|
if (status == AFATFS_OPERATION_FAILURE && file->operation.operation == AFATFS_FILE_OPERATION_TRUNCATE) {
|
||||||
|
|
|
@ -417,6 +417,7 @@ static void osdFormatWindSpeedStr(char *buff, int32_t ws, bool isValid)
|
||||||
centivalue = (ws * 224) / 100;
|
centivalue = (ws * 224) / 100;
|
||||||
suffix = SYM_MPH;
|
suffix = SYM_MPH;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
case OSD_UNIT_METRIC:
|
case OSD_UNIT_METRIC:
|
||||||
centivalue = (ws * 36) / 10;
|
centivalue = (ws * 36) / 10;
|
||||||
suffix = SYM_KMH;
|
suffix = SYM_KMH;
|
||||||
|
@ -1011,6 +1012,7 @@ static void osdDrawMap(int referenceHeading, uint8_t referenceSym, uint8_t cente
|
||||||
break;
|
break;
|
||||||
case OSD_UNIT_UK:
|
case OSD_UNIT_UK:
|
||||||
FALLTHROUGH;
|
FALLTHROUGH;
|
||||||
|
default:
|
||||||
case OSD_UNIT_METRIC:
|
case OSD_UNIT_METRIC:
|
||||||
initialScale = 10; // 10m as initial scale
|
initialScale = 10; // 10m as initial scale
|
||||||
break;
|
break;
|
||||||
|
@ -1844,6 +1846,7 @@ static bool osdDrawSingleElement(uint8_t item)
|
||||||
value = CENTIMETERS_TO_CENTIFEET(value);
|
value = CENTIMETERS_TO_CENTIFEET(value);
|
||||||
sym = SYM_FTS;
|
sym = SYM_FTS;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
case OSD_UNIT_METRIC:
|
case OSD_UNIT_METRIC:
|
||||||
// Already in cm/s
|
// Already in cm/s
|
||||||
sym = SYM_MS;
|
sym = SYM_MS;
|
||||||
|
@ -2325,6 +2328,7 @@ static bool osdDrawSingleElement(uint8_t item)
|
||||||
break;
|
break;
|
||||||
case OSD_UNIT_UK:
|
case OSD_UNIT_UK:
|
||||||
FALLTHROUGH;
|
FALLTHROUGH;
|
||||||
|
default:
|
||||||
case OSD_UNIT_METRIC:
|
case OSD_UNIT_METRIC:
|
||||||
scaleToUnit = 100; // scale to cm for osdFormatCentiNumber()
|
scaleToUnit = 100; // scale to cm for osdFormatCentiNumber()
|
||||||
scaleUnitDivisor = 1000; // Convert to km when scale gets bigger than 999m
|
scaleUnitDivisor = 1000; // Convert to km when scale gets bigger than 999m
|
||||||
|
|
|
@ -225,7 +225,7 @@ static uint8_t osdUpdateSidebar(osd_sidebar_scroll_e scroll, osd_sidebar_t *side
|
||||||
// Scroll between SYM_AH_DECORATION_MIN and SYM_AH_DECORATION_MAX.
|
// Scroll between SYM_AH_DECORATION_MIN and SYM_AH_DECORATION_MAX.
|
||||||
// Zero scrolling should draw SYM_AH_DECORATION.
|
// Zero scrolling should draw SYM_AH_DECORATION.
|
||||||
uint8_t decoration = SYM_AH_DECORATION;
|
uint8_t decoration = SYM_AH_DECORATION;
|
||||||
int offset;
|
int offset = 0;
|
||||||
int steps;
|
int steps;
|
||||||
switch (scroll) {
|
switch (scroll) {
|
||||||
case OSD_SIDEBAR_SCROLL_NONE:
|
case OSD_SIDEBAR_SCROLL_NONE:
|
||||||
|
@ -240,8 +240,6 @@ static uint8_t osdUpdateSidebar(osd_sidebar_scroll_e scroll, osd_sidebar_t *side
|
||||||
case OSD_SIDEBAR_SCROLL_GROUND_SPEED:
|
case OSD_SIDEBAR_SCROLL_GROUND_SPEED:
|
||||||
#if defined(USE_GPS)
|
#if defined(USE_GPS)
|
||||||
offset = gpsSol.groundSpeed;
|
offset = gpsSol.groundSpeed;
|
||||||
#else
|
|
||||||
offset = 0;
|
|
||||||
#endif
|
#endif
|
||||||
// Move 1 char for every 20 cm/s
|
// Move 1 char for every 20 cm/s
|
||||||
steps = offset / 20;
|
steps = offset / 20;
|
||||||
|
@ -249,8 +247,6 @@ static uint8_t osdUpdateSidebar(osd_sidebar_scroll_e scroll, osd_sidebar_t *side
|
||||||
case OSD_SIDEBAR_SCROLL_HOME_DISTANCE:
|
case OSD_SIDEBAR_SCROLL_HOME_DISTANCE:
|
||||||
#if defined(USE_GPS)
|
#if defined(USE_GPS)
|
||||||
offset = GPS_distanceToHome;
|
offset = GPS_distanceToHome;
|
||||||
#else
|
|
||||||
offset = 0;
|
|
||||||
#endif
|
#endif
|
||||||
// Move 1 char for every 5m
|
// Move 1 char for every 5m
|
||||||
steps = offset / 5;
|
steps = offset / 5;
|
||||||
|
|
|
@ -300,6 +300,9 @@ static void smartportMasterPoll(void)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
default: // should not happen
|
||||||
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue