@duet3d/objectmodel 3.7.0-beta.14 → 3.7.0-beta.15

package/dist/documentation.json

@@ -972,8 +972,6 @@
 	"sensors.probes[].disablesHeaters": "Whether probing disables the heater(s)",
 	"sensors.probes[].diveHeight": "Dive height of the probe (in mm)",
 	"sensors.probes[].diveHeights": "Dive heights of the probe (in mm). The first element is the dive height for the first tap; the second element is used for subsequent taps when multi-tapping",
-	"sensors.probes[].force": "Force measured by the probe (in g), or null if it is not a force-sensing probe",
-	"sensors.probes[].gramsPerCount": "Scale of a force-sensing probe (in g per count), or null if it has not been calibrated",
 	"sensors.probes[].isCalibrated": "Indicates if the scanning probe is calibrated",
 	"sensors.probes[].lastStopHeight": "Height of the probe where it stopped last time (in mm)",
 	"sensors.probes[].maxProbeCount": "Maximum number of times to probe after a bad reading was determined",

package/dist/sensors/Probe.d.ts

@@ -14,6 +14,12 @@ export declare enum ProbeType {
     scanningAnalog = 11,
     loadCell = 12
 }
+export declare class ProbeLoadCell extends ModelObject {
+    force: number;
+    gramsPerCount: number;
+    preload: number;
+    preloadWindow: Array<number>;
+}
 export declare class ProbeTouchMode extends ModelObject {
     active: boolean;
     speed: number;
@@ -30,14 +36,12 @@ export declare class Probe extends ModelObject {
      */
     diveHeight: number;
     diveHeights: Array<number>;
-    force: number | null;
-    gramsPerCount: number | null;
     isCalibrated: boolean | null;
     lastStopHeight: number;
+    loadCell: ProbeLoadCell | null;
     maxProbeCount: number;
     measuredHeight: number | null;
     offsets: Array<number>;
-    preload: number | null;
     recoveryTime: number;
     scanCoefficients: Array<number> | null;
     speeds: Array<number>;

package/dist/sensors/Probe.js

@@ -15,6 +15,15 @@ export var ProbeType;
     ProbeType[ProbeType["scanningAnalog"] = 11] = "scanningAnalog";
     ProbeType[ProbeType["loadCell"] = 12] = "loadCell";
 })(ProbeType || (ProbeType = {}));
+export class ProbeLoadCell extends ModelObject {
+    constructor() {
+        super(...arguments);
+        this.force = 0;
+        this.gramsPerCount = 0;
+        this.preload = 0;
+        this.preloadWindow = [0, 0];
+    }
+}
 export class ProbeTouchMode extends ModelObject {
     constructor() {
         super(...arguments);
@@ -35,14 +44,12 @@ export class Probe extends ModelObject {
          */
         this.diveHeight = 5;
         this.diveHeights = [0, 0];
-        this.force = null;
-        this.gramsPerCount = null;
         this.isCalibrated = null;
         this.lastStopHeight = 0;
+        this.loadCell = null;
         this.maxProbeCount = 1;
         this.measuredHeight = null;
         this.offsets = [0, 0];
-        this.preload = null;
         this.recoveryTime = 0;
         this.scanCoefficients = null;
         this.speeds = [2, 2];
@@ -54,6 +61,7 @@ export class Probe extends ModelObject {
         this.triggerHeight = 0.7;
         this.type = ProbeType.none;
         this.value = [];
+        ModelObject.wrapModelProperty(this, "loadCell", ProbeLoadCell);
         ModelObject.wrapModelProperty(this, "touchMode", ProbeTouchMode);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-beta.14",
+  "version": "3.7.0-beta.15",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "type": "module",
   "main": "dist/index.js",