diff --git a/qml/ui/sidebar/MappedMavlinkChoices.qml b/qml/ui/sidebar/MappedMavlinkChoices.qml index a5d642eaf..1c4496035 100644 --- a/qml/ui/sidebar/MappedMavlinkChoices.qml +++ b/qml/ui/sidebar/MappedMavlinkChoices.qml @@ -164,14 +164,6 @@ Item { ListElement {value: 20; verbose:"20Mhz"} ListElement {value: 40; verbose:"40Mhz\n(HIGH BW)"} } - ListModel{ - id: elements_frequency_scan - ListElement {value: 0; verbose:"OHD"} - ListElement {value: 1; verbose:"5.8"} - ListElement {value: 2; verbose:"2.4"} - ListElement {value: 3; verbose:"ALL"} - //ListElement {value: 3; verbose:"CUSTOM"} - } ListModel{ id: elements_model_rate ListElement {value: 0; verbose:"MCS0\n(LONG RANGE)"} @@ -206,8 +198,6 @@ Item { return frequencies_model_with_5180mhz_lowband } return frequencies_model; - }else if(param_id=="FREQUENCY_SCAN"){ - return elements_frequency_scan; }else if(param_id=="CHANNEL_WIDTH"){ return elements_model_channel_width; }else if(param_id=="RATE"){ diff --git a/qml/ui/sidebar/MavlinkChoiceElement2.qml b/qml/ui/sidebar/MavlinkChoiceElement2.qml index 120a85697..bdfab8f9d 100644 --- a/qml/ui/sidebar/MavlinkChoiceElement2.qml +++ b/qml/ui/sidebar/MavlinkChoiceElement2.qml @@ -140,10 +140,6 @@ BaseJoyEditElement2{ }else{ m_param_exists=m_settings_model.param_int_exists(m_param_id) } - if(m_param_id==mPARAM_ID_FREQUENCY_SCAN){ - m_param_exists=true; - _wbLinkSettingsHelper.change_param_air_and_ground_frequency(value_new) - } if(!m_param_exists){ console.log("Param "+m_param_id+" does not exist"); populate_display_text="NOT\nAVAILABLE"; diff --git a/qml/ui/sidebar/Panel1Link.qml b/qml/ui/sidebar/Panel1Link.qml index 082031ee7..6cc8f07d4 100644 --- a/qml/ui/sidebar/Panel1Link.qml +++ b/qml/ui/sidebar/Panel1Link.qml @@ -5,7 +5,7 @@ SideBarBasePanel{ function takeover_control(){ - scan_frequency_element.takeover_control(); + edit_frequency_element.takeover_control(); } Column { @@ -42,25 +42,13 @@ SideBarBasePanel{ sidebar.regain_control_on_sidebar_stack() } }*/ - MavlinkChoiceElement2{ - id:scan_frequency_element - m_title: "Scan for Air" - m_param_id: mPARAM_ID_FREQUENCY_SCAN - m_settings_model: _ohdSystemGroundSettings - onGoto_previous: { - sidebar.regain_control_on_sidebar_stack(); - } - onGoto_next: { - edit_frequency_element.takeover_control() - } - } MavlinkChoiceElement2{ id:edit_frequency_element m_title: "Frequency" m_param_id: mPARAM_ID_FREQUENCY m_settings_model: _ohdSystemAirSettingsModel onGoto_previous: { - scan_frequency_element.takeover_control() + sidebar.regain_control_on_sidebar_stack() } onGoto_next: { edit_channel_width_element.takeover_control() diff --git a/qml/ui/sidebar/Panel3Camera.qml b/qml/ui/sidebar/Panel3Camera.qml index 8f8a0499b..7ba36f53d 100644 --- a/qml/ui/sidebar/Panel3Camera.qml +++ b/qml/ui/sidebar/Panel3Camera.qml @@ -31,28 +31,28 @@ SideBarBasePanel{ sidebar.regain_control_on_sidebar_stack() } onGoto_next: { - exposure.takeover_control(); + saturation.takeover_control(); } } MavlinkChoiceElement2{ - id: exposure - m_title: "Exposure" - m_param_id: "EXPOSURE" + id: saturation + m_title: "Saturation" + m_param_id: "SATURATION" m_settings_model: _airCameraSettingsModel onGoto_previous: { brightness.takeover_control(); } onGoto_next: { - metering.takeover_control(); + contrast.takeover_control(); } } MavlinkChoiceElement2{ - id: metering - m_title: "Metering" - m_param_id: "METERING" + id: contrast + m_title: "Contrast" + m_param_id: "CONTRAST" m_settings_model: _airCameraSettingsModel onGoto_previous: { - exposure.takeover_control(); + saturation.takeover_control(); } onGoto_next: { sharpness.takeover_control(); @@ -64,7 +64,7 @@ SideBarBasePanel{ m_param_id: "SHARPNESS" m_settings_model: _airCameraSettingsModel onGoto_previous: { - metering.takeover_control(); + contrast.takeover_control(); } onGoto_next: { sidebar.regain_control_on_sidebar_stack() diff --git a/qml/ui/sidebar/Panel4Recording.qml b/qml/ui/sidebar/Panel4Recording.qml index 90d9b3107..5479f27b2 100644 --- a/qml/ui/sidebar/Panel4Recording.qml +++ b/qml/ui/sidebar/Panel4Recording.qml @@ -44,16 +44,15 @@ SideBarBasePanel { } Rectangle { color: "#171d25" - opacity: 0.85 height: recording_mode.height width: recording_mode.width Text { anchors.centerIn: parent anchors.leftMargin: 40 text: { - var tmp = " Status"; + var tmp = " Status"; if (!_ohdSystemAir.is_alive) { - return tmp + " disabled "; + return tmp + " disabled "; } return tmp + _cameraStreamModelPrimary.camera_recording_mode_to_string(_cameraStreamModelPrimary.air_recording_active) } @@ -64,7 +63,6 @@ SideBarBasePanel { } Rectangle { color: secondaryUiColor - opacity: 0.20 height: recording_mode.height+120 width: recording_mode.width } diff --git a/qml/ui/sidebar/Panel7Status.qml b/qml/ui/sidebar/Panel7Status.qml index 3500cb735..665c93f52 100644 --- a/qml/ui/sidebar/Panel7Status.qml +++ b/qml/ui/sidebar/Panel7Status.qml @@ -16,7 +16,6 @@ SideBarBasePanel { Rectangle { color: "#171d25" - opacity: 0.8 anchors.top: parent.top anchors.topMargin: 50 height: 340 @@ -70,24 +69,19 @@ SideBarBasePanel { Layout.alignment: Qt.AlignHCenter override_text_left: "Chipset GND:" override_color_right: _ohdSystemGround.is_alive ? "#20b383" : "#df4c7c" - override_text_right: _ohdSystemGround.is_alive ? "Supported" : "Not connected" - // override_text_right: _ohdSystemGround.is_alive ? _ohdSystemGround.card_type_as_string : "Not connected" - + override_text_right: _ohdSystemGround.is_alive ? _ohdSystemGround.card_type_as_string : "Not connected" } InfoElement2 { Layout.alignment: Qt.AlignHCenter override_text_left: "Chipset AIR:" override_color_right: _ohdSystemAir.is_alive ? "#20b383" : "#df4c7c" - override_text_right: _ohdSystemAir.is_alive ? "Supported" : "Not connected" - // override_text_right: _ohdSystemAir.is_alive ? _ohdSystemAir.card_type_as_string : "Not connected" - + override_text_right: _ohdSystemAir.is_alive ? _ohdSystemAir.card_type_as_string : "Not connected" } InfoElement2 { Layout.alignment: Qt.AlignHCenter override_text_left: "Camera:" override_color_right: _ohdSystemAir.is_alive ? "#20b383" : "#df4c7c" - override_text_right: _ohdSystemAir.is_alive ? "Supported" : "Not connected" - // override_text_right: _ohdSystemAir.is_alive ? _ohdSystemAir.ohd_cam_type : "Not connected" + override_text_right: _ohdSystemAir.is_alive ? _ohdSystemAir.ohd_cam_type : "Not connected" } Button { Layout.alignment: Qt.AlignHCenter