From 6b23f959bea69e683e16b1dc7ec2708836ae98c1 Mon Sep 17 00:00:00 2001 From: julian_lilov Date: Wed, 15 Jan 2020 22:08:14 +0200 Subject: [PATCH 1/2] LP_617 --- .../src/plugins/config/configcamerastabilizationwidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp b/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp index ce0c51332..8c7fae4fa 100644 --- a/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp +++ b/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp @@ -128,6 +128,8 @@ void ConfigCameraStabilizationWidget::refreshWidgetsValuesImpl(UAVObject *obj) &mixerSettingsData.Mixer8Type, &mixerSettingsData.Mixer9Type, &mixerSettingsData.Mixer10Type, + &mixerSettingsData.Mixer11Type, + &mixerSettingsData.Mixer12Type, }; const int NUM_MIXERS = sizeof(mixerTypes) / sizeof(mixerTypes[0]); @@ -183,6 +185,8 @@ void ConfigCameraStabilizationWidget::updateObjectsFromWidgetsImpl() &mixerSettingsData.Mixer8Type, &mixerSettingsData.Mixer9Type, &mixerSettingsData.Mixer10Type, + &mixerSettingsData.Mixer11Type, + &mixerSettingsData.Mixer12Type, }; const int NUM_MIXERS = sizeof(mixerTypes) / sizeof(mixerTypes[0]); From 7c03a006b081ca11a70a675a55649f965eba3e2b Mon Sep 17 00:00:00 2001 From: julian_lilov Date: Thu, 16 Jan 2020 12:35:05 +0200 Subject: [PATCH 2/2] Revert "LP_617" This reverts commit 6b23f959bea69e683e16b1dc7ec2708836ae98c1. --- .../src/plugins/config/configcamerastabilizationwidget.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp b/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp index 8c7fae4fa..ce0c51332 100644 --- a/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp +++ b/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp @@ -128,8 +128,6 @@ void ConfigCameraStabilizationWidget::refreshWidgetsValuesImpl(UAVObject *obj) &mixerSettingsData.Mixer8Type, &mixerSettingsData.Mixer9Type, &mixerSettingsData.Mixer10Type, - &mixerSettingsData.Mixer11Type, - &mixerSettingsData.Mixer12Type, }; const int NUM_MIXERS = sizeof(mixerTypes) / sizeof(mixerTypes[0]); @@ -185,8 +183,6 @@ void ConfigCameraStabilizationWidget::updateObjectsFromWidgetsImpl() &mixerSettingsData.Mixer8Type, &mixerSettingsData.Mixer9Type, &mixerSettingsData.Mixer10Type, - &mixerSettingsData.Mixer11Type, - &mixerSettingsData.Mixer12Type, }; const int NUM_MIXERS = sizeof(mixerTypes) / sizeof(mixerTypes[0]);