diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Analog.h b/libraries/AP_BattMonitor/AP_BattMonitor_Analog.h
index 40439380f3..10d5fe8c3a 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_Analog.h
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_Analog.h
@@ -44,31 +44,24 @@
  # define AP_BATT_CURR_PIN                  12
  # define AP_BATT_VOLTDIVIDER_DEFAULT       10.1
  # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT  17.0
-#elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN && defined(CONFIG_ARCH_BOARD_VRBRAIN_V40)
- # define AP_BATT_VOLT_PIN                  10
- # define AP_BATT_CURR_PIN                   -1
- # define AP_BATT_VOLTDIVIDER_DEFAULT       1.1
- # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT  17.0
-#elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN && defined(CONFIG_ARCH_BOARD_VRBRAIN_V45)
+
+#elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
+#if defined(CONFIG_ARCH_BOARD_VRBRAIN_V45) || defined(CONFIG_ARCH_BOARD_VRBRAIN_V51) || defined(CONFIG_ARCH_BOARD_VRBRAIN_V52)
  # define AP_BATT_VOLT_PIN                  10
  # define AP_BATT_CURR_PIN                  11
- # define AP_BATT_VOLTDIVIDER_DEFAULT       1.1
+ # define AP_BATT_VOLTDIVIDER_DEFAULT       10.1
  # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT  17.0
-#elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN && defined(CONFIG_ARCH_BOARD_VRBRAIN_V50)
- # define AP_BATT_VOLT_PIN                  10
- # define AP_BATT_CURR_PIN                  11
- # define AP_BATT_VOLTDIVIDER_DEFAULT       1.1
- # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT  17.0
-#elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN && defined(CONFIG_ARCH_BOARD_VRBRAIN_V51)
- # define AP_BATT_VOLT_PIN                  10
- # define AP_BATT_CURR_PIN                  11
- # define AP_BATT_VOLTDIVIDER_DEFAULT       1.1
- # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT  17.0
-#elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN && defined(CONFIG_ARCH_BOARD_VRUBRAIN_V51)
+#elif defined(CONFIG_ARCH_BOARD_VRUBRAIN_V51)
  # define AP_BATT_VOLT_PIN                  10
  # define AP_BATT_CURR_PIN                  -1
- # define AP_BATT_VOLTDIVIDER_DEFAULT       1.1
+ # define AP_BATT_VOLTDIVIDER_DEFAULT       10.1
  # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT  17.0
+#elif defined(CONFIG_ARCH_BOARD_VRUBRAIN_V52)
+ # define AP_BATT_VOLT_PIN                  10
+ # define AP_BATT_CURR_PIN                  1
+ # define AP_BATT_VOLTDIVIDER_DEFAULT       10.1
+ # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT  17.0
+#endif
 #elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN && defined(CONFIG_ARCH_BOARD_VRHERO_V10)
  # define AP_BATT_VOLT_PIN                  100
  # define AP_BATT_CURR_PIN                  101