@kuriousdesign/machine-sdk 1.0.65 → 1.0.69

package/src/custom-types/AppState.ts

@@ -1,115 +1,115 @@
-import { PartStateDeprecated, Page } from "../enums";
-import { ButtonBar, StatusBar } from "./HMI";
-import { PartDataDeprecated } from "./Part";
-import { Device } from "./BaseDevice/Device";
-import { GlobalConstants } from "./GlobalConstants";
-import {
-  RackData,
-  RackHmiPbs,
-  RecipeData,
-  RecipeManagerPbs,
-  SystemFaultData,
-  TaskQueue,
-  UserData,
-  UserManagerFB,
-} from ".";
-import { RobDataDEPRECATED } from "./Devices/Robot";
-
-export enum NodeId {
-  // new node ids
-  ButtonBar = "Main.HMI.ButtonBar",
-  StatusBar = "Main.HMI.StatusBar",
-  RackPbs = "Main.HMI.RackPbs",
-  ROB = "Main.ROB",
-  CNC = "Main.CNC",
-  DBRR = "Main.DBRR",
-  WASH = "Main.WASH",
-  PartData = "Main.PartData",
-  TaskQueue = "Main.TaskQueue",
-  GlobalConstants = "GlobalConstants", // TODO: add this to monitored items
-  MachineUser = "Machine.User",
-  MachineErrors = "Machine.Errors",
-  MachineWarnings = "Machine.Warnings",
-  RackData = "Main.RackData",
-  RecipeData = "Main.RecipeData",
-  ActiveJobRecipe = "Main.Job.ActiveRecipe",
-  RecipeManagerState = "Main.RecipeManagerFB.State",
-  RecipeManagerPbs = "Main.RecipeManagerFB.Pbs",
-  RemoteControlPage = "Main.HMI.RemoteControlPage",
-  RobData = "Main.RobData",
-
-  // TODO: add following to montored items, correctly
-  UserManagerFB = "Main.UserManagerFB",
-}
-
-export interface AppState {
-  [NodeId.StatusBar]: StatusBar;
-  [NodeId.ButtonBar]: ButtonBar;
-  [NodeId.RackPbs]: RackHmiPbs;
-  [NodeId.ROB]: Device;
-  [NodeId.CNC]: Device;
-  [NodeId.DBRR]: Device;
-  [NodeId.WASH]: Device;
-  [NodeId.PartData]: PartDataDeprecated;
-  [NodeId.TaskQueue]: TaskQueue;
-  [NodeId.GlobalConstants]: GlobalConstants;
-  [NodeId.MachineUser]: UserData;
-  [NodeId.MachineErrors]: SystemFaultData;
-  [NodeId.MachineWarnings]: SystemFaultData;
-  [NodeId.RackData]: RackData;
-  [NodeId.RecipeData]: RecipeData[];
-  [NodeId.ActiveJobRecipe]: RecipeData;
-  [NodeId.RecipeManagerState]: number;
-  [NodeId.RecipeManagerPbs]: RecipeManagerPbs;
-  [NodeId.UserManagerFB]: UserManagerFB;
-  [NodeId.RemoteControlPage]: Page;
-  [NodeId.RobData]: RobDataDEPRECATED;
-}
-
-export enum InputNodeId {
-  ButtonBarStopBtnClick = "Main.HMI.ButtonBar.StopBtn.wasClicked",
-  ButtonBarUnloadbtnClick = "Main.HMI.ButtonBar.UnloadBtn.wasClicked",
-  ButtonBarUnlockbtnClick = "Main.HMI.ButtonBar.UnlockBtn.wasClicked",
-  ButtonBarEnergizebtnClick = "Main.HMI.ButtonBar.EnergizeBtn.wasClicked",
-  ButtonBarStartbtnClick = "Main.HMI.ButtonBar.StartBtn.wasClicked",
-  ButtonBarLockbtnClick = "Main.HMI.ButtonBar.LockBtn.wasClicked",
-  ButtonBarResetbtnClick = "Main.HMI.ButtonBar.ResetBtn.wasClicked",
-  ButtonBarJobchangeBtnClick = "Main.HMI.ButtonBar.JobChangeBtn.wasClicked",
-  ButtonBarClearFaultsBtnClick = "Main.HMI.ButtonBar.ClearFaultsBtn.wasClicked",
-
-  PartDataDoneShelf = "Main.PartData.DoneShelf",
-  PartDataRawShelf = "Main.PartData.RawShelf",
-
-  Username = "Machine.User.Username",
-  Password = "Machine.User.Password",
-  LoginBtnBlick = "Machine.User.HmiLoginBtn.wasClicked",
-  LogoutBtnBlick = "Machine.User.HmiLogoutBtn.wasClicked",
-
-  EditRawShelfBtnClick = "Main.HMI.RackPbs.EditRawShelfBtn.wasClicked",
-  EditDoneShelfBtnClick = "Main.HMI.RackPbs.EditDoneShelfBtn.wasClicked",
-  ShelfCancelBtnClick = "Main.HMI.RackPbs.CancelBtn.wasClicked",
-  ShelfSaveBtnClick = "Main.HMI.RackPbs.SaveBtn.wasClicked",
-
-  RecipeManagerEditBtnClick = "Main.recipeManagerFB.pbs.EditBtn.wasClicked",
-  RecipeManagerChangeBtnClick = "Main.recipeManagerFB.pbs.ChangeBtn.wasClicked",
-  RecipeManagerJobSetupBtnClick = "Main.recipeManagerFB.pbs.JobSetupBtn.wasClicked",
-  RecipeManagerActivateBtnClick = "Main.recipeManagerFB.pbs.ActivateBtn",
-  RecipeManagerCancelBtnClick = "Main.recipeManagerFB.pbs.CancelBtn",
-  RecipeManagerStartSetupBtnClick = "Main.recipeManagerFB.pbs.StartSetupBtn",
-  RecipeManagerFinishSetupBtnClick = "Main.recipeManagerFB.pbs.FinishSetupBtn",
-
-  RecipeData = "Main.RecipeData",
-  ActiveJobRecipe = "Machine.Job.ActiveRecipe",
-  JobBatchQuantity = "Machine.Job.BatchQty",
-
-  ActivePage = "Main.HMI.ActivePage",
-
-  CncPart1 = "Main.PartData.Cnc[0]",
-  CncPart2 = "Main.PartData.Cnc[1]",
-  PreOpPart1 = "Main.PartData.CncPreOp[0]",
-  PreOpPart2 = "Main.PartData.CncPreOp[1]",
-  PostOpPart1 = "Main.PartData.CncPostOp[0]",
-  PostOpPart2 = "Main.PartData.CncPostOp[1]",
-  RobotPart1 = "Main.PartData.Robot[0]",
-  RobotPart2 = "Main.PartData.Robot[1]",
-}
+import { PartStateDeprecated, Page } from "../enums";
+import { ButtonBar, StatusBar } from "./HMI";
+import { PartDataDeprecated } from "./Part";
+import { Device } from "./BaseDevice/Device";
+import { GlobalConstants } from "./GlobalConstants";
+import {
+  RackData,
+  RackHmiPbs,
+  RecipeData,
+  RecipeManagerPbs,
+  SystemFaultData,
+  TaskQueue,
+  UserData,
+  UserManagerFB,
+} from ".";
+import { RobDataDEPRECATED } from "./Devices/Robot";
+
+export enum NodeId {
+  // new node ids
+  ButtonBar = "Main.HMI.ButtonBar",
+  StatusBar = "Main.HMI.StatusBar",
+  RackPbs = "Main.HMI.RackPbs",
+  ROB = "Main.ROB",
+  CNC = "Main.CNC",
+  DBRR = "Main.DBRR",
+  WASH = "Main.WASH",
+  PartData = "Main.PartData",
+  TaskQueue = "Main.TaskQueue",
+  GlobalConstants = "GlobalConstants", // TODO: add this to monitored items
+  MachineUser = "Machine.User",
+  MachineErrors = "Machine.Errors",
+  MachineWarnings = "Machine.Warnings",
+  RackData = "Main.RackData",
+  RecipeData = "Main.RecipeData",
+  ActiveJobRecipe = "Main.Job.ActiveRecipe",
+  RecipeManagerState = "Main.RecipeManagerFB.State",
+  RecipeManagerPbs = "Main.RecipeManagerFB.Pbs",
+  RemoteControlPage = "Main.HMI.RemoteControlPage",
+  RobData = "Main.RobData",
+
+  // TODO: add following to montored items, correctly
+  UserManagerFB = "Main.UserManagerFB",
+}
+
+export interface AppState {
+  [NodeId.StatusBar]: StatusBar;
+  [NodeId.ButtonBar]: ButtonBar;
+  [NodeId.RackPbs]: RackHmiPbs;
+  [NodeId.ROB]: Device;
+  [NodeId.CNC]: Device;
+  [NodeId.DBRR]: Device;
+  [NodeId.WASH]: Device;
+  [NodeId.PartData]: PartDataDeprecated;
+  [NodeId.TaskQueue]: TaskQueue;
+  [NodeId.GlobalConstants]: GlobalConstants;
+  [NodeId.MachineUser]: UserData;
+  [NodeId.MachineErrors]: SystemFaultData;
+  [NodeId.MachineWarnings]: SystemFaultData;
+  [NodeId.RackData]: RackData;
+  [NodeId.RecipeData]: RecipeData[];
+  [NodeId.ActiveJobRecipe]: RecipeData;
+  [NodeId.RecipeManagerState]: number;
+  [NodeId.RecipeManagerPbs]: RecipeManagerPbs;
+  [NodeId.UserManagerFB]: UserManagerFB;
+  [NodeId.RemoteControlPage]: Page;
+  [NodeId.RobData]: RobDataDEPRECATED;
+}
+
+export enum InputNodeId {
+  ButtonBarStopBtnClick = "Main.HMI.ButtonBar.StopBtn.wasClicked",
+  ButtonBarUnloadbtnClick = "Main.HMI.ButtonBar.UnloadBtn.wasClicked",
+  ButtonBarUnlockbtnClick = "Main.HMI.ButtonBar.UnlockBtn.wasClicked",
+  ButtonBarEnergizebtnClick = "Main.HMI.ButtonBar.EnergizeBtn.wasClicked",
+  ButtonBarStartbtnClick = "Main.HMI.ButtonBar.StartBtn.wasClicked",
+  ButtonBarLockbtnClick = "Main.HMI.ButtonBar.LockBtn.wasClicked",
+  ButtonBarResetbtnClick = "Main.HMI.ButtonBar.ResetBtn.wasClicked",
+  ButtonBarJobchangeBtnClick = "Main.HMI.ButtonBar.JobChangeBtn.wasClicked",
+  ButtonBarClearFaultsBtnClick = "Main.HMI.ButtonBar.ClearFaultsBtn.wasClicked",
+
+  PartDataDoneShelf = "Main.PartData.DoneShelf",
+  PartDataRawShelf = "Main.PartData.RawShelf",
+
+  Username = "Machine.User.Username",
+  Password = "Machine.User.Password",
+  LoginBtnBlick = "Machine.User.HmiLoginBtn.wasClicked",
+  LogoutBtnBlick = "Machine.User.HmiLogoutBtn.wasClicked",
+
+  EditRawShelfBtnClick = "Main.HMI.RackPbs.EditRawShelfBtn.wasClicked",
+  EditDoneShelfBtnClick = "Main.HMI.RackPbs.EditDoneShelfBtn.wasClicked",
+  ShelfCancelBtnClick = "Main.HMI.RackPbs.CancelBtn.wasClicked",
+  ShelfSaveBtnClick = "Main.HMI.RackPbs.SaveBtn.wasClicked",
+
+  RecipeManagerEditBtnClick = "Main.recipeManagerFB.pbs.EditBtn.wasClicked",
+  RecipeManagerChangeBtnClick = "Main.recipeManagerFB.pbs.ChangeBtn.wasClicked",
+  RecipeManagerJobSetupBtnClick = "Main.recipeManagerFB.pbs.JobSetupBtn.wasClicked",
+  RecipeManagerActivateBtnClick = "Main.recipeManagerFB.pbs.ActivateBtn",
+  RecipeManagerCancelBtnClick = "Main.recipeManagerFB.pbs.CancelBtn",
+  RecipeManagerStartSetupBtnClick = "Main.recipeManagerFB.pbs.StartSetupBtn",
+  RecipeManagerFinishSetupBtnClick = "Main.recipeManagerFB.pbs.FinishSetupBtn",
+
+  RecipeData = "Main.RecipeData",
+  ActiveJobRecipe = "Machine.Job.ActiveRecipe",
+  JobBatchQuantity = "Machine.Job.BatchQty",
+
+  ActivePage = "Main.HMI.ActivePage",
+
+  CncPart1 = "Main.PartData.Cnc[0]",
+  CncPart2 = "Main.PartData.Cnc[1]",
+  PreOpPart1 = "Main.PartData.CncPreOp[0]",
+  PreOpPart2 = "Main.PartData.CncPreOp[1]",
+  PostOpPart1 = "Main.PartData.CncPostOp[0]",
+  PostOpPart2 = "Main.PartData.CncPostOp[1]",
+  RobotPart1 = "Main.PartData.Robot[0]",
+  RobotPart2 = "Main.PartData.Robot[1]",
+}

