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

package/output/pwm-v2.c.ftl

@@ -7,7 +7,7 @@
   *
   * @brief This file contains the API implementations for the ${moduleNameUpperCase} module.
   *
-  * @version ${moduleNameUpperCase} Driver Version 2.0.2
+  * @version ${moduleNameUpperCase} Driver Version 2.0.3
 */
 
  ${disclaimer}
@@ -28,7 +28,15 @@
     // Set the PWM to the options selected in the ${productName}.
     <#list initRegisters as reg>
     // ${reg.comment}
-    ${reg.name} = ${reg.valueAsHex};   
+    <#if reg.name == "CCPTMRS1">
+    ${CCPTMRS1.settings.CTSEL.bitName} = ${CCPTMRS1.settings.CTSEL.valueAsHex};
+    <#elseif reg.name == "CCPTMRS">
+    ${CCPTMRS.settings.CTSEL.bitName} = ${CCPTMRS.settings.CTSEL.valueAsHex};
+    <#elseif reg.name == "PWMTMRS0">  
+    ${PWMTMRS.settings.CTSEL.bitName} = ${PWMTMRS.settings.CTSEL.valueAsHex};
+    <#else>
+    ${reg.name} = ${reg.valueAsHex};
+    </#if> 
 
     </#list>
     <#if timerselpresence == "timerselpresent">
@@ -56,8 +64,8 @@
  void ${api.LoadDutyValue.name}(uint16_t dutyValue)
  {
      // Writing to 8 MSBs of PWM duty cycle in PWMDCH register
-     ${PWMDCH} = (uint8_t) ((dutyValue & 0x03FCu) >> 2);
+     ${PWMDCH.name} = (uint8_t) ((dutyValue & 0x03FCu) >> 2);
      
      // Writing to 2 LSBs of PWM duty cycle in PWMDCL register
-     ${PWMDCL} = (uint8_t) ((dutyValue & 0x0003u) << 6);
+     ${PWMDCL.name} = (uint8_t) ((dutyValue & 0x0003u) << 6);
  }

package/output/pwm-v2.h.ftl

@@ -7,7 +7,7 @@
  *
  * @brief This file contains the API prototypes for the ${moduleNameUpperCase} driver.
  *
- * @version ${moduleNameUpperCase} Driver Version 2.0.2
+ * @version ${moduleNameUpperCase} Driver Version 2.0.3
 */
 
 ${disclaimer}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mchp-mcc/scf-pic8-pwm-v2",
-    "version": "4.2.6",
+    "version": "4.2.7",
     "scf": {
         "reducer": "auto",
         "creator": "output/creator.js",
@@ -175,7 +175,7 @@
         "@microchip/initializer-system": "^0.5.3",
         "@microchip/melody-automodule-interface": "^1.5.1",
         "@microchip/pic-8bit-types": "^5.0.1",
-        "@microchip/run-directory": "^3.3.0",
+        "@microchip/run-directory": "^4.2.3",
         "@microchip/scf-automodule": "^5.5.1",
         "@microchip/scf-automodule-impl": "^1.7.1",
         "@microchip/scf-autoview": "^3.26.1",
@@ -230,4 +230,4 @@
     "description": "- Download & Install [nodejs](https://nodejs.org/en/download/)\r - Download & Install npm\r - Setup node & npm in enviroment path",
     "main": "lib/generated_module/src/index.js",
     "author": ""
-}
+}

package/src/DerivedData.test.ts

@@ -299,8 +299,8 @@ describe("DerivedData for APIs: Timer selection -- >", () => {
             expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM4timer2");
         });
     });
