AP_GPS: remove check for AVR CPUs

Remove the checks for HAL_CPU_CLASS > HAL_CPU_CLASS_16 and HAL_CPU_CLASS >= HAL_CPU_CLASS_75. Corresponding dead code will be removed on separate commits.
WickedShell · Nov 4, 2015 · 4cef751 · 4cef751
1 parent 8eef58a
commit 4cef751
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 26 deletions.
diff --git a/libraries/AP_GPS/AP_GPS.h b/libraries/AP_GPS/AP_GPS.h
@@ -31,30 +31,10 @@
    maximum number of GPS instances available on this platform. If more
    than 1 then redundent sensors may be available
  */
-#if HAL_CPU_CLASS > HAL_CPU_CLASS_16
 #define GPS_MAX_INSTANCES 2
-#else
-#define GPS_MAX_INSTANCES 1
-#endif
-
-#if HAL_CPU_CLASS >= HAL_CPU_CLASS_75
 #define GPS_RTK_AVAILABLE 1
-#else
-#define GPS_RTK_AVAILABLE 0
-#endif
-
 #define GPS_RTK_INJECT_TO_ALL 127
 
-/**
- * save flash by skipping NMEA and SIRF support on copter and plane
- * for APM1/APM2
- */
-#if HAL_CPU_CLASS < HAL_CPU_CLASS_75 && defined(APM_BUILD_DIRECTORY)
-  #if APM_BUILD_TYPE(APM_BUILD_ArduCopter) || APM_BUILD_TYPE(APM_BUILD_ArduPlane)
-    #define GPS_SKIP_SIRF_NMEA
-  #endif
-#endif
-
 class DataFlash_Class;
 class AP_GPS_Backend;
 

diff --git a/libraries/AP_GPS/AP_GPS_UBLOX.h b/libraries/AP_GPS/AP_GPS_UBLOX.h
@@ -41,17 +41,11 @@
 #define UBLOX_SET_BINARY "\265\142\006\001\003\000\001\006\001\022\117$PUBX,41,1,0003,0001,38400,0*26\r\n"
 #define UBLOX_SET_BINARY_RAW_BAUD "\265\142\006\001\003\000\001\006\001\022\117$PUBX,41,1,0003,0001,115200,0*1E\r\n"
 
-#if HAL_CPU_CLASS >= HAL_CPU_CLASS_75
 #define UBLOX_RXM_RAW_LOGGING 1
 #define UBLOX_MAX_RXM_RAW_SATS 22
 #define UBLOX_MAX_RXM_RAWX_SATS 32
 #define UBLOX_GNSS_SETTINGS 1
 #define UBLOX_HW_LOGGING 1
-#else
-#define UBLOX_RXM_RAW_LOGGING 0
-#define UBLOX_GNSS_SETTINGS 0
-#define UBLOX_HW_LOGGING 0
-#endif
 
 #define UBLOX_MAX_GNSS_CONFIG_BLOCKS 7
 #define UBX_MSG_TYPES 2