Templates/ExtendedLibs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

добавлены newline и по мелочи

Browse Source
This commit is contained in:
Razvalyaev
2025-12-25 10:33:15 +03:00
parent a6b27da4ce
commit dfbae9be39
7 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MyLibs/Inc/filters.h
View File

@@ -85,8 +85,10 @@ int32_t process_value_int(int32_t raw_adc_quant) {
#ifdef FILTERS_ENABLE #ifdef FILTERS_ENABLE
#ifdef ARM_MATH_CM4 #ifdef ARM_MATH_CM4
#include "arm_math.h" #include "arm_math.h"
#define DSP_FITLERS 1 #define DSP_FITLERS 1
#else
#include "math.h"
#endif #endif

6
MyLibs/Inc/mylibs_defs.h
View File

@@ -201,6 +201,12 @@ extern void Error_Handler(void);
*/ */
#define ABS(x) ( ((x) > 0)? (x) : -(x)) #define ABS(x) ( ((x) > 0)? (x) : -(x))
/**
* @brief Константа Пи
*/
#ifndef PI
#define PI 3.14159265f
#endif
/** UTILS_DEFINES /** UTILS_DEFINES
* @} * @}
*/ */

18
MyLibs/Src/filters.c
View File

@@ -354,14 +354,14 @@ float FilterRMS_Process(FilterRMS_t* filter, float input) {
// ==================== INT32_T ВЕРСИИ ==================== // ==================== INT32_T ВЕРСИИ ====================
// Вспомогательная функция для сравнения int32_t //// Вспомогательная функция для сравнения int32_t
static int Filter_int32_compare(const void *a, const void *b) { //static int Filter_int32_compare(const void *a, const void *b) {
int32_t ia = *(const int32_t*)a; // int32_t ia = *(const int32_t*)a;
int32_t ib = *(const int32_t*)b; // int32_t ib = *(const int32_t*)b;
if (ia < ib) return -1; // if (ia < ib) return -1;
if (ia > ib) return 1; // if (ia > ib) return 1;
return 0; // return 0;
} //}
/** /**
* @brief Инициализация медианного фильтра (int32_t) * @brief Инициализация медианного фильтра (int32_t)
@@ -748,7 +748,7 @@ int32_t FilterRMSInt_Process(FilterRMSInt_t* filter, int32_t input) {
int64_t mean_square = filter->sum_squares / filter->count; int64_t mean_square = filter->sum_squares / filter->count;
// Защита от отрицательных значений // Защита от отрицательных значений
if (mean_square < 0) mean_square = 0; if (mean_square < 0) mean_square = 0;
filter->last_rms = (int32_t)sqrt((double)mean_square); filter->last_rms = (int32_t)_sqrtf((float)mean_square);
} }
return filter->last_rms; return filter->last_rms;