@mchp-mcc/scf-pic8-pwm-v2 4.2.6 → 4.2.7

package/Changelog.md

@@ -1,6 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.2.7] - 2023-03-09
+
+### Bug Fixes
+- **CC8SCRIP-13488** :- Added support for Timer8 dependency in UI and generated driver for PIC18FxxK40 device family
+- **CC8SCRIP-13401** :- Added support for timer dependency selector in the UI
+- **CC8SCRIP-12947** :- PWM output not seen when multiple instances are used.
+
+
 ## [4.2.6] - 2022-12-20
 
 ### Improvements
@@ -14,9 +22,3 @@ All notable changes to this project will be documented in this file.
 - **CC8SCRIP-7971** :- Added options for timer selection component in UI
 - **CC8SCRIP-7856** :- Added "Timer Dependency Selector" Component in the UI
 - **CC8SCRIP-7817** :- Added support to make PWMxOUT pin visible in pin grid view
-
-
-## [4.2.4] - 2022-03-23
-
-### New Features
-- **CC8SCRIP-7662** :- Added Analytics support

package/Readme.md

@@ -18,6 +18,14 @@ This driver generates the following files:
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.2.7] - 2023-03-09
+
+### Bug Fixes
+- **CC8SCRIP-13488** :- Added support for Timer8 dependency in UI and generated driver for PIC18FxxK40 device family
+- **CC8SCRIP-13401** :- Added support for timer dependency selector in the UI
+- **CC8SCRIP-12947** :- PWM output not seen when multiple instances are used.
+
+
 ## [4.2.6] - 2022-12-20
 
 ### Improvements
@@ -31,9 +39,3 @@ All notable changes to this project will be documented in this file.
 - **CC8SCRIP-7971** :- Added options for timer selection component in UI
 - **CC8SCRIP-7856** :- Added "Timer Dependency Selector" Component in the UI
 - **CC8SCRIP-7817** :- Added support to make PWMxOUT pin visible in pin grid view
-
-
-## [4.2.4] - 2022-03-23
-
-### New Features
-- **CC8SCRIP-7662** :- Added Analytics support

package/output/autoCreator.js

@@ -2820,6 +2820,7 @@ var MyDerivedData = function MyDerivedData(dataModel) {
         return _this.getPwmCalculator().getPwmResolution();
       },
       ctselCcptmrs1: _this.ctselTimerSetting,
