Add Support for INA228

boards/px4/fmu-v5x/default.cmake

@@ -40,6 +40,7 @@ px4_add_board(
 		pca9685
 		pca9685_pwm_out
 		power_monitor/ina226
+		power_monitor/ina228
 		#protocol_splitter
 		pwm_input
 		pwm_out_sim

boards/px4/fmu-v5x/init/rc.board_defaults

@@ -3,4 +3,7 @@
 # board specific defaults
 #------------------------------------------------------------------------------
 
+param set-default SENS_EN_INA228 0
+param set-default SENS_EN_INA226 1
+
 safety_button start

boards/px4/fmu-v5x/init/rc.board_sensors

@@ -4,9 +4,20 @@
 #------------------------------------------------------------------------------
 board_adc start
 
-# Start Digital power monitors
-ina226 -X -b 1 -t 1 -k start
-ina226 -X -b 2 -t 2 -k start
+
+if param compare SENS_EN_INA226 1
+then
+	# Start Digital power monitors
+	ina226 -X -b 1 -t 1 -k start
+	ina226 -X -b 2 -t 2 -k start
+fi
+
+if param compare SENS_EN_INA228 1
+then
+	# Start Digital power monitors
+	ina228 -X -b 1 -t 1 -k start
+	ina228 -X -b 2 -t 2 -k start
+fi
 
 if ver hwtypecmp V5X90 V5X91 V5X92 V5Xa0 V5Xa1 V5Xa2
 then

boards/px4/fmu-v6x/default.cmake

@@ -41,6 +41,7 @@ px4_add_board(
 		pca9685
 		pca9685_pwm_out
 		power_monitor/ina226
+		power_monitor/ina228
 		#protocol_splitter
 		pwm_out_sim
 		pwm_out
@@ -49,7 +50,7 @@ px4_add_board(
 		roboclaw
 		rpm
 		safety_button
-		smart_battery/batmon
+		#smart_battery/batmon
 		telemetry # all available telemetry drivers
 		tone_alarm
 		uavcan

boards/px4/fmu-v6x/init/rc.board_defaults

@@ -3,4 +3,7 @@
 # board specific defaults
 #------------------------------------------------------------------------------
 
-safety_button start
+param set-default SENS_EN_INA228 0
+param set-default SENS_EN_INA226 1
+
+safety_button start

boards/px4/fmu-v6x/init/rc.board_sensors

@@ -4,9 +4,19 @@
 #------------------------------------------------------------------------------
 board_adc start
 
-# Start Digital power monitors
-ina226 -X -b 1 -t 1 -k start
-ina226 -X -b 2 -t 2 -k start
+if param compare SENS_EN_INA226 1
+then
+	# Start Digital power monitors
+	ina226 -X -b 1 -t 1 -k start
+	ina226 -X -b 2 -t 2 -k start
+fi
+
+if param compare SENS_EN_INA228 1
+then
+	# Start Digital power monitors
+	ina228 -X -b 1 -t 1 -k start
+	ina228 -X -b 2 -t 2 -k start
+fi
 
 # Internal SPI BMI088
 bmi088 -A -R 4 -s start

src/drivers/drv_sensor.h

@@ -143,7 +143,8 @@
 #define DRV_DIST_DEVTYPE_TERARANGER   0x75
 #define DRV_DIST_DEVTYPE_VL53L0X      0x76
 #define DRV_POWER_DEVTYPE_INA226      0x77
-#define DRV_POWER_DEVTYPE_VOXLPM      0x78
+#define DRV_POWER_DEVTYPE_INA228      0x78
+#define DRV_POWER_DEVTYPE_VOXLPM      0x79
 
 #define DRV_LED_DEVTYPE_RGBLED        0x7a
 #define DRV_LED_DEVTYPE_RGBLED_NCP5623C 0x7b

src/drivers/power_monitor/ina226/ina226_params.c

@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2019 PX4 Development Team. All rights reserved.
+ *   Copyright (c) 2019, 2021 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,16 @@
  *
  ****************************************************************************/
 
+/**
+ * Enable INA226 Power Monitor
+ *
+ * For systems a INA226 Power Monitor, this should be set to true
+ *
+ * @group Sensors
+ * @boolean
+ * @reboot_required true
+*/
+PARAM_DEFINE_INT32(SENS_EN_INA226, 0);
 
 /**
  * INA226 Power Monitor Config

src/drivers/power_monitor/ina228/CMakeLists.txt

@@ -0,0 +1,44 @@
+############################################################################
+#
+#   Copyright (c) 2021 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+px4_add_module(
+	MODULE drivers__ina228
+	MAIN ina228
+	COMPILE_FLAGS
+		-Wno-cast-align # TODO: fix and enable
+	SRCS
+		ina228_main.cpp
+		ina228.cpp
+	DEPENDS
+		battery
+		px4_work_queue
+	)