@kuriousdesign/machine-sdk 1.0.39 → 1.0.41

package/dist/custom-types/BaseDevice/Device.d.ts

@@ -90,3 +90,7 @@ export interface Device {
     apiOpcua: ApiOpcuaData;
 }
 export declare const initialDevice: Device;
+export interface DeviceLogData {
+    list: DebugLogData[];
+    lastIndex: number;
+}

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

@@ -31,4 +31,5 @@ export declare const GCs: {
     SYSTIME_TO_UTC_SCALAR: number;
     NUM_PARTS_PER_FIXTURE: number;
     MAX_NUM_HW_CARDS: number;
+    NUM_ENTRIES_MACHINE_LOG: number;
 };

package/dist/custom-types/GlobalConstants.js

@@ -80,4 +80,5 @@ exports.GCs = {
     //TASKQUEUE_LEN:INT:=100;
     // HW SIDE
     MAX_NUM_HW_CARDS: 16,
+    NUM_ENTRIES_MACHINE_LOG: 100,
 };

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

@@ -1,4 +1,4 @@
-import { ComponentAnimation, DeviceRegistration, TaskQueue } from ".";
+import { ComponentAnimation, DebugLogData, DeviceLogData, DeviceRegistration, TaskQueue } from ".";
 import { PartDataStatus } from "./Part";
 export interface UserData {
     activeUser: number;
@@ -42,5 +42,12 @@ export interface Machine {
     registeredDevices: DeviceRegistration[];
     heartbeatPlc: number;
     heartbeatHmi: number;
+    machineLog: LogRecordData;
+    deviceLogs: DeviceLogData[];
 }
+export interface LogRecordData {
+    list: DebugLogData[];
+    lastIndex: number;
+}
+export declare const initialLogRecordData: LogRecordData;
 export declare const initialMachine: Machine;

package/dist/custom-types/Machine.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialMachine = exports.initialMachineCfg = exports.initialSystemFaultData = exports.initialFaultCodeData = void 0;
+exports.initialMachine = exports.initialLogRecordData = exports.initialMachineCfg = exports.initialSystemFaultData = exports.initialFaultCodeData = void 0;
 const _1 = require(".");
 const Part_1 = require("./Part");
 exports.initialFaultCodeData = {
@@ -20,6 +20,10 @@ exports.initialMachineCfg = {
     apiOpcuaDeviceId: -1,
     ethernetAdapterList: [],
 };
+exports.initialLogRecordData = {
+    list: Array(_1.GCs.NUM_ENTRIES_MACHINE_LOG).fill(null).map(() => ({ ..._1.initialDebugLogData })),
+    lastIndex: 0,
+};
 exports.initialMachine = ({
     estopCircuit_OK: false,
     estopCircuitDelayed_OK: false,
@@ -37,4 +41,6 @@ exports.initialMachine = ({
     registeredDevices: [],
     heartbeatPlc: 0,
     heartbeatHmi: 0,
+    machineLog: { ...exports.initialLogRecordData },
+    deviceLogs: Array(_1.GCs.NUM_DEVICES).fill(null).map(() => ({ ..._1.initialDeviceLogData })),
 });

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

@@ -11,6 +11,8 @@ export declare const MachineTags: {
     HeartbeatHMI: string;
     parts: string;
     taskQueue: string;
+    machineLog: string;
+    deviceLogs: string;
 };
 export declare const DeviceTags: {
     Cfg: string;

package/dist/plc-tags/index.js

@@ -29,6 +29,9 @@ exports.MachineTags = {
     HeartbeatHMI: 'HeartbeatHMI',
     parts: 'Parts',
     taskQueue: 'TaskQueue',
+    //deviceLogs: 'DeviceLogs',
+    machineLog: 'MachineLog',
+    deviceLogs: 'Machine.DeviceLogs',
 };
 exports.DeviceTags = {
     Cfg: 'Cfg',

package/package.json

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

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

@@ -102,10 +102,10 @@ export interface DeviceStatus {
   state: number; // enum for States enum, same as the boolean states in the data structure
   stepNum: number;
   stepDescription: string;
-  
+
   colorCode: number; // color to indicate the current status for HMI purposes
   statusMsg: string; // status string
-  
+
   error: boolean; // state, device or child has an error
   killed: boolean; // device is de-energized
   inactive: boolean; // waiting to be reset
@@ -124,15 +124,15 @@ export interface DeviceStatus {
   ipr: boolean; // IdleOrPausedOrRunning
   kei: boolean; // KilledErrorOrInactive
   runningOrStopping: boolean;
-  
+
   // Children Status
   allChildrenIdle: boolean;
   allChildrenKilled: boolean;
   allChildrenInactive: boolean;
   allChildrenIdleOrError: boolean;
-  
+
   commanderId: number; // used for external control
-  
+
   recordingLogs: boolean;
 }
 
@@ -202,4 +202,17 @@ export const initialDevice: Device = {
   process: initialProcessData,
   script: initialProcessData,
   apiOpcua: initialApiOpcuaData
-};
+};
+
+
+// TYPE DeviceLogData :
+// STRUCT
+// 	List: ARRAY[0..DeviceConstants.NUM_LOG_ENTRIES-1] OF DebugLogData;
+// 	LastIndex:INT; //index of the most recent recorde entries
+// END_STRUCT
+// END_TYPE
+
+export interface DeviceLogData {
+  list: DebugLogData[];
+  lastIndex: number; // index of the most recent recorded entries
+}

package/src/custom-types/GlobalConstants.ts

@@ -92,4 +92,5 @@ export const GCs = {
   //TASKQUEUE_LEN:INT:=100;
   // HW SIDE
   MAX_NUM_HW_CARDS: 16,
+  NUM_ENTRIES_MACHINE_LOG: 100,
 };

package/src/custom-types/Machine.ts

@@ -1,4 +1,4 @@
-import { ComponentAnimation, DeviceConstants, DeviceRegistration, GCs, initialDeviceRegistration, initialTaskQueue, TaskQueue } from ".";
+import { ComponentAnimation, DebugLogData, DeviceConstants, DeviceLogData, DeviceRegistration, GCs, initialDebugLogData, initialDeviceLogData, initialDeviceRegistration, initialTaskQueue, TaskQueue } from ".";
 import { initialPartDataStatus, PartData, PartDataStatus } from "./Part";
 
 
@@ -84,8 +84,27 @@ export interface Machine {
     registeredDevices: DeviceRegistration[];
     heartbeatPlc: number;
     heartbeatHmi: number;
+    machineLog: LogRecordData;
+    deviceLogs: DeviceLogData[];  //ARRAY[0..(GCs.NUM_DEVICES-1)] OF DeviceLogData;
 }
 
+// TYPE LogRecordData :
+// STRUCT
+// 	List: ARRAY[0..DiagConstants.NUM_ENTRIES_RECORDED_LOG-1] OF DebugLogData;
+// 	LastIndex:USINT; //index of the most recent recorde entries
+// END_STRUCT
+// END_TYPE
+
+export interface LogRecordData {
+  list: DebugLogData[];
+  lastIndex: number; // index of the most recent recorded entries
+}
+
+export const initialLogRecordData: LogRecordData = {
+  list: Array(GCs.NUM_ENTRIES_MACHINE_LOG).fill(null).map(() => ({ ...initialDebugLogData })),
+  lastIndex: 0,
+};
+
 export const initialMachine: Machine = ({
   estopCircuit_OK: false,
   estopCircuitDelayed_OK: false,
@@ -103,4 +122,6 @@ export const initialMachine: Machine = ({
   registeredDevices: [],
   heartbeatPlc: 0,
   heartbeatHmi: 0,
+  machineLog: { ...initialLogRecordData },
+  deviceLogs: Array(GCs.NUM_DEVICES).fill(null).map(() => ({ ...initialDeviceLogData })),
 });

package/src/custom-types/index.ts

@@ -11,4 +11,4 @@ export * from "./UserManagerFB";
 export * from "./TaskQueue";
 export * from "./Devices";
 export * from "./Bridge";
-export * from "./Part";
+export * from "./Part";

package/src/plc-tags/index.ts

@@ -13,6 +13,9 @@ export const MachineTags = {
     HeartbeatHMI: 'HeartbeatHMI',
     parts: 'Parts',
     taskQueue: 'TaskQueue',
+    //deviceLogs: 'DeviceLogs',
+    machineLog: 'MachineLog',
+    deviceLogs: 'Machine.DeviceLogs',
 }
 
 export const DeviceTags = {