From ba58558bd185519e79c67321dc2675cb56638be1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Tue, 21 Dec 2021 18:04:05 +1100
Subject: [PATCH] SITL: fixed default BATT_CAPACITY for SITL

don't override from JSON model unless we have a value
---
 libraries/SITL/SIM_Frame.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/SITL/SIM_Frame.cpp b/libraries/SITL/SIM_Frame.cpp
index eeb1550c7c..d8df693f21 100644
--- a/libraries/SITL/SIM_Frame.cpp
+++ b/libraries/SITL/SIM_Frame.cpp
@@ -495,7 +495,9 @@ void Frame::init(const char *frame_str, Battery *_battery)
     // setup reasonable defaults for battery
     AP_Param::set_default_by_name("SIM_BATT_VOLTAGE", model.maxVoltage);
     AP_Param::set_default_by_name("SIM_BATT_CAP_AH", model.battCapacityAh);
-    AP_Param::set_default_by_name("BATT_CAPACITY", model.battCapacityAh*1000);
+    if (model.battCapacityAh > 0) {
+        AP_Param::set_default_by_name("BATT_CAPACITY", model.battCapacityAh*1000);
+    }
 }
 
 /*