Brain: Repair, OSD capabilities to targets

* This commit re-adds a few missing files that were automatically resolved toward the upstream side in the rebase. * Add missing taskinfo fields (onscreendisplay) * Tabify taskinfo.xml * Enable BrainFPV modules * Add OSD board capabilities to other targets.Only the BrainFPV supports OSD, so these are all false.
d-ronin · Nov 26, 2015 · 38fa18f · 38fa18f
1 parent efdf6b1
commit 38fa18f
Show file tree

Hide file tree

Showing 19 changed files with 54 additions and 5 deletions.
diff --git a/flight/Modules/Stabilization/inc/virtualflybar.h b/flight/Modules/Stabilization/inc/virtualflybar.h
@@ -43,4 +43,4 @@ int stabilization_virtual_flybar_pirocomp(float z_gyro, float dT);
 /**
  * @}
  * @}
- */
+ */
diff --git a/flight/targets/brain/fw/Makefile b/flight/targets/brain/fw/Makefile
@@ -113,7 +113,6 @@ SRC += pios_usb_board_data.c
 SRC += $(FLIGHTLIB)/alarms.c
 SRC += $(OPUAVTALK)/uavtalk.c
 SRC += $(OPUAVOBJ)/uavobjectmanager.c
-SRC += $(OPUAVOBJ)/eventdispatcher.c
 
 ifeq ($(DEBUG),YES)
 SRC += $(DEBUG_CM3_DIR)/dcc_stdio.c

diff --git a/flight/targets/brain/fw/pios_board.c b/flight/targets/brain/fw/pios_board.c
@@ -469,7 +469,6 @@ void PIOS_Board_Init(void) {
 	RCC_ClearFlag(); // The flags cleared after use
 
 	/* Initialize UAVObject libraries */
-	EventDispatcherInitialize();
 	UAVObjInitialize();
 
 	HwBrainInitialize();

diff --git a/ground/gcs/src/plugins/boards_aeroquad/aq32.cpp b/ground/gcs/src/plugins/boards_aeroquad/aq32.cpp
@@ -86,6 +86,8 @@ bool AQ32::queryCapabilities(BoardCapabilities capability)
         return true;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_naze/naze.cpp b/ground/gcs/src/plugins/boards_naze/naze.cpp
@@ -79,6 +79,8 @@ bool Naze::queryCapabilities(BoardCapabilities capability)
         return false;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_openpilot/coptercontrol.cpp b/ground/gcs/src/plugins/boards_openpilot/coptercontrol.cpp
@@ -76,6 +76,8 @@ bool CopterControl::queryCapabilities(BoardCapabilities capability)
         return false;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_openpilot/revomini.cpp b/ground/gcs/src/plugins/boards_openpilot/revomini.cpp
@@ -91,6 +91,8 @@ bool RevoMini::queryCapabilities(BoardCapabilities capability)
         return true;
     case BOARD_CAPABILITIES_RADIO:
         return true;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_quantec/quanton.cpp b/ground/gcs/src/plugins/boards_quantec/quanton.cpp
@@ -86,6 +86,8 @@ bool Quanton::queryCapabilities(BoardCapabilities capability)
         return true;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_stm/discoveryf4.cpp b/ground/gcs/src/plugins/boards_stm/discoveryf4.cpp
@@ -73,6 +73,8 @@ bool DiscoveryF4::queryCapabilities(BoardCapabilities capability)
         return false;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_stm/flyingf3.cpp b/ground/gcs/src/plugins/boards_stm/flyingf3.cpp
@@ -85,6 +85,8 @@ bool FlyingF3::queryCapabilities(BoardCapabilities capability)
         return false;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_stm/flyingf4.cpp b/ground/gcs/src/plugins/boards_stm/flyingf4.cpp
@@ -83,6 +83,8 @@ bool FlyingF4::queryCapabilities(BoardCapabilities capability)
         return true;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_taulabs/sparky.cpp b/ground/gcs/src/plugins/boards_taulabs/sparky.cpp
@@ -88,6 +88,8 @@ bool Sparky::queryCapabilities(BoardCapabilities capability)
         return true;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_taulabs/sparky2.cpp b/ground/gcs/src/plugins/boards_taulabs/sparky2.cpp
@@ -101,6 +101,8 @@ bool Sparky2::queryCapabilities(BoardCapabilities capability)
         return true;
     case BOARD_CAPABILITIES_RADIO:
         return true;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_taulabs/taulink.cpp b/ground/gcs/src/plugins/boards_taulabs/taulink.cpp
@@ -81,6 +81,8 @@ bool TauLink::queryCapabilities(BoardCapabilities capability)
         return false;
     case BOARD_CAPABILITIES_RADIO:
         return true;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/boards_tbs/colibri.cpp b/ground/gcs/src/plugins/boards_tbs/colibri.cpp
@@ -86,6 +86,8 @@ bool Colibri::queryCapabilities(BoardCapabilities capability)
         return true;
     case BOARD_CAPABILITIES_RADIO:
         return false;
+    case BOARD_CAPABILITIES_OSD:
+        return false;
     }
     return false;
 }

