@kuriousdesign/machine-sdk 1.0.106 → 1.0.108

package/dist/custom-types/Devices/Axis.d.ts

@@ -110,7 +110,8 @@ export declare enum AxisMethods {
     ENFORCE_RAIL_BRAKES = 4,
     START_STREAM = 5,
     STOP = 6,
-    SET_IS_HOMED = 7
+    SET_IS_HOMED = 7,
+    MOVE_REL_CMD = 8
 }
 export declare function axisMethodIdToString(method: AxisMethods): string;
 export declare enum AxisProcesses {

package/dist/custom-types/Devices/Axis.js

@@ -18,6 +18,7 @@ var AxisMethods;
     AxisMethods[AxisMethods["START_STREAM"] = 5] = "START_STREAM";
     AxisMethods[AxisMethods["STOP"] = 6] = "STOP";
     AxisMethods[AxisMethods["SET_IS_HOMED"] = 7] = "SET_IS_HOMED";
+    AxisMethods[AxisMethods["MOVE_REL_CMD"] = 8] = "MOVE_REL_CMD";
 })(AxisMethods || (exports.AxisMethods = AxisMethods = {}));
 function axisMethodIdToString(method) {
     switch (method) {
@@ -37,6 +38,8 @@ function axisMethodIdToString(method) {
             return "Stop";
         case AxisMethods.SET_IS_HOMED:
             return "Set isHomed";
+        case AxisMethods.MOVE_REL_CMD:
+            return "Move Relative Command";
         default:
             return "Unknown";
     }

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

@@ -14,11 +14,14 @@ export declare enum PartStates {
     StartedPreWeighing = 29,
     PreWeighed = 30,
     StartedApplying = 31,
-    Applied = 40,
+    LinerApplied = 40,
+    StartedLinerBrushing = 41,
+    LinerBrushed = 50,
     StartedPhotographing = 61,
     Photographed = 70,
     StartedPostWeighing = 71,
     PostWeighed = 80,
+    Scrapped = 900,
     Failed = 911,
     Passed = 1000
 }
@@ -35,6 +38,7 @@ export declare enum PartValidationStates {
     NONE = 0,
     Scrapped_Generic = 1,
     Scrapped_LINER_APPLICATION_STARTED_BUT_NOT_FINISHED = 101,
+    Scrapped_LINER_BRUSHING_STARTED_BUT_NOT_FINISHED = 102,
     Scrapped_Failed_Weight_TOO_LIGHT = 701,
     Scrapped_Failed_Weight_TOO_HEAVY = 702,
     Scrapped_Failed_Image_Review_GENERAL = 800,
@@ -43,12 +47,13 @@ export declare enum PartValidationStates {
     PASSED = 1000
 }
 export interface PartValidationData {
-    valState: PartValidationStates;
+    weightSts: PartValidationStates;
+    visionSts: PartValidationStates;
+    timestampVision_sec: number;
     statusMsg: string;
     preWeightKg: number;
     postWeightKg: number;
     linerWeightKg: number;
-    videoReviewSts: number;
 }
 export declare const initialPartValidationData: PartValidationData;
 export declare const initialPartData: PartData;

package/dist/custom-types/Part.js

@@ -41,42 +41,24 @@ function partLocationIdToString(locationId) {
             return "Unknown";
     }
 }
-// TYPE PartStates :
-// (
-// 	Empty:=0,//no part present
-// 	//BadSensorEmpty:=1, //used if sensors give false positive
-// 	UnvalidatedRaw:=10, //used if registered by sensor, but not approved by operator
-// 	Raw:=20,
-// 	//BadSensorRaw:=21, //used if loaded by sensor didn't work
-// 	StartedPreWeighing:=29,
-// 	PreWeighed:=30,
-// 	StartedApplying:=31,
-// 	Applied:=40,
-// 	StartedPhotographing:=61,
-// 	Photographed:=70,
-// 	StartedPostWeighing:=71,
-// 	PostWeighed:=80,
-// 	Failed:=911,
-// 	Passed:=1000 //ProessingDone, back in fixture and waiting to be unloaded
-// );
-// END_TYPE
 var PartStates;
 (function (PartStates) {
     PartStates[PartStates["Empty"] = 0] = "Empty";
-    //BadSensorEmpty = 1, //used if sensors give false positive
     PartStates[PartStates["UnvalidatedRaw"] = 10] = "UnvalidatedRaw";
     PartStates[PartStates["Raw"] = 20] = "Raw";
-    //BadSensorRaw = 21, //used if loaded by sensor didn't work
     PartStates[PartStates["StartedPreWeighing"] = 29] = "StartedPreWeighing";
     PartStates[PartStates["PreWeighed"] = 30] = "PreWeighed";
     PartStates[PartStates["StartedApplying"] = 31] = "StartedApplying";
-    PartStates[PartStates["Applied"] = 40] = "Applied";
+    PartStates[PartStates["LinerApplied"] = 40] = "LinerApplied";
+    PartStates[PartStates["StartedLinerBrushing"] = 41] = "StartedLinerBrushing";
+    PartStates[PartStates["LinerBrushed"] = 50] = "LinerBrushed";
     PartStates[PartStates["StartedPhotographing"] = 61] = "StartedPhotographing";
     PartStates[PartStates["Photographed"] = 70] = "Photographed";
     PartStates[PartStates["StartedPostWeighing"] = 71] = "StartedPostWeighing";
     PartStates[PartStates["PostWeighed"] = 80] = "PostWeighed";
+    PartStates[PartStates["Scrapped"] = 900] = "Scrapped";
     PartStates[PartStates["Failed"] = 911] = "Failed";
-    PartStates[PartStates["Passed"] = 1000] = "Passed"; //ProessingDone, back in fixture and waiting to be unloaded
+    PartStates[PartStates["Passed"] = 1000] = "Passed"; //ProessingDone, back in fixture and waiting to be unloaded   
 })(PartStates || (exports.PartStates = PartStates = {}));
 ;
 function partStateToString(state) {
@@ -87,11 +69,14 @@ function partStateToString(state) {
         case PartStates.StartedPreWeighing: return "Started Pre-Weighing";
         case PartStates.PreWeighed: return "Pre-Weighed";
         case PartStates.StartedApplying: return "Started Applying";
-        case PartStates.Applied: return "Applied";
+        case PartStates.LinerApplied: return "Liner Applied";
+        case PartStates.StartedLinerBrushing: return "Started Liner Brushing";
+        case PartStates.LinerBrushed: return "Liner Brushed";
         case PartStates.StartedPhotographing: return "Started Photographing";
         case PartStates.Photographed: return "Photographed";
         case PartStates.StartedPostWeighing: return "Started Post-Weighing";
         case PartStates.PostWeighed: return "Post-Weighed";
+        case PartStates.Scrapped: return "Scrapped";
         case PartStates.Failed: return "Failed";
         case PartStates.Passed: return "Passed";
     }
@@ -101,6 +86,7 @@ var PartValidationStates;
     PartValidationStates[PartValidationStates["NONE"] = 0] = "NONE";
     PartValidationStates[PartValidationStates["Scrapped_Generic"] = 1] = "Scrapped_Generic";
     PartValidationStates[PartValidationStates["Scrapped_LINER_APPLICATION_STARTED_BUT_NOT_FINISHED"] = 101] = "Scrapped_LINER_APPLICATION_STARTED_BUT_NOT_FINISHED";
+    PartValidationStates[PartValidationStates["Scrapped_LINER_BRUSHING_STARTED_BUT_NOT_FINISHED"] = 102] = "Scrapped_LINER_BRUSHING_STARTED_BUT_NOT_FINISHED";
     PartValidationStates[PartValidationStates["Scrapped_Failed_Weight_TOO_LIGHT"] = 701] = "Scrapped_Failed_Weight_TOO_LIGHT";
     PartValidationStates[PartValidationStates["Scrapped_Failed_Weight_TOO_HEAVY"] = 702] = "Scrapped_Failed_Weight_TOO_HEAVY";
     PartValidationStates[PartValidationStates["Scrapped_Failed_Image_Review_GENERAL"] = 800] = "Scrapped_Failed_Image_Review_GENERAL";
@@ -109,12 +95,13 @@ var PartValidationStates;
     PartValidationStates[PartValidationStates["PASSED"] = 1000] = "PASSED";
 })(PartValidationStates || (exports.PartValidationStates = PartValidationStates = {}));
 exports.initialPartValidationData = {
-    valState: PartValidationStates.NONE,
+    weightSts: PartValidationStates.NONE,
+    visionSts: PartValidationStates.NONE,
+    timestampVision_sec: 0,
     statusMsg: "",
     preWeightKg: 0,
     postWeightKg: 0,
     linerWeightKg: 0,
-    videoReviewSts: 0,
 };
 exports.initialPartData = {
     processSts: PartStates.Empty,

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

@@ -62,6 +62,7 @@ export interface RecipeData {
     cameraSpeed: number;
     usesBrushTool: boolean;
     brushToolSpeed_RPM: number;
+    robotSpeedWhileBrushing: number;
 }
 export declare enum CameraIds {
     NONE = 0,

package/dist/custom-types/Recipe.js

@@ -152,6 +152,7 @@ exports.initialRecipe = {
     applicatorCollisionPayloadOffset: 0,
     usesBrushTool: false,
     brushToolSpeed_RPM: 0,
+    robotSpeedWhileBrushing: 0,
     cleanerId: Cleaners.NONE,
     cleanerString: exports.cleanerIdToStringMap.get(Cleaners.NONE) || "",
     weighingFingerId: WeighingFingers.NONE,

package/package.json

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

package/src/custom-types/Devices/Axis.ts

@@ -167,7 +167,8 @@ export enum AxisMethods {
     ENFORCE_RAIL_BRAKES = 4,
     START_STREAM = 5,
     STOP = 6,
-    SET_IS_HOMED = 7
+    SET_IS_HOMED = 7,
+    MOVE_REL_CMD = 8
 }
 
 export function axisMethodIdToString(method: AxisMethods): string {
@@ -188,6 +189,8 @@ export function axisMethodIdToString(method: AxisMethods): string {
             return "Stop";
         case AxisMethods.SET_IS_HOMED:
             return "Set isHomed";
+        case AxisMethods.MOVE_REL_CMD:
+            return "Move Relative Command";
 
         default:
             return "Unknown";

package/src/custom-types/Part.ts

@@ -42,51 +42,33 @@ export function partLocationIdToString(locationId: PartLocationIds): string {
             return "Unknown";
     }
 }
-// TYPE PartStates :
-// (
-// 	Empty:=0,//no part present
-// 	//BadSensorEmpty:=1, //used if sensors give false positive
-	
-// 	UnvalidatedRaw:=10, //used if registered by sensor, but not approved by operator
-
-// 	Raw:=20,
-// 	//BadSensorRaw:=21, //used if loaded by sensor didn't work
-	
-// 	StartedPreWeighing:=29,
-// 	PreWeighed:=30,
-	
-// 	StartedApplying:=31,
-// 	Applied:=40,
-	
-// 	StartedPhotographing:=61,
-// 	Photographed:=70,
-	
-// 	StartedPostWeighing:=71,
-// 	PostWeighed:=80,
-	
-// 	Failed:=911,
-// 	Passed:=1000 //ProessingDone, back in fixture and waiting to be unloaded
-
-	
-// );
-// END_TYPE
+
 
 export enum PartStates {
     Empty = 0,//no part present
-    //BadSensorEmpty = 1, //used if sensors give false positive
     UnvalidatedRaw = 10, //used if registered by sensor, but not approved by operator
+
     Raw = 20,
-    //BadSensorRaw = 21, //used if loaded by sensor didn't work
+    
     StartedPreWeighing = 29,
     PreWeighed = 30,
+    
     StartedApplying = 31,
-    Applied = 40,
+    LinerApplied = 40,
+    
+    StartedLinerBrushing = 41,
+    LinerBrushed = 50,
+    
     StartedPhotographing = 61,
     Photographed = 70,
+    
     StartedPostWeighing = 71,
     PostWeighed = 80,
+    
+    Scrapped = 900,
     Failed = 911,
-    Passed = 1000 //ProessingDone, back in fixture and waiting to be unloaded
+    Passed = 1000 //ProessingDone, back in fixture and waiting to be unloaded   
+
 };
 
 export function partStateToString(state: PartStates): string {
@@ -97,11 +79,14 @@ export function partStateToString(state: PartStates): string {
         case PartStates.StartedPreWeighing: return "Started Pre-Weighing";
         case PartStates.PreWeighed: return "Pre-Weighed";
         case PartStates.StartedApplying: return "Started Applying";
-        case PartStates.Applied: return "Applied";
+        case PartStates.LinerApplied: return "Liner Applied";
+        case PartStates.StartedLinerBrushing: return "Started Liner Brushing";
+        case PartStates.LinerBrushed: return "Liner Brushed";
         case PartStates.StartedPhotographing: return "Started Photographing";
         case PartStates.Photographed: return "Photographed";
         case PartStates.StartedPostWeighing: return "Started Post-Weighing";
         case PartStates.PostWeighed: return "Post-Weighed";
+        case PartStates.Scrapped: return "Scrapped";
         case PartStates.Failed: return "Failed";
         case PartStates.Passed: return "Passed";
     }
@@ -116,10 +101,13 @@ export interface PartData {
     inFixture: boolean; // CurrentLocation = FixtureLocationWhenLoaded
 }
 
+
+
 export enum PartValidationStates {
     NONE = 0,
     Scrapped_Generic = 1,
     Scrapped_LINER_APPLICATION_STARTED_BUT_NOT_FINISHED = 101,
+    Scrapped_LINER_BRUSHING_STARTED_BUT_NOT_FINISHED = 102,
     Scrapped_Failed_Weight_TOO_LIGHT = 701,
     Scrapped_Failed_Weight_TOO_HEAVY = 702,
     Scrapped_Failed_Image_Review_GENERAL = 800,
@@ -128,22 +116,25 @@ export enum PartValidationStates {
     PASSED = 1000
 }
 
+
 export interface PartValidationData {
-    valState: PartValidationStates;
+    weightSts: PartValidationStates; //use PartValidationStates
+    visionSts: PartValidationStates; //use PartValidationStates
+    timestampVision_sec: number;
     statusMsg: string;
     preWeightKg: number;
     postWeightKg: number;
     linerWeightKg: number;
-    videoReviewSts: number; //0: NOT REVIEWED, 911: FAILED, 1000: PASSED
 }
 
 export const initialPartValidationData: PartValidationData = {
-    valState: PartValidationStates.NONE,
+    weightSts: PartValidationStates.NONE,
+    visionSts: PartValidationStates.NONE,
+    timestampVision_sec: 0,
     statusMsg: "",
     preWeightKg: 0,
     postWeightKg: 0,
     linerWeightKg: 0,
-    videoReviewSts: 0,
 };
 export const initialPartData: PartData = {
     processSts: PartStates.Empty,

package/src/custom-types/Recipe.ts

@@ -111,6 +111,7 @@ export interface RecipeData {
 
     usesBrushTool: boolean;
 	brushToolSpeed_RPM: number;
+	robotSpeedWhileBrushing: number;
 }
 
 export enum CameraIds {
@@ -240,6 +241,7 @@ export const initialRecipe: RecipeData = {
     applicatorCollisionPayloadOffset: 0,
     usesBrushTool: false,
     brushToolSpeed_RPM: 0,
+    robotSpeedWhileBrushing: 0,
     cleanerId: Cleaners.NONE,
     cleanerString: cleanerIdToStringMap.get(Cleaners.NONE) || "",
     weighingFingerId: WeighingFingers.NONE,