Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ina238: Support for ina238 power monitors #18260

Merged
merged 2 commits into from
Sep 22, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions boards/px4/fmu-v5x/default.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ px4_add_board(
pca9685_pwm_out
power_monitor/ina226
power_monitor/ina228
power_monitor/ina23X
#protocol_splitter
pwm_input
pwm_out_sim
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v5x/init/rc.board_defaults
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# board specific defaults
#------------------------------------------------------------------------------

param set-default SENS_EN_INA23X 0
param set-default SENS_EN_INA228 0
param set-default SENS_EN_INA226 1

Expand Down
7 changes: 7 additions & 0 deletions boards/px4/fmu-v5x/init/rc.board_sensors
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ then
ina228 -X -b 2 -t 2 -k start
fi

if param compare SENS_EN_INA23X 1
then
# Start Digital power monitors
ina23X -X -b 1 -t 1 -k start
ina23X -X -b 2 -t 2 -k start
fi

if ver hwtypecmp V5X90 V5X91 V5X92 V5Xa0 V5Xa1 V5Xa2
then
#SKYNODE base fmu board orientation
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v6x/default.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ px4_add_board(
pca9685_pwm_out
power_monitor/ina226
power_monitor/ina228
power_monitor/ina23X
#protocol_splitter
pwm_out_sim
pwm_out
Expand Down
3 changes: 2 additions & 1 deletion boards/px4/fmu-v6x/init/rc.board_defaults
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
# board specific defaults
#------------------------------------------------------------------------------

param set-default SENS_EN_INA23X 0
param set-default SENS_EN_INA228 0
param set-default SENS_EN_INA226 1

safety_button start
safety_button start
7 changes: 7 additions & 0 deletions boards/px4/fmu-v6x/init/rc.board_sensors
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ then
ina228 -X -b 2 -t 2 -k start
fi

if param compare SENS_EN_INA23X 1
then
# Start Digital power monitors
ina23X -X -b 1 -t 1 -k start
ina23X -X -b 2 -t 2 -k start
fi

# Internal SPI BMI088
bmi088 -A -R 4 -s start
bmi088 -G -R 4 -s start
Expand Down
1 change: 1 addition & 0 deletions src/drivers/drv_sensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
#define DRV_DIST_DEVTYPE_GY_US42 0x9C

#define DRV_BAT_DEVTYPE_BATMON_SMBUS 0x9d
#define DRV_POWER_DEVTYPE_INA23X 0x9E
davids5 marked this conversation as resolved.
Show resolved Hide resolved
#define DRV_GPIO_DEVTYPE_MCP23009 0x9F

#define DRV_GPS_DEVTYPE_ASHTECH 0xA0
Expand Down
44 changes: 44 additions & 0 deletions src/drivers/power_monitor/ina23X/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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__ina23X
MAIN ina23X
COMPILE_FLAGS
-Wno-cast-align # TODO: fix and enable
SRCS
ina23X_main.cpp
ina23X.cpp
DEPENDS
battery
px4_work_queue
)
Loading