Add receiver gain compilation options

n2xdd · Jul 17, 2018 · 46ba5cc · 46ba5cc
1 parent 6729d23
commit 46ba5cc
Show file tree

Hide file tree

Showing 15 changed files with 141 additions and 3 deletions.
diff --git a/ADF7021.cpp b/ADF7021.cpp
@@ -525,7 +525,15 @@ void CIO::ifConf(MMDVM_STATE modemState, bool reset)
   Send_AD7021_control();
 
   // AGC (auto, defaults) (9)
-  AD7021_control_word = 0x000231E9;
+#if defined(AD7021_GAIN_AUTO)
+  AD7021_control_word = 0x000231E9; // AGC ON, normal operation
+#elif defined(AD7021_GAIN_AUTO_LIN)
+  AD7021_control_word = 0x100231E9; // AGC ON, LNA high linearity
+#elif defined(AD7021_GAIN_LOW)
+  AD7021_control_word = 0x120631E9; // AGC OFF, low gain, LNA high linearity
+#elif defined(AD7021_GAIN_HIGH)
+  AD7021_control_word = 0x00A631E9; // AGC OFF, high gain
+#endif
   Send_AD7021_control();
 
   // AFC (10)

diff --git a/ADF7021.h b/ADF7021.h
@@ -118,7 +118,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf
 
 // Post demodulator bandwith (REG 04)
 #define ADF7021_POST_BW_DSTAR    10U
-#define ADF7021_POST_BW_DMR      150U
+#define ADF7021_POST_BW_DMR      80U
 #define ADF7021_POST_BW_YSF      20U
 #define ADF7021_POST_BW_P25      6U
 #define ADF7021_POST_BW_NXDN     7U
@@ -219,7 +219,7 @@ www.analog.com/media/en/technical-documentation/data-sheets/ADF7021.pdf
 
 // Post demodulator bandwith (REG 04)
 #define ADF7021_POST_BW_DSTAR    10U
-#define ADF7021_POST_BW_DMR      150U
+#define ADF7021_POST_BW_DMR      80U
 #define ADF7021_POST_BW_YSF      20U
 #define ADF7021_POST_BW_P25      6U
 #define ADF7021_POST_BW_NXDN     8U

diff --git a/Config.h b/Config.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 // #define STM32_USART1_HOST
 #define STM32_USB_HOST

diff --git a/configs/MMDVM_HS_Dual_Hat-12mhz.h b/configs/MMDVM_HS_Dual_Hat-12mhz.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST

diff --git a/configs/MMDVM_HS_Dual_Hat.h b/configs/MMDVM_HS_Dual_Hat.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST

diff --git a/configs/MMDVM_HS_Hat-12mhz.h b/configs/MMDVM_HS_Hat-12mhz.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST

diff --git a/configs/MMDVM_HS_Hat.h b/configs/MMDVM_HS_Hat.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST

diff --git a/configs/NanoDV.h b/configs/NanoDV.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST

diff --git a/configs/Nano_hotSPOT.h b/configs/Nano_hotSPOT.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST

diff --git a/configs/ZUMspot_Libre.h b/configs/ZUMspot_Libre.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 // #define STM32_USART1_HOST
 #define STM32_USB_HOST

diff --git a/configs/ZUMspot_RPi.h b/configs/ZUMspot_RPi.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST

diff --git a/configs/ZUMspot_USB.h b/configs/ZUMspot_USB.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 // #define STM32_USART1_HOST
 #define STM32_USB_HOST

diff --git a/configs/ZUMspot_duplex.h b/configs/ZUMspot_duplex.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 // #define STM32_USART1_HOST
 #define STM32_USB_HOST

diff --git a/configs/generic_duplex_gpio.h b/configs/generic_duplex_gpio.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST

diff --git a/configs/generic_gpio.h b/configs/generic_gpio.h
@@ -45,6 +45,16 @@
 // For 12.2880 MHz:
 // #define ADF7021_12_2880
 
+// Configure receiver gain for ADF7021
+// AGC automatic, default settings:
+#define AD7021_GAIN_AUTO
+// AGC automatic with high LNA linearity:
+// #define AD7021_GAIN_AUTO_LIN
+// AGC OFF, lowest gain: 
+// #define AD7021_GAIN_LOW
+// AGC OFF, highest gain:
+// #define AD7021_GAIN_HIGH
+
 // Host communication selection:
 #define STM32_USART1_HOST
 // #define STM32_USB_HOST