diff --git a/ground/gcs/src/plugins/config/config.pro b/ground/gcs/src/plugins/config/config.pro
@@ -45,6 +45,7 @@ HEADERS += calibration.h \
     textbubbleslider.h \
     vehicletrim.h \
     configmodulewidget.h \
+    configosdwidget.h \
     convertmwrate.h \
     expocurve.h
 
@@ -78,6 +79,7 @@ SOURCES += calibration.cpp \
     textbubbleslider.cpp \
     vehicletrim.cpp \
     configmodulewidget.cpp \
+    configosdwidget.cpp \
     convertmwrate.cpp \
     expocurve.cpp
 
@@ -96,7 +98,9 @@ FORMS += airframe.ui \
     autotune.ui \
     hwfieldselector.ui \
     modules.ui \
-    convertmwrate.ui
+    convertmwrate.ui \
+    osd.ui \
+    osdpage.ui
 RESOURCES += configgadget.qrc
 
 

diff --git a/ground/gcs/src/plugins/config/modules.ui b/ground/gcs/src/plugins/config/modules.ui
@@ -208,6 +208,16 @@
          </property>
         </widget>
        </item>
+       <item>
+         <widget class="QCheckBox" name="cbLogging">
+           <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select to enable logging to on-board flash memory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+             <string>Logging</string>
+           </property>
+         </widget>
+       </item>
        <item>
         <widget class="QCheckBox" name="cbUAVOMSPBridge">
          <property name="toolTip">
@@ -228,6 +238,16 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="cbOnScreenDisplay">
+         <property name="toolTip">
+          <string></string>
+         </property>
+         <property name="text">
+          <string>TxPID</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_4">
          <property name="orientation">

diff --git a/ground/gcs/src/plugins/config/osdpage.ui b/ground/gcs/src/plugins/config/osdpage.ui
@@ -536,7 +536,7 @@
              </widget>
             </item>
             <item row="5" column="6">
-             <layout class="QHBoxLayout" name="horizontalLayout">
+             <layout class="QHBoxLayout" name="horizontalLayout1">
               <item>
                <widget class="QLabel" name="label_35">
                 <property name="text">

diff --git a/shared/uavobjectdefinition/taskinfo.xml b/shared/uavobjectdefinition/taskinfo.xml
@@ -37,6 +37,7 @@
 			<elementname>UAVOHoTTBridge</elementname>
 			<elementname>UAVOFrSKYSensorHubBridge</elementname>
 			<elementname>PicoC</elementname>
+			<elementname>OnScreenDisplay</elementname>
 			<elementname>Logging</elementname>
 			<elementname>UAVOFrSkySPortBridge</elementname>
 			<elementname>FlightStats</elementname>
@@ -78,6 +79,7 @@
 			<elementname>UAVOHoTTBridge</elementname>
 			<elementname>UAVOFrSKYSBridge</elementname>
 			<elementname>PicoC</elementname>
+			<elementname>OnScreenDisplay</elementname>
 			<elementname>Logging</elementname>
 			<elementname>UAVOFrSkySPortBridge</elementname>
 			<elementname>FlightStats</elementname>
@@ -123,6 +125,7 @@
 			<elementname>UAVOHoTTBridge</elementname>
 			<elementname>UAVOFrSKYSensorHubBridge</elementname>
 			<elementname>PicoC</elementname>
+			<elementname>OnScreenDisplay</elementname>
 			<elementname>Logging</elementname>
 			<elementname>UAVOFrSkySPortBridge</elementname>
 			<elementname>FlightStats</elementname>