@kuriousdesign/machine-sdk 1.0.103 → 1.0.105

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

@@ -1,10 +1,19 @@
-import { ComponentAnimation, DebugLogData, DeviceRegistration, FaultData, JobData, RecipeData, RecipeStore, TaskQueue } from ".";
+import { DebugLogData, DeviceRegistration, FaultData, JobData, RecipeData, RecipeStore, TaskQueue } from ".";
 import { PartDataStatus } from "./Part";
+export declare enum Users {
+    OPERATOR = 0,
+    EXPERT = 1
+}
+export declare function userIdToString(userId: number): string;
 export interface UserData {
     activeUser: number;
-    hmiLoginBtn: ComponentAnimation;
-    hmiLogoutBtn: ComponentAnimation;
+    login_REQ: boolean;
+    logout_REQ: boolean;
+    username: string;
+    password: string;
+    timeLeftBeforeAutoLogout_MIN: number;
 }
+export declare const initialUserData: UserData;
 export interface FaultCodeData {
     deviceId: number;
     code: number;
@@ -66,6 +75,7 @@ export interface Machine {
     activeUserId: number;
     activeRecipe: RecipeData;
     settings: Settings;
+    user: UserData;
 }
 export interface LogRecordData {
     list: DebugLogData[];

package/dist/custom-types/Machine.js

@@ -1,9 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialMachine = exports.initialLogRecordData = exports.initialSettings = exports.initialSettingsAllUsers = exports.initialSettingsExpert = exports.initialMachineCfg = exports.initialSystemFaultData = exports.initialFaultCodeData = void 0;
+exports.initialMachine = exports.initialLogRecordData = exports.initialSettings = exports.initialSettingsAllUsers = exports.initialSettingsExpert = exports.initialMachineCfg = exports.initialSystemFaultData = exports.initialFaultCodeData = exports.initialUserData = exports.Users = void 0;
+exports.userIdToString = userIdToString;
 const _1 = require(".");
 const Part_1 = require("./Part");
 const GlobalConstants_1 = require("./GlobalConstants");
+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";
+    }
+}
+exports.initialUserData = {
+    activeUser: 0,
+    login_REQ: false,
+    logout_REQ: false,
+    username: "",
+    password: "",
+    timeLeftBeforeAutoLogout_MIN: 0,
+};
 exports.initialFaultCodeData = {
     deviceId: 0,
     code: 0,
@@ -66,4 +90,5 @@ exports.initialMachine = ({
     activeUserId: 0,
     activeRecipe: { ..._1.initialRecipe },
     settings: { ...exports.initialSettings },
+    user: { ...exports.initialUserData },
 });

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

@@ -60,6 +60,8 @@ export interface RecipeData {
     cameraId: number;
     cameraString: string;
     cameraSpeed: number;
+    usesBrushTool: boolean;
+    brushToolSpeed_RPM: number;
 }
 export declare enum CameraIds {
     NONE = 0,

package/dist/custom-types/Recipe.js

@@ -150,6 +150,8 @@ exports.initialRecipe = {
     applicatorToolId: ApplicatorTools.NONE,
     applicatorToolString: exports.applicatorToolIdToStringMap.get(ApplicatorTools.NONE) || "",
     applicatorCollisionPayloadOffset: 0,
+    usesBrushTool: false,
+    brushToolSpeed_RPM: 0,
     cleanerId: Cleaners.NONE,
     cleanerString: exports.cleanerIdToStringMap.get(Cleaners.NONE) || "",
     weighingFingerId: WeighingFingers.NONE,

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

@@ -5,8 +5,3 @@ 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,19 +1,2 @@
 "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/plc-tags/index.d.ts

@@ -26,6 +26,7 @@ export declare const MachineTags: {
     ethercatSlaves_OK: string;
     currentTimeMs: string;
     settings: string;
+    user: string;
 };
 export declare const DeviceTags: {
     Cfg: string;

package/dist/plc-tags/index.js

@@ -46,6 +46,7 @@ exports.MachineTags = {
     ethercatSlaves_OK: 'EthercatSlaves_OK',
     currentTimeMs: 'CurrentTimeMs',
     settings: 'Settings',
+    user: 'User',
 };
 exports.DeviceTags = {
     Cfg: 'Cfg',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kuriousdesign/machine-sdk",
-  "version": "1.0.103",
+  "version": "1.0.105",
   "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

@@ -2,13 +2,40 @@ import { ComponentAnimation, DebugLogData, DeviceRegistration, FaultData, initia
 import { initialPartDataStatus, PartDataStatus } from "./Part";
 import { GCs } from "./GlobalConstants";
 
+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";
+  }
+}
 
 export interface UserData {
   activeUser: number;
-  hmiLoginBtn: ComponentAnimation;
-  hmiLogoutBtn: ComponentAnimation;
+  login_REQ: boolean;
+  logout_REQ: boolean;
+  username: string;
+  password: string;
+  timeLeftBeforeAutoLogout_MIN: number;
 }
 
+export const initialUserData: UserData = {
+  activeUser: 0,
+  login_REQ: false,
+  logout_REQ: false,
+  username: "",
+  password: "",
+  timeLeftBeforeAutoLogout_MIN: 0,
+};
+
 export interface FaultCodeData {
   deviceId: number;
   code: number;
@@ -30,24 +57,6 @@ export const initialSystemFaultData: SystemFaultData = {
 };
 
 
-
-// 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;
@@ -133,6 +142,7 @@ export interface Machine {
     activeUserId: number;
     activeRecipe: RecipeData;
     settings: Settings;
+    user: UserData;
 }
 
 // TYPE LogRecordData :
@@ -178,4 +188,5 @@ export const initialMachine: Machine = ({
   activeUserId: 0,
   activeRecipe: { ...initialRecipe},
   settings: { ...initialSettings },
+  user: { ...initialUserData },
 });

package/src/custom-types/Recipe.ts

@@ -108,6 +108,9 @@ export interface RecipeData {
     cameraId: number;
     cameraString: string;
     cameraSpeed: number;
+
+    usesBrushTool: boolean;
+	brushToolSpeed_RPM: number;
 }
 
 export enum CameraIds {
@@ -235,6 +238,8 @@ export const initialRecipe: RecipeData = {
     applicatorToolId: ApplicatorTools.NONE,
     applicatorToolString: applicatorToolIdToStringMap.get(ApplicatorTools.NONE) || "",
     applicatorCollisionPayloadOffset: 0,
+    usesBrushTool: false,
+    brushToolSpeed_RPM: 0,
     cleanerId: Cleaners.NONE,
     cleanerString: cleanerIdToStringMap.get(Cleaners.NONE) || "",
     weighingFingerId: WeighingFingers.NONE,

package/src/custom-types/UserManagerFB.ts

@@ -7,18 +7,4 @@ export interface UserManagerFB {
   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/plc-tags/index.ts

@@ -31,6 +31,7 @@ export const MachineTags = {
 	ethercatSlaves_OK: 'EthercatSlaves_OK',
     currentTimeMs: 'CurrentTimeMs',
     settings: 'Settings',
+    user: 'User',
 }
 
 export const DeviceTags = {