Add flightbatterystate to the GCS, ran uavobjgenerator on all XML files. .cpp and .h included for GCS now, uncommented out these files from the uavobjects.pro.

Moving sounds folder to shared. Some sounds will be uploaded later.


git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@792 ebee16cc-31ac-478f-84a7-5cbb03baadba

flight/OpenPilot/UAVObjects/uavobjectsinit.c

@@ -35,7 +35,6 @@
 #include "attitudeactual.h"
 #include "attitudedesired.h"
 #include "attitudesettings.h"
-#include "flightbatterystate.h"
 #include "exampleobject1.h"
 #include "exampleobject2.h"
 #include "examplesettings.h"
@@ -66,7 +65,6 @@ void UAVObjectsInitializeAll()
     AttitudeActualInitialize();
     AttitudeDesiredInitialize();
     AttitudeSettingsInitialize();
-    FlightBatteryStateInitialize();
     ExampleObject1Initialize();
     ExampleObject2Initialize();
     ExampleSettingsInitialize();

ground/share/openpilotgcs/sounds/Complete sound set.txt

@@ -12,7 +12,6 @@ Whoop
 
 Spoken Collections (sorted alphabetically):
 
-active
 active
 alarm
 alert

ground/share/share.pro

@@ -1,2 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS = openpilotgcs/translations
+#SUBDIRS += openpilotgcs/sounds
+

ground/src/plugins/uavobjects/flightbatterystate.cpp

