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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mchp-mcc/clock-16bit-driver",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "scf": {
         "reducer": "output/reducer.js",
         "creator": "output/creator.js",
@@ -106,7 +106,7 @@
         "@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.4",
+        "@microchip/run-directory": "^4.2.3",
         "@microchip/scf-automodule": "^5.6.3",
         "@microchip/scf-automodule-impl": "^1.8.2",
         "@microchip/scf-autoview": "^3.26.1",

package/src/DerivedData.ts

@@ -125,19 +125,28 @@ class MyDerivedData implements DerivedData {
         };
     };
 
-    private getDeviceName = (): string => {
-        let deviceName = "";
+    private getFamilyName = (): string => {
+        let deviceFamilyName = "";
         const deviceMetaData = this.dataModel?.getImports()?.device_meta?.payload;
         if (deviceMetaData) {
-            deviceName = deviceMetaData?.deviceName;
+            deviceFamilyName = deviceMetaData?.familyName;
         }
-        return deviceName;
+        return deviceFamilyName;
     };
 
     private isSecondaryDevice = (): boolean => {
-        const deviceName = this.getDeviceName();
-        // device name ends with "S" followed by a digit
-        if (deviceName.match(/S\d$/)) {
+        const deviceFamilyName = this.getFamilyName();
+
+        const hasSecondaryCoreFlashSupport =
+            this.getModel()?.getImports()?.device_meta?.payload
+                ?.hasSecondaryCoreFlashSupport ?? false;
+
+        /*
+            Device name ends with "S" followed by a digit.
+            The second part of the condition is for devices like Centaurus which have their inidividual flash.
+
+        */
+        if (deviceFamilyName.match(/S\d$/) && !hasSecondaryCoreFlashSupport) {
             return true;
         }
         return false;
@@ -300,7 +309,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;
@@ -333,6 +342,15 @@ class MyDerivedData implements DerivedData {
                         "CAN FD clock source frequency should be less than or equal to 640 MHz",
                 };
                 break;
+            case COMPONENT_MAIN_CLOCK_SOURCE:
+                if (this.shouldShowSecDeviceNotif()) {
+                    uiBehavior = {
+                        ["ui:help"]: `Ensure to select ${this.dataModel.getComponentValue(
+                            COMPONENT_MAIN_CLOCK_SOURCE,
+                        )} as part of Main Device also`,
+                    };
+                }
+                break;
             default:
                 break;
         }
@@ -362,9 +380,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;
     };
 
@@ -566,9 +584,39 @@ class MyDerivedData implements DerivedData {
             }
         }
 
+        if (this.shouldShowSecDeviceNotif()) {
+            alerts.push({
+                type: Processor.AlertTypes.Hint,
+                text: `Ensure to select ${this.dataModel?.getComponentValue(
+                    COMPONENT_MAIN_CLOCK_SOURCE,
+                )} as clock source for the Main Device with frequency ${this.dataModel?.getComponentValue(
+                    COMPONENT_MAIN_CLOCK_INPUT_FREQUENCY,
+                )}Hz`,
+            });
+        }
+
         return alerts;
     };
 
+    private shouldShowSecDeviceNotif = (): boolean => {
+        const deviceFamilyName = this.getFamilyName();
+        if (deviceFamilyName.match(/S\d$/)) {
+            if (
+                this.dataModel?.getComponentValue(COMPONENT_MAIN_CLOCK_SOURCE) ===
+                    "Primary Oscillator" ||
+                this.dataModel?.getComponentValue(COMPONENT_MAIN_CLOCK_SOURCE) ===
+                    "Primary Oscillator with PLL" ||
+                this.dataModel?.getComponentValue(COMPONENT_MAIN_CLOCK_SOURCE) ===
+                    "External Oscillator" ||
+                this.dataModel?.getComponentValue(COMPONENT_MAIN_CLOCK_SOURCE) ===
+                    "External Oscillator with PLL"
+            ) {
+                return true;
+            }
+        }
+        return false;
+    };
+
     private calculatedFunction = (): any => {
         return;
     };
@@ -1208,9 +1256,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,
         );