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

package/src/PinsLogic.ts

@@ -1,5 +1,5 @@
 import { AppModel } from "../generated_module/src/types/AutoModuleTypes";
-import { pin_row } from "@microchip/pin-standard";
+import { pin_row, behaviour } from "@microchip/pin-standard";
 
 // provide complete dynamic data for all pin rows. It overrides static pindata.json
 export const getCompletePinData = (appModel: AppModel): any => {
@@ -8,19 +8,206 @@ export const getCompletePinData = (appModel: AppModel): any => {
 };
 
 // overrides pin data for a particular row based on model.
-export function getRowData(appModel: AppModel, rowData: pin_row): pin_row {
+export function getRowData(appModel: AppModel, rowData: pin_row): pin_row | undefined {
     const pwminstancename = appModel.getHardware()?.getPeripheral()?.instance;
+    const moduleName = appModel.getName() ?? "PWM";
+    const allPinsData: any = appModel.getImportValue("pin_standard")?.allpins;
+    const modulePins: string[] = getModulePins(allPinsData, moduleName);
+    const pinName: string = getPinName(modulePins, rowData.filter.aliasReEx);
+    const pinBehaviour: string = getpinBehaviour(allPinsData, moduleName, pinName);
+    const isPPS = pinBehaviour === "pps";
+    const isAPFCON = pinBehaviour === "apfcon";
 
+    if (pinName === "") {
+        return undefined;
+    }
     if (rowData.name === "out") {
         rowData = {
             ...rowData,
-            module: "PWM" + pwminstancename,
-            function: "PWM" + pwminstancename + "OUT",
+            module: moduleName,
+            function: moduleName + "OUT",
+            filter: {
+                module: moduleName,
+                aliasReEx: `^PWM${pwminstancename}$`,
+            },
+            behaviour: isPPS
+                ? behaviour.PPS
+                : isAPFCON
+                ? behaviour.APFCON
+                : behaviour.LOCK_UNLOCK,
+        };
+    } else if (rowData.name === "pwmx0") {
+        rowData = {
+            ...rowData,
+            module: moduleName,
+            function: moduleName + "0OUT",
+            filter: {
+                ...rowData.filter,
+                module: moduleName,
+            },
+            behaviour: isPPS
+                ? behaviour.PPS
+                : isAPFCON
+                ? behaviour.APFCON
+                : behaviour.LOCK_UNLOCK,
+        };
+        if (appModel.isComponentValue("pwmoe0Pwmaoe") === true) {
+            rowData = {
+                ...rowData,
+                behaviourMeta: { lockPinRegEx: moduleName + "0" },
+            };
+        }
+    } else if (rowData.name === "pwmx1") {
+        rowData = {
+            ...rowData,
+            module: moduleName,
+            function: moduleName + "1OUT",
+            filter: {
+                ...rowData.filter,
+                module: moduleName,
+            },
+            behaviour: isPPS
+                ? behaviour.PPS
+                : isAPFCON
+                ? behaviour.APFCON
+                : behaviour.LOCK_UNLOCK,
+        };
+        if (appModel.isComponentValue("pwmoe1Pwmaoe") === true) {
+            rowData = {
+                ...rowData,
+                behaviourMeta: { lockPinRegEx: moduleName + "1" },
+            };
+        }
+    } else if (rowData.name === "pwmx2") {
+        rowData = {
+            ...rowData,
+            module: moduleName,
+            function: moduleName + "2OUT",
             filter: {
-                module: "PWM" + pwminstancename,
-                aliasReEx: "PWM" + pwminstancename,
+                ...rowData.filter,
+                module: moduleName,
             },
+            behaviour: isPPS
+                ? behaviour.PPS
+                : isAPFCON
+                ? behaviour.APFCON
+                : behaviour.LOCK_UNLOCK,
         };
+        if (appModel.isComponentValue("pwmoe2Pwmaoe") === true) {
+            rowData = {
+                ...rowData,
+                behaviourMeta: { lockPinRegEx: moduleName + "2" },
+            };
+        }
+    } else if (rowData.name === "pwmx3") {
+        rowData = {
+            ...rowData,
+            module: moduleName,
+            function: moduleName + "3OUT",
+            filter: {
+                ...rowData.filter,
+                module: moduleName,
+            },
+            behaviour: isPPS
+                ? behaviour.PPS
+                : isAPFCON
+                ? behaviour.APFCON
+                : behaviour.LOCK_UNLOCK,
+        };
+        if (appModel.isComponentValue("pwmoe3Pwmaoe") === true) {
+            rowData = {
+                ...rowData,
+                behaviourMeta: { lockPinRegEx: moduleName + "3" },
+            };
+        }
+    }
+
+    let rowActions = [];
+    const pwmx0Regcomponent = appModel.getComponent("pwmoe0Pwmaoe")?.component;
+    const pwmx1Regcomponent = appModel.getComponent("pwmoe1Pwmaoe")?.component;
+    const pwmx2Regcomponent = appModel.getComponent("pwmoe2Pwmaoe")?.component;
+    const pwmx3Regcomponent = appModel.getComponent("pwmoe3Pwmaoe")?.component;
+
+    if (pwmx0Regcomponent) {
+        rowActions = rowActions.concat(
+            appModel
+                .getPCPHelper?.()
+                .stateActionBuilder(rowData)
+                .rowWithName("pwmx0")
+                .forComponent(pwmx0Regcomponent)
+                .addIfLockedSetValue(moduleName + "0", true)
+                .addIfUnLockedSetValue(".*", false)
+                .build(),
+        );
     }
+    if (pwmx1Regcomponent) {
+        rowActions = rowActions.concat(
+            appModel
+                .getPCPHelper?.()
+                .stateActionBuilder(rowData)
+                .rowWithName("pwmx1")
+                .forComponent(pwmx1Regcomponent)
+                .addIfLockedSetValue(moduleName + "1", true)
+                .addIfUnLockedSetValue(".*", false)
+                .build(),
+        );
+    }
+    if (pwmx2Regcomponent) {
+        rowActions = rowActions.concat(
+            appModel
+                .getPCPHelper?.()
+                .stateActionBuilder(rowData)
+                .rowWithName("pwmx2")
+                .forComponent(pwmx2Regcomponent)
+                .addIfLockedSetValue(moduleName + "2", true)
+                .addIfUnLockedSetValue(".*", false)
+                .build(),
+        );
+    }
+    if (pwmx3Regcomponent) {
+        rowActions = rowActions.concat(
+            appModel
+                .getPCPHelper?.()
+                .stateActionBuilder(rowData)
+                .rowWithName("pwmx3")
+                .forComponent(pwmx3Regcomponent)
+                .addIfLockedSetValue(moduleName + "3", true)
+                .addIfUnLockedSetValue(".*", false)
+                .build(),
+        );
+    }
+    rowData = { ...rowData, actions: rowActions };
     return rowData;
 }
+const getModulePins = (allPins: any, moduleName: string): string[] => {
+    const pins: string[] = [];
+    for (const portPin in allPins) {
+        const modulePins: any = allPins[portPin]?.[moduleName];
+        for (const modulePin in modulePins) {
+            if (pins.indexOf(modulePin) === -1) {
+                pins.push(modulePin);
+            }
+        }
+    }
+    return pins;
+};
+const getPinName = (modulePins: string[], regEx: string): string => {
+    let pinName = "";
+    modulePins.forEach((pin) => {
+        if (pin.match(new RegExp(regEx, "g"))) {
+            pinName = pin;
+        }
+    });
+    return pinName;
+};
+const getpinBehaviour = (allPins: any, moduleName: string, pinName: string): string => {
+    for (const portPin in allPins) {
+        const pinData: any = allPins[portPin]?.[moduleName]?.[pinName];
+        if (pinData?.["pps"]) {
+            return "pps";
+        } else if (pinData?.["apfcon"]) {
+            return "apfcon";
+        }
+    }
+    return "lock_unlock";
+};

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]$|^PIC18F.*K40$",
+                    "deviceFilterRegEx": ".*",
                     "releaseNotesLink": "https://onlinedocs.microchip.com/v2/keyword-lookup?keyword=MCC.MELODY.8BITPIC.RELEASENOTES&version=latest&redirect=true"
                 }
         }

