Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-18 22:05:12 +03:00
Code Wiki Activity

Ignore the platform stuff, and handle it during build.

Browse source
This commit is contained in:
Marcelo Bezerra 2025-01-17 20:48:01 +01:00
parent 0cef17b842
commit cf979f0012
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -107,7 +107,9 @@ jobs:
timeout_minutes: 10 timeout_minutes: 10
on_retry_command: rm -rfv node_modules on_retry_command: rm -rfv node_modules
- name: Remove other SITL binary - 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 - name: Build Linux
run: npm run make run: npm run make
- name: Upload Linux deb - name: Upload Linux deb

9
js/gui.js
View file

@ -19,7 +19,6 @@ var GUI_control = function () {
this.active_tab; this.active_tab;
this.tab_switch_in_progress = false; this.tab_switch_in_progress = false;
this.operating_system; this.operating_system;
this.extra_platform = "";
this.defaultAllowedTabsWhenDisconnected = [ this.defaultAllowedTabsWhenDisconnected = [
'landing', 'landing',
'firmware_flasher', 'firmware_flasher',
@ -66,13 +65,7 @@ var GUI_control = function () {
if (navigator.appVersion.indexOf("Win") != -1) this.operating_system = "Windows"; 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("Mac") != -1) this.operating_system = "MacOS";
else if (navigator.appVersion.indexOf("CrOS") != -1) this.operating_system = "ChromeOS"; else if (navigator.appVersion.indexOf("CrOS") != -1) this.operating_system = "ChromeOS";
else if (navigator.appVersion.indexOf("Linux") != -1) { else if (navigator.appVersion.indexOf("Linux") != -1) this.operating_system = "Linux";
this.operating_system = "Linux";
if(navigator.platform.indexOf('aarch64') != -1)
{
this.extra_platform = 'arm64';
}
}
else if (navigator.appVersion.indexOf("X11") != -1) this.operating_system = "UNIX"; else if (navigator.appVersion.indexOf("X11") != -1) this.operating_system = "UNIX";
else this.operating_system = "Unknown"; else this.operating_system = "Unknown";

6
js/sitl.js
View file

@ -141,11 +141,7 @@ var SITLProcess = {
sitlExePath = path.join(__dirname, './../resources/sitl/windows/inav_SITL.exe'); sitlExePath = path.join(__dirname, './../resources/sitl/windows/inav_SITL.exe');
eepromPath = `${app.getPath('userData')}\\${eepromFileName}` eepromPath = `${app.getPath('userData')}\\${eepromFileName}`
} else if (GUI.operating_system == 'Linux') { } else if (GUI.operating_system == 'Linux') {
if(GUI.extra_platform != '') { sitlExePath = path.join(__dirname, './../resources/sitl/linux/inav_SITL');
sitlExePath = path.join(__dirname, './../resources/sitl/linux/', GUI.extra_platform, '/inav_SITL');
} else {
sitlExePath = path.join(__dirname, './../resources/sitl/linux/inav_SITL');
}
eepromPath = `${app.getPath('userData')}/${eepromFileName}` eepromPath = `${app.getPath('userData')}/${eepromFileName}`
chmod(sitlExePath, 0o755, err => { chmod(sitlExePath, 0o755, err => {
if (err) if (err)