Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Firmware info on setup tab #3369

Merged
merged 11 commits into from Mar 16, 2023
Merged

Firmware info on setup tab #3369

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
adbbf36
More messages
HThuren Mar 5, 2023
a58eb6c
caps API
HThuren Mar 5, 2023
3ab7c70
More buiold info
HThuren Mar 7, 2023
5af7522
buildinfo
HThuren Mar 7, 2023
c86caff
buildinfo test
HThuren Mar 9, 2023
620aab7
Added build options
HThuren Mar 12, 2023
698a106
Added build options
HThuren Mar 12, 2023
5aef0eb
Change of label
HThuren Mar 13, 2023
54c674e
chang loop
HThuren Mar 13, 2023
b4b3069
Add buildkey and sensors
HThuren Mar 14, 2023
480c05c
Show config and log based on buildkey
HThuren Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 16 additions & 1 deletion locales/en/messages.json
View file
Open in desktop
Expand Up @@ -865,7 +865,7 @@
"message": "Magnetometer"
},
"initialSetupInfoHead": {
"message": "Info"
"message": "System info"
},
"initialSetupBattery": {
"message": "Battery voltage:"
Expand Down Expand Up @@ -1014,6 +1014,21 @@
"initialSetupInstrumentsHead": {
"message": "Instruments"
},
"initialSetupInfoAPIversion": {
"message": "MSP API:"
},
"initialSetupInfoBuild": {
"message": "Firmware info"
},
"initialSetupInfoBuildinfo": {
"message": "Build date:"
},
"initialSetupInfoBuildOptions": {
"message": "Build Options:"
},
"initialSetupInfoBuildOptionsEmpty": {
"message": "Local Build - no Defines"
},
"initialSetupButtonSave": {
"message": "Save"
},
Expand Down
40 changes: 32 additions & 8 deletions src/js/tabs/setup.js
View file
Open in desktop
Expand Up @@ -197,7 +197,11 @@ setup.initialize = function (callback) {
gpsLon_e = $('.gpsLon'),
roll_e = $('dd.roll'),
pitch_e = $('dd.pitch'),
heading_e = $('dd.heading');
heading_e = $('dd.heading'),
// Firmware info
msp_api_e = $('.api-version'),
build_info_e = $('.build-info'),
build_opt_e = $('.build-options');

// DISARM FLAGS
// We add all the arming/disarming flags available, and show/hide them if needed.
Expand Down Expand Up @@ -265,7 +269,25 @@ setup.initialize = function (callback) {
}
};

const showFirmwareInfo = function() {
MSP.send_message(MSPCodes.MSP_STATUS_EX, false, false, function() {
// Firmware info
msp_api_e.text([FC.CONFIG.apiVersion]);
build_info_e.text([FC.CONFIG.buildInfo]);

if(FC.CONFIG.buildOptions.length > 0) {
build_opt_e.text = "";
for (let i = 0; i < FC.CONFIG.buildOptions.length; i++) {
build_opt_e.append(FC.CONFIG.buildOptions[i], ' ');
HThuren marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
build_opt_e.text(i18n.getMessage('initialSetupInfoBuildOptionsEmpty'));
}
});
};

prepareDisarmFlags();
showFirmwareInfo();

function get_slow_data() {

Expand All @@ -279,13 +301,7 @@ setup.initialize = function (callback) {

});

MSP.send_message(MSPCodes.MSP_ANALOG, false, false, function () {
bat_voltage_e.text(i18n.getMessage('initialSetupBatteryValue', [FC.ANALOG.voltage]));
bat_mah_drawn_e.text(i18n.getMessage('initialSetupBatteryMahValue', [FC.ANALOG.mAhdrawn]));
bat_mah_drawing_e.text(i18n.getMessage('initialSetupBatteryAValue', [FC.ANALOG.amperage.toFixed(2)]));
rssi_e.text(i18n.getMessage('initialSetupRSSIValue', [((FC.ANALOG.rssi / 1023) * 100).toFixed(0)]));
});

// GPS info
if (have_sensor(FC.CONFIG.activeSensors, 'gps')) {
MSP.send_message(MSPCodes.MSP_RAW_GPS, false, false, function () {
gpsFix_e.html((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse'));
Expand All @@ -294,6 +310,14 @@ setup.initialize = function (callback) {
gpsLon_e.text(`${(FC.GPS_DATA.lon / 10000000).toFixed(4)} deg`);
});
}

// System info
MSP.send_message(MSPCodes.MSP_ANALOG, false, false, function () {
bat_voltage_e.text(i18n.getMessage('initialSetupBatteryValue', [FC.ANALOG.voltage]));
bat_mah_drawn_e.text(i18n.getMessage('initialSetupBatteryMahValue', [FC.ANALOG.mAhdrawn]));
bat_mah_drawing_e.text(i18n.getMessage('initialSetupBatteryAValue', [FC.ANALOG.amperage.toFixed(2)]));
rssi_e.text(i18n.getMessage('initialSetupRSSIValue', [((FC.ANALOG.rssi / 1023) * 100).toFixed(0)]));
});
}

function get_fast_data() {
Expand Down
101 changes: 62 additions & 39 deletions src/tabs/setup.html
View file
Open in desktop
Expand Up @@ -88,84 +88,107 @@
</div>
</div>
<div class="grid-col col3">
<div class="gui_box grey instrumentsbox" align="center">
<div class="gui_box_titlebar" align="left">
<div class="spacer_box_title" i18n="initialSetupInstrumentsHead"></div>
</div>
<span id="attitude"></span> <span id="heading"></span>
</div>
<div class="gui_box grey backupRestore">
<div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="initialSetupBackupRestoreHeader"></div>
</div>
<div class="spacer_box">
<div class="default_btn">
<a class="backup" href="#" i18n="initialSetupButtonBackup"></a>
</div>
<div class="default_btn">
<a class="restore" href="#" i18n="initialSetupButtonRestore"></a>
</div>
<div class="cell_setup">
<span i18n="initialSetupBackupRestoreText"></span>
</div>
</div>
</div>
<div class="gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="initialSetupInfoHead"></div>
<div class="spacer_box_title" i18n="initialSetupGPSHead"></div>
</div>
<div class="spacer_box">
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
<tbody>
<tr>
<td id="arming-disable-flag" i18n="initialSetupArmingDisableFlags" class="cf_tip"></td>
<td class="arming-disable-flags"></td>
</tr>
<tr>
<td i18n="initialSetupBattery"></td>
<td class="bat-voltage">0 V</td>
<td i18n="gps3dFix"></td>
<td class="gpsFix"></td>
</tr>
<tr>
<td i18n="initialSetupDrawn"></td>
<td class="bat-mah-drawn">0 mAh</td>
<td i18n="gpsSats"></td>
<td class="gpsSats"></td>
</tr>
<tr>
<td i18n="initialSetupDrawing"></td>
<td class="bat-mah-drawing">0.00 A</td>
<td i18n="gpsLat"></td>
<td class="gpsLat"></td>
</tr>
<tr class="noboarder">
<td i18n="initialSetupRSSI"></td>
<td class="rssi">0 %</td>
<td i18n="gpsLon"></td>
<td class="gpsLon"></td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="initialSetupGPSHead"></div>
<div class="spacer_box_title" i18n="initialSetupInfoHead"></div>
</div>
<div class="spacer_box">
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
<tbody>
<tr>
<td i18n="gps3dFix"></td>
<td class="gpsFix"></td>
<td id="arming-disable-flag" i18n="initialSetupArmingDisableFlags" class="cf_tip"></td>
<td class="arming-disable-flags"></td>
</tr>
<tr>
<td i18n="gpsSats"></td>
<td class="gpsSats"></td>
<td i18n="initialSetupBattery"></td>
<td class="bat-voltage">0 V</td>
</tr>
<tr>
<td i18n="gpsLat"></td>
<td class="gpsLat"></td>
<td i18n="initialSetupDrawn"></td>
<td class="bat-mah-drawn">0 mAh</td>
</tr>
<tr>
<td i18n="initialSetupDrawing"></td>
<td class="bat-mah-drawing">0.00 A</td>
</tr>
<tr class="noboarder">
<td i18n="gpsLon"></td>
<td class="gpsLon"></td>
<td i18n="initialSetupRSSI"></td>
<td class="rssi">0 %</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="gui_box grey instrumentsbox" align="center">
<div class="gui_box_titlebar" align="left">
<div class="spacer_box_title" i18n="initialSetupInstrumentsHead"></div>
</div>
<span id="attitude"></span> <span id="heading"></span>
</div>
<div class="gui_box grey backupRestore">
<div class="gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="initialSetupBackupRestoreHeader"></div>
<div class="spacer_box_title" i18n="initialSetupInfoBuild"></div>
</div>
<div class="spacer_box">
<div class="default_btn">
<a class="backup" href="#" i18n="initialSetupButtonBackup"></a>
</div>
<div class="default_btn">
<a class="restore" href="#" i18n="initialSetupButtonRestore"></a>
</div>
<div class="cell_setup">
<span i18n="initialSetupBackupRestoreText"></span>
</div>
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
<tbody>
<tr>
<td id="api-version" i18n="initialSetupInfoAPIversion"></td>
<td class="api-version"></td>
</tr>
<tr>
<td id="build-info" i18n="initialSetupInfoBuildinfo"></td>
<td class="build-info"></td>
</tr>
<tr>
<td id="build-options" i18n="initialSetupInfoBuildOptions" class="cf_tip"></td>
<td class="build-options"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
Expand Down