feat(dronecan): GPS node-ID and battery-ID filter fields

index.html

@@ -347,9 +347,13 @@ <h2 class="groundstation-telemetry__header" data-i18n="gsTelemetry"></h2>
                             <li class="tab_led_strip">
                                 <a href="#" data-i18n="tabLedStrip" class="tabicon ic_led" title="LED Strip"></a>
                             </li>
+                             <li class="tab_dronecan">
+                                <a href="#" data-i18n="tabDroneCAN" class="tabicon ic_dronecan" title="DroneCAN"></a>
+                            </li>
+
                         </ul>
                     </li>
-
+                    
                     <!-- Data Logging -->
                     <li class="nav-group">
                         <div class="group-header" role="button" tabindex="0" aria-expanded="false">

js/configurator_main.js

@@ -36,6 +36,7 @@ import configurationTab from './../tabs/configuration';
 import pidTuningTab from './../tabs/pid_tuning';
 import receiverTab from './../tabs/receiver';
 import gpsTab from './../tabs/gps';
+import dronecanTab from './../tabs/dronecan';
 import magnetometerTab from './../tabs/magnetometer';
 import missionControlTab from './../tabs/mission_control';
 import mixerTab from './../tabs/mixer';
@@ -116,7 +117,7 @@ $(function() {
         var ui_tabs = $('#tabs > ul');
         $('a', ui_tabs).on('click', function() {
 
-            if ($(this).parent().hasClass("tab_help")) {
+            if ($(this).parent().hasClass("tab_help") || $(this).parent().hasClass("nav-toggle-all")) {
                 return;
             }
 
@@ -231,6 +232,9 @@ $(function() {
                         case 'gps':
                             gpsTab.initialize(content_ready);
                             break;
+                         case 'dronecan':
+                              dronecanTab.initialize(content_ready);
+                              break;
                         case 'magnetometer':
                             magnetometerTab.initialize(content_ready);
                             break;
@@ -360,84 +364,6 @@ $(function() {
         // Update button state on initialization
         updateToggleAllButton();
 
-
-        // Accordion Navigation Groups
-        $('.group-header').on('click', function(e) {
-            e.stopPropagation(); // Prevent triggering tab click
-            const header = $(this);
-            const items = header.next('.group-items');
-
-            // Toggle this group
-            header.toggleClass('active');
-            items.toggleClass('expanded');
-
-            // Update aria-expanded for accessibility
-            header.attr('aria-expanded', header.hasClass('active'));
-
-            // Update the expand/collapse all button state
-            updateToggleAllButton();
-        });
-
-        // Keyboard accessibility for accordion headers
-        $('.group-header').on('keydown', function(e) {
-            if (e.key === 'Enter' || e.key === ' ') {
-                e.preventDefault();
-                $(this).trigger('click');
-            }
-        });
-
-        function updateToggleAllButton() {
-            const allExpanded = $('.nav-group .group-header.active').length === $('.nav-group .group-header').length;
-            const $expandIcon = $('#toggleAllGroups .expand-icon');
-            const $collapseIcon = $('#toggleAllGroups .collapse-icon');
-            const $toggleText = $('#toggleAllGroups .toggle-text');
-
-            if (allExpanded) {
-                $expandIcon.hide();
-                $collapseIcon.show();
-                $toggleText.attr('data-i18n', 'navCollapseAll');
-                $toggleText.text(i18n.getMessage('navCollapseAll'));
-            } else {
-                $expandIcon.show();
-                $collapseIcon.hide();
-                $toggleText.attr('data-i18n', 'navExpandAll');
-                $toggleText.text(i18n.getMessage('navExpandAll'));
-            }
-        }
-
-        // Expand/Collapse All Toggle
-        $('#toggleAllGroups').on('click', function(e) {
-            e.preventDefault();
-            const allExpanded = $('.nav-group .group-header.active').length === $('.nav-group .group-header').length;
-
-            if (allExpanded) {
-                // Collapse all except first
-                $('.nav-group .group-header').removeClass('active').attr('aria-expanded', 'false');
-                $('.nav-group .group-items').removeClass('expanded');
-                $('#tabs ul.mode-connected .nav-group:first-child .group-header').addClass('active').attr('aria-expanded', 'true');
-                $('#tabs ul.mode-connected .nav-group:first-child .group-items').addClass('expanded');
-                store.set('expand_all_groups', false);
-            } else {
-                // Expand all
-                $('.nav-group .group-header').addClass('active').attr('aria-expanded', 'true');
-                $('.nav-group .group-items').addClass('expanded');
-                store.set('expand_all_groups', true);
-            }
-
-            updateToggleAllButton();
-        });
-
-        // Initialize: apply saved expand all preference or expand first group by default
-        if (store.get('expand_all_groups', false)) {
-            $('.nav-group .group-header').addClass('active').attr('aria-expanded', 'true');
-            $('.nav-group .group-items').addClass('expanded');
-        } else {
-            $('#tabs ul.mode-connected .nav-group:first-child .group-header').addClass('active').attr('aria-expanded', 'true');
-            $('#tabs ul.mode-connected .nav-group:first-child .group-items').addClass('expanded');
-        }
-
-        updateToggleAllButton();
-
         // options
         $('#options').on('click', function() {
             var el = $(this);
@@ -477,15 +403,6 @@ $(function() {
                         store.set('disable_3d_acceleration', check);
                     });
 
-                    if (store.get('disable_3d_acceleration', false)) {
-                        $('div.disable_3d_acceleration input').prop('checked', true);
-                    }
-
-                    $('div.disable_3d_acceleration input').on('change', function () {
-                        var check = $(this).is(':checked');
-                        store.set('disable_3d_acceleration', check);
-                    });
-
                     $('div.statistics input').on('change', function () {
                         var check = $(this).is(':checked');
                     });

js/fc.js

@@ -88,6 +88,9 @@ var FC = {
     EZ_TUNE: null,
     FLIGHT_MODES: null,
     GEOZONES: null,
+    DRONECAN_NODES: [],
+    DRONECAN_ASYNC_REQUEST: null,
+    DRONECAN_ASYNC_RESULT: null,
 
     restartRequired: false,
     MAX_SERVO_RATE: 125,
@@ -611,6 +614,10 @@ var FC = {
            items: [],
         };
 
+        this.DRONECAN_NODES = [];
+        this.DRONECAN_ASYNC_REQUEST = null;
+        this.DRONECAN_ASYNC_RESULT = null;
+
     },
     getOutputUsages: function() {
         return {
@@ -666,7 +673,9 @@ var FC = {
         return [
             'UBLOX',
             'MSP',
-            'FAKE'
+            'CRSF',
+            'FAKE',
+            'DRONECAN'
         ];
     },
     getGpsBaudRates: function () {

js/gui.js

@@ -28,6 +28,7 @@ var GUI_control = function () {
         'cli',
         'configuration',
         'gps',
+        'dronecan',
         'magnetometer',
         'led_strip',
         'logging',

js/msp/MSPCodes.js

@@ -222,6 +222,10 @@ var MSPCodes = {
     MSP2_INAV_LOGIC_CONDITIONS_SINGLE:      0x203B,
     MSP2_INAV_LOGIC_CONDITIONS_CONFIGURED:  0x203C,
 
+    MSP2_INAV_DRONECAN_NODES:           0x2042,
+    MSP2_INAV_DRONECAN_ASYNC_REQUEST:   0x2043,
+    MSP2_INAV_DRONECAN_ASYNC_RESULT:    0x2044,
+
     MSP2_INAV_LED_STRIP_CONFIG_EX:      0x2048,
     MSP2_INAV_SET_LED_STRIP_CONFIG_EX:  0x2049,
 

js/msp/MSPHelper.js

@@ -26,6 +26,16 @@
 var mspHelper = (function () {
     var self = {};
 
+    const PARAM_TYPE_INT    = 1;
+    const PARAM_TYPE_FLOAT  = 2;
+    const PARAM_TYPE_BOOL   = 3;
+    const PARAM_TYPE_STRING = 4;
+    const DRONECAN_SERVICE_GETNODEINFO    = 1;
+    const DRONECAN_SERVICE_RESTART_NODE   = 5;
+    const DRONECAN_SERVICE_EXECUTE_OPCODE = 10;
+    const DRONECAN_SERVICE_PARAM_GETSET   = 11;
+    const DRONECAN_ASYNC_STATE_READY      = 2;
+
     self.sensorStatusEx = null;
 
     self.setSensorStatusEx = function (cb)  {
@@ -1557,6 +1567,126 @@
                 console.log('Safehome points saved');
                 break;
 
+            case MSPCodes.MSP2_INAV_DRONECAN_NODES:
+                FC.DRONECAN_NODES = [];
+                if (data.byteLength > 0) {
+                    const count = data.getUint8(0);
+                    for (let i = 0; i < count; i++) {
+                        const offset = 1 + i * 13;
+                        if (offset + 13 > data.byteLength) break;
+                        FC.DRONECAN_NODES.push({
+                            nodeID:              data.getUint8(offset),
+                            health:              data.getUint8(offset + 1),
+                            mode:                data.getUint8(offset + 2),
+                            last_seen_ms:        data.getUint32(offset + 3, true),
+                            uptime_sec:          data.getUint32(offset + 7, true),
+                            vendor_status_code:  data.getUint16(offset + 11, true),
+                        });
+                    }
+                }
+                break;
+
+            case MSPCodes.MSP2_INAV_DRONECAN_ASYNC_REQUEST:
+                if (data.byteLength >= 2) {
+                    FC.DRONECAN_ASYNC_REQUEST = {
+                        status: data.getUint8(0),
+                        seq:    data.getUint8(1),
+                    };  
+                }   
+                break;
+
+            case MSPCodes.MSP2_INAV_DRONECAN_ASYNC_RESULT:
+                if (data.byteLength >= 5) {
+                    const state      = data.getUint8(0);
+                    const seq        = data.getUint8(1);
+                    const service_id = data.getUint16(2, true);
+                    const node_id    = data.getUint8(4); 
+                    const result = { state, seq, service_id, node_id };
+
+                    if (state === DRONECAN_ASYNC_STATE_READY) {
+                        try {
+                        let offset = 5;
+                        if (service_id === DRONECAN_SERVICE_RESTART_NODE || service_id === DRONECAN_SERVICE_EXECUTE_OPCODE) {
+                            result.ok = data.getUint8(offset) !== 0;
+                        } else {
+                            const name_len = data.getUint8(offset++);
+                            result.name = String.fromCharCode(
+                                ...new Uint8Array(data.buffer, data.byteOffset + offset, name_len));
+                            offset += name_len;
+
+                            if (service_id === DRONECAN_SERVICE_GETNODEINFO) {
+                                result.sw_major                = data.getUint8(offset++);
+                                result.sw_minor                = data.getUint8(offset++);
+                                result.sw_optional_field_flags = data.getUint8(offset++);
+                                result.sw_vcs_commit           = data.getUint32(offset, true); offset += 4;
+                                result.hw_major                = data.getUint8(offset++);
+                                result.hw_minor                = data.getUint8(offset++);
+                                result.hw_unique_id            = new Uint8Array(
+                                    data.buffer, data.byteOffset + offset, 16).slice(); // copy; don't hold a live view into the MSP buffer
+                            } else if (service_id === DRONECAN_SERVICE_PARAM_GETSET) {
+                                result.value_type = data.getUint8(offset++);
+                                switch (result.value_type) {
+                                    case PARAM_TYPE_INT: { // 8 bytes, little-endian lo/hi
+                                        const lo = data.getUint32(offset, true);
+                                        const hi = data.getUint32(offset + 4, true);
+                                        const big = BigInt(hi) * BigInt(0x100000000) + BigInt(lo);
+                                        const signed = big >= (1n << 63n) ? big - (1n << 64n) : big;
+                                        result.value = (signed >= BigInt(Number.MIN_SAFE_INTEGER) &&
+                                                        signed <= BigInt(Number.MAX_SAFE_INTEGER))
+                                                        ? Number(signed) : signed;
+                                        offset += 8;
+                                        break;
+                                    }
+                                    case PARAM_TYPE_FLOAT: // 4 bytes
+                                        result.value = data.getFloat32(offset, true);
+                                        offset += 4;
+                                        break;
+                                    case PARAM_TYPE_BOOL: // 1 byte
+                                        result.value = data.getUint8(offset) !== 0;
+                                        offset += 1;
+                                        break;
+                                    case PARAM_TYPE_STRING: { // 1-byte length prefix + data
+                                        const slen = data.getUint8(offset++);
+                                        result.value = String.fromCharCode(
+                                            ...new Uint8Array(data.buffer, data.byteOffset + offset, slen));
+                                        offset += slen;
+                                        break;
+                                    }
+                                    default:
+                                        result.value = null;
+                                }
+                                // min/max are NumericValue (EMPTY, INT, or FLOAT); only present for INT and FLOAT params
+                                if (result.value_type === PARAM_TYPE_INT || result.value_type === PARAM_TYPE_FLOAT) {
+                                    const decodeNumeric = () => {
+                                        const type = data.getUint8(offset++);
+                                        if (type === PARAM_TYPE_INT) {
+                                            const lo = data.getUint32(offset, true);
+                                            const hi = data.getUint32(offset + 4, true);
+                                            offset += 8;
+                                            const big = BigInt(hi) * BigInt(0x100000000) + BigInt(lo);
+                                            const signed = big >= (1n << 63n) ? big - (1n << 64n) : big;
+                                            return (signed >= BigInt(Number.MIN_SAFE_INTEGER) &&
+                                                    signed <= BigInt(Number.MAX_SAFE_INTEGER))
+                                                   ? Number(signed) : signed;
+                                        } else if (type === PARAM_TYPE_FLOAT) {
+                                            const v = data.getFloat32(offset, true);
+                                            offset += 4;
+                                            return v;
+                                        }
+                                        return undefined; // EMPTY — no range provided
+                                    };
+                                    result.min = decodeNumeric();
+                                    result.max = decodeNumeric();
+                                }
+                            }
+                        }
+                        } catch (e) { /* truncated or malformed response — result fields may be partial */ }
+                    }
+
+                    FC.DRONECAN_ASYNC_RESULT = result;
+                }
+                break;
+
             case MSPCodes.MSP2_INAV_FW_APPROACH:
                 FC.FW_APPROACH.put(new FwApproach(
                     data.getUint8(0),