From 1db7969d50250520ce1d84ad08d1dc4a2a72479e Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Thu, 25 Feb 2021 01:22:34 +0000
Subject: [PATCH] Add missing xswiftbus DBus methods

---
 .../org.swift_project.xswiftbus.service.xml   | 42 ++++++++++++++++++-
 src/xswiftbus/service.cpp                     |  8 ----
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/xswiftbus/org.swift_project.xswiftbus.service.xml b/src/xswiftbus/org.swift_project.xswiftbus.service.xml
index 9b3324143..d79e15189 100644
--- a/src/xswiftbus/org.swift_project.xswiftbus.service.xml
+++ b/src/xswiftbus/org.swift_project.xswiftbus.service.xml
@@ -22,6 +22,42 @@ R"XML(<node>
       <arg name="trueHeading" type="d" direction="out"/>
       <arg name="qnh" type="d" direction="out"/>
     </method>
+    <method name="getOwnAircraftCom1Data">
+      <arg name="actv" type="i" direction="out"/>
+      <arg name="stby" type="i" direction="out"/>
+      <arg name="vol" type="d" direction="out"/>
+      <arg name="rx" type="b" direction="out"/>
+      <arg name="tx" type="b" direction="out"/>
+    </method>
+    <method name="getOwnAircraftCom2Data">
+      <arg name="actv" type="i" direction="out"/>
+      <arg name="stby" type="i" direction="out"/>
+      <arg name="vol" type="d" direction="out"/>
+      <arg name="rx" type="b" direction="out"/>
+      <arg name="tx" type="b" direction="out"/>
+    </method>
+    <method name="getOwnAircraftXpdr">
+      <arg name="code" type="i" direction="out"/>
+      <arg name="mode" type="i" direction="out"/>
+      <arg name="ident" type="b" direction="out"/>
+    </method>
+    <method name="getOwnAircraftLights">
+      <arg name="beacon" type="b" direction="out"/>
+      <arg name="landing" type="b" direction="out"/>
+      <arg name="nav" type="b" direction="out"/>
+      <arg name="strobe" type="b" direction="out"/>
+      <arg name="taxi" type="b" direction="out"/>
+    </method>
+    <method name="getOwnAircraftParts">
+      <arg name="flapRatio" type="d" direction="out"/>
+      <arg name="gearRatio" type="d" direction="out"/>
+      <arg name="spoilerRatio" type="d" direction="out"/>
+      <arg name="enginesN1pct" type="d" direction="out"/>
+    </method>
+    <method name="getOwnAircraftModelData">
+      <arg name="path" type="s" direction="out"/>
+      <arg name="icao" type="s" direction="out"/>
+    </method>
     <method name="updateAirportsInRange">
     </method>
     <method name="getAircraftModelPath">
@@ -177,7 +213,11 @@ R"XML(<node>
     <method name="getSpeedBrakeRatio">
       <arg type="d" direction="out"/>
     </method>
-    <method name="toggleMessageBoxVisibility">
+    <method name="getSettingsJson">
+      <arg type="s" direction="out"/>
+    </method>
+    <method name="setSettingsJson">
+      <arg type="s" direction="in"/>
     </method>
   </interface>
 </node>)XML"
diff --git a/src/xswiftbus/service.cpp b/src/xswiftbus/service.cpp
index f863af0a7..8e06a03e7 100644
--- a/src/xswiftbus/service.cpp
+++ b/src/xswiftbus/service.cpp
@@ -926,14 +926,6 @@ namespace XSwiftBus
                     sendDBusReply(sender, serial, getSpeedBrakeRatio());
                 });
             }
-            else if (message.getMethodName() == "toggleMessageBoxVisibility")
-            {
-                maybeSendEmptyDBusReply(wantsReply, sender, serial);
-                queueDBusCall([ = ]()
-                {
-                    toggleMessageBoxVisibility();
-                });
-            }
             else if (message.getMethodName() == "getSettingsJson")
             {
                 queueDBusCall([ = ]()