@duet3d/objectmodel 3.5.0-beta.29 → 3.5.0-beta.31

package/dist/move/Axis.d.ts

@@ -24,6 +24,7 @@ export declare enum AxisLetter {
 export declare class Axis extends ModelObject {
     acceleration: number;
     babystep: number;
+    backlash: number;
     current: number;
     readonly drivers: ModelCollection<DriverId>;
     homed: boolean;

package/dist/move/Axis.js

@@ -30,6 +30,7 @@ class Axis extends ModelObject_1.default {
         super(...arguments);
         this.acceleration = 0;
         this.babystep = 0;
+        this.backlash = 0;
         this.current = 0;
         this.drivers = new ModelCollection_1.default(DriverId_1.default);
         this.homed = false;

package/dist/move/KeepoutZone.d.ts

@@ -0,0 +1,10 @@
+import { ModelCollection } from "../ModelCollection";
+import { ModelObject } from "../ModelObject";
+export declare class KeepoutZoneCoordinates extends ModelObject {
+    max: number;
+    min: number;
+}
+export default class KeepoutZone extends ModelObject {
+    active: boolean;
+    coords: ModelCollection<KeepoutZoneCoordinates | null>;
+}

package/dist/move/KeepoutZone.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeepoutZoneCoordinates = void 0;
+const ModelCollection_1 = require("../ModelCollection");
+const ModelObject_1 = require("../ModelObject");
+class KeepoutZoneCoordinates extends ModelObject_1.ModelObject {
+    constructor() {
+        super(...arguments);
+        this.max = 0;
+        this.min = 0;
+    }
+}
+exports.KeepoutZoneCoordinates = KeepoutZoneCoordinates;
+class KeepoutZone extends ModelObject_1.ModelObject {
+    constructor() {
+        super(...arguments);
+        this.active = true;
+        this.coords = new ModelCollection_1.ModelCollection(KeepoutZoneCoordinates);
+    }
+}
+exports.default = KeepoutZone;

package/dist/move/index.d.ts

@@ -1,11 +1,12 @@
 import ModelObject from "../ModelObject";
 import ModelCollection from "../ModelCollection";
+import Kinematics from "./kinematics";
 import Axis from "./Axis";
-import MoveCalibration from "./MoveCalibration";
-import MoveCompensation from "./MoveCompensation";
 import Extruder from "./Extruder";
 import InputShaping from "./InputShaping";
-import Kinematics from "./kinematics";
+import KeepoutZone from "./KeepoutZone";
+import MoveCalibration from "./MoveCalibration";
+import MoveCompensation from "./MoveCompensation";
 export declare class CurrentMove extends ModelObject {
     acceleration: number;
     deceleration: number;
@@ -28,11 +29,13 @@ export declare class MoveRotation extends ModelObject {
 }
 export declare class Move extends ModelObject {
     readonly axes: ModelCollection<Axis>;
+    backlashFactor: number;
     readonly calibration: MoveCalibration;
     readonly compensation: MoveCompensation;
     readonly currentMove: CurrentMove;
     readonly extruders: ModelCollection<Extruder>;
     readonly idle: MotorsIdleControl;
+    readonly keepout: ModelCollection<KeepoutZone | null>;
     kinematics: Kinematics;
     limitAxes: boolean;
     noMovesBeforeHoming: boolean;
@@ -51,6 +54,7 @@ export * from "./Axis";
 export * from "./DriverId";
 export * from "./Extruder";
 export * from "./InputShaping";
+export * from "./KeepoutZone";
 export * from "./Microstepping";
 export * from "./MoveCalibration";
 export * from "./MoveCompensation";

package/dist/move/index.js

@@ -17,12 +17,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Move = exports.MoveRotation = exports.MoveQueueItem = exports.MotorsIdleControl = exports.CurrentMove = void 0;
 const ModelObject_1 = require("../ModelObject");
 const ModelCollection_1 = require("../ModelCollection");
+const kinematics_1 = require("./kinematics");
 const Axis_1 = require("./Axis");
-const MoveCalibration_1 = require("./MoveCalibration");
-const MoveCompensation_1 = require("./MoveCompensation");
 const Extruder_1 = require("./Extruder");
 const InputShaping_1 = require("./InputShaping");
-const kinematics_1 = require("./kinematics");
+const KeepoutZone_1 = require("./KeepoutZone");
+const MoveCalibration_1 = require("./MoveCalibration");
+const MoveCompensation_1 = require("./MoveCompensation");
 class CurrentMove extends ModelObject_1.default {
     constructor() {
         super(...arguments);
@@ -63,11 +64,13 @@ class Move extends ModelObject_1.default {
     constructor() {
         super(...arguments);
         this.axes = new ModelCollection_1.default(Axis_1.default);
+        this.backlashFactor = 10;
         this.calibration = new MoveCalibration_1.default();
         this.compensation = new MoveCompensation_1.default();
         this.currentMove = new CurrentMove();
         this.extruders = new ModelCollection_1.default(Extruder_1.default);
         this.idle = new MotorsIdleControl();
+        this.keepout = new ModelCollection_1.default(KeepoutZone_1.default);
         this.kinematics = new kinematics_1.default();
         this.limitAxes = true;
         this.noMovesBeforeHoming = true;
@@ -88,6 +91,7 @@ __exportStar(require("./Axis"), exports);
 __exportStar(require("./DriverId"), exports);
 __exportStar(require("./Extruder"), exports);
 __exportStar(require("./InputShaping"), exports);
+__exportStar(require("./KeepoutZone"), exports);
 __exportStar(require("./Microstepping"), exports);
 __exportStar(require("./MoveCalibration"), exports);
 __exportStar(require("./MoveCompensation"), exports);

package/dist/sensors/AnalogSensor.d.ts

@@ -9,6 +9,9 @@ export declare enum AnalogSensorType {
     dht21 = "dht21",
     dht22 = "dht22",
     dhtHumidity = "dhthumidity",
+    bme280 = "bme280",
+    bme280pressure = "bme280-pressure",
+    bme280humidity = "bme280-humidity",
     currentLoop = "currentloooppyro",
     mcuTemp = "mcutemp",
     drivers = "drivers",

package/dist/sensors/AnalogSensor.js

@@ -13,6 +13,9 @@ var AnalogSensorType;
     AnalogSensorType["dht21"] = "dht21";
     AnalogSensorType["dht22"] = "dht22";
     AnalogSensorType["dhtHumidity"] = "dhthumidity";
+    AnalogSensorType["bme280"] = "bme280";
+    AnalogSensorType["bme280pressure"] = "bme280-pressure";
+    AnalogSensorType["bme280humidity"] = "bme280-humidity";
     AnalogSensorType["currentLoop"] = "currentloooppyro";
     AnalogSensorType["mcuTemp"] = "mcutemp";
     AnalogSensorType["drivers"] = "drivers";

package/dist/sensors/Probe.js

@@ -24,7 +24,7 @@ class Probe extends ModelObject_1.default {
         this.disablesHeaters = false;
         this.diveHeight = 0;
         this.lastStopHeight = 0;
-        this.maxProbeCount = -1;
+        this.maxProbeCount = 1;
         this.offsets = [0, 0];
         this.recoveryTime = 0;
         this.speeds = [2, 2];

package/package.json

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