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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mchp-mcc/clock-16bit-driver",
-    "version": "1.1.1",
+    "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,6 +82,7 @@
         }
     },
     "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",
@@ -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",
@@ -175,4 +181,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.ts

@@ -118,11 +118,31 @@ 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 (
@@ -152,6 +172,11 @@ class MyDerivedData implements DerivedData {
                 isComponentEnabled = true;
             }
         }
+
+        // Checking whether Secondary Device of Dual Core is being used
+        if (componentName === COMPONENT_MAIN_CLOCK_SOURCE && this.isSecondaryDevice()) {
+            isComponentEnabled = false;
+        }
         return isComponentEnabled;
     };
 
@@ -275,7 +300,7 @@ class MyDerivedData implements DerivedData {
         if (
             interfaceData != undefined &&
             this.dataModel?.getComponentValue("mainClockSource") !=
-                "FRC Oscillator with Postscaler"
+            "FRC Oscillator with Postscaler"
         ) {
             maxSystemClockFrequency =
                 interfaceData?.mainClockPayload?.maxSystemClockFrequency ?? 0;
@@ -337,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;
     };
 
@@ -1183,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,
         );
@@ -1212,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/moduleConfig.json

@@ -45,6 +45,14 @@
                 },
                 "isRequired": true
             }
+        },
+        "device_meta": {
+            "import": {
+                "interfaceId": {
+                    "name": "device-meta",
+                    "version": "1.0.0"
+                }
+            }
         }
     },
     "exports": {

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
+}
+
+
+
+