Merge pull request #688 from OpenHD/consti-dev

Fxies & ready for 2.5.4-beta
OpenHD · Apr 19, 2024 · bb72a6f · bb72a6f
2 parents 89d1048 + be0dba9
commit bb72a6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/util/qopenhd.h b/app/util/qopenhd.h
@@ -69,7 +69,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.4-evo-alpha");
+    L_RO_PROP(QString,version_string,set_version_string,"2.5.4-evo-beta");
     //
     // Shows a message popup to the user that needs to be clicked away - use sparingly
     //

diff --git a/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml b/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml
@@ -226,6 +226,14 @@ Rectangle{
                             }
                             TabButton{
                                 text: "2.4G"
+                                enabled: {
+                                    if(_ohdSystemAir.is_alive && _ohdSystemAir.ohd_platform_type==30){
+                                        // X20 does not support 2.4G
+                                        return false;
+                                    }
+                                    return true;
+
+                                }
                             }
                             TabButton{
                                 text: "5.8G"