@kuriousdesign/machine-sdk 1.0.28 → 1.0.30

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

@@ -1,6 +1,6 @@
 import { Page } from "../enums";
 import { ButtonBar, StatusBar } from "./HMI";
-import { PartData } from "./PartData";
+import { PartDataDeprecated } from "./Part";
 import { Device } from "./BaseDevice/Device";
 import { GlobalConstants } from "./GlobalConstants";
 import { RackData, RackHmiPbs, RecipeData, RecipeManagerPbs, SystemFaultData, TaskQueue, UserData, UserManagerFB, RobData } from ".";
@@ -35,7 +35,7 @@ export interface AppState {
     [NodeId.CNC]: Device;
     [NodeId.DBRR]: Device;
     [NodeId.WASH]: Device;
-    [NodeId.PartData]: PartData;
+    [NodeId.PartData]: PartDataDeprecated;
     [NodeId.TaskQueue]: TaskQueue;
     [NodeId.GlobalConstants]: GlobalConstants;
     [NodeId.MachineUser]: UserData;

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

@@ -1,4 +1,5 @@
-import { ComponentAnimation } from ".";
+import { ComponentAnimation, TaskQueue } from ".";
+import { PartData } from "./Part";
 export interface UserData {
     activeUser: number;
     hmiLoginBtn: ComponentAnimation;
@@ -8,10 +9,22 @@ export interface FaultCodeData {
     deviceId: number;
     code: number;
 }
+export declare const initialFaultCodeData: FaultCodeData;
 export interface SystemFaultData {
     list: FaultCodeData[];
     present: boolean;
 }
+export declare const initialSystemFaultData: SystemFaultData;
+export interface MachineCfg {
+    firmwareVersion: string;
+    cellType: string;
+    softwareMode: string;
+    allowAnonymousControl: boolean;
+    deviceIsBypassed: boolean[];
+    apiOpcuaDeviceId: number;
+    ethernetAdapterList: number[];
+}
+export declare const initialMachineCfg: MachineCfg;
 export interface Machine {
     estopCircuit_OK: boolean;
     estopCircuitDelayed_OK: boolean;
@@ -21,4 +34,10 @@ export interface Machine {
     ethercatMaster_OK: boolean;
     ethercatSlaves_OK: boolean;
     supplyAir_OK: boolean;
+    cfg: MachineCfg;
+    parts: PartData[];
+    errors: SystemFaultData;
+    warnings: SystemFaultData;
+    taskQueue: TaskQueue;
 }
+export declare const initialMachine: Machine;

package/dist/custom-types/Machine.js

@@ -1,2 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.initialMachine = exports.initialMachineCfg = exports.initialSystemFaultData = exports.initialFaultCodeData = void 0;
+const _1 = require(".");
+exports.initialFaultCodeData = {
+    deviceId: 0,
+    code: 0,
+};
+exports.initialSystemFaultData = {
+    list: Array(_1.DeviceConstants.DEVICE_FAULTCODEARRAY_LEN).fill(null).map(() => ({ ...exports.initialFaultCodeData })),
+    present: false,
+};
+exports.initialMachineCfg = {
+    firmwareVersion: "",
+    cellType: "",
+    softwareMode: "",
+    allowAnonymousControl: false,
+    deviceIsBypassed: [],
+    apiOpcuaDeviceId: -1,
+    ethernetAdapterList: [],
+};
+exports.initialMachine = {
+    estopCircuit_OK: false,
+    estopCircuitDelayed_OK: false,
+    fenceCircuit_OK: false,
+    guardDoors_LOCKED: false,
+    networkHealth_OK: false,
+    ethercatMaster_OK: false,
+    ethercatSlaves_OK: false,
+    supplyAir_OK: false,
+    cfg: exports.initialMachineCfg,
+    parts: [],
+    errors: exports.initialSystemFaultData,
+    warnings: exports.initialSystemFaultData,
+    taskQueue: _1.initialTaskQueue,
+};

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

@@ -0,0 +1,25 @@
+import { PartStateDeprecated as PartStateDeprecated } from "../enums";
+export interface PartData {
+    processSts: number;
+    validation: PartValidationData;
+    loadedBadSensor: boolean;
+    fixtureLocationWhenLoaded: number;
+    currentLocation: number;
+    inFixture: boolean;
+}
+export interface PartValidationData {
+    state: number;
+    preWeightKg: number;
+    postWeightKg: number;
+    linerWeightKg: number;
+}
+export interface PartDataDeprecated {
+    cncPreOp: [PartStateDeprecated, PartStateDeprecated];
+    cnc: [PartStateDeprecated, PartStateDeprecated];
+    cncPostOp: [PartStateDeprecated, PartStateDeprecated];
+    doneShelf: PartStateDeprecated[];
+    rawShelf: PartStateDeprecated[];
+    robot: [PartStateDeprecated, PartStateDeprecated];
+    washer: [PartStateDeprecated, PartStateDeprecated];
+    hmiEditingAllowed: boolean;
+}

package/dist/custom-types/Part.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,24 +1,25 @@
-import { Priority, TaskId } from "..";
+export declare enum Priorities {
+    NONE = 0,// do not remove or change this
+    LOAD_PARTS = 2,
+    START_UTILITIES = 10,
+    PRE_WEIGH_TUBES = 20,
+    APPLY_LINER = 30,
+    PHOTOGRAPH_TUBES = 40,
+    POST_WEIGH_TUBES = 50,
+    STOP_UTILITIES = 60,
+    UNLOAD_PARTS = 70
+}
+export interface TaskData {
+    targetId: number;
+    taskId: number;
+    paramArray: number[];
+    state: number;
+}
+export declare const initialTaskData: TaskData;
 export interface TaskQueue {
-    topPriority: Priority;
-    taskList: TaskId[];
+    topPriority: Priorities;
+    taskList: TaskData[];
     taskCnt: number;
     activeTaskIndex: number;
 }
-export interface TaskData {
-    id: number;
-    TaskString: string;
-    T: number;
-    TaskType: number;
-    StartPositionId: number;
-    EndPositionId: number;
-    GateId: number;
-    StationId: number;
-    PartStatusStart: number[];
-    PartStatusEnd: number[];
-    PartId: number;
-    OffsetUserFrameId: number;
-    GripperPositionId: number;
-    LeftGripperMustBeEmpty: boolean;
-    isCurrentlyAllowed: boolean;
-}
+export declare const initialTaskQueue: TaskQueue;

package/dist/custom-types/TaskQueue.js

@@ -1,2 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.initialTaskQueue = exports.initialTaskData = exports.Priorities = void 0;
+const BaseDevice_1 = require("./BaseDevice");
+var Priorities;
+(function (Priorities) {
+    Priorities[Priorities["NONE"] = 0] = "NONE";
+    Priorities[Priorities["LOAD_PARTS"] = 2] = "LOAD_PARTS";
+    Priorities[Priorities["START_UTILITIES"] = 10] = "START_UTILITIES";
+    Priorities[Priorities["PRE_WEIGH_TUBES"] = 20] = "PRE_WEIGH_TUBES";
+    Priorities[Priorities["APPLY_LINER"] = 30] = "APPLY_LINER";
+    Priorities[Priorities["PHOTOGRAPH_TUBES"] = 40] = "PHOTOGRAPH_TUBES";
+    Priorities[Priorities["POST_WEIGH_TUBES"] = 50] = "POST_WEIGH_TUBES";
+    Priorities[Priorities["STOP_UTILITIES"] = 60] = "STOP_UTILITIES";
+    Priorities[Priorities["UNLOAD_PARTS"] = 70] = "UNLOAD_PARTS";
+})(Priorities || (exports.Priorities = Priorities = {}));
+exports.initialTaskData = {
+    targetId: 0,
+    taskId: 0,
+    paramArray: Array(BaseDevice_1.DeviceConstants.MAX_NUM_PARAMS).fill(0),
+    state: 0
+};
+exports.initialTaskQueue = {
+    topPriority: Priorities.NONE,
+    taskList: Array(BaseDevice_1.DeviceConstants.MAX_NUM_PARAMS).fill(null).map(() => ({ ...exports.initialTaskData })),
+    taskCnt: 0,
+    activeTaskIndex: -1
+};

package/dist/enums/States.d.ts

@@ -26,7 +26,7 @@ export declare enum States {
 export declare function convertStateToString(state: States): "ABORTING" | "ERROR" | "KILLED" | "INACTIVE" | "RESETTING" | "IDLE" | "RUNNING" | "STOPPING" | "PAUSED" | "DONE" | "MANUAL" | "UNKNOWN";
 export declare function convertStateToColor(state: States): "text-darkred-500" | "text-red-500" | "text-gray-500" | "text-white" | "text-lightblue-500" | "text-blue-500" | "text-green-500" | "text-orange-500" | "text-purple-500" | "text-pink-500" | undefined;
 export declare function getStateFromStep(step: number): States;
-export declare enum PartState {
+export declare enum PartStateDeprecated {
     Empty = 0,//no part present
     Raw = 10,
     DeburrBottomStarted = 11,

package/dist/enums/States.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BannerMode = exports.StatusMsg = exports.TaskItemState = exports.PartState = exports.States = exports.VisibilityState = void 0;
+exports.BannerMode = exports.StatusMsg = exports.TaskItemState = exports.PartStateDeprecated = exports.States = exports.VisibilityState = void 0;
 exports.convertStateToString = convertStateToString;
 exports.convertStateToColor = convertStateToColor;
 exports.getStateFromStep = getStateFromStep;
@@ -143,24 +143,24 @@ function getStateFromStep(step) {
     }
     return state;
 }
-var PartState;
-(function (PartState) {
-    PartState[PartState["Empty"] = 0] = "Empty";
-    PartState[PartState["Raw"] = 10] = "Raw";
-    PartState[PartState["DeburrBottomStarted"] = 11] = "DeburrBottomStarted";
-    PartState[PartState["DeburrBottomFinished"] = 12] = "DeburrBottomFinished";
-    PartState[PartState["DeburrTopStarted"] = 15] = "DeburrTopStarted";
-    PartState[PartState["Deburred"] = 20] = "Deburred";
-    PartState[PartState["MachiningStarted"] = 45] = "MachiningStarted";
-    PartState[PartState["Machined"] = 50] = "Machined";
-    PartState[PartState["WashStarted"] = 55] = "WashStarted";
-    PartState[PartState["Washed"] = 60] = "Washed";
-    PartState[PartState["DryStarted"] = 65] = "DryStarted";
-    PartState[PartState["Dryed"] = 70] = "Dryed";
-    PartState[PartState["Finished"] = 100] = "Finished";
-    PartState[PartState["Scrapped"] = 911] = "Scrapped";
-    PartState[PartState["Error"] = 999] = "Error";
-})(PartState || (exports.PartState = PartState = {}));
+var PartStateDeprecated;
+(function (PartStateDeprecated) {
+    PartStateDeprecated[PartStateDeprecated["Empty"] = 0] = "Empty";
+    PartStateDeprecated[PartStateDeprecated["Raw"] = 10] = "Raw";
+    PartStateDeprecated[PartStateDeprecated["DeburrBottomStarted"] = 11] = "DeburrBottomStarted";
+    PartStateDeprecated[PartStateDeprecated["DeburrBottomFinished"] = 12] = "DeburrBottomFinished";
+    PartStateDeprecated[PartStateDeprecated["DeburrTopStarted"] = 15] = "DeburrTopStarted";
+    PartStateDeprecated[PartStateDeprecated["Deburred"] = 20] = "Deburred";
+    PartStateDeprecated[PartStateDeprecated["MachiningStarted"] = 45] = "MachiningStarted";
+    PartStateDeprecated[PartStateDeprecated["Machined"] = 50] = "Machined";
+    PartStateDeprecated[PartStateDeprecated["WashStarted"] = 55] = "WashStarted";
+    PartStateDeprecated[PartStateDeprecated["Washed"] = 60] = "Washed";
+    PartStateDeprecated[PartStateDeprecated["DryStarted"] = 65] = "DryStarted";
+    PartStateDeprecated[PartStateDeprecated["Dryed"] = 70] = "Dryed";
+    PartStateDeprecated[PartStateDeprecated["Finished"] = 100] = "Finished";
+    PartStateDeprecated[PartStateDeprecated["Scrapped"] = 911] = "Scrapped";
+    PartStateDeprecated[PartStateDeprecated["Error"] = 999] = "Error";
+})(PartStateDeprecated || (exports.PartStateDeprecated = PartStateDeprecated = {}));
 var TaskItemState;
 (function (TaskItemState) {
     TaskItemState[TaskItemState["TaskDone"] = 48] = "TaskDone";

package/dist/enums/index.d.ts

@@ -4,6 +4,5 @@ export * from "./OpcuaDatatype";
 export * from "./ExtrusionType";
 export * from "./DeviceId";
 export * from "./TaskId";
-export * from "./Priorities";
 export * from "./Pages";
 export * from "./RobPositions";

package/dist/enums/index.js

@@ -20,6 +20,5 @@ __exportStar(require("./OpcuaDatatype"), exports);
 __exportStar(require("./ExtrusionType"), exports);
 __exportStar(require("./DeviceId"), exports);
 __exportStar(require("./TaskId"), exports);
-__exportStar(require("./Priorities"), exports);
 __exportStar(require("./Pages"), exports);
 __exportStar(require("./RobPositions"), exports);

package/dist/functions/colorMapping.d.ts

@@ -1,4 +1,4 @@
 import { Color } from "../enums/Colors";
-import { States, PartState } from "../enums/States";
+import { States, PartStateDeprecated } from "../enums/States";
 export declare function deviceStateToColorMap(state: States): Color;
-export declare function partStateToColorMap(state: PartState): Color;
+export declare function partStateToColorMap(state: PartStateDeprecated): Color;

package/dist/functions/colorMapping.js

@@ -23,21 +23,21 @@ function deviceStateToColorMap(state) {
 }
 function partStateToColorMap(state) {
     const colorMap = {
-        [States_1.PartState.Empty]: Colors_1.Color.Empty,
-        [States_1.PartState.Raw]: Colors_1.Color.Raw,
-        [States_1.PartState.DeburrBottomStarted]: Colors_1.Color.Processing,
-        [States_1.PartState.DeburrBottomFinished]: Colors_1.Color.DeburrBottomFinished,
-        [States_1.PartState.DeburrTopStarted]: Colors_1.Color.Processing,
-        [States_1.PartState.Deburred]: Colors_1.Color.Deburred,
-        [States_1.PartState.MachiningStarted]: Colors_1.Color.Processing,
-        [States_1.PartState.Machined]: Colors_1.Color.Machined,
-        [States_1.PartState.WashStarted]: Colors_1.Color.Processing,
-        [States_1.PartState.Washed]: Colors_1.Color.Processing,
-        [States_1.PartState.DryStarted]: Colors_1.Color.Processing,
-        [States_1.PartState.Dryed]: Colors_1.Color.Dryed,
-        [States_1.PartState.Finished]: Colors_1.Color.Finished,
-        [States_1.PartState.Scrapped]: Colors_1.Color.Scrapped,
-        [States_1.PartState.Error]: Colors_1.Color.Error,
+        [States_1.PartStateDeprecated.Empty]: Colors_1.Color.Empty,
+        [States_1.PartStateDeprecated.Raw]: Colors_1.Color.Raw,
+        [States_1.PartStateDeprecated.DeburrBottomStarted]: Colors_1.Color.Processing,
+        [States_1.PartStateDeprecated.DeburrBottomFinished]: Colors_1.Color.DeburrBottomFinished,
+        [States_1.PartStateDeprecated.DeburrTopStarted]: Colors_1.Color.Processing,
+        [States_1.PartStateDeprecated.Deburred]: Colors_1.Color.Deburred,
+        [States_1.PartStateDeprecated.MachiningStarted]: Colors_1.Color.Processing,
+        [States_1.PartStateDeprecated.Machined]: Colors_1.Color.Machined,
+        [States_1.PartStateDeprecated.WashStarted]: Colors_1.Color.Processing,
+        [States_1.PartStateDeprecated.Washed]: Colors_1.Color.Processing,
+        [States_1.PartStateDeprecated.DryStarted]: Colors_1.Color.Processing,
+        [States_1.PartStateDeprecated.Dryed]: Colors_1.Color.Dryed,
+        [States_1.PartStateDeprecated.Finished]: Colors_1.Color.Finished,
+        [States_1.PartStateDeprecated.Scrapped]: Colors_1.Color.Scrapped,
+        [States_1.PartStateDeprecated.Error]: Colors_1.Color.Error,
     };
     return colorMap[state];
 }

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

@@ -9,6 +9,7 @@ export declare const MachineTags: {
     axisStsArray: string;
     HeartbeatPLC: string;
     HeartbeatHMI: string;
+    parts: string;
 };
 export declare const DeviceTags: {
     Cfg: string;

package/dist/plc-tags/index.js

@@ -26,7 +26,8 @@ exports.MachineTags = {
     registeredDevices: 'RegisteredDevices',
     axisStsArray: 'AxisStsArray',
     HeartbeatPLC: 'HeartbeatPLC',
-    HeartbeatHMI: 'HeartbeatHMI'
+    HeartbeatHMI: 'HeartbeatHMI',
+    parts: 'Parts',
 };
 exports.DeviceTags = {
     Cfg: 'Cfg',

package/package.json

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

package/src/custom-types/AppState.ts

@@ -1,6 +1,6 @@
-import { PartState, Page } from "../enums";
+import { PartStateDeprecated, Page } from "../enums";
 import { ButtonBar, StatusBar } from "./HMI";
-import { PartData } from "./PartData";
+import { PartDataDeprecated } from "./Part";
 import { Device } from "./BaseDevice/Device";
 import { GlobalConstants } from "./GlobalConstants";
 import {
@@ -51,7 +51,7 @@ export interface AppState {
   [NodeId.CNC]: Device;
   [NodeId.DBRR]: Device;
   [NodeId.WASH]: Device;
-  [NodeId.PartData]: PartData;
+  [NodeId.PartData]: PartDataDeprecated;
   [NodeId.TaskQueue]: TaskQueue;
   [NodeId.GlobalConstants]: GlobalConstants;
   [NodeId.MachineUser]: UserData;

package/src/custom-types/Machine.ts

@@ -1,4 +1,5 @@
-import { ComponentAnimation } from ".";
+import { ComponentAnimation, DeviceConstants, initialTaskQueue, TaskQueue } from ".";
+import { PartData } from "./Part";
 
 export interface UserData {
   activeUser: number;
@@ -11,16 +12,59 @@ export interface FaultCodeData {
   code: number;
 }
 
+export const initialFaultCodeData: FaultCodeData = {
+  deviceId: 0,
+  code: 0,
+};
+
 export interface SystemFaultData {
   list: FaultCodeData[];
   present: boolean;
 }
 
-// export interface Machine {
-//   user: UserData;
-//   errors: SystemFaultData;
-//   warnings: SystemFaultData;
-// }
+export const initialSystemFaultData: SystemFaultData = {
+  list: Array(DeviceConstants.DEVICE_FAULTCODEARRAY_LEN).fill(null).map(() => ({ ...initialFaultCodeData })),
+  present: false,
+};
+
+
+
+// TYPE MachineCfg :
+// STRUCT
+// 	FirmwareVersion: STRING;
+// 	CellType: CellTypes;
+// 	SoftwareMode: SoftwareModes;
+// 	AllowAnonymousControl: BOOL;
+// 	DeviceIsBypassed: ARRAY[0..(GCs.NUM_DEVICES-1)] OF BOOL; //used to set devices to be bypassed or not
+// 	ApiOpcuaDeviceId:INT; //designates which device is using the opcua api
+// 	EthernetAdapterList: ARRAY[0..4] OF INT;
+// 	//SerialNumber: STRING(255); moved to ControllerInstanceData
+// 	//Name: STRING; moved to ControllerInstanceData
+// 	//Location: STRING; moved to ControllerInstanceData
+	
+// END_STRUCT
+// END_TYPE
+
+
+export interface MachineCfg {
+  firmwareVersion: string;
+  cellType: string;
+  softwareMode: string;
+  allowAnonymousControl: boolean;
+  deviceIsBypassed: boolean[];
+  apiOpcuaDeviceId: number;
+  ethernetAdapterList: number[];
+}
+
+export const initialMachineCfg: MachineCfg = {
+  firmwareVersion: "",
+  cellType: "",
+  softwareMode: "",
+  allowAnonymousControl: false,
+  deviceIsBypassed: [],
+  apiOpcuaDeviceId: -1,
+  ethernetAdapterList: [],
+};
 
 export interface Machine {
     estopCircuit_OK: boolean;
@@ -31,4 +75,25 @@ export interface Machine {
     ethercatMaster_OK: boolean;
     ethercatSlaves_OK: boolean;
     supplyAir_OK: boolean;
-}
+    cfg: MachineCfg;
+    parts: PartData[];
+    errors: SystemFaultData;
+    warnings: SystemFaultData;
+    taskQueue: TaskQueue;
+}
+
+export const initialMachine: Machine = {  
+    estopCircuit_OK: false,
+    estopCircuitDelayed_OK: false,
+    fenceCircuit_OK: false,
+    guardDoors_LOCKED: false,
+    networkHealth_OK: false,
+    ethercatMaster_OK: false,
+    ethercatSlaves_OK: false,
+    supplyAir_OK: false,
+    cfg: initialMachineCfg,
+    parts: [],
+    errors: initialSystemFaultData,
+    warnings: initialSystemFaultData,
+    taskQueue: initialTaskQueue,
+};

package/src/custom-types/Part.ts

@@ -0,0 +1,57 @@
+import { PartStateDeprecated as PartStateDeprecated } from "../enums";
+
+
+
+// TYPE PartValidationData :
+// STRUCT
+// 	State:INT;
+// 	PreWeightKg:LREAL;
+// 	PostWeightKg:LREAL;
+// 	LinerWeightKg:LREAL;
+// END_STRUCT
+// END_TYPE
+
+
+// TYPE PartData :
+// STRUCT
+// 	ProcessSts:INT;//PartStates enum
+// 	Validation:PartValidationData;
+// 	LoadedBadSensor:BOOL; //marks if loaded into system with bad part present sensor
+// 	FixtureLocationWhenLoaded:INT; //LocationIds enum, where this part was loaced
+// 	CurrentLocation:INT; //LocationIds enum, this is also the same as the partIndex of the Machine.PartData[partIndex]
+// 	InFixture:BOOL; //CurrentLocation = FixtureLocationWhenLoaded
+	
+// 	//RecipeData:PartRecipeData;
+// END_STRUCT
+// END_TYPE
+
+
+
+export interface PartData {
+    processSts: number; // PartStates enum
+    validation: PartValidationData;
+    loadedBadSensor: boolean; // marks if loaded into system with bad part present sensor
+    fixtureLocationWhenLoaded: number; // LocationIds enum, where this part was loaced
+    currentLocation: number; // LocationIds enum, this is also the same as the partIndex of the Machine.PartData[partIndex]
+    inFixture: boolean; // CurrentLocation = FixtureLocationWhenLoaded
+}
+
+export interface PartValidationData {
+    state: number; // PartStates enum
+    preWeightKg: number; // LREAL
+    postWeightKg: number; // LREAL
+    linerWeightKg: number; // LREAL
+}
+
+
+
+export interface PartDataDeprecated {
+  cncPreOp: [PartStateDeprecated, PartStateDeprecated];
+  cnc: [PartStateDeprecated, PartStateDeprecated];
+  cncPostOp: [PartStateDeprecated, PartStateDeprecated];
+  doneShelf: PartStateDeprecated[];
+  rawShelf: PartStateDeprecated[];
+  robot: [PartStateDeprecated, PartStateDeprecated];
+  washer: [PartStateDeprecated, PartStateDeprecated];
+  hmiEditingAllowed: boolean;
+}

package/src/custom-types/TaskQueue.ts

@@ -1,31 +1,43 @@
-import { Priority, TaskId } from "..";
+import { DeviceConstants } from "./BaseDevice";
 
-export interface TaskQueue {
-  topPriority: Priority;
-  taskList: TaskId[];
-  taskCnt: number;
-  activeTaskIndex: number;
+export enum Priorities {
+    NONE = 0, // do not remove or change this
+    LOAD_PARTS = 2,
+    START_UTILITIES = 10,
+    PRE_WEIGH_TUBES = 20,
+    APPLY_LINER = 30,
+    PHOTOGRAPH_TUBES = 40,
+    POST_WEIGH_TUBES = 50,
+    STOP_UTILITIES = 60,
+    UNLOAD_PARTS = 70
 }
 
-export interface TaskData {
-  id: number;
-  TaskString: string; //like a description
-  T: number; // time in seconds to complete task
-  TaskType: number; //Pick (state change ignored), Load (state change ignored), Move (state change ignored), Move with Process (state change used), Transform/Process (stage change used)
 
-  StartPositionId: number; //starting position required before this task is allowed
-  EndPositionId: number; //ending position after this task is finished
-  GateId: number; //robot-cnc door, for example
 
-  StationId: number; //used for transform processes
-  PartStatusStart: number[];
-  PartStatusEnd: number[];
-  PartId: number; //used for pick and load moves
+export interface TaskData {
+  targetId: number;
+  taskId: number; // specific to the targetId
+  paramArray: number[]; // ARRAY[0..DeviceConstants.MAX_NUM_PARAMS-1] OF LREAL;
+  state: number; // DeviceStates: 0 (NONE), IDLE, RUNNING, PAUSED, ERROR, DONE
+}
 
-  OffsetUserFrameId: number; //90 Through 99, corresponds to our PRs 90-99 which correspdond to the user frame
+export const initialTaskData: TaskData = {
+  targetId: 0,
+  taskId: 0,
+  paramArray: Array(DeviceConstants.MAX_NUM_PARAMS).fill(0),
+  state: 0
+};  
 
-  GripperPositionId: number; //0 for left, 1 for right, 2 for both (used for moves in and out of CNC, and to from washer)
-  LeftGripperMustBeEmpty: boolean;
 
-  isCurrentlyAllowed: boolean; //set this with logic, do not configure
+export interface TaskQueue {
+  topPriority: Priorities;
+  taskList: TaskData[];
+  taskCnt: number;
+  activeTaskIndex: number;
 }
+export const initialTaskQueue: TaskQueue = {
+  topPriority: Priorities.NONE,
+  taskList: Array(DeviceConstants.MAX_NUM_PARAMS).fill(null).map(() => ({ ...initialTaskData })),
+  taskCnt: 0,
+  activeTaskIndex: -1
+};

package/src/enums/States.ts

@@ -137,7 +137,7 @@ export function getStateFromStep(step:number): States {
     return state;
 }
 
-export enum PartState {
+export enum PartStateDeprecated {
   Empty = 0, //no part present
   Raw = 10,
   DeburrBottomStarted = 11,

package/src/enums/index.ts

@@ -5,6 +5,6 @@ export * from "./ExtrusionType";
 
 export * from "./DeviceId";
 export * from "./TaskId";
-export * from "./Priorities";
+
 export * from "./Pages";
 export * from "./RobPositions";

package/src/functions/colorMapping.ts

@@ -1,5 +1,5 @@
 import { Color } from "../enums/Colors";
-import { States, PartState } from "../enums/States";
+import { States, PartStateDeprecated } from "../enums/States";
 
 export function deviceStateToColorMap(state: States): Color {
   const colorMap: { [key in States]: Color } = {
@@ -20,23 +20,23 @@ export function deviceStateToColorMap(state: States): Color {
   return colorMap[state];
 }
 
-export function partStateToColorMap(state: PartState): Color {
-  const colorMap: { [key in PartState]: Color } = {
-    [PartState.Empty]: Color.Empty,
-    [PartState.Raw]: Color.Raw,
-    [PartState.DeburrBottomStarted]: Color.Processing,
-    [PartState.DeburrBottomFinished]: Color.DeburrBottomFinished,
-    [PartState.DeburrTopStarted]: Color.Processing,
-    [PartState.Deburred]: Color.Deburred,
-    [PartState.MachiningStarted]: Color.Processing,
-    [PartState.Machined]: Color.Machined,
-    [PartState.WashStarted]: Color.Processing,
-    [PartState.Washed]: Color.Processing,
-    [PartState.DryStarted]: Color.Processing,
-    [PartState.Dryed]: Color.Dryed,
-    [PartState.Finished]: Color.Finished,
-    [PartState.Scrapped]: Color.Scrapped,
-    [PartState.Error]: Color.Error,
+export function partStateToColorMap(state: PartStateDeprecated): Color {
+  const colorMap: { [key in PartStateDeprecated]: Color } = {
+    [PartStateDeprecated.Empty]: Color.Empty,
+    [PartStateDeprecated.Raw]: Color.Raw,
+    [PartStateDeprecated.DeburrBottomStarted]: Color.Processing,
+    [PartStateDeprecated.DeburrBottomFinished]: Color.DeburrBottomFinished,
+    [PartStateDeprecated.DeburrTopStarted]: Color.Processing,
+    [PartStateDeprecated.Deburred]: Color.Deburred,
+    [PartStateDeprecated.MachiningStarted]: Color.Processing,
+    [PartStateDeprecated.Machined]: Color.Machined,
+    [PartStateDeprecated.WashStarted]: Color.Processing,
+    [PartStateDeprecated.Washed]: Color.Processing,
+    [PartStateDeprecated.DryStarted]: Color.Processing,
+    [PartStateDeprecated.Dryed]: Color.Dryed,
+    [PartStateDeprecated.Finished]: Color.Finished,
+    [PartStateDeprecated.Scrapped]: Color.Scrapped,
+    [PartStateDeprecated.Error]: Color.Error,
   };
 
   return colorMap[state];

package/src/plc-tags/index.ts

@@ -10,7 +10,8 @@ export const MachineTags = {
     registeredDevices: 'RegisteredDevices',
     axisStsArray: 'AxisStsArray',
     HeartbeatPLC: 'HeartbeatPLC',
-    HeartbeatHMI: 'HeartbeatHMI'
+    HeartbeatHMI: 'HeartbeatHMI',
+    parts: 'Parts',
 }
 
 export const DeviceTags = {

package/src/custom-types/PartData.ts

@@ -1,11 +0,0 @@
-import { PartState } from "../enums";
-export interface PartData {
-  cncPreOp: [PartState, PartState];
-  cnc: [PartState, PartState];
-  cncPostOp: [PartState, PartState];
-  doneShelf: PartState[];
-  rawShelf: PartState[];
-  robot: [PartState, PartState];
-  washer: [PartState, PartState];
-  hmiEditingAllowed: boolean;
-}

package/src/enums/Priorities.ts

@@ -1,21 +0,0 @@
-export enum Priority {
-  //TopPriorities must be ordered from most important (priority = 1) to least important
-  NoPriority = 0, //no priorites were detected
-  StartCnc = 1, //priority to start cnc (get robot out of cnc, close door and start that thing)
-  DropoffMachinedParts = 2, //Dropoff machined parts in the post op (do this after cnc machining and before cnc loading)
-  LoadCnc = 3, //Top priority to load the deburred parts into the cnc
-  FinishPostOp = 4, //Top prioroity to finish parts after the cnc op
-  UnloadCnc = 5, //Top priority to remove machined parts from cnc
-  PrepParts = 6, //Top priority to get two parts deburred into the preop deadnest
-  WaitToUnload = 7,
-  CloseCncDoor = 8,
-
-  //FillRobotWithTwoDeburredParts=11, //sub priority to loading cnc, robot needs to fill both grippers with deburred parts
-  DeburrPart = 20, //sub priorty to loading cnc and robot needs deburred parts
-  PickRawShelf = 21, //sub priority to pick raw shelf
-  PickRawPartFromPreOp = 22, //sub priority to pick raw shelf
-  LoadPreOpWithDeburred = 23,
-  GatherDeburredPartsForCncLoad = 24, //Top priority to grab deburred parts and get in ready position to load cnc (do this before cnc loading)
-  WashParts = 31,
-  RejectScrap = 91, //priority to pick and reject a scrap part
-}