Index: local/stinger_config.h
===================================================================
RCS file: /home/CVS/emerald/local/stinger_config.h,v
retrieving revision 1.482
diff -u -r1.482 stinger_config.h
--- local/stinger_config.h	14 Apr 2023 00:11:40 -0000	1.482
+++ local/stinger_config.h	1 Jun 2023 15:53:05 -0000
@@ -349,12 +349,12 @@
 // off by default.
 // Level 1 diagnostics that we always want to see when special
 // StingerTeam diagnostics are enabled.
-#define dStingerTeamDebug   (FALSE)
+#define dStingerTeamDebug   (TRUE)
 // Level 2 diagnostics that we understand well enough and we may
 // only want to see under some specific circumstances.
 #define dStingerTeamDebug2  (FALSE)
 // Store/restore reference week # for RF replay/simulator systems?
-#define RESTORE_RF_SIM_REF_WEEK (FALSE)
+#define RESTORE_RF_SIM_REF_WEEK (TRUE)
 
 // Enable L2C/L5 GPS/QZSS CNAV decoding
 #define ENABLE_L2C_CNAV_DECODING (L2_INSTALLED)
Index: system/argon_feature.h
===================================================================
RCS file: /home/CVS/panem/system/argon_feature.h,v
retrieving revision 1.109
diff -u -r1.109 argon_feature.h
--- system/argon_feature.h	31 May 2023 21:27:54 -0000	1.109
+++ system/argon_feature.h	1 Jun 2023 15:53:05 -0000
@@ -52,6 +52,9 @@
      
      #undef TWO_MAXWELL_24_CHAN
      
+     #define OneKHzLoopInstalled (1)
+     #define dHARDWARE_CNO (1)
+
      #define POLARIS_RF              (1)
      #define POLARIS_CHANNEL_TEST    (1)  // Enables Web GUI
      // Turns on the Polaris LPF calibration
@@ -123,13 +126,6 @@
      // signals unaided except for L2E and SBAS L5.
      #define TRACK_SECONDARY_SIGNALS_UNAIDED   (TRUE)
 
-     // Enable Stinger Kalman filter loop tracking
-     #define ENABLE_KF_LM_TRACK (TRUE)
-
-     // The following define enables Stinger to do cross-aiding 
-     // among different bands.
-     #define CROSS_AIDING_ENABLED (TRUE)
-
      // The following define enables slave signal reacquisition
     #if CROSS_AIDING_ENABLED
      #define CROSS_AIDING_PLUS_ENABLED (TRUE)