Deal with SA818 and add -DSQL_TONE in Makefile

This commit is contained in:
Armel FAUVEAU
2024-11-02 05:46:52 +01:00
parent a76673fd3d
commit ebd4878bc6
2 changed files with 6 additions and 8 deletions

View File

@@ -408,8 +408,11 @@ endif
ifeq ($(ENABLE_FEAT_F4HWN),1) ifeq ($(ENABLE_FEAT_F4HWN),1)
CFLAGS += -DENABLE_FEAT_F4HWN CFLAGS += -DENABLE_FEAT_F4HWN
CFLAGS += -DALERT_TOT=10 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_1=\"$(AUTHOR_STRING_1)\" -DVERSION_STRING_1=\"$(VERSION_STRING_1)\"
CFLAGS += -DAUTHOR_STRING_2=\"$(AUTHOR_STRING_2)\" -DVERSION_STRING_2=\"$(VERSION_STRING_2)\" CFLAGS += -DAUTHOR_STRING_2=\"$(AUTHOR_STRING_2)\" -DVERSION_STRING_2=\"$(VERSION_STRING_2)\"
else
CFLAGS += -DSQL_TONE=550
endif endif
ifeq ($(ENABLE_FEAT_F4HWN_SCREENSHOT),1) ifeq ($(ENABLE_FEAT_F4HWN_SCREENSHOT),1)
CFLAGS += -DENABLE_FEAT_F4HWN_SCREENSHOT CFLAGS += -DENABLE_FEAT_F4HWN_SCREENSHOT

11
radio.c
View File

@@ -753,13 +753,8 @@ void RADIO_SetupRegisters(bool switchToForeground)
{ {
default: default:
case CODE_TYPE_OFF: case CODE_TYPE_OFF:
BK4819_SetCTCSSFrequency(670); BK4819_SetCTCSSFrequency(SQL_TONE);
BK4819_SetTailDetection(SQL_TONE); // Default 550 = QS's 55Hz tone method
//#ifndef ENABLE_CTCSS_TAIL_PHASE_SHIFT
BK4819_SetTailDetection(550); // QS's 55Hz tone method
//#else
// BK4819_SetTailDetection(670); // 67Hz
//#endif
InterruptMask = BK4819_REG_3F_CxCSS_TAIL | BK4819_REG_3F_SQUELCH_FOUND | BK4819_REG_3F_SQUELCH_LOST; InterruptMask = BK4819_REG_3F_CxCSS_TAIL | BK4819_REG_3F_SQUELCH_FOUND | BK4819_REG_3F_SQUELCH_LOST;
break; break;
@@ -768,7 +763,7 @@ void RADIO_SetupRegisters(bool switchToForeground)
BK4819_SetCTCSSFrequency(CTCSS_Options[Code]); BK4819_SetCTCSSFrequency(CTCSS_Options[Code]);
//#ifndef ENABLE_CTCSS_TAIL_PHASE_SHIFT //#ifndef ENABLE_CTCSS_TAIL_PHASE_SHIFT
BK4819_SetTailDetection(550); // QS's 55Hz tone method // BK4819_SetTailDetection(550); // QS's 55Hz tone method
//#else //#else
// BK4819_SetTailDetection(CTCSS_Options[Code]); // BK4819_SetTailDetection(CTCSS_Options[Code]);
//#endif //#endif