+      ctselCcptmrs: _this.ctselTimerSetting,
       ctselPwmtmrs: _this.ctselTimerSetting,
       pwmdchPwmdch: function pwmdchPwmdch() {
         return Number(_this.dataModel.getComponentValue("pwmdcValue")) >> 2;
@@ -2882,11 +2883,11 @@ var MyDerivedData = function MyDerivedData(dataModel) {
     switch (componentName) {
       case "timerSelection":
         {
-          var _this$dataModel$getPe, _this$dataModel$getPe2, _this$dataModel$getPe3, _this$dataModel$getPe4;
+          var _this$dataModel$getPe, _this$dataModel$getPe2, _this$dataModel$getPe3, _this$dataModel$getPe4, _this$dataModel$getPe5, _this$dataModel$getPe6, _this$dataModel$getPe7;
 
           var result = [];
-          var CCPTMRSREG = (_this$dataModel$getPe = _this.dataModel.getPeripheralDescription()) === null || _this$dataModel$getPe === void 0 ? void 0 : (_this$dataModel$getPe2 = _this$dataModel$getPe.registers) === null || _this$dataModel$getPe2 === void 0 ? void 0 : _this$dataModel$getPe2.CCPTMRS1;
-          var PWMTMRSREG = (_this$dataModel$getPe3 = _this.dataModel.getPeripheralDescription()) === null || _this$dataModel$getPe3 === void 0 ? void 0 : (_this$dataModel$getPe4 = _this$dataModel$getPe3.registers) === null || _this$dataModel$getPe4 === void 0 ? void 0 : _this$dataModel$getPe4.PWMTMRS;
+          var CCPTMRSREG = (_this$dataModel$getPe = (_this$dataModel$getPe2 = _this.dataModel.getPeripheralDescription()) === null || _this$dataModel$getPe2 === void 0 ? void 0 : (_this$dataModel$getPe3 = _this$dataModel$getPe2.registers) === null || _this$dataModel$getPe3 === void 0 ? void 0 : _this$dataModel$getPe3.CCPTMRS1) !== null && _this$dataModel$getPe !== void 0 ? _this$dataModel$getPe : (_this$dataModel$getPe4 = _this.dataModel.getPeripheralDescription()) === null || _this$dataModel$getPe4 === void 0 ? void 0 : (_this$dataModel$getPe5 = _this$dataModel$getPe4.registers) === null || _this$dataModel$getPe5 === void 0 ? void 0 : _this$dataModel$getPe5.CCPTMRS;
+          var PWMTMRSREG = (_this$dataModel$getPe6 = _this.dataModel.getPeripheralDescription()) === null || _this$dataModel$getPe6 === void 0 ? void 0 : (_this$dataModel$getPe7 = _this$dataModel$getPe6.registers) === null || _this$dataModel$getPe7 === void 0 ? void 0 : _this$dataModel$getPe7.PWMTMRS;
 
           if (CCPTMRSREG) {
             var _CCPTMRSREG$settings, _CTSELSETT$options;
@@ -3080,20 +3081,18 @@ var MyDerivedData = function MyDerivedData(dataModel) {
   });
 
   _defineProperty(this, "ctselTimerSetting", function () {
-    var _this$dataModel$getHa3, _this$dataModel$getHa4, _this$dataModel$getHa5;
+    var _this$dataModel$getCo4, _timerSelection$match2;
 
-    switch (_this.dataModel.getComponentValue("timerSelection")) {
-      case "TMR2":
-        return ((_this$dataModel$getHa3 = _this.dataModel.getHardware()) === null || _this$dataModel$getHa3 === void 0 ? void 0 : _this$dataModel$getHa3.getName()) + "timer2";
+    var timerSelection = (_this$dataModel$getCo4 = _this.dataModel.getComponentValue("timerSelection")) !== null && _this$dataModel$getCo4 !== void 0 ? _this$dataModel$getCo4 : "";
+    var groupmatch = (_timerSelection$match2 = timerSelection.match(/^TMR([0-9])$/)) !== null && _timerSelection$match2 !== void 0 ? _timerSelection$match2 : "";
 
-      case "TMR4":
-        return ((_this$dataModel$getHa4 = _this.dataModel.getHardware()) === null || _this$dataModel$getHa4 === void 0 ? void 0 : _this$dataModel$getHa4.getName()) + "timer4";
+    if (groupmatch.length > 1) {
+      var _this$dataModel$getHa3;
 
-      case "TMR6":
-        return ((_this$dataModel$getHa5 = _this.dataModel.getHardware()) === null || _this$dataModel$getHa5 === void 0 ? void 0 : _this$dataModel$getHa5.getName()) + "timer6";
-
-      default:
-        return undefined;
+      var timersuffix = (groupmatch === null || groupmatch === void 0 ? void 0 : groupmatch.length) > 1 ? groupmatch[1] : "";
+      return ((_this$dataModel$getHa3 = _this.dataModel.getHardware()) === null || _this$dataModel$getHa3 === void 0 ? void 0 : _this$dataModel$getHa3.getName()) + "timer" + timersuffix;
+    } else {
+      return undefined;
     }
   });
 
@@ -3138,12 +3137,18 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _generated_module_src_autoModule_AutoModuleHelpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../generated_module/src/autoModule/AutoModuleHelpers */ "./generated_module/src/autoModule/AutoModuleHelpers.ts");
 /* harmony import */ var _generated_module_src_autoModule_AutoModuleTemplates__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../generated_module/src/autoModule/AutoModuleTemplates */ "./generated_module/src/autoModule/AutoModuleTemplates.ts");
 /* harmony import */ var _generated_module_src_Utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../generated_module/src/Utils */ "./generated_module/src/Utils.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 
 
 
 
 var getGeneratorModel = function getGeneratorModel(model) {
-  var _model$getComponentVa, _model$getPeripheralD, _model$getPeripheralD2, _model$getPeripheralD3, _model$getPeripheralD4, _model$getName, _model$getName2, _pwmInterface$headerF, _model$getImportValue, _templateSettings$reg, _templateSettings$reg2, _templateSettings$reg3, _templateSettings$reg4, _templateSettings$reg5, _templateSettings$reg6, _templateSettings$reg7, _templateSettings$reg8, _templateSettings$reg9, _templateSettings$reg10, _templateSettings$reg11, _templateSettings$reg12, _ctsel$options$length, _ctsel$options;
+  var _model$getComponentVa, _model$getPeripheralD, _model$getPeripheralD2, _model$getPeripheralD3, _model$getPeripheralD4, _model$getName, _model$getName2, _pwmInterface$headerF, _model$getImportValue, _templateSettings$reg, _templateSettings$reg2, _templateSettings$reg3, _templateSettings$reg4, _templateSettings$reg5, _templateSettings$reg6, _templateSettings$reg7, _ctsel$options$length, _ctsel$options;
 
   if (!model.getHardware()) return {};
   var pwmInterface = _interfaces_pwm_general_parameters__WEBPACK_IMPORTED_MODULE_0__["Interface"].createFirmwareApi((_model$getComponentVa = model.getComponentValue("componentName")) !== null && _model$getComponentVa !== void 0 ? _model$getComponentVa : "", getHeaderFiles(model));
@@ -3152,7 +3157,7 @@ var getGeneratorModel = function getGeneratorModel(model) {
   var initRegisters = Object(_generated_module_src_Utils__WEBPACK_IMPORTED_MODULE_3__["values"])(registerValues !== null && registerValues !== void 0 ? registerValues : {});
   var ctsel = (_model$getPeripheralD = model.getPeripheralDescription()) === null || _model$getPeripheralD === void 0 ? void 0 : (_model$getPeripheralD2 = _model$getPeripheralD.registers) === null || _model$getPeripheralD2 === void 0 ? void 0 : (_model$getPeripheralD3 = _model$getPeripheralD2.CCPTMRS1) === null || _model$getPeripheralD3 === void 0 ? void 0 : (_model$getPeripheralD4 = _model$getPeripheralD3.settings) === null || _model$getPeripheralD4 === void 0 ? void 0 : _model$getPeripheralD4.CTSEL;
   var CTSELvalue = ctsel ? Object(_generated_module_src_autoModule_AutoModuleHelpers__WEBPACK_IMPORTED_MODULE_1__["getOptionValueByName"])(ctsel, model.getDerivedFunction("ctselCcptmrs1")) : 1;
-  return {
+  return _objectSpread({
     moduleNameLowerCase: (_model$getName = model.getName()) === null || _model$getName === void 0 ? void 0 : _model$getName.toLowerCase(),
     moduleNameUpperCase: (_model$getName2 = model.getName()) === null || _model$getName2 === void 0 ? void 0 : _model$getName2.toUpperCase(),
     header: (_pwmInterface$headerF = pwmInterface.headerFiles) === null || _pwmInterface$headerF === void 0 ? void 0 : _pwmInterface$headerF[0],
@@ -3168,14 +3173,14 @@ var getGeneratorModel = function getGeneratorModel(model) {
     //TODO
     //Registers and Settings
     initRegisters: initRegisters,
-    PWMDCH: (_templateSettings$reg = templateSettings === null || templateSettings === void 0 ? void 0 : (_templateSettings$reg2 = templateSettings.registers) === null || _templateSettings$reg2 === void 0 ? void 0 : _templateSettings$reg2.PWMDCH.name) !== null && _templateSettings$reg !== void 0 ? _templateSettings$reg : "",
-    PWMDCL: (_templateSettings$reg3 = templateSettings === null || templateSettings === void 0 ? void 0 : (_templateSettings$reg4 = templateSettings.registers) === null || _templateSettings$reg4 === void 0 ? void 0 : (_templateSettings$reg5 = _templateSettings$reg4.PWMDCL) === null || _templateSettings$reg5 === void 0 ? void 0 : _templateSettings$reg5.name) !== null && _templateSettings$reg3 !== void 0 ? _templateSettings$reg3 : "",
-    CCPTMRSregname: (_templateSettings$reg6 = templateSettings === null || templateSettings === void 0 ? void 0 : (_templateSettings$reg7 = templateSettings.registers) === null || _templateSettings$reg7 === void 0 ? void 0 : (_templateSettings$reg8 = _templateSettings$reg7.CCPTMRS1) === null || _templateSettings$reg8 === void 0 ? void 0 : _templateSettings$reg8.name) !== null && _templateSettings$reg6 !== void 0 ? _templateSettings$reg6 : "",
-    CTSELsettingname: (_templateSettings$reg9 = templateSettings === null || templateSettings === void 0 ? void 0 : (_templateSettings$reg10 = templateSettings.registers) === null || _templateSettings$reg10 === void 0 ? void 0 : (_templateSettings$reg11 = _templateSettings$reg10.CCPTMRS1) === null || _templateSettings$reg11 === void 0 ? void 0 : (_templateSettings$reg12 = _templateSettings$reg11.settings) === null || _templateSettings$reg12 === void 0 ? void 0 : _templateSettings$reg12.CTSEL.name) !== null && _templateSettings$reg9 !== void 0 ? _templateSettings$reg9 : "",
+    // PWMDCH: templateSettings?.registers?.PWMDCH.name ?? "",
+    // PWMDCL: templateSettings?.registers?.PWMDCL?.name ?? "",
+    CCPTMRSregname: (_templateSettings$reg = templateSettings === null || templateSettings === void 0 ? void 0 : (_templateSettings$reg2 = templateSettings.registers) === null || _templateSettings$reg2 === void 0 ? void 0 : (_templateSettings$reg3 = _templateSettings$reg2.CCPTMRS1) === null || _templateSettings$reg3 === void 0 ? void 0 : _templateSettings$reg3.name) !== null && _templateSettings$reg !== void 0 ? _templateSettings$reg : "",
+    CTSELsettingname: (_templateSettings$reg4 = templateSettings === null || templateSettings === void 0 ? void 0 : (_templateSettings$reg5 = templateSettings.registers) === null || _templateSettings$reg5 === void 0 ? void 0 : (_templateSettings$reg6 = _templateSettings$reg5.CCPTMRS1) === null || _templateSettings$reg6 === void 0 ? void 0 : (_templateSettings$reg7 = _templateSettings$reg6.settings) === null || _templateSettings$reg7 === void 0 ? void 0 : _templateSettings$reg7.CTSEL.name) !== null && _templateSettings$reg4 !== void 0 ? _templateSettings$reg4 : "",
     CTSELvalue: CTSELvalue,
     timerselpresence: ((_ctsel$options$length = ctsel === null || ctsel === void 0 ? void 0 : (_ctsel$options = ctsel.options) === null || _ctsel$options === void 0 ? void 0 : _ctsel$options.length) !== null && _ctsel$options$length !== void 0 ? _ctsel$options$length : 0) > 0 ? "timerselpresent" : "timerselabsent",
     pwmdcValue: model.getComponentValue("pwmdcValue")
-  };
+  }, registerValues);
 };
 var getHeaderFiles = function getHeaderFiles(model) {
   return [{