Code cleanup

src/modules/battery_status/analog_battery.cpp

@@ -58,10 +58,6 @@ AnalogBattery::updateBatteryStatusRawADC(hrt_abstime timestamp, int32_t voltage_
 				     selected_source, priority, throttle_normalized, armed, _params.source == 0);
 }
 
-/**
- * Whether the ADC channel for the voltage of this battery is valid.
- * Corresponds to BOARD_BRICK_VALID_LIST
- */
 bool AnalogBattery::is_valid()
 {
 #ifdef BOARD_BRICK_VALID_LIST

src/modules/battery_status/analog_battery.h

@@ -39,7 +39,7 @@
 class AnalogBattery : public Battery
 {
 public:
-	AnalogBattery(int index = 1, ModuleParams *parent = nullptr);
+	AnalogBattery(int index, ModuleParams *parent);
 
 	/**
 	 * Update current battery status message.

src/modules/simulator/simulator.h

@@ -238,10 +238,14 @@ private:
 	hrt_abstime _last_sitl_timestamp{0};
 	hrt_abstime _last_battery_timestamp{0};
 
-	class : public Battery
+	class SimulatorBattery : public Battery
 	{
+	public:
+		SimulatorBattery() : Battery(1, nullptr) {}
+
 		virtual void updateParams() override
 		{
+			Battery::updateParams();
 			_params.v_empty = 3.5f;
 			_params.v_charged = 4.05f;
 			_params.n_cells = 4;