@kuriousdesign/machine-sdk 1.0.84 → 1.0.86

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

@@ -1,4 +1,4 @@
-import { ComponentAnimation, DebugLogData, DeviceRegistration, FaultData, JobData, RecipeStore, TaskQueue } from ".";
+import { ComponentAnimation, DebugLogData, DeviceRegistration, FaultData, JobData, RecipeData, RecipeStore, TaskQueue } from ".";
 import { PartDataStatus } from "./Part";
 export interface UserData {
     activeUser: number;
@@ -46,6 +46,9 @@ export interface Machine {
     machineLog: LogRecordData;
     recipeStore: RecipeStore;
     job: JobData;
+    currentTimeMs: number;
+    activeUserId: number;
+    activeRecipe: RecipeData;
 }
 export interface LogRecordData {
     list: DebugLogData[];

package/dist/custom-types/Machine.js

@@ -47,4 +47,7 @@ exports.initialMachine = ({
     recipeStore: { ..._1.initialRecipeStore },
     job: { ..._1.initialJobData },
     //deviceLogs: Array(GCs.NUM_DEVICES).fill(null).map(() => ({ ...initialDeviceLogData })),
+    currentTimeMs: 0,
+    activeUserId: 0,
+    activeRecipe: { ..._1.initialRecipe },
 });

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

@@ -1,15 +1,15 @@
 export interface JobData {
-    ActiveRecipeIndex: number;
-    JobName: string;
-    LotQty: number;
-    GoodCnt: number;
-    ScrapCnt: number;
-    SetupStartTime: bigint;
-    SetupEndTime: bigint;
-    SetupCompleted: boolean;
-    JobStartTime: bigint;
-    JobEndTime: bigint;
-    JobComplete: boolean;
+    activeRecipeIndex: number;
+    jobName: string;
+    lotQty: number;
+    goodCnt: number;
+    scrapCnt: number;
+    setupStartTime: bigint;
+    setupEndTime: bigint;
+    setupCompleted: boolean;
+    jobStartTime: bigint;
+    jobEndTime: bigint;
+    jobComplete: boolean;
 }
 export declare const initialJobData: JobData;
 export interface ApplicatorSetpoint {

package/dist/custom-types/Recipe.js

@@ -4,17 +4,17 @@ exports.initialRecipeStore = exports.initialRecipe = exports.weighingFingerStrin
 exports.getTubeTypeString = getTubeTypeString;
 const GlobalConstants_1 = require("./GlobalConstants");
 exports.initialJobData = {
-    ActiveRecipeIndex: 0,
-    JobName: "",
-    LotQty: 0,
-    GoodCnt: 0,
-    ScrapCnt: 0,
-    SetupStartTime: BigInt(0),
-    SetupEndTime: BigInt(0),
-    SetupCompleted: false,
-    JobStartTime: BigInt(0),
-    JobEndTime: BigInt(0),
-    JobComplete: false
+    activeRecipeIndex: 0,
+    jobName: "",
+    lotQty: 0,
+    goodCnt: 0,
+    scrapCnt: 0,
+    setupStartTime: BigInt(0),
+    setupEndTime: BigInt(0),
+    setupCompleted: false,
+    jobStartTime: BigInt(0),
+    jobEndTime: BigInt(0),
+    jobComplete: false
 };
 exports.initialApplicatorSetpoint = {
     speed: 0,

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

@@ -5,3 +5,8 @@ export interface UserManagerFB {
     username: string;
     password: string;
 }
+export declare enum Users {
+    OPERATOR = 0,
+    EXPERT = 1
+}
+export declare function userIdToString(userId: number): string;

package/dist/custom-types/UserManagerFB.js

@@ -1,2 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Users = void 0;
+exports.userIdToString = userIdToString;
+var Users;
+(function (Users) {
+    Users[Users["OPERATOR"] = 0] = "OPERATOR";
+    Users[Users["EXPERT"] = 1] = "EXPERT";
+})(Users || (exports.Users = Users = {}));
+function userIdToString(userId) {
+    switch (userId) {
+        case Users.OPERATOR:
+            return "Operator";
+        case Users.EXPERT:
+            return "Expert";
+        default:
+            return "Unknown";
+    }
+}

package/dist/enums/DeviceId.d.ts

@@ -17,7 +17,7 @@ export declare enum DeviceId {
     FLSB_T = 18,
     FLSB_S = 19,
     POT = 20,
-    STEPR = 21,
+    SQUEE = 21,
     GRIP = 22,
     WEIGH = 23,
     LNR = 41,

package/dist/enums/DeviceId.js

@@ -22,7 +22,7 @@ var DeviceId;
     DeviceId[DeviceId["FLSB_T"] = 18] = "FLSB_T";
     DeviceId[DeviceId["FLSB_S"] = 19] = "FLSB_S";
     DeviceId[DeviceId["POT"] = 20] = "POT";
-    DeviceId[DeviceId["STEPR"] = 21] = "STEPR";
+    DeviceId[DeviceId["SQUEE"] = 21] = "SQUEE";
     DeviceId[DeviceId["GRIP"] = 22] = "GRIP";
     DeviceId[DeviceId["WEIGH"] = 23] = "WEIGH";
     DeviceId[DeviceId["LNR"] = 41] = "LNR";
@@ -76,7 +76,7 @@ function deviceIdToString(deviceId) {
         case DeviceId.FLSB_T: return "FLSB_T";
         case DeviceId.FLSB_S: return "FLSB_S";
         case DeviceId.POT: return "POT";
-        case DeviceId.STEPR: return "STEPR";
+        case DeviceId.SQUEE: return "SQUEE";
         case DeviceId.GRIP: return "GRIP";
         case DeviceId.WEIGH: return "WEIGH";
         case DeviceId.LNR: return "LNR";

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

@@ -24,6 +24,7 @@ export declare const MachineTags: {
     networkHealth_OK: string;
     ethercatMaster_OK: string;
     ethercatSlaves_OK: string;
+    currentTimeMs: string;
 };
 export declare const DeviceTags: {
     Cfg: string;

package/dist/plc-tags/index.js

@@ -44,6 +44,7 @@ exports.MachineTags = {
     networkHealth_OK: 'NetworkHealth_OK',
     ethercatMaster_OK: 'EthercatMaster_OK',
     ethercatSlaves_OK: 'EthercatSlaves_OK',
+    currentTimeMs: 'CurrentTimeMs',
 };
 exports.DeviceTags = {
     Cfg: 'Cfg',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kuriousdesign/machine-sdk",
-  "version": "1.0.84",
+  "version": "1.0.86",
   "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, DeviceRegistration, FaultData, initialDebugLogData, initialFaultData, initialJobData, initialRecipeStore, initialTaskQueue, JobData, RecipeStore, TaskQueue } from ".";
+import { ComponentAnimation, DebugLogData, DeviceRegistration, FaultData, initialDebugLogData, initialFaultData, initialJobData, initialRecipe, initialRecipeStore, initialTaskQueue, JobData, RecipeData, RecipeStore, TaskQueue } from ".";
 import { initialPartDataStatus, PartDataStatus } from "./Part";
 import { GCs } from "./GlobalConstants";
 
@@ -90,6 +90,9 @@ export interface Machine {
     recipeStore: RecipeStore;
     job: JobData;
     //deviceLogs: DeviceLogData[];  //ARRAY[0..(GCs.NUM_DEVICES-1)] OF DeviceLogData;
+    currentTimeMs: number;
+    activeUserId: number;
+    activeRecipe: RecipeData;
 }
 
 // TYPE LogRecordData :
@@ -131,4 +134,7 @@ export const initialMachine: Machine = ({
   recipeStore: { ...initialRecipeStore },
   job: { ...initialJobData },
   //deviceLogs: Array(GCs.NUM_DEVICES).fill(null).map(() => ({ ...initialDeviceLogData })),
+  currentTimeMs: 0,
+  activeUserId: 0,
+  activeRecipe: { ...initialRecipe},
 });

package/src/custom-types/Recipe.ts

@@ -1,31 +1,31 @@
 import { GCs } from "./GlobalConstants";
 
 export interface JobData {
-    ActiveRecipeIndex: number;
-    JobName: string;
-    LotQty: number;
-    GoodCnt: number;
-    ScrapCnt: number;
-    SetupStartTime: bigint;
-    SetupEndTime: bigint;
-    SetupCompleted: boolean;
-    JobStartTime: bigint;
-    JobEndTime: bigint;
-    JobComplete: boolean;
+    activeRecipeIndex: number;
+    jobName: string;
+    lotQty: number;
+    goodCnt: number;
+    scrapCnt: number;
+    setupStartTime: bigint;
+    setupEndTime: bigint;
+    setupCompleted: boolean;
+    jobStartTime: bigint;
+    jobEndTime: bigint;
+    jobComplete: boolean;
 }
 
 export const initialJobData: JobData = {
-    ActiveRecipeIndex: 0,
-    JobName: "",
-    LotQty: 0,
-    GoodCnt: 0,
-    ScrapCnt: 0,
-    SetupStartTime: BigInt(0),
-    SetupEndTime: BigInt(0),
-    SetupCompleted: false,
-    JobStartTime: BigInt(0),
-    JobEndTime: BigInt(0),
-    JobComplete: false
+    activeRecipeIndex: 0,
+    jobName: "",
+    lotQty: 0,
+    goodCnt: 0,
+    scrapCnt: 0,
+    setupStartTime: BigInt(0),
+    setupEndTime: BigInt(0),
+    setupCompleted: false,
+    jobStartTime: BigInt(0),
+    jobEndTime: BigInt(0),
+    jobComplete: false
 };
 
 export interface ApplicatorSetpoint {

package/src/custom-types/UserManagerFB.ts

@@ -5,4 +5,20 @@ export interface UserManagerFB {
   logoutBtn: ComponentAnimation;
   username: string;
   password: string;
+}
+
+export enum Users {
+  OPERATOR = 0,
+  EXPERT = 1,
+}
+
+export function userIdToString(userId: number): string {
+  switch (userId) {
+    case Users.OPERATOR:
+      return "Operator";
+    case Users.EXPERT:
+      return "Expert";
+    default:
+      return "Unknown";
+  }
 }

package/src/enums/DeviceId.ts

@@ -18,7 +18,7 @@ export enum DeviceId {
   FLSB_T = 18,
   FLSB_S = 19,
   POT = 20,
-  STEPR = 21,
+  SQUEE = 21,
 	GRIP = 22,
 	WEIGH = 23,
 
@@ -78,7 +78,7 @@ export function deviceIdToString(deviceId: DeviceId | number): string {
     case DeviceId.FLSB_T: return "FLSB_T";
     case DeviceId.FLSB_S: return "FLSB_S";
     case DeviceId.POT: return "POT";
-    case DeviceId.STEPR: return "STEPR";
+    case DeviceId.SQUEE: return "SQUEE";
     case DeviceId.GRIP: return "GRIP";
     case DeviceId.WEIGH: return "WEIGH";
     case DeviceId.LNR: return "LNR";

package/src/plc-tags/index.ts

@@ -29,6 +29,7 @@ export const MachineTags = {
 	networkHealth_OK: 'NetworkHealth_OK',
 	ethercatMaster_OK: 'EthercatMaster_OK',
 	ethercatSlaves_OK: 'EthercatSlaves_OK',
+    currentTimeMs: 'CurrentTimeMs',
 }
 
 export const DeviceTags = {