@@ -0,0 +1,132 @@
+/**
+ ******************************************************************************
+ *
+ * @file       flightbatterystate.cpp
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+ * @brief      Implementation of the FlightBatteryState object. This file has been 
+ *             automatically generated by the UAVObjectGenerator.
+ * 
+ * @note       Object definition file: flightbatterystate.xml. 
+ *             This is an automatically generated file.
+ *             DO NOT modify manually.
+ *
+ * @see        The GNU Public License (GPL) Version 3
+ *
+ *****************************************************************************/
+/* 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation; either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+ * for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along 
+ * with this program; if not, write to the Free Software Foundation, Inc., 
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include "flightbatterystate.h"
+#include "uavobjectfield.h"
+
+const QString FlightBatteryState::NAME = QString("FlightBatteryState");
+
+/**
+ * Constructor
+ */
+FlightBatteryState::FlightBatteryState(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
+{
+    // Create fields
+    QList<UAVObjectField*> fields;
+    QStringList VoltageElemNames;
+    VoltageElemNames.append("0");
+    fields.append( new UAVObjectField(QString("Voltage"), QString("mV"), UAVObjectField::UINT32, VoltageElemNames, QStringList()) );
+    QStringList CurrentElemNames;
+    CurrentElemNames.append("0");
+    fields.append( new UAVObjectField(QString("Current"), QString("mA"), UAVObjectField::UINT32, CurrentElemNames, QStringList()) );
+    QStringList ConsumedEnergyElemNames;
+    ConsumedEnergyElemNames.append("0");
+    fields.append( new UAVObjectField(QString("ConsumedEnergy"), QString("mAh"), UAVObjectField::UINT32, ConsumedEnergyElemNames, QStringList()) );
+
+    // Initialize object
+    initializeFields(fields, (quint8*)&data, NUMBYTES);
+    // Set the default field values
+    setDefaultFieldValues();
+}
+
+/**
+ * Get the default metadata for this object
+ */
+UAVObject::Metadata FlightBatteryState::getDefaultMetadata()
+{
+    UAVObject::Metadata metadata;
+    metadata.flightAccess = ACCESS_READWRITE;
+    metadata.gcsAccess = ACCESS_READONLY;
+    metadata.gcsTelemetryAcked = 0;
+    metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL;
+    metadata.gcsTelemetryUpdatePeriod = 0;
+    metadata.flightTelemetryAcked = 0;
+    metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC;
+    metadata.flightTelemetryUpdatePeriod = 1000;
+    metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER;
+    metadata.loggingUpdatePeriod = 0;
+    return metadata;
+}
+
+/**
+ * Initialize object fields with the default values.
+ * If a default value is not specified the object fields
+ * will be initialized to zero.
+ */
+void FlightBatteryState::setDefaultFieldValues()
+{
+
+}
+
+/**
+ * Get the object data fields
+ */
+FlightBatteryState::DataFields FlightBatteryState::getData()
+{
+    QMutexLocker locker(mutex);
+    return data;
+}
+
+/**
+ * Set the object data fields
+ */
+void FlightBatteryState::setData(const DataFields& data)
+{
+    QMutexLocker locker(mutex);
+    // Get metadata
+    Metadata mdata = getMetadata();
+    // Update object if the access mode permits
+    if ( mdata.gcsAccess == ACCESS_READWRITE )
+    {
+        this->data = data;
+        emit objectUpdatedAuto(this); // trigger object updated event
+        emit objectUpdated(this);
+    }
+}
+
+/**
+ * Create a clone of this object, a new instance ID must be specified.
+ * Do not use this function directly to create new instances, the
+ * UAVObjectManager should be used instead.
+ */
+UAVDataObject* FlightBatteryState::clone(quint32 instID)
+{
+    FlightBatteryState* obj = new FlightBatteryState();
+    obj->initialize(instID, this->getMetaObject());
+    return obj;
+}
+
+/**
+ * Static function to retrieve an instance of the object.
+ */
+FlightBatteryState* FlightBatteryState::GetInstance(UAVObjectManager* objMngr, quint32 instID)
+{
+    return dynamic_cast<FlightBatteryState*>(objMngr->getObject(FlightBatteryState::OBJID, instID));
+}

ground/src/plugins/uavobjects/flightbatterystate.h

@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ *
+ * @file       flightbatterystate.h
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+ * @brief      Implementation of the FlightBatteryState object. This file has been 
+ *             automatically generated by the UAVObjectGenerator.
+ * 
+ * @note       Object definition file: flightbatterystate.xml. 
+ *             This is an automatically generated file.
+ *             DO NOT modify manually.
+ *
+ * @see        The GNU Public License (GPL) Version 3
+ *
+ *****************************************************************************/
+/* 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation; either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+ * for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along 
+ * with this program; if not, write to the Free Software Foundation, Inc., 
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef FLIGHTBATTERYSTATE_H
+#define FLIGHTBATTERYSTATE_H
+
+#include "uavdataobject.h"
+#include "uavobjectmanager.h"
+
+class UAVOBJECTS_EXPORT FlightBatteryState: public UAVDataObject
+{
+    Q_OBJECT
+
+public:
+    // Field structure
+    typedef struct {
+        quint32 Voltage;
+        quint32 Current;
+        quint32 ConsumedEnergy;
+
+    } __attribute__((packed)) DataFields;
+
+    // Field information
+    // Field Voltage information
+    // Field Current information
+    // Field ConsumedEnergy information
+
+  
+    // Constants
+    static const quint32 OBJID = 4176558368U;
+    static const QString NAME;
+    static const bool ISSINGLEINST = 1;
+    static const bool ISSETTINGS = 0;
+    static const quint32 NUMBYTES = sizeof(DataFields);
+
+    // Functions
+    FlightBatteryState();
+
+    DataFields getData();
+    void setData(const DataFields& data);
+    Metadata getDefaultMetadata();
+    UAVDataObject* clone(quint32 instID);
+
+    static FlightBatteryState* GetInstance(UAVObjectManager* objMngr, quint32 instID = 0);
+	
+private:
+    DataFields data;
+
+    void setDefaultFieldValues();
+
+};
+
+#endif // FLIGHTBATTERYSTATE_H

ground/src/plugins/uavobjects/flightbatterystate.py

@@ -0,0 +1,106 @@
+##
+##############################################################################
+#
+# @file       flightbatterystate.py
+# @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+# @brief      Implementation of the FlightBatteryState object. This file has been 
+#             automatically generated by the UAVObjectGenerator.
+# 
+# @note       Object definition file: flightbatterystate.xml. 
+#             This is an automatically generated file.
+#             DO NOT modify manually.
+#
+# @see        The GNU Public License (GPL) Version 3
+#
+#############################################################################/
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+
+import uavobject
+
+import struct
+from collections import namedtuple
+
+# This is a list of instances of the data fields contained in this object
+_fields = [ \
+	uavobject.UAVObjectField(
+		'Voltage',
+		'I',
+		1,
+		[
+			'0',
+		],
+		{
+		}
+	),
+	uavobject.UAVObjectField(
+		'Current',
+		'I',
+		1,
+		[
+			'0',
+		],
+		{
+		}
+	),
+	uavobject.UAVObjectField(
+		'ConsumedEnergy',
+		'I',
+		1,
+		[
+			'0',
+		],
+		{
+		}
+	),
+]
+
+
+class FlightBatteryState(uavobject.UAVObject):
+    ## Object constants
+    OBJID        = 4176558368
+    NAME         = "FlightBatteryState"
+    METANAME     = "FlightBatteryStateMeta"
+    ISSINGLEINST = 1
+    ISSETTINGS   = 0
+
+    def __init__(self):
+        uavobject.UAVObject.__init__(self,
+                                     self.OBJID, 
+                                     self.NAME,
+                                     self.METANAME,
+                                     0,
+                                     self.ISSINGLEINST)
+
+        for f in _fields:
+            self.add_field(f)
+        
+    def __str__(self):
+        s  = ("0x%08X (%10u)  %-30s  %3u bytes  format '%s'\n"
+                 % (self.OBJID, self.OBJID, self.NAME, self.get_struct().size, self.get_struct().format))
+        for f in self.get_tuple()._fields:
+            s += ("\t%s\n" % f)
+        return (s)
+
+def main():
+    # Instantiate the object and dump out some interesting info
+    x = FlightBatteryState()
+    print (x)
+
+if __name__ == "__main__":
+    #import pdb ; pdb.run('main()')
+    main()

ground/src/plugins/uavobjects/uavobjects.pro

@@ -32,7 +32,7 @@ HEADERS += uavobjects_global.h \
     actuatordesired.h \
     actuatorcommand.h \
     positionactual.h
-#    flightbatterystate.h
+    flightbatterystate.h
 SOURCES += uavobject.cpp \
     uavmetaobject.cpp \
     uavobjectmanager.cpp \
@@ -61,5 +61,5 @@ SOURCES += uavobject.cpp \
     actuatordesired.cpp \
     actuatorcommand.cpp \
     positionactual.cpp
-#    flightbatterystate.cpp
+    flightbatterystate.cpp
 OTHER_FILES += UAVObjects.pluginspec

ground/src/plugins/uavobjects/uavobjectsinit.cpp

@@ -37,10 +37,10 @@
 #include "attitudeactual.h"
 #include "attitudedesired.h"
 #include "attitudesettings.h"
-//#include "flightbatterystate.h"
 #include "exampleobject1.h"
 #include "exampleobject2.h"
 #include "examplesettings.h"
+#include "flightbatterystate.h"
 #include "flighttelemetrystats.h"
 #include "gcstelemetrystats.h"
 #include "manualcontrolcommand.h"
@@ -67,11 +67,10 @@ void UAVObjectsInitialize(UAVObjectManager* objMngr)
     objMngr->registerObject( new AttitudeActual() );
     objMngr->registerObject( new AttitudeDesired() );
     objMngr->registerObject( new AttitudeSettings() );
-//    objMngr->registerObject( new FlightBatteryState() );
     objMngr->registerObject( new ExampleObject1() );
     objMngr->registerObject( new ExampleObject2() );
     objMngr->registerObject( new ExampleSettings() );
-//    objMngr->registerObject( new FlightBatteryState() );
+    objMngr->registerObject( new FlightBatteryState() );
     objMngr->registerObject( new FlightTelemetryStats() );
     objMngr->registerObject( new GCSTelemetryStats() );
     objMngr->registerObject( new ManualControlCommand() );