AP_GPS: correct compilation when blended not compiled in

Author: peterbarker

libraries/AP_GPS/AP_GPS.cpp

@@ -429,13 +429,13 @@ void AP_GPS::convert_parameters()
 
     // convert old Blended configuration into a defined backend type
     // PARAMETER_CONVERSION - Added: Dec-2024 for 4.6
-#if GPS_MAX_INSTANCES > 2
+#if AP_GPS_BLENDED_ENABLED
     if (_auto_switch == 2) {
         if (!params[2].type.configured()) {
             params[2].type.set_and_save(GPS_TYPE_BLENDED);
         }
     }
-#endif
+#endif  // AP_GPS_BLENDED_ENABLED
 }
 
 // return number of active GPS sensors. Note that if the first GPS
@@ -1009,16 +1009,18 @@ void AP_GPS::update_instance(uint8_t instance)
     }
 
 #if HAL_LOGGING_ENABLED
+#if AP_GPS_BLENDED_ENABLED
     if (type == GPS_TYPE_BLENDED) {
         // Blended backend does its own logging:
         data_should_be_logged = false;
     }
+#endif  // AP_GPS_BLENDED_ENABLED
     if (data_should_be_logged && should_log()) {
         Write_GPS(instance);
     }
-#else
-    (void)data_should_be_logged;
 #endif
+    // sometimes we don't do anything with data_should_be_logged
+    (void)data_should_be_logged;
 
 #if AP_RTC_ENABLED
     if (state[instance].status >= GPS_OK_FIX_3D) {
@@ -1927,13 +1929,15 @@ bool AP_GPS::pre_arm_checks(char failure_msg[], uint16_t failure_msg_len)
     if (_auto_switch == 2) {
         // ensure there is a blended backend
         bool found = false;
+#if AP_GPS_BLENDED_ENABLED
         for (uint8_t i=0; i<GPS_MAX_INSTANCES; i++) {
             // only care about configured type, not allocated type:
             if (get_type(i) == GPS_TYPE_BLENDED) {
                 found = true;
                 break;
             }
         }
+#endif  // AP_GPS_BLENDED_ENABLED
         if (!found) {
             hal.util->snprintf(failure_msg, failure_msg_len, "GPS_AUTO_SWITCH is blended but no blended backend configured");
             return false;