@mchp-mcc/scf-pic8-clc-v1 4.1.0 → 4.1.1

package/Changelog.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.1.1] - 2023-10-10
+
+### New Features
+- **CC8SCRIP-17527** :- Added APFCON Support on Content
+
+
 ## [4.1.0] - 2023-09-03
 
 ### New Features
@@ -19,12 +25,3 @@ All notable changes to this project will be documented in this file.
 
 ### New Features
 - **CC8SCRIP-17337** :- Added support for PIC12/16(L)F150x device family 
-
-
-## [4.0.14] - 2022-12-15
-
-### Bug Fixes
-- **CC8SCRIP-11417** :- CLC module does not show on the Pin Grid View
-
-### Improvements
-- **CC8SCRIP-11127** :- Added a validator for the Custom Name in Easy View

package/Readme.md

@@ -7,6 +7,12 @@ The Configurable Logic Cell (CLC) module provides programmable logic that operat
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.1.1] - 2023-10-10
+
+### New Features
+- **CC8SCRIP-17527** :- Added APFCON Support on Content
+
+
 ## [4.1.0] - 2023-09-03
 
 ### New Features
@@ -25,12 +31,3 @@ All notable changes to this project will be documented in this file.
 
 ### New Features
 - **CC8SCRIP-17337** :- Added support for PIC12/16(L)F150x device family 
-
-
-## [4.0.14] - 2022-12-15
-
-### Bug Fixes
-- **CC8SCRIP-11417** :- CLC module does not show on the Pin Grid View
-
-### Improvements
-- **CC8SCRIP-11127** :- Added a validator for the Custom Name in Easy View

package/output/autoCreator.js

@@ -315,6 +315,7 @@ var QueryAdapterKey;
     QueryAdapterKey["ALLPINS"] = "allpins";
     QueryAdapterKey["ALLPINS_FOR_ATTRIBS"] = "allpins_for_attribs";
     QueryAdapterKey["PPS"] = "pps";
+    QueryAdapterKey["APFCON"] = "apfcon";
     QueryAdapterKey["PORTMUX"] = "portmux";
     QueryAdapterKey["HASPPS"] = "hasPPS";
 })(QueryAdapterKey = exports.QueryAdapterKey || (exports.QueryAdapterKey = {}));
