@kuriousdesign/machine-sdk 1.0.31 → 1.0.33

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

@@ -1,5 +1,5 @@
 import { ComponentAnimation, DeviceRegistration, TaskQueue } from ".";
-import { PartData } from "./Part";
+import { PartDataStatus } from "./Part";
 export interface UserData {
     activeUser: number;
     hmiLoginBtn: ComponentAnimation;
@@ -35,7 +35,7 @@ export interface Machine {
     ethercatSlaves_OK: boolean;
     supplyAir_OK: boolean;
     cfg: MachineCfg;
-    parts: PartData[];
+    pdmSts: PartDataStatus;
     errors: SystemFaultData;
     warnings: SystemFaultData;
     taskQueue: TaskQueue;

package/dist/custom-types/Machine.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initialMachine = exports.initialMachineCfg = exports.initialSystemFaultData = exports.initialFaultCodeData = void 0;
 const _1 = require(".");
+const Part_1 = require("./Part");
 exports.initialFaultCodeData = {
     deviceId: 0,
     code: 0,
@@ -29,9 +30,9 @@ exports.initialMachine = ({
     ethercatSlaves_OK: false,
     supplyAir_OK: false,
     cfg: { ...exports.initialMachineCfg },
-    parts: [],
+    pdmSts: Part_1.initialPartDataStatus,
     errors: { ...exports.initialSystemFaultData },
     warnings: { ...exports.initialSystemFaultData },
     taskQueue: { ..._1.initialTaskQueue },
-    registeredDevices: Array(_1.GCs.NUM_DEVICES).fill(null).map(() => ({ ..._1.initialDeviceRegistration }))
+    registeredDevices: [],
 });

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

@@ -13,6 +13,34 @@ export interface PartValidationData {
     postWeightKg: number;
     linerWeightKg: number;
 }
+export declare const initialPartValidationData: PartValidationData;
+export declare const initialPartData: PartData;
+export interface PartDataStatus {
+    parts: PartData[];
+    allStationsAreEmpty: boolean;
+    rawShelfIsEmpty: boolean;
+    doneShelfIsEmpty: boolean;
+    doneShelfIsFull: boolean;
+    doneShelfSpacesLeftCnt: number;
+    rawShelfPartsLeftCnt: number;
+    allFixturesAreEmpty: boolean;
+    leftFixtureIsEmpty: boolean;
+    rightFixtureIsEmpty: boolean;
+    robotIsEmpty: boolean;
+    robotHasNoPostOpParts: boolean;
+    robotHasMachinedParts: boolean;
+    robotHasOnePreTopDeburring: boolean;
+    robotHasOnePreMachining: boolean;
+    robotHasTwoPreMachining: boolean;
+    robotHasOneRaw: boolean;
+    oneOrMoreRejectPartsInCell: boolean;
+    oneOrMoreRejectPartsInRobot: boolean;
+    robotHasOneFinishedPart: boolean;
+    finishedCnt: number;
+    activeCnt: number;
+    batchCntFlag: boolean;
+}
+export declare const initialPartDataStatus: PartDataStatus;
 export interface PartDataDeprecated {
     cncPreOp: [PartStateDeprecated, PartStateDeprecated];
     cnc: [PartStateDeprecated, PartStateDeprecated];

package/dist/custom-types/Part.js

@@ -1,2 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.initialPartDataStatus = exports.initialPartData = exports.initialPartValidationData = void 0;
+const GlobalConstants_1 = require("./GlobalConstants");
+exports.initialPartValidationData = {
+    state: -1,
+    preWeightKg: -1,
+    postWeightKg: -1,
+    linerWeightKg: -1,
+};
+exports.initialPartData = {
+    processSts: -1,
+    validation: { ...exports.initialPartValidationData },
+    loadedBadSensor: false,
+    fixtureLocationWhenLoaded: -1,
+    currentLocation: -1,
+    inFixture: false,
+};
+exports.initialPartDataStatus = {
+    parts: Array(GlobalConstants_1.GCs.PARTDATA_COUNT).fill(null).map(() => ({ ...exports.initialPartData })),
+    allStationsAreEmpty: false,
+    rawShelfIsEmpty: false,
+    doneShelfIsEmpty: false,
+    doneShelfIsFull: false,
+    doneShelfSpacesLeftCnt: 0,
+    rawShelfPartsLeftCnt: 0,
+    allFixturesAreEmpty: false,
+    leftFixtureIsEmpty: false,
+    rightFixtureIsEmpty: false,
+    robotIsEmpty: false,
+    robotHasNoPostOpParts: false,
+    robotHasMachinedParts: false,
+    robotHasOnePreTopDeburring: false,
+    robotHasOnePreMachining: false,
+    robotHasTwoPreMachining: false,
+    robotHasOneRaw: false,
+    oneOrMoreRejectPartsInCell: false,
+    oneOrMoreRejectPartsInRobot: false,
+    robotHasOneFinishedPart: false,
+    finishedCnt: 0,
+    activeCnt: 0,
+    batchCntFlag: false,
+};

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

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

package/dist/plc-tags/index.js

@@ -28,6 +28,7 @@ exports.MachineTags = {
     HeartbeatPLC: 'HeartbeatPLC',
     HeartbeatHMI: 'HeartbeatHMI',
     parts: 'Parts',
+    taskQueue: 'TaskQueue',
 };
 exports.DeviceTags = {
     Cfg: 'Cfg',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kuriousdesign/machine-sdk",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "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,5 +1,5 @@
 import { ComponentAnimation, DeviceConstants, DeviceRegistration, GCs, initialDeviceRegistration, initialTaskQueue, TaskQueue } from ".";
-import { PartData } from "./Part";
+import { initialPartDataStatus, PartData, PartDataStatus } from "./Part";
 
 
 export interface UserData {
@@ -77,7 +77,7 @@ export interface Machine {
     ethercatSlaves_OK: boolean;
     supplyAir_OK: boolean;
     cfg: MachineCfg;
-    parts: PartData[];
+    pdmSts: PartDataStatus;
     errors: SystemFaultData;
     warnings: SystemFaultData;
     taskQueue: TaskQueue;
@@ -94,10 +94,10 @@ export const initialMachine: Machine = ({
   ethercatSlaves_OK: false,
   supplyAir_OK: false,
   cfg: { ...initialMachineCfg },
-  parts: [],
+  pdmSts: initialPartDataStatus,
   errors: { ...initialSystemFaultData },
   warnings: { ...initialSystemFaultData },
   taskQueue: { ...initialTaskQueue },
-  registeredDevices: Array(GCs.NUM_DEVICES).fill(null).map(() => ({ ...initialDeviceRegistration }))
+  registeredDevices: [],
 
 });

package/src/custom-types/Part.ts

@@ -1,4 +1,5 @@
 import { PartStateDeprecated as PartStateDeprecated } from "../enums";
+import { GCs } from "./GlobalConstants";
 
 
 
@@ -43,7 +44,108 @@ export interface PartValidationData {
     linerWeightKg: number; // LREAL
 }
 
+export const initialPartValidationData: PartValidationData = {
+    state: -1,
+    preWeightKg: -1,
+    postWeightKg: -1,
+    linerWeightKg: -1,
+};
+export const initialPartData: PartData = {
+    processSts: -1,
+    validation: { ...initialPartValidationData },
+    loadedBadSensor: false,
+    fixtureLocationWhenLoaded: -1,
+    currentLocation: -1,
+    inFixture: false,
+};
 
+// TYPE PartDataStatus :
+// STRUCT
+// 	Parts: ARRAY[0..GCs.PARTDATA_COUNT-1] OF PartData; //uses PartLocationIds, but lost parts get added to the end of known locations
+// 	AllStationsAreEmpty:BOOL;
+// 	RawShelfIsEmpty:BOOL;
+// 	DoneShelfIsEmpty:BOOL;
+// 	DoneShelfIsFull:BOOL;
+// 	DoneShelfSpacesLeftCnt:INT;
+// 	RawShelfPartsLeftCnt:INT;
+// 	AllFixturesAreEmpty:BOOL;
+// 	LeftFixtureIsEmpty:BOOL;
+// 	RightFixtureIsEmpty:BOOL;
+
+// 	RobotIsEmpty:BOOL;
+// 	RobotHasNoPostOpParts:BOOL; //robot isn't holding any parts that are machined or washing/dryed or finished
+// 	RobotHasMachinedParts:BOOL; //robot is holding at least one machined part
+// 	RobotHasOnePreTopDeburring:BOOL;
+// 	RobotHasOnePreMachining:BOOL;
+// 	RobotHasTwoPreMachining:BOOL;
+// 	RobotHasOneRaw:BOOL;
+
+// 	OneOrMoreRejectPartsInCell:BOOL;// there is a reject part in the robot, preop OR post op (doesn't look at cnc)
+// 	OneOrMoreRejectPartsInRobot:BOOL;
+
+// 	RobotHasOneFinishedPart:BOOL;
+// 	FinishedCnt:INT;//amount of finished parts either in post op or in robot
+// 	ActiveCnt:INT;//how many active parts are in the cell, cnc or robot (does not include raw or done rack)
+// 	BatchCntFlag:BOOL; //prevent more parts from being picked by raw
+// END_STRUCT
+// END_TYPE
+export interface PartDataStatus {
+    parts: PartData[];
+    allStationsAreEmpty: boolean;
+    rawShelfIsEmpty: boolean;
+    doneShelfIsEmpty: boolean;
+    doneShelfIsFull: boolean;
+    doneShelfSpacesLeftCnt: number;
+    rawShelfPartsLeftCnt: number;
+    allFixturesAreEmpty: boolean;
+    leftFixtureIsEmpty: boolean;
+    rightFixtureIsEmpty: boolean;
+
+    robotIsEmpty: boolean;
+    robotHasNoPostOpParts: boolean; //robot isn't holding any parts that are machined or washing/dryed or finished
+    robotHasMachinedParts: boolean; //robot is holding at least one machined part
+    robotHasOnePreTopDeburring: boolean;
+    robotHasOnePreMachining: boolean;
+    robotHasTwoPreMachining: boolean;
+    robotHasOneRaw: boolean;
+
+    oneOrMoreRejectPartsInCell: boolean;// there is a reject part in the robot, preop OR post op (doesn't look at cnc)
+    oneOrMoreRejectPartsInRobot: boolean;
+
+    robotHasOneFinishedPart: boolean;
+    finishedCnt: number;//amount of finished parts either in post op or in robot
+    activeCnt: number;//how many active parts are in the cell, cnc or robot (does not include raw or done rack)
+    batchCntFlag: boolean; //prevent more parts from being picked by raw
+}
+
+export const initialPartDataStatus: PartDataStatus = {
+    parts: Array(GCs.PARTDATA_COUNT).fill(null).map(() => ({ ...initialPartData })),
+    allStationsAreEmpty: false,
+    rawShelfIsEmpty: false,
+    doneShelfIsEmpty: false,
+    doneShelfIsFull: false,
+    doneShelfSpacesLeftCnt: 0,
+    rawShelfPartsLeftCnt: 0,
+    allFixturesAreEmpty: false,
+    leftFixtureIsEmpty: false,
+    rightFixtureIsEmpty: false,
+
+    robotIsEmpty: false,
+    robotHasNoPostOpParts: false,
+    robotHasMachinedParts: false,
+    robotHasOnePreTopDeburring: false,
+    robotHasOnePreMachining: false,
+    robotHasTwoPreMachining: false,
+    robotHasOneRaw: false,
+
+    oneOrMoreRejectPartsInCell: false,
+    oneOrMoreRejectPartsInRobot: false,
+
+    robotHasOneFinishedPart: false,
+    finishedCnt: 0,
+    activeCnt: 0,
+    batchCntFlag: false,
+};
 
 export interface PartDataDeprecated {
   cncPreOp: [PartStateDeprecated, PartStateDeprecated];

package/src/plc-tags/index.ts

@@ -12,6 +12,7 @@ export const MachineTags = {
     HeartbeatPLC: 'HeartbeatPLC',
     HeartbeatHMI: 'HeartbeatHMI',
     parts: 'Parts',
+    taskQueue: 'TaskQueue',
 }
 
 export const DeviceTags = {