config-editor-base 2.9.6 → 2.9.8

package/dist/index.js

@@ -24283,7 +24283,8 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
       filterType = _this$state6.filterType,
       prescalerType = _this$state6.prescalerType,
       prescalerValue = _this$state6.prescalerValue,
-      dataPrescalerMask = _this$state6.dataPrescalerMask;
+      dataPrescalerMask = _this$state6.dataPrescalerMask,
+      csvData = _this$state6.csvData;
     var selectedEntries = mergedEntries.filter(function (e) {
       return e.selected;
     });
@@ -24407,15 +24408,33 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         } else if (isCanmodRouter) {
           var isExtended = _entry4.idInt > 0x7FF;
           var idHex = parseInt(_entry4.id, 16).toString(16).toUpperCase();
-          var _filter = {
-            name: (_entry4.messageName || idHex).substring(0, 16),
-            state: 1,
-            id_format: isExtended ? 1 : 0,
-            frame_format: 2,
-            f1: idHex,
-            f2: isExtended ? "1FFFFFFF" : "7FF",
-            prescaler_type: prescaler_type
-          };
+          var isDbcOnlyJ1939 = !csvData && _entry4.isJ1939 && isExtended;
+          var _filter = void 0;
+          if (isDbcOnlyJ1939) {
+            var _pgn = extractPgn$1(_entry4.idInt);
+            var _isPdu = (_pgn & 0xFF00) < 0xF000;
+            var _mask = _isPdu ? "3FF0000" : "3FFFF00";
+            var _filterId = _isPdu ? ((_pgn & 0x3FF00) << 8).toString(16).toUpperCase() : (_pgn << 8).toString(16).toUpperCase();
+            _filter = {
+              name: (_entry4.messageName || "PGN " + _pgn.toString(16).toUpperCase()).substring(0, 16),
+              state: 1,
+              id_format: 1,
+              frame_format: 2,
+              f1: _filterId,
+              f2: _mask,
+              prescaler_type: prescaler_type
+            };
+          } else {
+            _filter = {
+              name: (_entry4.messageName || idHex).substring(0, 16),
+              state: 1,
+              id_format: isExtended ? 1 : 0,
+              frame_format: 2,
+              f1: idHex,
+              f2: isExtended ? "1FFFFFFF" : "7FF",
+              prescaler_type: prescaler_type
+            };
+          }
           if (prescaler_value !== undefined) {
             _filter.prescaler_value = prescaler_value;
           }
@@ -24423,16 +24442,35 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
         } else {
           var _isExtended = _entry4.idInt > 0x7FF;
           var _idHex = _entry4.id.toUpperCase();
-          var _filter2 = {
-            name: (_entry4.messageName || _idHex).substring(0, 16),
-            state: 1,
-            type: filterTypeValue,
-            id_format: _isExtended ? 1 : 0,
-            method: 0,
-            f1: _idHex,
-            f2: _idHex,
-            prescaler_type: prescaler_type
-          };
+          var _isDbcOnlyJ = !csvData && _entry4.isJ1939 && _isExtended;
+          var _filter2 = void 0;
+          if (_isDbcOnlyJ) {
+            var _pgn2 = extractPgn$1(_entry4.idInt);
+            var _isPdu2 = (_pgn2 & 0xFF00) < 0xF000;
+            var _mask2 = _isPdu2 ? "3FF0000" : "3FFFF00";
+            var _filterId2 = _isPdu2 ? ((_pgn2 & 0x3FF00) << 8).toString(16).toUpperCase() : (_pgn2 << 8).toString(16).toUpperCase();
+            _filter2 = {
+              name: (_entry4.messageName || "PGN " + _pgn2.toString(16).toUpperCase()).substring(0, 16),
+              state: 1,
+              type: filterTypeValue,
+              id_format: 1,
+              method: 1,
+              f1: _filterId2,
+              f2: _mask2,
+              prescaler_type: prescaler_type
+            };
+          } else {
+            _filter2 = {
+              name: (_entry4.messageName || _idHex).substring(0, 16),
+              state: 1,
+              type: filterTypeValue,
+              id_format: _isExtended ? 1 : 0,
+              method: 0,
+              f1: _idHex,
+              f2: _idHex,
+              prescaler_type: prescaler_type
+            };
+          }
           if (prescaler_value !== undefined) {
             _filter2.prescaler_value = prescaler_value;
           }
@@ -24721,9 +24759,10 @@ var FilterBuilderTool = /*#__PURE__*/function (_React$Component) {
     }
     var defaultFilters;
     var isCanmodRouter = this.isCanmodRouter();
+    var isGnssDevice = formData && formData.gnss !== undefined;
     if (deviceType === "CANmod" && isCanmodRouter) {
       defaultFilters = canmodRouterDefaultFilters;
-    } else if (deviceType && deviceType.includes("GNSS")) {
+    } else if (isGnssDevice) {
       defaultFilters = canedgeDefaultFiltersGps;
     } else {
       defaultFilters = canedgeDefaultFilters;