diff --git a/ground/openpilotgcs/src/plugins/hitl/hitloptionspage.ui b/ground/openpilotgcs/src/plugins/hitl/hitloptionspage.ui
index 30eb578c5..22b3c4cd5 100644
--- a/ground/openpilotgcs/src/plugins/hitl/hitloptionspage.ui
+++ b/ground/openpilotgcs/src/plugins/hitl/hitloptionspage.ui
@@ -6,8 +6,8 @@
0
0
- 885
- 741
+ 792
+ 530
@@ -27,20 +27,14 @@
- 3
+ 6
-
+
+ QLayout::SetDefaultConstraint
+
+
0
-
- 0
-
-
- 0
-
-
- 3
-
-
-
@@ -51,7 +45,14 @@
-
-
+
+
+
+ 0
+ 0
+
+
+
@@ -66,986 +67,430 @@
0
- 100
+ 0
- 350
+ 16777215
16777215
IP addresses
-
-
-
- 10
- 30
- 323
- 24
-
+
+
+ 9
-
- -
-
-
- Local host:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 125
- 16777215
-
-
-
- For communication with sim computer via network. Should be the IP address of one of the interfaces of the GCS computer.
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Port:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 55
- 16777215
-
-
-
- IP port for receiving data from sim
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
-
-
- 10
- 60
- 322
- 24
-
-
-
- -
-
-
- Remote host:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 125
- 16777215
-
-
-
- Only required if running simulator on remote machine. Should be the IP of the machine on which the simulator is running.
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Port:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 55
- 16777215
-
-
-
- IP port for sending data to sim
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
+ -
+
+
-
+
+
+ Local host:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 125
+ 16777215
+
+
+
+ For communication with sim computer via network. Should be the IP address of one of the interfaces of the GCS computer.
+
+
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Port:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 55
+ 16777215
+
+
+
+ IP port for receiving data from sim
+
+
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ -
+
+
-
+
+
+ Remote host:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 125
+ 16777215
+
+
+
+ Only required if running simulator on remote machine. Should be the IP of the machine on which the simulator is running.
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Port:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 55
+ 16777215
+
+
+
+ IP port for sending data to sim
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
-
-
-
-
- 0
- 180
-
+
+
+ 3
-
- Program parameters
-
-
-
-
- 120
- 60
- 401
- 16
-
-
-
-
- 0
- 0
-
-
-
-
-
-
- 10
- 60
- 94
- 16
-
-
-
-
- 0
- 0
-
-
-
-
- 110
- 16777215
-
-
-
- Data directory:
-
-
-
-
-
- 120
- 34
- 401
- 16
-
-
-
-
- 0
- 0
-
-
-
-
-
-
- 10
- 34
- 104
- 16
-
-
-
-
- 0
- 0
-
-
-
-
- 110
- 16777215
-
-
-
- Path executable:
-
-
-
-
-
- 10
- 120
- 229
- 20
-
-
-
- Check this box to start the simulator on the local computer
-
-
- Start simulator on local machine
-
-
-
-
-
- 10
- 150
- 89
- 20
-
-
-
- Add noise to sensor simulation
-
-
- Add noise
-
-
-
-
-
- 10
- 80
- 491
- 16
-
-
-
- Qt::Horizontal
-
-
-
-
-
- 10
- 90
- 161
- 22
-
-
-
- Initial latitude (decimal):
-
-
-
-
-
- 290
- 90
- 171
- 22
-
-
-
- Initial longitude (decimal):
-
-
-
-
-
- 460
- 90
- 100
- 22
-
-
-
-
- 0
- 0
-
-
-
-
- 100
- 16777215
-
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
- 170
- 90
- 100
- 22
-
-
-
-
- 0
- 0
-
-
-
-
- 100
- 16777215
-
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
- -
-
-
- QFormLayout::AllNonFixedFieldsGrow
-
-
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
-
- -
-
-
-
-
+
+
+ Program Parameters
+
+
-
-
-
-
- 16777215
- 150
-
-
-
- Attitude data
-
-
-
- 3
-
-
- 3
-
-
- 3
-
-
- 3
-
-
- 0
-
-
-
-
-
- true
-
-
- AttitudeRaw (gyro, accels)
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
+
+
-
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+
+ 0
+ 0
+
-
- 3
+
+
+ 110
+ 16777215
+
-
- 0
+
+ Path executable:
-
- 0
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ Data directory:
+
+
+
+ -
+
-
-
-
- Refresh rate:
-
-
-
- -
-
-
- true
-
-
- 0 - update once, or every N seconds
-
-
- ms
-
-
- 10
-
-
- 100
-
-
- 20
+
+
+
+ 0
+ 0
+
-
-
- -
-
-
- true
-
-
- AttitudeActual
-
-
- true
-
-
- true
-
-
- true
-
-
-
- 3
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
-
- 3
+
+ Check this box to start the simulator on the local computer
-
- 0
+
+ Start simulator on local machine
-
- 0
+
+
+ -
+
+
+
+ 0
+ 0
+
-
-
-
-
-
- 75
- true
-
-
-
-
-
-
- use values from simulator
-
-
- true
-
-
-
- -
-
-
- send simulated inertial data to board
-
-
-
- -
-
-
-
-
-
- calculate from simulated sensor data
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
-
+
+ Add noise to sensor simulation
+
+
+ Add noise
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ Initial latitude (decimal):
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Initial longitude (decimal):
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
-
-
-
+
+
+ Qt::Vertical
+
+
- 0
- 150
+ 20
+ 40
-
- Spatial data
-
-
-
-
-
-
- Ground truth position and velocity
-
-
- true
-
-
- true
-
-
- true
-
-
-
- 3
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
- Refresh rate:
-
-
-
- -
-
-
- true
-
-
- 0 - update once, or every N seconds
-
-
- ms
-
-
- 1
-
-
- 5000
-
-
- 100
-
-
- 100
-
-
-
-
-
-
- -
-
-
- GPS data
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
- true
-
-
- Refresh rate:
-
-
-
- -
-
-
- true
-
-
- 0 - update once, or every N seconds
-
-
- ms
-
-
- 1
-
-
- 5000
-
-
- 100
-
-
- 100
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
+
-
- -
-
+
+
+
+ Attitude Data
+
+
-
-
-
-
- 0
- 275
-
+
+
+ 0
-
- Other data
-
-
-
- 3
-
-
- 3
-
-
- 3
-
-
- 3
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
- AirspeedActual
-
-
- true
-
-
- true
-
-
-
-
-
-
- Refresh rate:
-
-
-
- -
-
-
- 0 - update once, or every N seconds
-
-
- ms
-
-
- 5000
-
-
- 100
-
-
-
-
-
-
- -
-
-
- false
-
-
- BaroAltitude
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
-
-
- 6
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
-
-
-
- Range detection:
-
-
-
- -
-
-
- m
-
-
- 1
-
-
- 10
-
-
- 5
-
-
-
- -
-
-
- Refresh rate:
-
-
-
- -
-
-
- 0 - update once, or every N seconds
-
-
- ms
-
-
- 20
-
-
- 2000
-
-
- 10
-
-
- 250
-
-
-
-
-
-
-
-
- -
-
-
- true
-
-
- Map transmitter commands...
-
-
- true
-
-
- true
-
-
- true
-
-
-
- 3
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
- true
-
-
-
- 75
- true
-
-
-
- from hardware to simulator (via ManualCtrl)
-
-
- true
-
-
-
- -
-
-
- from simulator to hardware (via GCSReceiver)
-
-
- false
-
-
-
-
-
-
- -
-
+
-
+
+
+ true
+
+
+ AttitudeRaw (gyro, accels)
+
+
+ true
+
+
+ true
+
+
+ false
+
+
6
+
+ 9
+
+
+ 9
+
+
+ 9
+
-
-
+
+
+
+ 0
+ 0
+
+
- Maximum GCS to hardware output rate:
+ Refresh rate:
-
-
+
true
+
+
+ 0
+ 0
+
+
- Set the maximum rate at which GCS sends simulator data to the hardware
+ 0 - update once, or every N seconds
ms
@@ -1054,10 +499,165 @@
10
- 500
+ 100
+
+
+ 20
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ AttitudeActual
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ 6
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
-
+
+
+
+ 75
+ true
+
+
+
+
+
+
+ use values from simulator
+
+
+ true
+
+
+
+ -
+
+
+ send simulated inertial data to board
+
+
+
+ -
+
+
+
+
+
+ calculate from simulated sensor data
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+
+
+ Spatial Data
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ Ground truth position and velocity
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ 6
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
-
+
+
+ Refresh rate:
+
+
+
+ -
+
+
+ true
+
+
+ 0 - update once, or every N seconds
+
+
+ ms
+
+
+ 1
+
+
+ 5000
- 5
+ 100
100
@@ -1065,26 +665,365 @@
-
- -
-
-
- Qt::Vertical
+
+
+ -
+
+
+ GPS data
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 6
-
-
- 20
- 40
-
+
+ 9
-
-
-
-
+
+ 9
+
+
+ 9
+
+ -
+
+
+ true
+
+
+ Refresh rate:
+
+
+
+ -
+
+
+ true
+
+
+ 0 - update once, or every N seconds
+
+
+ ms
+
+
+ 1
+
+
+ 5000
+
+
+ 100
+
+
+ 100
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
-
-
+
+
+
+ Other Data
+
+
+ -
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ AirspeedActual
+
+
+ true
+
+
+ true
+
+
+
+ 6
+
+
-
+
+
+ Refresh rate:
+
+
+
+ -
+
+
+ 0 - update once, or every N seconds
+
+
+ ms
+
+
+ 5000
+
+
+ 100
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+ BaroAltitude
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 6
+
+
+ 9
+
+
-
+
+
-
+
+
+ Range detection:
+
+
+
+ -
+
+
+ m
+
+
+ 1
+
+
+ 10
+
+
+ 5
+
+
+
+ -
+
+
+ Refresh rate:
+
+
+
+ -
+
+
+ 0 - update once, or every N seconds
+
+
+ ms
+
+
+ 20
+
+
+ 2000
+
+
+ 10
+
+
+ 250
+
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Map transmitter commands...
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ 6
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
-
+
+
+ true
+
+
+
+ 75
+ true
+
+
+
+ from hardware to simulator (via ManualCtrl)
+
+
+ true
+
+
+
+ -
+
+
+ from simulator to hardware (via GCSReceiver)
+
+
+ false
+
+
+
+
+
+
+ -
+
+
+ 6
+
+
-
+
+
+ Maximum GCS to hardware output rate:
+
+
+
+ -
+
+
+ true
+
+
+ Set the maximum rate at which GCS sends simulator data to the hardware
+
+
+ ms
+
+
+ 10
+
+
+ 500
+
+
+ 5
+
+
+ 100
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Expanding
+
+
+
+ 20
+ 40
+
+
+