@kuriousdesign/machine-sdk 1.0.76 → 1.0.78

package/dist/custom-types/Machine.d.ts

@@ -1,4 +1,4 @@
-import { ComponentAnimation, DebugLogData, DeviceRegistration, RecipeStore, TaskQueue } from ".";
+import { ComponentAnimation, DebugLogData, DeviceRegistration, FaultData, RecipeStore, TaskQueue } from ".";
 import { PartDataStatus } from "./Part";
 export interface UserData {
     activeUser: number;
@@ -11,7 +11,7 @@ export interface FaultCodeData {
 }
 export declare const initialFaultCodeData: FaultCodeData;
 export interface SystemFaultData {
-    list: FaultCodeData[];
+    list: FaultData[];
     present: boolean;
 }
 export declare const initialSystemFaultData: SystemFaultData;
@@ -33,6 +33,7 @@ export interface Machine {
     networkHealth_OK: boolean;
     ethercatMaster_OK: boolean;
     ethercatSlaves_OK: boolean;
+    manualMode: boolean;
     supplyAir_OK: boolean;
     cfg: MachineCfg;
     pdmSts: PartDataStatus;

package/dist/custom-types/Machine.js

@@ -9,7 +9,7 @@ exports.initialFaultCodeData = {
     code: 0,
 };
 exports.initialSystemFaultData = {
-    list: Array(_1.DeviceConstants.DEVICE_FAULTCODEARRAY_LEN).fill(null).map(() => ({ ...exports.initialFaultCodeData })),
+    list: Array(GlobalConstants_1.GCs.MACHINE_FAULTCODEARRAY_LEN).fill(null).map(() => ({ ..._1.initialFaultData })),
     present: false,
 };
 exports.initialMachineCfg = {
@@ -33,6 +33,7 @@ exports.initialMachine = ({
     networkHealth_OK: false,
     ethercatMaster_OK: false,
     ethercatSlaves_OK: false,
+    manualMode: false,
     supplyAir_OK: false,
     cfg: { ...exports.initialMachineCfg },
     pdmSts: Part_1.initialPartDataStatus,

package/dist/plc-tags/index.d.ts

@@ -14,6 +14,15 @@ export declare const MachineTags: {
     machineLog: string;
     deviceLogs: string;
     recipeStore: string;
+    errors: string;
+    warnings: string;
+    estopCircuitDelayed_OK: string;
+    fenceCircuit_OK: string;
+    guardDoors_LOCKED: string;
+    manualMode: string;
+    networkHealth_OK: string;
+    ethercatMaster_OK: string;
+    ethercatSlaves_OK: string;
 };
 export declare const DeviceTags: {
     Cfg: string;

package/dist/plc-tags/index.js

@@ -33,6 +33,16 @@ exports.MachineTags = {
     machineLog: 'MachineLog',
     deviceLogs: 'DeviceLogs',
     recipeStore: 'RecipeStore',
+    errors: 'Errors',
+    warnings: 'Warnings',
+    estopCircuitDelayed_OK: 'EstopCircuitDelayed_OK',
+    fenceCircuit_OK: 'FenceCircuit_OK',
+    guardDoors_LOCKED: 'GuardDoors_LOCKED',
+    manualMode: 'ManualMode',
+    // Network Manager
+    networkHealth_OK: 'NetworkHealth_OK',
+    ethercatMaster_OK: 'EthercatMaster_OK',
+    ethercatSlaves_OK: 'EthercatSlaves_OK',
 };
 exports.DeviceTags = {
     Cfg: 'Cfg',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kuriousdesign/machine-sdk",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "description": "Shared data types and helpers for machine-related repositories",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/custom-types/Machine.ts

@@ -1,4 +1,4 @@
-import { ComponentAnimation, DebugLogData, DeviceConstants, DeviceRegistration, initialDebugLogData, initialRecipeStore, initialTaskQueue, RecipeStore, TaskQueue } from ".";
+import { ComponentAnimation, DebugLogData, DeviceRegistration, FaultData, initialDebugLogData, initialFaultData, initialRecipeStore, initialTaskQueue, RecipeStore, TaskQueue } from ".";
 import { initialPartDataStatus, PartDataStatus } from "./Part";
 import { GCs } from "./GlobalConstants";
 
@@ -20,12 +20,12 @@ export const initialFaultCodeData: FaultCodeData = {
 };
 
 export interface SystemFaultData {
-  list: FaultCodeData[];
+  list: FaultData[];
   present: boolean;
 }
 
 export const initialSystemFaultData: SystemFaultData = {
-  list: Array(DeviceConstants.DEVICE_FAULTCODEARRAY_LEN).fill(null).map(() => ({ ...initialFaultCodeData })),
+  list: Array(GCs.MACHINE_FAULTCODEARRAY_LEN).fill(null).map(() => ({ ...initialFaultData })),
   present: false,
 };
 
@@ -76,6 +76,7 @@ export interface Machine {
     networkHealth_OK: boolean;
     ethercatMaster_OK: boolean;
     ethercatSlaves_OK: boolean;
+    manualMode: boolean;
     supplyAir_OK: boolean;
     cfg: MachineCfg;
     pdmSts: PartDataStatus;
@@ -115,6 +116,7 @@ export const initialMachine: Machine = ({
   networkHealth_OK: false,
   ethercatMaster_OK: false,
   ethercatSlaves_OK: false,
+  manualMode: false,
   supplyAir_OK: false,
   cfg: { ...initialMachineCfg },
   pdmSts: initialPartDataStatus,

package/src/plc-tags/index.ts

@@ -17,6 +17,17 @@ export const MachineTags = {
     machineLog: 'MachineLog',
     deviceLogs: 'DeviceLogs',
     recipeStore: 'RecipeStore',
+    errors: 'Errors',
+    warnings: 'Warnings',
+    estopCircuitDelayed_OK: 'EstopCircuitDelayed_OK',
+    fenceCircuit_OK: 'FenceCircuit_OK',
+    guardDoors_LOCKED: 'GuardDoors_LOCKED',
+    manualMode: 'ManualMode',
+	
+	// Network Manager
+	networkHealth_OK: 'NetworkHealth_OK',
+	ethercatMaster_OK: 'EthercatMaster_OK',
+	ethercatSlaves_OK: 'EthercatSlaves_OK',
 }
 
 export const DeviceTags = {