From b0cf5d1b5814e7be2e8a328a732fb0f9548e8d91 Mon Sep 17 00:00:00 2001 From: BetterPageSol Date: Fri, 24 May 2024 14:31:41 -0400 Subject: [PATCH 1/2] Added fix for Raspbian 12 and minor edits to the Makefile for clean and install --- install.sh | 6 ++++++ src/Makefile | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 087b247..6ddf41c 100755 --- a/install.sh +++ b/install.sh @@ -38,7 +38,13 @@ read -r CONT if [ "$CONT" = "y" ]; then echo "Set GPU to 250Mhz in order to be stable" LINE='gpu_freq=250' + if [ ! -f /boot/firmware/config.txt ]; then + echo "Raspbian 11 or below detected using /boot/config.txt" FILE='/boot/config.txt' + else + echo "Raspbian 12 detected using /boot/firmware/config.txt" + FILE='/boot/firmware/config.txt' + fi grep -qF "$LINE" "$FILE" || echo "$LINE" | sudo tee --append "$FILE" #PI4 LINE='force_turbo=1' diff --git a/src/Makefile b/src/Makefile index 05122da..e1920d7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -92,7 +92,7 @@ CFLAGS_Pidcf77 = -Wall -g -O2 -Wno-unused-variable ../pidcf77 : ../dcf77/pidcf77.c $(CC) $(CFLAGS_Piam) -o ../pidcf77 ../dcf77/pidcf77.c $(LDFLAGS) clean: - rm -f ../dvbrf ../sendiq ../pissb ../pisstv ../pifsq ../pifm ../piam ../pidcf77 ../pichirp ../tune ../freedv ../piopera ../spectrumpaint ../pocsag ../pifmrds ../rpitx ../sendook + rm -f ../dvbrf ../sendiq ../pissb ../pisstv ../pifsq ../pifm ../piam ../pidcf77 ../pichirp ../tune ../freedv ../piopera ../spectrumpaint ../pocsag ../pifmrds ../rpitx ../sendook ../foxhunt ../morse ../pift8 ../morse install: all install -m 0755 ../pisstv $(INSTALL_DIR) @@ -108,4 +108,10 @@ install: all install -m 0755 ../pift8 $(INSTALL_DIR) install -m 0755 ../sendook $(INSTALL_DIR) install -m 0755 ../dvbrf $(INSTALL_DIR) - install -m 0755 ../pifmrds $(INSTALL_DIR) \ No newline at end of file + install -m 0755 ../pifmrds $(INSTALL_DIR) + install -m 0755 ../pocsag $(INSTALL_DIR) + install -m 0755 ../pissb $(INSTALL_DIR) + install -m 0755 ../piam $(INSTALL_DIR) + install -m 0755 ../pidcf77 $(INSTALL_DIR) + install -m 0755 ../spectrumpaint $(INSTALL_DIR) + install -m 0755 ../morse $(INSTALL_DIR) From 24cf6a9152e46a9d94449b3fd397e92f50c51e81 Mon Sep 17 00:00:00 2001 From: BetterPageSol Date: Fri, 24 May 2024 14:56:18 -0400 Subject: [PATCH 2/2] Minor typo fix --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index e1920d7..9ea8b70 100644 --- a/src/Makefile +++ b/src/Makefile @@ -92,7 +92,7 @@ CFLAGS_Pidcf77 = -Wall -g -O2 -Wno-unused-variable ../pidcf77 : ../dcf77/pidcf77.c $(CC) $(CFLAGS_Piam) -o ../pidcf77 ../dcf77/pidcf77.c $(LDFLAGS) clean: - rm -f ../dvbrf ../sendiq ../pissb ../pisstv ../pifsq ../pifm ../piam ../pidcf77 ../pichirp ../tune ../freedv ../piopera ../spectrumpaint ../pocsag ../pifmrds ../rpitx ../sendook ../foxhunt ../morse ../pift8 ../morse + rm -f ../dvbrf ../sendiq ../pissb ../pisstv ../pifsq ../pifm ../piam ../pidcf77 ../pichirp ../tune ../freedv ../piopera ../spectrumpaint ../pocsag ../pifmrds ../rpitx ../sendook ../foxhunt ../morse ../pift8 install: all install -m 0755 ../pisstv $(INSTALL_DIR)