From ebd4878bc6c355a80b3fbfb9345b78440c2bff49 Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Sat, 2 Nov 2024 05:46:52 +0100 Subject: [PATCH] Deal with SA818 and add -DSQL_TONE in Makefile --- Makefile | 3 +++ radio.c | 11 +++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 983b8adb..6e35cc5b 100644 --- a/Makefile +++ b/Makefile @@ -408,8 +408,11 @@ endif ifeq ($(ENABLE_FEAT_F4HWN),1) CFLAGS += -DENABLE_FEAT_F4HWN CFLAGS += -DALERT_TOT=10 + CFLAGS += -DSQL_TONE=550 # For SA818, use 600 and python3 sa818.py --port /dev/ttyS2 radio --frequency 434.975 --ctcss 71.9 --tail Open CFLAGS += -DAUTHOR_STRING_1=\"$(AUTHOR_STRING_1)\" -DVERSION_STRING_1=\"$(VERSION_STRING_1)\" CFLAGS += -DAUTHOR_STRING_2=\"$(AUTHOR_STRING_2)\" -DVERSION_STRING_2=\"$(VERSION_STRING_2)\" +else + CFLAGS += -DSQL_TONE=550 endif ifeq ($(ENABLE_FEAT_F4HWN_SCREENSHOT),1) CFLAGS += -DENABLE_FEAT_F4HWN_SCREENSHOT diff --git a/radio.c b/radio.c index 0fe2b1a9..927a8f91 100644 --- a/radio.c +++ b/radio.c @@ -753,13 +753,8 @@ void RADIO_SetupRegisters(bool switchToForeground) { default: case CODE_TYPE_OFF: - BK4819_SetCTCSSFrequency(670); - - //#ifndef ENABLE_CTCSS_TAIL_PHASE_SHIFT - BK4819_SetTailDetection(550); // QS's 55Hz tone method - //#else - // BK4819_SetTailDetection(670); // 67Hz - //#endif + BK4819_SetCTCSSFrequency(SQL_TONE); + BK4819_SetTailDetection(SQL_TONE); // Default 550 = QS's 55Hz tone method InterruptMask = BK4819_REG_3F_CxCSS_TAIL | BK4819_REG_3F_SQUELCH_FOUND | BK4819_REG_3F_SQUELCH_LOST; break; @@ -768,7 +763,7 @@ void RADIO_SetupRegisters(bool switchToForeground) BK4819_SetCTCSSFrequency(CTCSS_Options[Code]); //#ifndef ENABLE_CTCSS_TAIL_PHASE_SHIFT - BK4819_SetTailDetection(550); // QS's 55Hz tone method + // BK4819_SetTailDetection(550); // QS's 55Hz tone method //#else // BK4819_SetTailDetection(CTCSS_Options[Code]); //#endif