From 520d830cec15866ca1d018bdc51b6133cdb08491 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Tue, 26 May 2015 22:47:08 -0700 Subject: [PATCH] uORB: Moved subsystem_info to generated topics --- msg/system_power.msg | 7 +++ src/modules/uORB/topics/system_power.h | 71 -------------------------- 2 files changed, 7 insertions(+), 71 deletions(-) create mode 100644 msg/system_power.msg delete mode 100644 src/modules/uORB/topics/system_power.h diff --git a/msg/system_power.msg b/msg/system_power.msg new file mode 100644 index 0000000000..cb2a7c0eb0 --- /dev/null +++ b/msg/system_power.msg @@ -0,0 +1,7 @@ +uint64 timestamp # microseconds since system boot +float32 voltage5V_v # peripheral 5V rail voltage +uint8 usb_connected # USB is connected when 1 +uint8 brick_valid # brick power is good when 1 +uint8 servo_valid # servo power is good when 1 +uint8 periph_5V_OC # peripheral overcurrent when 1 +uint8 hipower_5V_OC # hi power peripheral overcurrent when 1 diff --git a/src/modules/uORB/topics/system_power.h b/src/modules/uORB/topics/system_power.h deleted file mode 100644 index 7763b60043..0000000000 --- a/src/modules/uORB/topics/system_power.h +++ /dev/null @@ -1,71 +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 system_power.h - * - * Definition of the system_power voltage and power status uORB topic. - */ - -#ifndef SYSTEM_POWER_H_ -#define SYSTEM_POWER_H_ - -#include "../uORB.h" -#include - -/** - * @addtogroup topics - * @{ - */ - -/** - * voltage and power supply status - */ -struct system_power_s { - uint64_t timestamp; /**< microseconds since system boot */ - float voltage5V_v; /**< peripheral 5V rail voltage */ - uint8_t usb_connected:1; /**< USB is connected when 1 */ - uint8_t brick_valid:1; /**< brick power is good when 1 */ - uint8_t servo_valid:1; /**< servo power is good when 1 */ - uint8_t periph_5V_OC:1; /**< peripheral overcurrent when 1 */ - uint8_t hipower_5V_OC:1; /**< hi power peripheral overcurrent when 1 */ -}; - -/** - * @} - */ - -/* register this as object request broker structure */ -ORB_DECLARE(system_power); - -#endif