package/src/custom-types/BaseDevice/Actions.ts

@@ -1,46 +1,46 @@
-import { DeviceConstants } from "./DeviceConstants";
-
-export enum ActionTypes {
-  MISSION = 0,
-  CMD = 1,
-  TASK = 2,
-  PROCESS = 3,
-  EXEC_METHOD = 4,
-  SCRIPT = 5,
-  COUNT = 6 // Update this value to match the number of action types
-}
-
-export function actionTypeToString(actionType: ActionTypes): string {
-  switch (actionType) {
-    case ActionTypes.MISSION:
-      return "MISSION";
-    case ActionTypes.CMD:
-      return "CMD";
-    case ActionTypes.TASK:
-      return "TASK";
-    case ActionTypes.PROCESS:
-      return "PROCESS";
-    case ActionTypes.EXEC_METHOD:
-      return "EXEC_METHOD";
-    case ActionTypes.SCRIPT:
-      return "SCRIPT";
-    default:
-      return "UNKNOWN";
-  }
-}
-
-export interface DeviceActionRequestData {
-  UniqueActionRequestId: number; // Unique identifier for each action request
-  SenderId: number;
-  ActionType: ActionTypes; // ActionTypes enum
-  ActionId: number; // could be cmd, task or processId
-  ParamArray: number[]; // Array of LREAL values
-};
-
-export const initialDeviceActionRequestData: DeviceActionRequestData = {
-  UniqueActionRequestId: 0,
-  SenderId: 0,
-  ActionType: 0,
-  ActionId: 0,
-  ParamArray: new Array(DeviceConstants.MAX_NUM_PARAMS).fill(0)
+import { DeviceConstants } from "./DeviceConstants";
+
+export enum ActionTypes {
+  MISSION = 0,
+  CMD = 1,
+  TASK = 2,
+  PROCESS = 3,
+  EXEC_METHOD = 4,
+  SCRIPT = 5,
+  COUNT = 6 // Update this value to match the number of action types
+}
+
+export function actionTypeToString(actionType: ActionTypes): string {
+  switch (actionType) {
+    case ActionTypes.MISSION:
+      return "MISSION";
+    case ActionTypes.CMD:
+      return "CMD";
+    case ActionTypes.TASK:
+      return "TASK";
+    case ActionTypes.PROCESS:
+      return "PROCESS";
+    case ActionTypes.EXEC_METHOD:
+      return "EXEC_METHOD";
+    case ActionTypes.SCRIPT:
+      return "SCRIPT";
+    default:
+      return "UNKNOWN";
+  }
+}
+
+export interface DeviceActionRequestData {
+  UniqueActionRequestId: number; // Unique identifier for each action request
+  SenderId: number;
+  ActionType: ActionTypes; // ActionTypes enum
+  ActionId: number; // could be cmd, task or processId
+  ParamArray: number[]; // Array of LREAL values
+};
+
+export const initialDeviceActionRequestData: DeviceActionRequestData = {
+  UniqueActionRequestId: 0,
+  SenderId: 0,
+  ActionType: 0,
+  ActionId: 0,
+  ParamArray: new Array(DeviceConstants.MAX_NUM_PARAMS).fill(0)
 };

package/src/custom-types/BaseDevice/ApiOpcua.ts

@@ -1,71 +1,71 @@
-import { DeviceActionRequestData, initialDeviceActionRequestData } from "./Actions";
-
-export interface ApiOpcuaReqData {
-  id: number; // likely use timestamp ms after epoch
-  checkSum: number;
-  actionRequestData: DeviceActionRequestData;
-  sts: number;
-}
-
-export const initialApiOpcuaReqData: ApiOpcuaReqData = {
-  id: 0,
-  checkSum: 0,
-  actionRequestData: initialDeviceActionRequestData,
-  sts: 0
-};
-
-export interface ApiOpcuaData {
-  hmiReq: ApiOpcuaReqData; // read by PLC
-  hmiResp: ApiOpcuaReqData; // written by PLC
-  orchReq: ApiOpcuaReqData; // read by PLC
-  orchResp: ApiOpcuaReqData; // written by PLC
-  req: ApiOpcuaReqData; // written by mtac, read by plc
-  resp: ApiOpcuaReqData; // written by plc, read by testand
-  internalReq: ApiOpcuaReqData; // used internally by mtac
-  internalResp: ApiOpcuaReqData; // used internally by mtac
-}
-
-export const initialApiOpcuaData: ApiOpcuaData = {
-  hmiReq: {} as ApiOpcuaReqData,
-  hmiResp: {} as ApiOpcuaReqData,
-  orchReq: {} as ApiOpcuaReqData,
-  orchResp: {} as ApiOpcuaReqData,
-  req: {} as ApiOpcuaReqData,
-  resp: {} as ApiOpcuaReqData,
-  internalReq: {} as ApiOpcuaReqData,
-  internalResp: {} as ApiOpcuaReqData
-};
-
-
-export enum ApiReqRespStates {
-    INACTIVE = 0,
-    WRITING = 10,
-    REQUEST_READY = 20,
-    REJECTED_INVALID_CHECKSUM = 30,
-    REJECTED_ACTION_NOT_ACCEPTED = 40,
-    REJECTED_INVALID_SENDERID = 50,
-    ACCEPTED = 1000,
-    // ERROR = 911,
-    // DONE = 1000
-}
-
-export function apiReqRespStateToString(state: ApiReqRespStates): string {
-  switch (state) {
-    case ApiReqRespStates.INACTIVE:
-      return "INACTIVE";
-    case ApiReqRespStates.WRITING:
-      return "WRITING";
-    case ApiReqRespStates.REQUEST_READY:
-      return "REQUEST_READY";
-    case ApiReqRespStates.REJECTED_INVALID_CHECKSUM:
-      return "REJECTED_INVALID_CHECKSUM";
-    case ApiReqRespStates.REJECTED_ACTION_NOT_ACCEPTED:
-      return "REJECTED_ACTION_NOT_ACCEPTED";
-    case ApiReqRespStates.REJECTED_INVALID_SENDERID:
-      return "REJECTED_INVALID_SENDERID";
-    case ApiReqRespStates.ACCEPTED:
-      return "ACCEPTED";
-    default:
-      return "UNKNOWN";
-  }
-}
+import { DeviceActionRequestData, initialDeviceActionRequestData } from "./Actions";
+
+export interface ApiOpcuaReqData {
+  id: number; // likely use timestamp ms after epoch
+  checkSum: number;
+  actionRequestData: DeviceActionRequestData;
+  sts: number;
+}
+
+export const initialApiOpcuaReqData: ApiOpcuaReqData = {
+  id: 0,
+  checkSum: 0,
+  actionRequestData: initialDeviceActionRequestData,
+  sts: 0
+};
+
+export interface ApiOpcuaData {
+  hmiReq: ApiOpcuaReqData; // read by PLC
+  hmiResp: ApiOpcuaReqData; // written by PLC
+  orchReq: ApiOpcuaReqData; // read by PLC
+  orchResp: ApiOpcuaReqData; // written by PLC
+  req: ApiOpcuaReqData; // written by mtac, read by plc
+  resp: ApiOpcuaReqData; // written by plc, read by testand
+  internalReq: ApiOpcuaReqData; // used internally by mtac
+  internalResp: ApiOpcuaReqData; // used internally by mtac
+}
+
+export const initialApiOpcuaData: ApiOpcuaData = {
+  hmiReq: {} as ApiOpcuaReqData,
+  hmiResp: {} as ApiOpcuaReqData,
+  orchReq: {} as ApiOpcuaReqData,
+  orchResp: {} as ApiOpcuaReqData,
+  req: {} as ApiOpcuaReqData,
+  resp: {} as ApiOpcuaReqData,
+  internalReq: {} as ApiOpcuaReqData,
+  internalResp: {} as ApiOpcuaReqData
+};
+
+
+export enum ApiReqRespStates {
+    INACTIVE = 0,
+    WRITING = 10,
+    REQUEST_READY = 20,
+    REJECTED_INVALID_CHECKSUM = 30,
+    REJECTED_ACTION_NOT_ACCEPTED = 40,
+    REJECTED_INVALID_SENDERID = 50,
+    ACCEPTED = 1000,
+    // ERROR = 911,
+    // DONE = 1000
+}
+
+export function apiReqRespStateToString(state: ApiReqRespStates): string {
+  switch (state) {
+    case ApiReqRespStates.INACTIVE:
+      return "INACTIVE";
+    case ApiReqRespStates.WRITING:
+      return "WRITING";
+    case ApiReqRespStates.REQUEST_READY:
+      return "REQUEST_READY";
+    case ApiReqRespStates.REJECTED_INVALID_CHECKSUM:
+      return "REJECTED_INVALID_CHECKSUM";
+    case ApiReqRespStates.REJECTED_ACTION_NOT_ACCEPTED:
+      return "REJECTED_ACTION_NOT_ACCEPTED";
+    case ApiReqRespStates.REJECTED_INVALID_SENDERID:
+      return "REJECTED_INVALID_SENDERID";
+    case ApiReqRespStates.ACCEPTED:
+      return "ACCEPTED";
+    default:
+      return "UNKNOWN";
+  }
+}