Merge branch 'fagci:main' into main

RE3CON · Oct 28, 2023 · 163da48 · 163da48
2 parents 0555542 + f95df07
commit 163da48
Show file tree

Hide file tree

Showing 44 changed files with 1,393 additions and 1,968 deletions.
diff --git a/Makefile b/Makefile
@@ -1,18 +1,15 @@
 TARGET = firmware
 
 ENABLE_AIRCOPY := 0
-ENABLE_ALARM := 0
 ENABLE_AM_FIX := 1
 ENABLE_FMRADIO := 0
-ENABLE_NOAA := 0
 ENABLE_OVERLAY := 0
 ENABLE_SPECTRUM := 1
 ENABLE_SWD := 1
 ENABLE_TX1750 := 1
 ENABLE_UART := 1
 ENABLE_NOSCANTIMEOUT := 1
 ENABLE_KEEPNAMEONSAVE := 1
-ENABLE_RSSIBAR := 1
 ENABLE_ALL_REGISTERS := 1
 ENABLE_FASTER_CHANNEL_SCAN := 1
 ENABLE_UART_CAT := 1
@@ -147,15 +144,9 @@ endif
 ifeq ($(ENABLE_AM_FIX),1)
 	CFLAGS  += -DENABLE_AM_FIX
 endif
-ifeq ($(ENABLE_ALARM),1)
-CFLAGS += -DENABLE_ALARM
-endif
 ifeq ($(ENABLE_FMRADIO),1)
 CFLAGS += -DENABLE_FMRADIO
 endif
-ifeq ($(ENABLE_NOAA),1)
-CFLAGS += -DENABLE_NOAA
-endif
 ifeq ($(ENABLE_OVERLAY),1)
 CFLAGS += -DENABLE_OVERLAY
 endif
@@ -181,9 +172,6 @@ endif
 ifeq ($(ENABLE_FASTER_CHANNEL_SCAN),1)
 CFLAGS  += -DENABLE_FASTER_CHANNEL_SCAN
 endif
-ifeq ($(ENABLE_RSSIBAR),1)
-CFLAGS += -DENABLE_RSSIBAR
-endif
 ifeq ($(ENABLE_ALL_REGISTERS),1)
 CFLAGS += -DENABLE_ALL_REGISTERS
 endif

diff --git a/am_fix.h b/am_fix.h
@@ -30,4 +30,3 @@
 
 #endif
 
-// vim: ft=c