@@ -4407,7 +4408,7 @@ var MyDerivedData = function MyDerivedData(dataModel) {
 
   _defineProperty(this, "getPinstandardArgs", function () {
     var args = {
-      queryAdapterMap: _defineProperty({}, _microchip_pin_standard_lib_pin_standard__WEBPACK_IMPORTED_MODULE_13__["QueryAdapterKey"].ALLPINS, "^CLC.*$")
+      queryAdapters: [_microchip_pin_standard_lib_pin_standard__WEBPACK_IMPORTED_MODULE_13__["QueryAdapterKey"].PPS, _microchip_pin_standard_lib_pin_standard__WEBPACK_IMPORTED_MODULE_13__["QueryAdapterKey"].APFCON]
     };
     return args;
   });
@@ -4922,39 +4923,40 @@ var getCompletePinData = function getCompletePinData(appModel) {
 }; // overrides pin data for a particular row based on model.
 
 function getRowData(appModel, rowData) {
-  var _appModel$getHardware, _appModel$getHardware2, _appModel$getImportVa, _appModel$getComponen, _appModel$getComponen2, _appModel$getComponen3;
+  var _appModel$getImportVa, _appModel$getImportVa2, _appModel$getImportVa3, _appModel$getImportVa4, _appModel$getImportVa5, _appModel$getImportVa6, _appModel$getHardware, _appModel$getHardware2, _appModel$getComponen, _appModel$getComponen2, _appModel$getComponen3;
 
   var retRowJSONdata = rowData;
+  var getPPSPins = (_appModel$getImportVa = appModel.getImportValue("pin_standard")) === null || _appModel$getImportVa === void 0 ? void 0 : (_appModel$getImportVa2 = _appModel$getImportVa["pps"]) === null || _appModel$getImportVa2 === void 0 ? void 0 : (_appModel$getImportVa3 = _appModel$getImportVa2["data"]) === null || _appModel$getImportVa3 === void 0 ? void 0 : _appModel$getImportVa3[appModel.getName()];
+  var getAPFCONPins = (_appModel$getImportVa4 = appModel.getImportValue("pin_standard")) === null || _appModel$getImportVa4 === void 0 ? void 0 : (_appModel$getImportVa5 = _appModel$getImportVa4["apfcon"]) === null || _appModel$getImportVa5 === void 0 ? void 0 : (_appModel$getImportVa6 = _appModel$getImportVa5["data"]) === null || _appModel$getImportVa6 === void 0 ? void 0 : _appModel$getImportVa6[appModel.getName()];
   var moduleName = (_appModel$getHardware = (_appModel$getHardware2 = appModel.getHardware()) === null || _appModel$getHardware2 === void 0 ? void 0 : _appModel$getHardware2.getName()) !== null && _appModel$getHardware !== void 0 ? _appModel$getHardware : "CLC";
-  var allPinsData = (_appModel$getImportVa = appModel.getImportValue("pin_standard")) === null || _appModel$getImportVa === void 0 ? void 0 : _appModel$getImportVa.allpins;
-  var modulePins = getModulePins(allPinsData, moduleName);
-  var pinName = getPinName(modulePins, retRowJSONdata.filter.aliasReEx);
-  var pinBehaviour = getpinBehaviour(allPinsData, moduleName, pinName);
-  var isPPS = pinBehaviour === "pps";
-  var isAPFCON = pinBehaviour === "apfcon";
   var inputSelections = [appModel.getComponentValue("lcd1sClcsel0"), (_appModel$getComponen = appModel.getComponentValue("lcd2sClcsel1")) !== null && _appModel$getComponen !== void 0 ? _appModel$getComponen : appModel.getComponentValue("lcd2sClcsel0"), (_appModel$getComponen2 = appModel.getComponentValue("lcd3sClcsel2")) !== null && _appModel$getComponen2 !== void 0 ? _appModel$getComponen2 : appModel.getComponentValue("lcd3sClcsel1"), (_appModel$getComponen3 = appModel.getComponentValue("lcd4sClcsel3")) !== null && _appModel$getComponen3 !== void 0 ? _appModel$getComponen3 : appModel.getComponentValue("lcd4sClcsel1")];
-  retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
-    module: moduleName,
-    filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
-      module: moduleName
-    }),
-    behaviour: isPPS ? _microchip_pin_standard__WEBPACK_IMPORTED_MODULE_0__["behaviour"].PPS : isAPFCON ? _microchip_pin_standard__WEBPACK_IMPORTED_MODULE_0__["behaviour"].APFCON : _microchip_pin_standard__WEBPACK_IMPORTED_MODULE_0__["behaviour"].LOCK_UNLOCK
-  });
 
-  if (rowData.name === "clcout" && !isPPS && !isAPFCON) {
+  if (rowData.name === "clcout" && getpinBehaviour(getAPFCONPins, getPPSPins, retRowJSONdata.filter.aliasReEx)) {
     retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
-      "function": moduleName,
       module: moduleName,
-      filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+      "function": moduleName,
+      behaviour: getpinBehaviour(getAPFCONPins, getPPSPins, retRowJSONdata.filter.aliasReEx),
+      filter: {
         module: moduleName,
         aliasReEx: "^".concat(moduleName, "$")
-      })
+      }
     });
   } else if (rowData.name === "clcin0") {
     if (inputSelections.indexOf("CLCIN0 (CLCIN0PPS)") !== -1) {
-      retRowJSONdata = _objectSpread({}, retRowJSONdata);
+      retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
+        module: moduleName,
+        behaviour: getpinBehaviour(getAPFCONPins, getPPSPins, retRowJSONdata.filter.aliasReEx),
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        })
+      });
     } else if (inputSelections.indexOf("CLCIN0") !== -1) {
       retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
+        module: moduleName,
+        behaviour: getpinBehaviour(getAPFCONPins, getPPSPins, retRowJSONdata.filter.aliasReEx),
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        }),
         behaviourMeta: {
           lockPinRegEx: "^CLC[1-9]IN0$"
         }
