From 44d54899f04ee83e739f7d2f94f674dff155f889 Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Fri, 27 Jun 2025 20:05:32 +0200 Subject: [PATCH] minor changes --- .vscode/.server-controller-port.log | 2 +- .vscode/settings.json | 3 ++- CMakeLists.txt | 8 +------- filter/bs412.c | 2 +- lib/optimization.h | 13 ------------- src/chimer95.c | 1 - src/fm95.c | 1 - 7 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 lib/optimization.h diff --git a/.vscode/.server-controller-port.log b/.vscode/.server-controller-port.log index 79f49cf..8d576b6 100644 --- a/.vscode/.server-controller-port.log +++ b/.vscode/.server-controller-port.log @@ -1,5 +1,5 @@ { "port": 13452, - "time": 1751012772726, + "time": 1751046472527, "version": "0.0.3" } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 704b741..87cfb4a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -36,7 +36,8 @@ "algorithm": "c", "socket.h": "c", "time.h": "c", - "vban.h": "c" + "vban.h": "c", + "chimer.h": "c" }, "C_Cpp.errorSquiggles": "disabled" } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 13790df..9775257 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,21 +13,15 @@ endif() file(GLOB SRC_FILES "src/*.c") # file(GLOB LIB_FILES "lib/*.c") - file(GLOB FILTER_FILES "filter/*.c") file(GLOB MODULATION_FILES "modulation/*.c") - file(GLOB DSP_FILES "dsp/*.c") - file(GLOB IO_FILES "io/*.c") # add_library(libfm OBJECT ${LIB_FILES}) - add_library(libfmfilter OBJECT ${FILTER_FILES}) add_library(libfmmodulation OBJECT ${MODULATION_FILES}) - add_library(libfmdsp OBJECT ${DSP_FILES}) - add_library(libfmio OBJECT ${IO_FILES}) # Define DEBUG macro for Debug builds on libraries @@ -56,6 +50,6 @@ foreach(SRC_FILE ${SRC_FILES}) install(TARGETS ${EXEC_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ + GROUP_EXECUTE GROUP_WRITE GROUP_READ WORLD_EXECUTE WORLD_READ) endforeach() \ No newline at end of file diff --git a/filter/bs412.c b/filter/bs412.c index 1dd103e..15133a2 100644 --- a/filter/bs412.c +++ b/filter/bs412.c @@ -7,7 +7,7 @@ inline float dbr_to_deviation(float dbr) { } inline float deviation_to_dbr(float deviation) { - if(deviation == 0.0f) return -100.0f; + if (deviation < 1e-6f) return -100.0f; return 10.0f * (log2f(deviation) - LOG2_19000) * 0.30103f; } diff --git a/lib/optimization.h b/lib/optimization.h deleted file mode 100644 index e78121e..0000000 --- a/lib/optimization.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#if defined(__ARM_NEON) || defined(__ARM_NEON__) - #ifdef DEBUG - #pragma message("Using ARM NEON optimizations") - #endif - #include - #define USE_NEON 1 -#else - #ifdef DEBUG - #pragma message("ARM NEON optimizations not available") - #endif - #define USE_NEON 0 -#endif \ No newline at end of file diff --git a/src/chimer95.c b/src/chimer95.c index b67d4a8..eff50e8 100644 --- a/src/chimer95.c +++ b/src/chimer95.c @@ -9,7 +9,6 @@ #define buffer_prebuf 0 #include "../dsp/oscillator.h" -#include "../lib/optimization.h" #define DEFAULT_FREQ 1000.0f #define DEFAULT_SAMPLE_RATE 4000 diff --git a/src/fm95.c b/src/fm95.c index f8d7713..5d8075a 100644 --- a/src/fm95.c +++ b/src/fm95.c @@ -20,7 +20,6 @@ #include "../filter/iir.h" #include "../modulation/fm_modulator.h" #include "../modulation/stereo_encoder.h" -#include "../lib/optimization.h" #include "../filter/bs412.h" #include "../filter/gain_control.h"