diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0e65374..57f602b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,9 @@ jobs: timeout_minutes: 10 on_retry_command: rm -rfv node_modules - name: Remove other SITL binary - run: rm -v resources/sitl/linux/inav_SITL + run: | + mv -fv resources/sitl/linux/arm64/inav_SITL resources/sitl/linux/inav_SITL + rmdir -v resources/sitl/linux/arm64 - name: Build Linux run: npm run make - name: Upload Linux deb diff --git a/js/gui.js b/js/gui.js index 174505ae..beb1e701 100644 --- a/js/gui.js +++ b/js/gui.js @@ -19,7 +19,6 @@ var GUI_control = function () { this.active_tab; this.tab_switch_in_progress = false; this.operating_system; - this.extra_platform = ""; this.defaultAllowedTabsWhenDisconnected = [ 'landing', 'firmware_flasher', @@ -66,13 +65,7 @@ var GUI_control = function () { if (navigator.appVersion.indexOf("Win") != -1) this.operating_system = "Windows"; else if (navigator.appVersion.indexOf("Mac") != -1) this.operating_system = "MacOS"; else if (navigator.appVersion.indexOf("CrOS") != -1) this.operating_system = "ChromeOS"; - else if (navigator.appVersion.indexOf("Linux") != -1) { - this.operating_system = "Linux"; - if(navigator.platform.indexOf('aarch64') != -1) - { - this.extra_platform = 'arm64'; - } - } + else if (navigator.appVersion.indexOf("Linux") != -1) this.operating_system = "Linux"; else if (navigator.appVersion.indexOf("X11") != -1) this.operating_system = "UNIX"; else this.operating_system = "Unknown"; diff --git a/js/sitl.js b/js/sitl.js index 6ca06b11..338a3eea 100644 --- a/js/sitl.js +++ b/js/sitl.js @@ -141,11 +141,7 @@ var SITLProcess = { sitlExePath = path.join(__dirname, './../resources/sitl/windows/inav_SITL.exe'); eepromPath = `${app.getPath('userData')}\\${eepromFileName}` } else if (GUI.operating_system == 'Linux') { - if(GUI.extra_platform != '') { - sitlExePath = path.join(__dirname, './../resources/sitl/linux/', GUI.extra_platform, '/inav_SITL'); - } else { - sitlExePath = path.join(__dirname, './../resources/sitl/linux/inav_SITL'); - } + sitlExePath = path.join(__dirname, './../resources/sitl/linux/inav_SITL'); eepromPath = `${app.getPath('userData')}/${eepromFileName}` chmod(sitlExePath, 0o755, err => { if (err)