From d400643738f6a3b9d9f245a87d0c837f55daa179 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 25 May 2015 19:23:43 +0200 Subject: [PATCH] Move battery status to generated topics --- msg/battery_status.msg | 5 ++ src/modules/uORB/topics/battery_status.h | 69 ------------------------ 2 files changed, 5 insertions(+), 69 deletions(-) create mode 100644 msg/battery_status.msg delete mode 100644 src/modules/uORB/topics/battery_status.h diff --git a/msg/battery_status.msg b/msg/battery_status.msg new file mode 100644 index 0000000000..4ed56dd038 --- /dev/null +++ b/msg/battery_status.msg @@ -0,0 +1,5 @@ +uint64 timestamp # microseconds since system boot, needed to integrate +float32 voltage_v # Battery voltage in volts, 0 if unknown +float32 voltage_filtered_v # Battery voltage in volts, filtered, 0 if unknown +float32 current_a # Battery current in amperes, -1 if unknown +float32 discharged_mah # Discharged amount in mAh, -1 if unknown diff --git a/src/modules/uORB/topics/battery_status.h b/src/modules/uORB/topics/battery_status.h deleted file mode 100644 index d473dff3f4..0000000000 --- a/src/modules/uORB/topics/battery_status.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012-2013 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. - * - ****************************************************************************/ - -/** - * @file battery_status.h - * - * Definition of the battery status uORB topic. - */ - -#ifndef BATTERY_STATUS_H_ -#define BATTERY_STATUS_H_ - -#include "../uORB.h" -#include - -/** - * @addtogroup topics - * @{ - */ - -/** - * Battery voltages and status - */ -struct battery_status_s { - uint64_t timestamp; /**< microseconds since system boot, needed to integrate */ - float voltage_v; /**< Battery voltage in volts, 0 if unknown */ - float voltage_filtered_v; /**< Battery voltage in volts, filtered, 0 if unknown */ - float current_a; /**< Battery current in amperes, -1 if unknown */ - float discharged_mah; /**< Discharged amount in mAh, -1 if unknown */ -}; - -/** - * @} - */ - -/* register this as object request broker structure */ -ORB_DECLARE(battery_status); - -#endif