@@ -4964,9 +4966,20 @@ function getRowData(appModel, rowData) {
     }
   } else if (rowData.name === "clcin1") {
     if (inputSelections.indexOf("CLCIN1 (CLCIN1PPS)") !== -1) {
-      retRowJSONdata = _objectSpread({}, retRowJSONdata);
+      retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
+        module: moduleName,
+        behaviour: getpinBehaviour(getAPFCONPins, getPPSPins, retRowJSONdata.filter.aliasReEx),
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        })
+      });
     } else if (inputSelections.indexOf("CLCIN1") !== -1) {
       retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
+        module: moduleName,
+        behaviour: getpinBehaviour(getAPFCONPins, getPPSPins, retRowJSONdata.filter.aliasReEx),
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        }),
         behaviourMeta: {
           lockPinRegEx: "^CLC[1-9]IN1$"
         }
@@ -4978,10 +4991,9 @@ function getRowData(appModel, rowData) {
     if (inputSelections.indexOf("CLCIN2 (CLCIN2PPS)") !== -1) {
       retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
         module: moduleName,
-        attribs: [{
-          aliasReEx: ".*",
-          analog: false
-        }]
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        })
       });
     } else {
       return undefined; // hide row
@@ -4989,10 +5001,10 @@ function getRowData(appModel, rowData) {
   } else if (rowData.name === "clcin3") {
     if (inputSelections.indexOf("CLCIN3 (CLCIN3PPS)") !== -1) {
       retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
-        attribs: [{
-          aliasReEx: ".*",
-          analog: false
-        }]
+        module: moduleName,
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        })
       });
     } else {
       return undefined; // hide row
@@ -5000,10 +5012,10 @@ function getRowData(appModel, rowData) {
   } else if (rowData.name === "clcin4") {
     if (inputSelections.indexOf("CLCIN4 (CLCIN4PPS)") !== -1) {
       retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
-        attribs: [{
-          aliasReEx: ".*",
-          analog: false
-        }]
+        module: moduleName,
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        })
       });
     } else {
       return undefined; // hide row
@@ -5011,10 +5023,10 @@ function getRowData(appModel, rowData) {
   } else if (rowData.name === "clcin5") {
     if (inputSelections.indexOf("CLCIN5 (CLCIN5PPS)") !== -1) {
       retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
-        attribs: [{
-          aliasReEx: ".*",
-          analog: false
-        }]
+        module: moduleName,
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        })
       });
     } else {
       return undefined; // hide row
@@ -5022,10 +5034,10 @@ function getRowData(appModel, rowData) {
   } else if (rowData.name === "clcin6") {
     if (inputSelections.indexOf("CLCIN6 (CLCIN6PPS)") !== -1) {
       retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
-        attribs: [{
-          aliasReEx: ".*",
-          analog: false
-        }]
+        module: moduleName,
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        })
       });
     } else {
       return undefined; // hide row
@@ -5033,17 +5045,17 @@ function getRowData(appModel, rowData) {
   } else if (rowData.name === "clcin7") {
     if (inputSelections.indexOf("CLCIN7 (CLCIN7PPS)") !== -1) {
       retRowJSONdata = _objectSpread(_objectSpread({}, retRowJSONdata), {}, {
-        attribs: [{
-          aliasReEx: ".*",
-          analog: false
-        }]
+        module: moduleName,
+        filter: _objectSpread(_objectSpread({}, retRowJSONdata.filter), {}, {
+          module: moduleName
+        })
       });
     } else {
       return undefined; // hide row
     }
   }
 
-  if (!isPPS && !isAPFCON) {
+  if (getpinBehaviour(getAPFCONPins, getPPSPins, retRowJSONdata.filter.aliasReEx) === "LOCK_UNLOCK") {
     var _appModel$getAutoModu, _appModel$getAutoModu2, _appModel$getAutoModu3, _appModel$getAutoModu4;
 
     var rowActions = []; // attach actions if pin to register update is required
@@ -5088,48 +5100,34 @@ function getRowData(appModel, rowData) {
   }
 }
 
-var getModulePins = function getModulePins(allPins, moduleName) {
-  var pins = [];
-
-  for (var portPin in allPins) {
-    var _allPins$portPin;
+var getpinBehaviour = function getpinBehaviour(apfconPins, ppsPins, regEx) {
+  var pinBehaviour = _microchip_pin_standard__WEBPACK_IMPORTED_MODULE_0__["behaviour"].LOCK_UNLOCK;
 
-    var modulePins = (_allPins$portPin = allPins[portPin]) === null || _allPins$portPin === void 0 ? void 0 : _allPins$portPin[moduleName];
-
-    for (var modulePin in modulePins) {
-      if (pins.indexOf(modulePin) === -1) {
-        pins.push(modulePin);
+  if (apfconPins) {
+    for (var key in apfconPins) {
+      if (key.match(regEx)) {
+        pinBehaviour = _microchip_pin_standard__WEBPACK_IMPORTED_MODULE_0__["behaviour"].APFCON;
       }
     }
   }
 
-  return pins;
-};
-
-var getPinName = function getPinName(modulePins, regEx) {
-  var pinName = "";
-  modulePins.forEach(function (pin) {
-    if (pin.match(new RegExp(regEx, "g"))) {
-      pinName = pin;
-    }
-  });
-  return pinName;
-};
-
-var getpinBehaviour = function getpinBehaviour(allPins, moduleName, pinName) {
-  for (var portPin in allPins) {
-    var _allPins$portPin2, _allPins$portPin2$mod;
-
-    var pinData = (_allPins$portPin2 = allPins[portPin]) === null || _allPins$portPin2 === void 0 ? void 0 : (_allPins$portPin2$mod = _allPins$portPin2[moduleName]) === null || _allPins$portPin2$mod === void 0 ? void 0 : _allPins$portPin2$mod[pinName];
-
-    if (pinData === null || pinData === void 0 ? void 0 : pinData["pps"]) {
-      return "pps";
-    } else if (pinData === null || pinData === void 0 ? void 0 : pinData["apfcon"]) {
-      return "apfcon";
+  if (ppsPins) {
+    for (var _key in ppsPins) {
+      if (_key === "pps_out") {
+        for (var key1 in ppsPins[_key]) {
+          if (key1.match(regEx)) {
+            pinBehaviour = _microchip_pin_standard__WEBPACK_IMPORTED_MODULE_0__["behaviour"].PPS;
+          }
+        }
+      } else {
+        if (_key.match(regEx)) {
+          pinBehaviour = _microchip_pin_standard__WEBPACK_IMPORTED_MODULE_0__["behaviour"].PPS;
+        }
+      }
     }
   }
 
-  return "lock_unlock";
+  return pinBehaviour;
 };
 
 /***/ }),
@@ -5437,7 +5435,7 @@ module.exports = JSON.parse("{\"rows\":[{\"name\":\"clcout\",\"module\":\"CLC1\"
 
 __webpack_require__(/*! core-js/es/set/index */"./node_modules/core-js/es/set/index.js");
 __webpack_require__(/*! core-js/es/map/index */"./node_modules/core-js/es/map/index.js");
-module.exports = __webpack_require__(/*! /home/jenkins/agent/workspace/ed_Content_scf-pic8-clc-v1_4.1.0/generated_module/src/autoCreator.ts */"./generated_module/src/autoCreator.ts");
+module.exports = __webpack_require__(/*! /home/jenkins/agent/workspace/ed_Content_scf-pic8-clc-v1_4.1.1/generated_module/src/autoCreator.ts */"./generated_module/src/autoCreator.ts");
 
 
 /***/ })