Refactored battery library for multiple instances

src/modules/simulator/simulator.h

@@ -239,7 +239,7 @@ private:
 	hrt_abstime _last_sitl_timestamp{0};
 
 	// Lib used to do the battery calculations.
-	Battery _battery {};
+	Battery1 _battery {};
 	battery_status_s _battery_status{};
 
 #ifndef __PX4_QURT

src/modules/simulator/simulator_mavlink.cpp

@@ -370,10 +370,7 @@ void Simulator::handle_message_hil_sensor(const mavlink_message_t *msg)
 		vbatt *= _battery.cell_count();
 
 		const float throttle = 0.0f; // simulate no throttle compensation to make the estimate predictable
-		_battery.updateBatteryStatus(now_us, vbatt, ibatt, true, true, 0, throttle, armed, &_battery_status);
-
-		// publish the battery voltage
-		_battery_pub.publish(_battery_status);
+		_battery.updateBatteryStatus(vbatt, ibatt, now_us, true, 0, throttle, armed);
 	}
 }