Merge pull request #612 from OpenHD/consti-dev

2.5.2-beta
OpenHD · Nov 20, 2023 · 0a6a741 · 0a6a741
2 parents 94371fa + 98dd78d
commit 0a6a741
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/app/util/qopenhd.h b/app/util/qopenhd.h
@@ -65,7 +65,7 @@ class QOpenHD : public QObject
     // Tries to mimic android toast as much as possible
     //
     Q_INVOKABLE void show_toast(QString message,bool long_toast=false);
-    L_RO_PROP(QString,version_string,set_version_string,"2.5.2-evo-alpha");
+    L_RO_PROP(QString,version_string,set_version_string,"2.5.2-evo-beta");
 public:
     L_RO_PROP(QString,toast_text,set_toast_text,"NONE");
     L_RO_PROP(bool,toast_visible,set_toast_visible,false);

diff --git a/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml b/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml
@@ -334,7 +334,15 @@ Rectangle{
                     Layout.preferredHeight: 50
                     Layout.preferredWidth: 120
                     text: {
-                        return "THROTTLE:\n"+_ohdSystemAir.curr_n_rate_adjustments
+                        var ret="THROTTLE:\n";
+                        if(_ohdSystemAir.curr_n_rate_adjustments<=-1){
+                            ret+="N/A";
+                        }else if(_ohdSystemAir.curr_n_rate_adjustments==0){
+                            ret+="NONE";
+                        }else{
+                            ret+=("ACTIVE:"+_ohdSystemAir.curr_n_rate_adjustments+"x");
+                        }
+                        return ret;
                     }
                     color: _ohdSystemAir.curr_n_rate_adjustments > 0 ? "red" : "black"
                     verticalAlignment: Qt.AlignVCenter

diff --git a/qml/ui/widgets/WBLinkRateControlWidget.qml b/qml/ui/widgets/WBLinkRateControlWidget.qml
@@ -379,6 +379,13 @@ Make the video more stable (less microfreezes) on the cost of less image quality
                     const mcs=model.get(currentIndex).value
                     set_air_only_mcs(mcs)
                 }
+                onDisplayTextChanged: {
+                    for(var i = 0; i < model.count; ++i) {
+                        if (model.get(i).value==m_curr_mcs_index){
+                            currentIndex=i;
+                        }
+                    }
+                }
                 enabled: _ohdSystemAir.is_alive;
             }
         }
@@ -408,6 +415,13 @@ Make the video more stable (less microfreezes) on the cost of less image quality
                     set_fec_percentage(fec)
                     set_keyframe_interval(key)
                 }
+                onDisplayTextChanged: {
+                    for(var i = 0; i < model.count; ++i) {
+                        if (model.get(i).value_fec==m_curr_fec_perc && model.get(i).value_keyframe==m_curr_keyframe_i){
+                            currentIndex=i;
+                        }
+                    }
+                }
                 enabled: _ohdSystemAir.is_alive;
             }
         }