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

Initial attempt at adding arm64 sitl binaries

Browse source
This commit is contained in:
Marcelo Bezerra 2025-01-17 20:04:13 +01:00
parent 325cd65663
commit 003fefe3ca
4 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,7 @@ jobs:
command: npm install --foreground-scripts command: npm install --foreground-scripts
timeout_minutes: 10 timeout_minutes: 10
on_retry_command: rm -rfv node_modules on_retry_command: rm -rfv node_modules
- name: Remove SITL binary - name: Remove other SITL binary
run: rm -v resources/sitl/linux/inav_SITL run: rm -v resources/sitl/linux/inav_SITL
- name: Build Linux - name: Build Linux
run: npm run make run: npm run make

12
js/gui.js
View file

@ -19,6 +19,7 @@ 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',
@ -60,14 +61,23 @@ var GUI_control = function () {
'MIXER' : 4 'MIXER' : 4
}; };
// check which operating system is user running // check which operating system is user running
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) this.operating_system = "Linux"; 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("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";
this.platform = navigator.platform;
}; };
// message = string // message = string

1
js/logicConditionsCollection.js
View file

@ -1,5 +1,6 @@
'use strict'; 'use strict';
var LogicConditionsCollection = function () { var LogicConditionsCollection = function () {
let self = {}, let self = {},

6
js/sitl.js
View file

@ -141,7 +141,11 @@ 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') {
sitlExePath = path.join(__dirname, './../resources/sitl/linux/inav_SITL'); 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');
}
eepromPath = `${app.getPath('userData')}/${eepromFileName}` eepromPath = `${app.getPath('userData')}/${eepromFileName}`
chmod(sitlExePath, 0o755, err => { chmod(sitlExePath, 0o755, err => {
if (err) if (err)