Merge branch 'master' into dzikuvx-mps-queue-improvements

iNavFlight · Apr 27, 2024 · 1cc748e · 1cc748e
2 parents c50c289 + 9c66cd9
commit 1cc748e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
                 name: ${{ env.BUILD_NAME }}_ZIP
                 path: ./out/make/zip/linux/x64/*.zip
     build-mac:
-        runs-on: macos-latest
+        runs-on: macos-13
         steps:
         - uses: actions/checkout@v4
         - name: Setup environment

diff --git a/js/sitl.js b/js/sitl.js
@@ -65,7 +65,14 @@ var Ser2TCP = {
                 if (err)
                     console.log(err);
             });
+        } else if (GUI.operating_system == 'MacOS') {
+            path = './../resources/sitl/macos/Ser2TCP'
+            chmod(path, 0o755, (err) => {
+                if (err)
+                    console.log(err);
+            });
         } else {
+            alert(GUI.operating_system);
             return;
         }
 
@@ -217,7 +224,16 @@ var SITLProcess = {
                 if (err)
                     console.log(err);
             });
+        } else if (GUI.operating_system == 'MacOS') {
+            sitlExePath = path.join(__dirname, './../resources/sitl/macos/inav_SITL');
+            eepromPath = `${app.getPath('userData')}/${eepromFileName}`
+            chmod(sitlExePath, 0o755, err => {
+                if (err)
+                    console.log(err);
+            });
+
         } else {
+            alert(GUI.operating_system);
             return;
         }
 

diff --git a/resources/sitl/macos/Ser2TCP b/resources/sitl/macos/Ser2TCP
diff --git a/resources/sitl/macos/inav_SITL b/resources/sitl/macos/inav_SITL
diff --git a/tabs/sitl.js b/tabs/sitl.js
@@ -78,17 +78,6 @@ TABS.sitl.initialize = (callback) => {
     GUI.load(path.join(__dirname, "sitl.html"), function () {
         i18n.localize();
 
-    var os = GUI.operating_system;
-    if (os != 'Windows' && os != 'Linux') {
-
-        $('.content_wrapper').find('*').remove();
-        $('.content_wrapper').append(`<h2>${i18n.getMessage('sitlOSNotSupported')}</h2>`);
-
-        GUI.content_ready(callback);
-        return;
-    }
-
-
     var currentSim, currentProfile, profiles;
     var mapping = new Array(28).fill(0);
     var serialProtocolls = Ser2TCP.getProtocolls();
@@ -524,4 +513,4 @@ TABS.sitl.cleanup = (callback) => {
     Ser2TCP.stopPollSerialPorts();
     if (callback) 
         callback();
-};
+};