Skip to content

Commit

Permalink
Work towards v3.5-b1
Browse files Browse the repository at this point in the history
Brought object model data up-to-date
  • Loading branch information
chrishamm committed Sep 29, 2022
1 parent ec57f69 commit 31c00e7
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@duet3d/objectmodel",
"version": "3.4.0-b25",
"version": "3.5.0-b1",
"description": "TypeScript implementation of the Duet3D Object Model",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
1 change: 1 addition & 0 deletions src/boards/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export class Board extends ModelObject {
uniqueId: string | null = null;
v12: MinMaxCurrent | null = null;
vIn: MinMaxCurrent | null = null;
wifiFirmwareFileName: string | null = null;
}

export default Board
3 changes: 2 additions & 1 deletion src/fans/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import ModelObject from "../ModelObject";

export class FanThermostaticControl extends ModelObject {
heaters: Array<number> = new Array<number>();
heaters: Array<number> = []; // *** deprecated as of v3.5, use sensors instead
highTemperature: number | null = null;
lowTemperature: number | null = null;
sensors: Array<number> = [];
}

export class Fan extends ModelObject {
Expand Down
1 change: 1 addition & 0 deletions src/move/Extruder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export class Extruder extends ModelObject {
current: number = 0;
driver: DriverId | null = null;
filament: string = "";
filamentDiameter: number = 1.75;
factor: number = 1;
jerk: number = 15;
readonly microstepping: Microstepping = new Microstepping();
Expand Down
12 changes: 10 additions & 2 deletions src/state/MessageBox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,20 @@ export enum MessageBoxMode {
noButtons,
closeOnly,
okOnly,
okCancel
okCancel,
multipleChoice,
intInput,
floatInput,
stringInput
}

export class MessageBox extends ModelObject {
axisControls: number = 0;
axisControls: number | null = null;
cancelButton: boolean = false;
default: number | string | null = null;
max: number | null = null;
message: string = "";
min: number | null = null;
mode: MessageBoxMode = MessageBoxMode.okOnly;
seq: number = -1;
timeout: number = 0;
Expand Down

0 comments on commit 31c00e7

Please sign in to comment.