Merge remote-tracking branch 'origin/master' into ahrs_dev_protocolfun

adsbexchange
Christopher Young 2017-08-15 16:28:45 -04:00
commit 5ddadfa78d
2 zmienionych plików z 4 dodań i 2 usunięć

Wyświetl plik

@ -471,6 +471,8 @@ func sdrWatcher() {
prevUATEnabled := false
prevESEnabled := false
time.Sleep(90 * time.Second)
for {
time.Sleep(1 * time.Second)
if sdrShutdown {

Wyświetl plik

@ -28,13 +28,13 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-7">Attitude Sensor</label>
<label class="control-label col-xs-7">AHRS Sensor</label>
<div class="col-xs-5">
<ui-switch ng-model='IMU_Sensor_Enabled' settings-change></ui-switch>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-7">Altitude Sensor</label>
<label class="control-label col-xs-7">Baro Sensor</label>
<div class="col-xs-5">
<ui-switch ng-model='BMP_Sensor_Enabled' settings-change></ui-switch>
</div>