Do radio settings solely by frequency

Compute the radio setting needed based on the calibration value
provided and the requested frequency.

Signed-off-by: Keith Packard <keithp@keithp.com>

7 files changed, 13 insertions, 7 deletions

diff --git a/src/product/Makefile.telebt b/src/product/Makefile.telebt
index ea18ff18..e53aa2c4 100644
--- a/src/product/Makefile.telebt
+++ b/src/product/Makefile.telebt
@@ -28,7 +28,8 @@ CORE_SRC = \
 	ao_panic.c \
 	ao_state.c \
 	ao_stdio.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_aes.c \
diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle
index cf33d1f1..27e7d24b 100644
--- a/src/product/Makefile.teledongle
+++ b/src/product/Makefile.teledongle
@@ -31,7 +31,8 @@ CORE_SRC = \
 	ao_rssi.c \
 	ao_state.c \
 	ao_stdio.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_aes.c \
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index 97764517..8aab50e0 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -27,7 +27,8 @@ CORE_SRC = \
 	ao_panic.c \
 	ao_stdio.c \
 	ao_storage.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index 52c723ca..e4f55f88 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -40,7 +40,8 @@ CORE_SRC = \
 	ao_log.c \
 	ao_log_big.c \
 	ao_report.c \
-	ao_telemetry.c
+	ao_telemetry.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 75beeae4..82ec42a2 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -33,7 +33,8 @@ CORE_SRC = \
 	ao_stdio.c \
 	ao_storage.c \
 	ao_task.c \
-	ao_telemetry.c
+	ao_telemetry.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index b30ca789..cf27527c 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -33,7 +33,8 @@ CORE_SRC = \
 	ao_stdio.c \
 	ao_storage.c \
 	ao_task.c \
-	ao_telemetry.c
+	ao_telemetry.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/product/ao_terraui.c b/src/product/ao_terraui.c
index 05157cb1..9b40c42a 100644
--- a/src/product/ao_terraui.c
+++ b/src/product/ao_terraui.c
@@ -459,7 +459,7 @@ ao_terraui_config(void) __reentrant
 	
 
 	for (chan = 0; chan < AO_NUM_CHANNELS; chan++)
-		if (ao_config.radio_channels[chan].radio_setting == ao_config.radio_setting)
+		if (ao_config.radio_channels[chan].kHz == ao_config.frequency)
 			break;
 	if (chan == AO_NUM_CHANNELS)
 		chan = 0;