-
-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* third baro temp widget for fc with 2 baros onboard * debug output fix
- Loading branch information
1 parent
e97c543
commit 78474bb
Showing
7 changed files
with
244 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| import QtQuick 2.12 | ||
| import QtQuick.Controls 2.12 | ||
| import QtQuick.Layouts 1.12 | ||
|
|
||
| import Qt.labs.settings 1.0 | ||
|
|
||
| import OpenHD 1.0 | ||
| //third bmp280 or another barometer used to monitor AC180 temperature so wifi icon was used | ||
| BaseWidget { | ||
| id: pressTempWidget3 | ||
| width: 30 | ||
| height: 30 | ||
|
|
||
| visible: settings.show_press_temp3 && settings.show_widgets | ||
|
|
||
| widgetIdentifier: "press_temp_widget3" | ||
| bw_verbose_name: "PREASSURE3 SENSOR TEMP" | ||
|
|
||
| defaultAlignment: 1 | ||
| defaultXOffset: 205 | ||
| defaultYOffset: 32 | ||
| defaultHCenter: false | ||
| defaultVCenter: false | ||
|
|
||
| hasWidgetDetail: false | ||
|
|
||
| widgetDetailComponent: ScrollView { | ||
|
|
||
| contentHeight: idBaseWidgetDefaultUiControlElements.height | ||
| ScrollBar.horizontal.policy: ScrollBar.AlwaysOff | ||
| clip: true | ||
|
|
||
| BaseWidgetDefaultUiControlElements{ | ||
| id: idBaseWidgetDefaultUiControlElements | ||
| Item { | ||
| width: parent.width | ||
| height: 32 | ||
| Text { | ||
| text: qsTr("Declutter Upon Arm") | ||
| color: "white" | ||
| height: parent.height | ||
| font.bold: true | ||
| font.pixelSize: detailPanelFontPixels | ||
| anchors.left: parent.left | ||
| verticalAlignment: Text.AlignVCenter | ||
| } | ||
| Switch { | ||
| width: 32 | ||
| height: parent.height | ||
| anchors.rightMargin: 6 | ||
| anchors.right: parent.right | ||
| checked: settings.press_temp_declutter3 | ||
| onCheckedChanged: settings.press_temp_declutter3 = checked | ||
| } | ||
| } | ||
| Item { | ||
| id: press_temp_warn_label3 | ||
| width: parent.width | ||
| height: 32 | ||
| Text { | ||
| text: qsTr("Warn Temp") | ||
| color: "white" | ||
| height: parent.height | ||
| font.bold: true | ||
| font.pixelSize: detailPanelFontPixels | ||
| anchors.left: parent.left | ||
| verticalAlignment: Text.AlignVCenter | ||
| } | ||
| Text { | ||
| text: settings.press_temp_warn3 | ||
| color: settings.color_warn | ||
| height: parent.height | ||
| font.bold: true | ||
| font.pixelSize: detailPanelFontPixels | ||
| anchors.left: parent.right | ||
| verticalAlignment: Text.AlignVCenter | ||
| } | ||
| Slider { | ||
| id: press_temp_warn_Slider3 | ||
| orientation: Qt.Horizontal | ||
| from: 75 | ||
| value: settings.press_temp_warn3 | ||
| to: 150 | ||
| stepSize: 1 | ||
| height: parent.height | ||
| anchors.rightMargin: 0 | ||
| anchors.right: parent.right | ||
| width: parent.width - 96 | ||
|
|
||
| onValueChanged: { | ||
| settings.press_temp_warn3 = Math.round( | ||
| press_temp_warn_Slider3.value * 10) / 10.0 | ||
| } | ||
| } | ||
| } | ||
| Item { | ||
| id: press_temp_caution_label3 | ||
| width: parent.width | ||
| height: 32 | ||
| Text { | ||
| text: qsTr("Caution Temp") | ||
| color: "white" | ||
| height: parent.height | ||
| font.bold: true | ||
| font.pixelSize: detailPanelFontPixels | ||
| anchors.left: parent.left | ||
| verticalAlignment: Text.AlignVCenter | ||
| } | ||
| Text { | ||
| text: settings.press_temp_caution3 | ||
| color: settings.color_caution | ||
| height: parent.height | ||
| font.bold: true | ||
| font.pixelSize: detailPanelFontPixels | ||
| anchors.left: press_temp_caution_label3.right | ||
| verticalAlignment: Text.AlignVCenter | ||
| } | ||
| Slider { | ||
| id: press_temp_caution_Slider3 | ||
| orientation: Qt.Horizontal | ||
| from: 30 | ||
| value: settings.press_temp_caution3 | ||
| to: 74 | ||
| stepSize: 1 | ||
| height: parent.height | ||
| anchors.rightMargin: 0 | ||
| anchors.right: parent.right | ||
| width: parent.width - 96 | ||
|
|
||
| onValueChanged: { | ||
| settings.press_temp_caution3 = Math.round( | ||
| press_temp_caution_Slider3.value * 10) / 10.0 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Item { | ||
| id: widgetInner | ||
|
|
||
| anchors.fill: parent | ||
| scale: bw_current_scale | ||
| opacity: bw_current_opacity | ||
|
|
||
| Text { | ||
| id: temp_glyph | ||
| color: _fcMavlinkSystem.preasure_sensor3_temperature_degree >= settings.press_temp_caution3 ? (_fcMavlinkSystem.preasure_sensor3_temperature_degree >= settings.press_temp_warn3 ? settings.color_warn : settings.color_caution) : settings.color_shape | ||
| text: "\uf1eb" | ||
| anchors.left: parent.left | ||
| anchors.bottom: parent.bottom | ||
| font.family: "Font Awesome 5 Free" | ||
| horizontalAlignment: Text.AlignLeft | ||
| font.pixelSize: 16 | ||
| verticalAlignment: Text.AlignTop | ||
| wrapMode: Text.NoWrap | ||
| elide: Text.ElideRight | ||
| style: Text.Outline | ||
| styleColor: settings.color_glow | ||
| } | ||
|
|
||
| Text { | ||
| id: press_temp3 | ||
| color: { | ||
| if (_fcMavlinkSystem.preasure_sensor3_temperature_degree >= settings.press_temp_warn3) { | ||
| widgetInner.visible = true | ||
| return settings.color_warn | ||
| } else if (_fcMavlinkSystem.preasure_sensor3_temperature_degree > settings.press_temp_caution3) { | ||
| widgetInner.visible = true | ||
| return settings.color_caution | ||
| } else if (settings.press_temp_declutter3 == true | ||
| && _fcMavlinkSystem.armed == true) { | ||
| widgetInner.visible = false | ||
| return settings.color_text | ||
| } else { | ||
| widgetInner.visible = true | ||
| return settings.color_text | ||
| } | ||
| } | ||
| text: _fcMavlinkSystem.preasure_sensor3_temperature_degree == 0 ? qsTr("N/A") : _fcMavlinkSystem.preasure_sensor3_temperature_degree + "°" | ||
| anchors.left: temp_glyph.right | ||
| anchors.leftMargin: 2 | ||
| anchors.bottom: parent.bottom | ||
| horizontalAlignment: Text.AlignRight | ||
| font.pixelSize: 14 | ||
| font.family: settings.font_text | ||
| verticalAlignment: Text.AlignVCenter | ||
| wrapMode: Text.NoWrap | ||
| elide: Text.ElideRight | ||
| style: Text.Outline | ||
| styleColor: settings.color_glow | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |