@mchp-mcc/clock-16bit-driver 1.1.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mchp-mcc/clock-16bit-driver",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "scf": {
         "reducer": "output/reducer.js",
         "creator": "output/creator.js",
@@ -44,7 +44,9 @@
         "build-run-dir-future": "node config/extract-run-directory-future.js",
         "profile": "jest profile",
         "release": "yarn build && yarn test && node -e 'require(\"./config/scf-project-scripts\").releaseProject()'",
-        "postprocess": "node config/appendPrototype.js"
+        "postprocess": "node config/appendPrototype.js",
+        "test-itf-all": "node ./node_modules/@microchip/ccl-itf/lib/index.js --sp=./tests/itf --rd=./run --df=\"dsPIC33CK64MC105|dsPIC33CK256MC506|dsPIC33CDV64MC106|dsPIC33CK64MP105|dsPIC33CDVL64MC106|dsPIC33CDV256MP506|dsPIC33CK512MPT608|dsPIC33CDVC256MP506|dsPIC33CK256MP508|dsPIC33CK512MP608|dsPIC33CK1024MP710|dsPIC33CH512MP508|dsPIC33CH128MP508\"",
+        "test-itf": "node ./node_modules/@microchip/ccl-itf/lib/index.js --sp=./tests/itf --rd=./run --df=\"dsPIC33CH128MP508$\""
     },
     "husky": {
         "hooks": {
@@ -59,14 +61,16 @@
     "files": [
         "output/**/*",
         "config.json",
-        "src/**/*"
+        "src/**/*",
+        "/tests/itf/"
     ],
     "jest": {
         "testPathIgnorePatterns": [
             "/node_modules/",
             "/run/",
             "/generated_module/examples/",
-            "/lib/"
+            "/lib/",
+            "/tests/"
         ],
         "modulePathIgnorePatterns": [
             "<rootDir>/run"
@@ -78,10 +82,11 @@
         }
     },
     "dependencies": {
+        "@mchp-mcc/pic-16bit": "^5.10.0",
         "@mchp-mcc/pic-8bit-types": "^5.4.1",
         "@microchip/api-prefix-registration": "^0.1.0",
         "@microchip/canfd-clock-interface": "^1.0.0",
-        "@microchip/clock-16bit-config-interface": "^1.1.2",
+        "@microchip/clock-16bit-config-interface": "^1.1.5",
         "@microchip/clock-16bit-interface": "^1.1.0",
         "@microchip/fosc-hz": "^0.1.2",
         "@microchip/pin-standard": "^0.4.1",
@@ -97,10 +102,11 @@
         "@babel/preset-env": "^7.9.6",
         "@babel/preset-react": "^7.9.4",
         "@babel/preset-typescript": "^7.9.0",
+        "@microchip/ccl-itf": "^1.6.0",
         "@microchip/initializer-system": "^0.5.3",
         "@microchip/melody-automodule-interface": "^1.6.2",
         "@microchip/pic-8bit-types": "^5.0.1",
-        "@microchip/run-directory": "^4.2.0",
+        "@microchip/run-directory": "^4.2.4",
         "@microchip/scf-automodule": "^5.6.3",
         "@microchip/scf-automodule-impl": "^1.8.2",
         "@microchip/scf-autoview": "^3.26.1",

package/src/DerivedData.ts

@@ -20,9 +20,13 @@ const CLOCK_16BIT_CONFIG_INTERFACE = "clock_16bit_config_interface";
 const DIGITS_AFTER_DECIMAL_POINT = 2;
 const COMPONENT_AUX_CLOCK_SOURCE = "auxClockSource";
 const COMPONENT_MAIN_CLOCK_SOURCE = "mainClockSource";
+const COMPONENT_CAN_FD_CLOCK_SOURCE_FREQ = "canfdClkSrcFreq";
 export const COMPONENT_AUX_CLOCK_INPUT_FREQUENCY = "auxClockInputFrequency_Hz";
 export const COMPONENT_MAIN_CLOCK_INPUT_FREQUENCY = "mainClockInputFrequency_Hz";
 const COMPONENT_REF_CLOCK_SOURCE = "refClockSource";
+const COMPONENT_REF_CLOCK_ENABLE = "refClockEnable";
+export const COMPONENT_CALCULATED_REF_OUTPUT_FREQUENCY =
+    "calculatedRefOutputFrequency_Hz";
 const COMPONENT_CANFD_CLOCK_SOURCE = "canfdClockSource";
 export const COMPONENT_REQUESTED_SYSTEM_FREQUENCY = "requestedSystemFrequency_Hz";
 const COMPONENT_FVCO_DIVIDER = "fvcoDivider";
@@ -102,6 +106,7 @@ class MyDerivedData implements DerivedData {
             requestedCanfdClockOutputFrequency_Hz: this
                 .getRequestedCanfdClockOutputFrequency_Hz,
             getUiBehavior: this.getUiBehavior,
+            isEnabled: this.isComponentEnabled,
             mainClockInputFrequency_HzValidator: this.mainClockInputFrequency_HzValidator,
             auxClockInputFrequency_HzValidator: this.auxClockInputFrequency_HzValidator,
             requestedAuxClockOutputFrequency_HzValidator: this
@@ -113,11 +118,68 @@ class MyDerivedData implements DerivedData {
             getCustomUiErrors: this.getCustomUiErrors,
             "clock-16bit-drv-interface_payloads": this
                 .getClockApplicationInterfacePayload,
+            "clock-16bit-drv-interface_payload": this
+                .getDefaultClockApplicationInterfacePayload,
             importName: this.friendlyImportName,
             exportName: this.friendlyExportName,
         };
     };
 
+    private getDeviceName = (): string => {
+        let deviceName = "";
+        const deviceMetaData = this.dataModel?.getImports()?.device_meta?.payload;
+        if (deviceMetaData) {
+            deviceName = deviceMetaData?.deviceName;
+        }
+        return deviceName;
+    };
+
+    private isSecondaryDevice = (): boolean => {
+        const deviceName = this.getDeviceName();
+        // device name ends with "S" followed by a digit
+        if (deviceName.match(/S\d$/)) {
+            return true;
+        }
+        return false;
+    };
+
+    private isComponentEnabled = (componentName: string): boolean => {
+        let isComponentEnabled = false;
+        if (
+            componentName === COMPONENT_REF_CLOCK_SOURCE ||
+            componentName === COMPONENT_REQUESTED_REF_CLOCK_OUTPUT_FREQUENCY
+        ) {
+            if (this.dataModel?.getComponentValue(COMPONENT_REF_CLOCK_ENABLE) === true) {
+                isComponentEnabled = true;
+            }
+        } else if (
+            componentName === COMPONENT_REF_CLOCK_ENABLE ||
+            componentName === COMPONENT_MAIN_CLOCK_SOURCE ||
+            componentName === COMPONENT_MAIN_CLOCK_INPUT_FREQUENCY ||
+            componentName === COMPONENT_SET_MAX_FREQUENCY ||
+            componentName === COMPONENT_FVCO_DIVIDER ||
+            componentName === COMPONENT_AUX_CLOCK_SOURCE ||
+            componentName === COMPONENT_CANFD_CLOCK_SOURCE ||
+            componentName === COMPONENT_AFVCO_DIVIDER ||
+            componentName === COMPONENT_AUX_CLOCK_INPUT_FREQUENCY ||
+            componentName === COMPONENT_REQUESTED_AUX_CLOCK_OUTPUT_FREQUENCY
+        ) {
+            isComponentEnabled = true;
+        } else if (componentName === COMPONENT_REQUESTED_SYSTEM_FREQUENCY) {
+            if (
+                this.dataModel?.getComponentValue(COMPONENT_SET_MAX_FREQUENCY) === false
+            ) {
+                isComponentEnabled = true;
+            }
+        }
+
+        // Checking whether Secondary Device of Dual Core is being used
+        if (componentName === COMPONENT_MAIN_CLOCK_SOURCE && this.isSecondaryDevice()) {
+            isComponentEnabled = false;
+        }
+        return isComponentEnabled;
+    };
+
     private getCustomUiErrors = (componentName: string): Error[] | undefined => {
         let customErrors: Error[];
         switch (componentName) {
@@ -207,6 +269,17 @@ class MyDerivedData implements DerivedData {
         return minClockFrequency;
     };
 
+    private getClockPropertiesFromPayLoad = (): any => {
+        let clockProperties: unknown;
+        const interfaceData: clock_16bit_config_interface.ProcessedPayload = this.dataModel.getImportValue(
+            CLOCK_16BIT_CONFIG_INTERFACE,
+        );
+        if (interfaceData != undefined) {
+            clockProperties = interfaceData?.clockProperties;
+        }
+        return clockProperties;
+    };
+
     private getMaxClockFrequency = (): number => {
         let maxClockFrequency = 0;
         const interfaceData: clock_16bit_config_interface.ProcessedPayload = this.dataModel.getImportValue(
@@ -224,10 +297,24 @@ class MyDerivedData implements DerivedData {
         const interfaceData: clock_16bit_config_interface.ProcessedPayload = this.dataModel.getImportValue(
             CLOCK_16BIT_CONFIG_INTERFACE,
         );
-        if (interfaceData != undefined) {
+        if (
+            interfaceData != undefined &&
+            this.dataModel?.getComponentValue("mainClockSource") !=
+            "FRC Oscillator with Postscaler"
+        ) {
             maxSystemClockFrequency =
                 interfaceData?.mainClockPayload?.maxSystemClockFrequency ?? 0;
         }
+        if (
+            this.dataModel?.getComponentValue("mainClockSource") ==
+            "FRC Oscillator with Postscaler"
+        ) {
+            if (this.getClockPropertiesFromPayLoad()["FRC_CLOCK"] != undefined) {
+                maxSystemClockFrequency = Number(
+                    this.getClockPropertiesFromPayLoad()["FRC_CLOCK"]?.value,
+                );
+            }
+        }
         return maxSystemClockFrequency;
     };
 
@@ -240,7 +327,7 @@ class MyDerivedData implements DerivedData {
                         "Requested FCAN frequency can be configured from CAN 2.0/CAN-FD modules in Drivers category",
                 };
                 break;
-            case "canfdClkSrcFreq":
+            case COMPONENT_CAN_FD_CLOCK_SOURCE_FREQ:
                 uiBehavior = {
                     ["ui:help"]:
                         "CAN FD clock source frequency should be less than or equal to 640 MHz",
@@ -275,9 +362,9 @@ class MyDerivedData implements DerivedData {
         const canfdInterfaceRequests:
             | Processor.Dictionary<any>
             | undefined = this.dataModel
-            .getExportInterfaces()
-            .getInterface("canfd_clock", canfd_clock_interface.Interface.getInterfaceId())
-            ?.args;
+                .getExportInterfaces()
+                .getInterface("canfd_clock", canfd_clock_interface.Interface.getInterfaceId())
+                ?.args;
         return canfdInterfaceRequests;
     };
 
@@ -296,17 +383,15 @@ class MyDerivedData implements DerivedData {
 
     private isMainClockInputFrequencyVisible = (): boolean => {
         let visible = false;
-        if (!this.dataModel.getComponentValue(COMPONENT_SET_MAX_FREQUENCY)) {
-            const mainClockSource = this.dataModel.getComponentValue(
-                COMPONENT_MAIN_CLOCK_SOURCE,
-            );
-            if (mainClockSource != undefined) {
-                if (
-                    mainClockSource?.indexOf(PRIMARY) >= 0 ||
-                    mainClockSource?.indexOf(EXTERNAL) >= 0
-                ) {
-                    visible = true;
-                }
+        const mainClockSource = this.dataModel.getComponentValue(
+            COMPONENT_MAIN_CLOCK_SOURCE,
+        );
+        if (mainClockSource != undefined) {
+            if (
+                mainClockSource?.indexOf(PRIMARY) >= 0 ||
+                mainClockSource?.indexOf(EXTERNAL) >= 0
+            ) {
+                visible = true;
             }
         }
         return visible;
@@ -314,7 +399,7 @@ class MyDerivedData implements DerivedData {
 
     private isRequestedSystemFrequencyVisible = (): boolean => {
         let visible = false;
-        if (!this.dataModel.getComponentValue(COMPONENT_SET_MAX_FREQUENCY)) {
+        if (this.dataModel?.getComponentValue(COMPONENT_SET_MAX_FREQUENCY) === false) {
             const mainClockSource = this.dataModel.getComponentValue(
                 COMPONENT_MAIN_CLOCK_SOURCE,
             );
@@ -390,20 +475,17 @@ class MyDerivedData implements DerivedData {
         } else if (
             componentName === COMPONENT_REF_CLOCK_SOURCE ||
             componentName === COMPONENT_REQUESTED_REF_CLOCK_OUTPUT_FREQUENCY ||
-            componentName === "calculatedRefOutputFrequency_Hz"
+            componentName === COMPONENT_CALCULATED_REF_OUTPUT_FREQUENCY ||
+            componentName === COMPONENT_REF_CLOCK_ENABLE
         ) {
             return this.isRefClockSupported();
         } else if (
             componentName === COMPONENT_CANFD_CLOCK_SOURCE ||
             componentName === COMPONENT_REQUESTED_CANFD_CLOCK_OUTPUT_FREQUENCY ||
             componentName === "calculatedCanfdOutputFrequency_Hz" ||
-            componentName === "canfdClkSrcFreq"
+            componentName === COMPONENT_CAN_FD_CLOCK_SOURCE_FREQ
         ) {
             return this.isCanfdClockSupported();
-        } else if (componentName === COMPONENT_MAIN_CLOCK_SOURCE) {
-            if (this.dataModel.getComponentValue(COMPONENT_SET_MAX_FREQUENCY)) {
-                return false;
-            }
         }
         return true;
     };
@@ -472,6 +554,17 @@ class MyDerivedData implements DerivedData {
                 });
             }
         }
+        if (this.dataModel?.getComponentValue(COMPONENT_SET_MAX_FREQUENCY)) {
+            const mainClockSource = this.dataModel?.getComponentValue(
+                COMPONENT_MAIN_CLOCK_SOURCE,
+            );
+            if (mainClockSource != undefined && mainClockSource?.indexOf(PLL) < 0) {
+                alerts.push({
+                    type: Processor.AlertTypes.Warning,
+                    text: "Please select PLL as clock source.",
+                });
+            }
+        }
 
         return alerts;
     };
@@ -940,27 +1033,38 @@ class MyDerivedData implements DerivedData {
     };
 
     private auxClockArg = (): any => {
-        return {
-            auxClockSource: this.dataModel.getComponentValue(COMPONENT_AUX_CLOCK_SOURCE),
-            auxClockInputFrequency_Hz: this.dataModel.getComponentValue(
-                COMPONENT_AUX_CLOCK_INPUT_FREQUENCY,
-            ),
-            requestedAuxClockOutputFrequency_Hz: this.dataModel.getComponentValue(
-                COMPONENT_REQUESTED_AUX_CLOCK_OUTPUT_FREQUENCY,
-            ),
-            afvcoDivider: Number(
-                this.dataModel.getComponentValue(COMPONENT_AFVCO_DIVIDER),
-            ),
-        };
+        if (
+            this.dataModel.getComponentValue(COMPONENT_AUX_CLOCK_SOURCE) !=
+            "FRC Oscillator"
+        ) {
+            return {
+                auxClockSource: this.dataModel.getComponentValue(
+                    COMPONENT_AUX_CLOCK_SOURCE,
+                ),
+                auxClockInputFrequency_Hz: this.dataModel.getComponentValue(
+                    COMPONENT_AUX_CLOCK_INPUT_FREQUENCY,
+                ),
+                requestedAuxClockOutputFrequency_Hz: this.dataModel.getComponentValue(
+                    COMPONENT_REQUESTED_AUX_CLOCK_OUTPUT_FREQUENCY,
+                ),
+                afvcoDivider: Number(
+                    this.dataModel.getComponentValue(COMPONENT_AFVCO_DIVIDER),
+                ),
+            };
+        }
     };
 
     private refClockArg = (): any => {
-        return {
-            refClockSource: this.dataModel.getComponentValue(COMPONENT_REF_CLOCK_SOURCE),
-            requestedRefClockOutputFrequency_Hz: this.dataModel.getComponentValue(
-                COMPONENT_REQUESTED_REF_CLOCK_OUTPUT_FREQUENCY,
-            ),
-        };
+        if (this.dataModel.getComponentValue(COMPONENT_REF_CLOCK_ENABLE) === true) {
+            return {
+                refClockSource: this.dataModel.getComponentValue(
+                    COMPONENT_REF_CLOCK_SOURCE,
+                ),
+                requestedRefClockOutputFrequency_Hz: this.dataModel.getComponentValue(
+                    COMPONENT_REQUESTED_REF_CLOCK_OUTPUT_FREQUENCY,
+                ),
+            };
+        }
     };
 
     private canfdClockArg = (): any => {
@@ -1104,9 +1208,9 @@ class MyDerivedData implements DerivedData {
         const clockApplicationInterfaceRequests:
             | Processor.Dictionary<clock_16bit_drv_interface.Arguments>
             | undefined = this.dataModel
-            .getExportInterfaces()
-            .getInterface("clock_16bit_drv_interface", this.getClock16bitDrvInterfaceId())
-            ?.args;
+                .getExportInterfaces()
+                .getInterface("clock_16bit_drv_interface", this.getClock16bitDrvInterfaceId())
+                ?.args;
         const interfaceData: clock_16bit_config_interface.ProcessedPayload = this.dataModel.getImportValue(
             CLOCK_16BIT_CONFIG_INTERFACE,
         );
@@ -1133,6 +1237,29 @@ class MyDerivedData implements DerivedData {
         }
         return clockApplicationInterfacePayloads;
     };
+
+    private getDefaultClockApplicationInterfacePayload = ():
+        | clock_16bit_config_interface.ProcessedPayload
+        | undefined => {
+        const interfaceData: clock_16bit_config_interface.ProcessedPayload = this.dataModel.getImportValue(
+            CLOCK_16BIT_CONFIG_INTERFACE,
+        );
+        if (interfaceData != undefined) {
+            return {
+                mainClockPayload: interfaceData.mainClockPayload,
+                hasUSB: interfaceData.hasUSB,
+                hasAuxClock: interfaceData.hasAuxClock,
+                hasRefClock: interfaceData.hasRefClock,
+                hasCanfdClock: interfaceData.hasCanfdClock,
+                hasSecondaryOscillator: interfaceData.hasSecondaryOscillator,
+                isSecondaryOscillatorEnabled: interfaceData.isSecondaryOscillatorEnabled,
+                auxClockPayload: interfaceData.auxClockPayload,
+                refClockPayload: interfaceData.refClockPayload,
+                canfdClockPayload: interfaceData.canfdClockPayload,
+            };
+        }
+    };
+
     private friendlyExportName = (exportKey: string): string => {
         let exportName: string;
         switch (exportKey) {

package/src/catalog.json

@@ -10,6 +10,8 @@
                     "avr",
                     "pic8",
                     "driver",
+                    "pic24",
+                    "dspic",
                     ""
                 ],
                 "name": "Clock",

package/src/moduleConfig.json

@@ -6,7 +6,7 @@
         "false": "disabled"
     },
     "help": {
-        "url": "v2/keyword-lookup?keyword=SYSTEM_16BIT_MELODY_DRIVER&version=latest&redirect=true",
+        "url": "v2/keyword-lookup?keyword=CLOCK_16BIT_MELODY_DRIVER&version=latest&redirect=true",
         "tooltip": "Click here to open documentation"
     },
     "UIGroups": {
@@ -41,10 +41,18 @@
             "import": {
                 "interfaceId": {
                     "name": "clock-16bit-config-interface",
-                    "version": "^1.1.2"
+                    "version": "^1.1.5"
                 },
                 "isRequired": true
             }
+        },
+        "device_meta": {
+            "import": {
+                "interfaceId": {
+                    "name": "device-meta",
+                    "version": "1.0.0"
+                }
+            }
         }
     },
     "exports": {
@@ -335,6 +343,17 @@
                 "readonly": true
             }
         },
+        "refClockEnable": {
+            "name": "refClockEnable",
+            "description": "Reference Clock Enable",
+            "type": "boolean",
+            "defaultValue": false,
+            "group": "refClock",
+            "tabs": [
+                "main"
+            ],
+            "category": "software"
+        },
         "refClockSource": {
             "name": "refClockSource",
             "description": "REFO Clock Source",

package/tests/itf/Utils.ts

@@ -0,0 +1,52 @@
+export const getReadOnlyValue = (moduleData: any, tabId:any,property:any): any => {
+    const uiPropertyValueRule = getUISchemaData(moduleData)?.[tabId]?.[property]?.["ui:readonly"];
+    return uiPropertyValueRule;
+}
+export const getHiddenProperty = (moduleData: any, tabId:any,property:any): any => {
+    const uiPropertyValueRule = getUISchemaData(moduleData)?.[tabId]?.[property]?.["ui:widget"];
+    return uiPropertyValueRule;
+}
+const getUISchemaData = (moduleData:any): any => {
+    const uiSchema = moduleData?.payload?.auto?.main.uiSchema;
+    return uiSchema;
+}
+export const getRegisterValue = (moduleData: any, regName:any): any => {
+    const uiRegisterValue =moduleData?.payload?.auto?.register?.schema?.properties?.[regName]?.title;
+    return uiRegisterValue
+}
+export const getSettingBit = (moduleData: any, regName:any,settingBit): any => {
+    const uiSettingBit=moduleData?.payload?.auto?.register?.formData?.[regName]?.[settingBit];
+    return uiSettingBit
+}
+export const getConfigBitsSettingBit = (moduleData: any, regName:any,settingBit): any => {
+    const uiSettingBit=moduleData?.payload?.auto?.main?.formData?.[regName]?.[settingBit];
+    return uiSettingBit
+}
+export const getArgs = (moduleData: any, moduleName:any,property:any): any => {
+    const argValue=moduleData?.imports?.[moduleName]?.args?.[property];
+    return argValue
+}
+export const getPayload = (moduleData: any, moduleNameInterface:any,property:any): any => {
+    const argpayLoaddata = moduleData?.exports?.[moduleNameInterface]?.interfaces[0]?.payload?.[property];
+    return argpayLoaddata
+}
+export const getClockPayload = (moduleData: any,moduleId:any,moduleNameInterface:any,property:any): any => {
+    const argpayLoaddata = moduleData?.exports?.[moduleNameInterface]?.interfaces[0]?.payloads?.[moduleId]?.[property];
+    return argpayLoaddata
+}
+export const getModulepins = (moduleData: any,moduleId:any,pinpath:any): any => {
+    const ModulePinName = moduleData?.payload?.processedRows?.rows?.[moduleId]?.[pinpath];
+    return ModulePinName;
+}
+export const getModuleLockedPins = (moduleData: any,moduleId:any,pinpath:any,pinname:any): any => {
+    const pinlockData: any = moduleData?.payload?.processedRows?.rows?.[moduleId]?.[pinpath]?.pins?.[pinname];
+    return pinlockData
+}
+export const getResult = (moduleData: any, moduleName:any,property:any): any => {
+    const argValue=moduleData?.imports?.[moduleName]?.results?.[property];
+    return argValue
+}
+
+
+
+