Merge pull request #2559 from sensei-hacker/fix/osd-lc-use-configured-mask

OSD: use LC configured mask

Author: sensei-hacker

tabs/osd.js

@@ -2435,10 +2435,15 @@ OSD.reload = function(callback) {
                     OSD.data.supported = true;
                     OSD.msp.decodePreferences(resp);
 
-                    MSP.promise(MSPCodes.MSP2_INAV_CUSTOM_OSD_ELEMENTS).then(() => { 
+                    MSP.promise(MSPCodes.MSP2_INAV_CUSTOM_OSD_ELEMENTS).then(() => {
                         mspHelper.loadOsdCustomElements(() => {
-                            createCustomElements();
-                            done();
+                            MSP.promise(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS_CONFIGURED).then(() => {
+                                createCustomElements();
+                                done();
+                            }).catch(() => {
+                                createCustomElements();
+                                done();
+                            });
                         });
                     });
                 });
@@ -3558,10 +3563,6 @@ TABS.osd = {};
 TABS.osd.initialize = function (callback) {
 
     mspHelper.loadServoMixRules();
-    mspHelper.loadLogicConditions(function() {
-        // Refresh LC dropdowns now that conditions are loaded
-        $('select.lc, select.ico_lc').html(getLCoptions());
-    });
 
     if (GUI.active_tab != 'osd') {
         GUI.active_tab = 'osd';
@@ -4177,13 +4178,16 @@ function getGVoptions(){
 
 function getLCoptions(){
     var result = '';
-    // Return empty if conditions aren't fully loaded yet - callback will refresh
-    if (FC.LOGIC_CONDITIONS.getCount() < FC.LOGIC_CONDITIONS.getMaxLogicConditionCount()) {
+    var mask = FC.LOGIC_CONDITIONS_CONFIGURED_MASK;
+    if (!mask) {
         return result;
     }
-    for(var i = 0; i < FC.LOGIC_CONDITIONS.getMaxLogicConditionCount(); i++) {
-        if (FC.LOGIC_CONDITIONS.isEnabled(i)) {
-            result += `<option value="` + i + `">LC ` + i + `</option>`;
+    for (var i = 0; i < 64; i++) {
+        var isConfigured = (i < 32) ?
+            ((mask.lower >>> i) & 1) === 1 :
+            ((mask.upper >>> (i - 32)) & 1) === 1;
+        if (isConfigured) {
+            result += '<option value="' + i + '">LC ' + i + '</option>';
         }
     }
     return result;