package/src/moduleConfig.json

@@ -7,7 +7,8 @@
     },
     "UIGroups": {
         "software": "Software Settings",
-        "hardware": "Hardware Settings"
+        "hardware": "Hardware Settings",
+        "additional": "Additional Pin Settings"
     },
     "UIOrder": {
         "software": [
@@ -15,6 +16,7 @@
         ],
         "hardware": [
             "pwmenPwmcon",
+            "pwmoePwmcon",
             "timerSelection",
             "dutyCycle",
             "pwmdcValue",
@@ -23,6 +25,9 @@
             "pwmFrequency",
             "pwmResolution",
             "*"
+        ],
+        "additional": [
+            "*"
         ]
     },
     "hasPins": true,
@@ -337,6 +342,63 @@
                             "tooltip": "Click for more Information",
                             "url": "v2/keyword-lookup?keyword=atmel;device:${deviceName};register:${registerName}&redirect=true"
                         }
+                    },
+                    {
+                        "setting": "PWMOE",
+                        "name": "pwmoePwmcon",
+                        "category": "hardware",
+                        "description": "Enable Pin Output",
+                        "type": "boolean",
+                        "group": "hardware",
+                        "tabs": [
+                            "main"
+                        ]
+                    }
+                ],
+                "PWMAOE": [
+                    {
+                        "setting": "PWMOE0",
+                        "name": "pwmoe0Pwmaoe",
+                        "category": "hardware",
+                        "description": "Enable Additional Output 1",
+                        "type": "boolean",
+                        "group": "additional",
+                        "tabs": [
+                            "main"
+                        ]
+                    },
+                    {
+                        "setting": "PWMOE1",
+                        "name": "pwmoe1Pwmaoe",
+                        "category": "hardware",
+                        "description": "Enable Additional Output 2",
+                        "type": "boolean",
+                        "group": "additional",
+                        "tabs": [
+                            "main"
+                        ]
+                    },
+                    {
+                        "setting": "PWMOE2",
+                        "name": "pwmoe2Pwmaoe",
+                        "category": "hardware",
+                        "description": "Enable Additional Output 3",
+                        "type": "boolean",
+                        "group": "additional",
+                        "tabs": [
+                            "main"
+                        ]
+                    },
+                    {
+                        "setting": "PWMOE3",
+                        "name": "pwmoe3Pwmaoe",
+                        "category": "hardware",
+                        "description": "Enable Additional Output 4",
+                        "type": "boolean",
+                        "group": "additional",
+                        "tabs": [
+                            "main"
+                        ]
                     }
                 ],
                 "PWMDCH": [

package/src/pinsdata.json

@@ -7,9 +7,48 @@
             "direction": "output",
             "filter": {
                 "module": "PWM6",
-                "aliasReEx": "^PWM6OUT$|PWM6$"
-            },
-            "behaviour": "PPS"
+                "aliasReEx": "^PWM[0-9]$"
+            }
+        },
+        {
+            "name": "pwmx0",
+            "module": "PWM1",
+            "function": "PWM10OUT",
+            "direction": "output",
+            "filter": {
+                "module": "PWM1",
+                "aliasReEx": "^PWM[0-9]0$"
+            }
+        },
+        {
+            "name": "pwmx1",
+            "module": "PWM1",
+            "function": "PWM10OUT",
+            "direction": "output",
+            "filter": {
+                "module": "PWM1",
+                "aliasReEx": "^PWM[0-9]1$"
+            }
+        },
+        {
+            "name": "pwmx2",
+            "module": "PWM1",
+            "function": "PWM10OUT",
+            "direction": "output",
+            "filter": {
+                "module": "PWM1",
+                "aliasReEx": "^PWM[0-9]2$"
+            }
+        },
+        {
+            "name": "pwmx3",
+            "module": "PWM1",
+            "function": "PWM10OUT",
+            "direction": "output",
+            "filter": {
+                "module": "PWM1",
+                "aliasReEx": "^PWM[0-9]3$"
+            }
         }
     ]
 }

package/src/pinlogic.json

@@ -1,20 +0,0 @@
-{
-    "key":"pinmodekey",
-    "pindata": [
-        {
-            "value": "normal",
-            "rows": [
-                {
-                    "name": "myPin",
-                    "pinRegEx": "",
-                    "direction": "output",
-                    "type": "digital",
-                    "interfaceId": {
-                        "name": "basic-pin",
-                        "version": "0.1.0"
-                    }
-                }
-            ]
-        }
-    ]
-}