-    describe("Invalid Timer 7 -->", () => {
-        const mockModule = mockAssignedModule(getMockState(true, "TMR7", "TMR7"));
+    describe("Invalid Timer -->", () => {
+        const mockModule = mockAssignedModule(getMockState(true, "TMR", "TMR"));
         const model = getModel(mockModule, MyDerivedData.getDerivedData);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();

package/src/DerivedData.ts

@@ -74,6 +74,7 @@ class MyDerivedData implements DerivedData {
             pwmResolution: (): number => this.getPwmCalculator().getPwmResolution(),
 
             ctselCcptmrs1: this.ctselTimerSetting,
+            ctselCcptmrs: this.ctselTimerSetting,
             ctselPwmtmrs: this.ctselTimerSetting,
             pwmdchPwmdch: (): number =>
                 Number(this.dataModel.getComponentValue("pwmdcValue")) >> 2,
@@ -131,8 +132,9 @@ class MyDerivedData implements DerivedData {
         switch (componentName) {
             case "timerSelection": {
                 const result: any[] = [];
-                const CCPTMRSREG = this.dataModel.getPeripheralDescription()?.registers
-                    ?.CCPTMRS1;
+                const CCPTMRSREG =
+                    this.dataModel.getPeripheralDescription()?.registers?.CCPTMRS1 ??
+                    this.dataModel.getPeripheralDescription()?.registers?.CCPTMRS;
                 const PWMTMRSREG = this.dataModel.getPeripheralDescription()?.registers
                     ?.PWMTMRS;
                 if (CCPTMRSREG) {
@@ -300,15 +302,14 @@ class MyDerivedData implements DerivedData {
     };
 
     private ctselTimerSetting = (): string | undefined => {
-        switch (this.dataModel.getComponentValue("timerSelection")) {
-            case "TMR2":
-                return this.dataModel.getHardware()?.getName() + "timer2";
-            case "TMR4":
-                return this.dataModel.getHardware()?.getName() + "timer4";
-            case "TMR6":
-                return this.dataModel.getHardware()?.getName() + "timer6";
-            default:
-                return undefined;
+        const timerSelection: string =
+            this.dataModel.getComponentValue("timerSelection") ?? "";
+        const groupmatch = timerSelection.match(/^TMR([0-9])$/) ?? "";
+        if (groupmatch.length > 1) {
+            const timersuffix = groupmatch?.length > 1 ? groupmatch[1] : "";
+            return this.dataModel.getHardware()?.getName() + "timer" + timersuffix;
+        } else {
+            return undefined;
         }
     };
 

package/src/GeneratorModel.tsx

@@ -41,8 +41,8 @@ export const getGeneratorModel = (model: AppModel): any => {
 
         //Registers and Settings
         initRegisters: initRegisters,
-        PWMDCH: templateSettings?.registers?.PWMDCH.name ?? "",
-        PWMDCL: templateSettings?.registers?.PWMDCL?.name ?? "",
+        // PWMDCH: templateSettings?.registers?.PWMDCH.name ?? "",
+        // PWMDCL: templateSettings?.registers?.PWMDCL?.name ?? "",
         CCPTMRSregname: templateSettings?.registers?.CCPTMRS1?.name ?? "",
         CTSELsettingname:
             templateSettings?.registers?.CCPTMRS1?.settings?.CTSEL.name ?? "",
@@ -51,6 +51,7 @@ export const getGeneratorModel = (model: AppModel): any => {
             (ctsel?.options?.length ?? 0) > 0 ? "timerselpresent" : "timerselabsent",
 
         pwmdcValue: model.getComponentValue("pwmdcValue"),
+        ...registerValues,
     };
 };
 

package/src/catalog.json

@@ -14,7 +14,7 @@
                     "name": "PWM",
                     "category": "Drivers/PWM",
                     "description": "This module is a 16-bit Pulse-Width Modulator (PWM) with a compare feature and multiple outputs.",
-                    "deviceFilterRegEx": "^PIC18F.*Q10$|^PIC16[L]{0,1}F188.*$|^PIC16F152.*$|^PIC16F180[57][45]$",
+                    "deviceFilterRegEx": "^PIC18F.*Q10$|^PIC16[L]{0,1}F188.*$|^PIC16F152.*$|^PIC16F180[57][45]$|^PIC18F.*K40$",
                     "releaseNotesLink": "https://onlinedocs.microchip.com/v2/keyword-lookup?keyword=MCC.MELODY.8BITPIC.RELEASENOTES&version=latest&redirect=true"
                 }
         }