@duet3d/objectmodel 3.6.0-beta.2 → 3.6.0-beta.4

package/dist/ModelCollection.d.ts

@@ -3,7 +3,9 @@ import { IModelObject } from "./ModelObject";
  * Class for storing model object items in an array
  */
 export declare class ModelCollection<T extends IModelObject | null> extends Array<T> implements IModelObject {
-    private readonly itemConstructor;
+    readonly itemConstructor: {
+        new (): T;
+    };
     /**
      * Constructor of this class
      * @param itemConstructor Item constructor type that items must derive from

package/dist/ModelDictionary.d.ts

@@ -3,8 +3,10 @@ import { IModelObject } from "./ModelObject";
  * Dictionary class to map object model data
  */
 export declare class ModelDictionary<T> extends Map<string, T | null> implements IModelObject {
-    private readonly nullDeletesKeys;
-    private readonly itemConstructor;
+    readonly nullDeletesKeys: boolean;
+    readonly itemConstructor: {
+        new (): T;
+    } | null;
     /**
      * Constructor of this class
      * @param nullDeletesKeys Whether setting null to items effectively deletes them

package/dist/ModelDictionary.js

@@ -14,8 +14,8 @@ class ModelDictionary extends Map {
      */
     constructor(nullDeletesKeys, itemConstructor = null) {
         super();
-        this.itemConstructor = itemConstructor;
         this.nullDeletesKeys = nullDeletesKeys;
+        this.itemConstructor = itemConstructor;
         Object.setPrototypeOf(this, ModelDictionary.prototype);
     }
     /**

package/dist/sensors/Probe.d.ts

@@ -13,7 +13,14 @@ export declare enum ProbeType {
     zMotorStall = 10,
     scanningAnalog = 11
 }
+export declare class ProbeTouchMode extends ModelObject {
+    active: boolean;
+    sensivity: number;
+    speed: number;
+    triggerHeight: number;
+}
 export declare class Probe extends ModelObject {
+    constructor();
     calibA: number | null;
     calibB: number | null;
     calibrationTemperature: number;
@@ -35,6 +42,7 @@ export declare class Probe extends ModelObject {
     temperatureCoefficients: Array<number>;
     threshold: number;
     tolerance: number;
+    touchMode: ProbeTouchMode | null;
     travelSpeed: number;
     triggerHeight: number;
     type: ProbeType;

package/dist/sensors/Probe.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Probe = exports.ProbeType = void 0;
+exports.Probe = exports.ProbeTouchMode = exports.ProbeType = void 0;
 const ModelObject_1 = require("../ModelObject");
 var ProbeType;
 (function (ProbeType) {
@@ -17,9 +17,19 @@ var ProbeType;
     ProbeType[ProbeType["zMotorStall"] = 10] = "zMotorStall";
     ProbeType[ProbeType["scanningAnalog"] = 11] = "scanningAnalog";
 })(ProbeType || (exports.ProbeType = ProbeType = {}));
-class Probe extends ModelObject_1.default {
+class ProbeTouchMode extends ModelObject_1.default {
     constructor() {
         super(...arguments);
+        this.active = false;
+        this.sensivity = 0;
+        this.speed = 0;
+        this.triggerHeight = 0;
+    }
+}
+exports.ProbeTouchMode = ProbeTouchMode;
+class Probe extends ModelObject_1.default {
+    constructor() {
+        super();
         this.calibA = null;
         this.calibB = null;
         this.calibrationTemperature = 0;
@@ -41,10 +51,12 @@ class Probe extends ModelObject_1.default {
         this.temperatureCoefficients = [0, 0];
         this.threshold = 500;
         this.tolerance = 0.03;
+        this.touchMode = null;
         this.travelSpeed = 6000;
         this.triggerHeight = 0.7;
         this.type = ProbeType.none;
         this.value = [];
+        ModelObject_1.default.wrapModelProperty(this, "touchMode", ProbeTouchMode);
     }
 }
 exports.Probe = Probe;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.6.0-beta.2",
+  "version": "3.6.0-beta.4",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",