@duet3d/objectmodel 3.7.0-beta.2 → 3.7.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -48,6 +48,7 @@ export declare class Board extends ModelObject {
48
48
  shortName: string;
49
49
  state: BoardState;
50
50
  supportsDirectDisplay: boolean;
51
+ timeout: number;
51
52
  uniqueId: string | null;
52
53
  v12: MinMaxCurrent | null;
53
54
  vIn: MinMaxCurrent | null;
@@ -59,6 +59,7 @@ export class Board extends ModelObject {
59
59
  this.shortName = "";
60
60
  this.state = BoardState.unknown;
61
61
  this.supportsDirectDisplay = false;
62
+ this.timeout = 10;
62
63
  this.uniqueId = null;
63
64
  this.v12 = null;
64
65
  this.vIn = null;
@@ -74,6 +74,7 @@
74
74
  }
75
75
  },
76
76
  "boards[].supportsDirectDisplay": "Indicates if this board supports external displays",
77
+ "boards[].timeout": "Connection timeout of this board (in s)",
77
78
  "boards[].uniqueId": "Unique identifier of the board or null if unknown",
78
79
  "boards[].v12": "Minimum, maximum, and current voltages on the 12V rail or null if unknown",
79
80
  "boards[].v12.current": "Current value",
@@ -782,6 +783,9 @@
782
783
  "sbc.memory.total": "Total memory (in bytes)",
783
784
  "sbc.model": "SBC model or null if unknown",
784
785
  "sbc.serial": "Serial of the SBC or null if unknown",
786
+ "sbc.upgrade": "Details about a software upgrade in progress or null if no upgrade is running",
787
+ "sbc.upgrade.message": "Description of the current upgrade step",
788
+ "sbc.upgrade.progress": "Progress of the current upgrade step (0..1) or null if indeterminate",
785
789
  "sbc.uptime": "Uptime of the running system (in s)",
786
790
  "sensors": "Information about connected sensors including Z-probes and endstops",
787
791
  "sensors.analog": "List of analog sensors",
@@ -0,0 +1,6 @@
1
+ import ModelObject from "../ModelObject";
2
+ export declare class Upgrade extends ModelObject {
3
+ message: string;
4
+ progress: number | null;
5
+ }
6
+ export default Upgrade;
@@ -0,0 +1,9 @@
1
+ import ModelObject from "../ModelObject";
2
+ export class Upgrade extends ModelObject {
3
+ constructor() {
4
+ super(...arguments);
5
+ this.message = "";
6
+ this.progress = null;
7
+ }
8
+ }
9
+ export default Upgrade;
@@ -2,7 +2,9 @@ import ModelObject from "../ModelObject";
2
2
  import DSF from "./dsf";
3
3
  import CPU from "./CPU";
4
4
  import Memory from "./Memory";
5
+ import Upgrade from "./Upgrade";
5
6
  export declare class SBC extends ModelObject {
7
+ constructor();
6
8
  appArmor: boolean;
7
9
  readonly cpu: CPU;
8
10
  readonly dsf: DSF;
@@ -11,9 +13,11 @@ export declare class SBC extends ModelObject {
11
13
  readonly memory: Memory;
12
14
  model: string | null;
13
15
  serial: string | null;
16
+ upgrade: Upgrade | null;
14
17
  uptime: number | null;
15
18
  }
16
19
  export default SBC;
17
20
  export * from "./dsf";
18
21
  export * from "./CPU";
19
22
  export * from "./Memory";
23
+ export * from "./Upgrade";
package/dist/sbc/index.js CHANGED
@@ -2,9 +2,10 @@ import ModelObject from "../ModelObject";
2
2
  import DSF from "./dsf";
3
3
  import CPU from "./CPU";
4
4
  import Memory from "./Memory";
5
+ import Upgrade from "./Upgrade";
5
6
  export class SBC extends ModelObject {
6
7
  constructor() {
7
- super(...arguments);
8
+ super();
8
9
  this.appArmor = false;
9
10
  this.cpu = new CPU();
10
11
  this.dsf = new DSF();
@@ -13,10 +14,13 @@ export class SBC extends ModelObject {
13
14
  this.memory = new Memory();
14
15
  this.model = null;
15
16
  this.serial = null;
17
+ this.upgrade = null;
16
18
  this.uptime = null;
19
+ ModelObject.wrapModelProperty(this, "upgrade", Upgrade);
17
20
  }
18
21
  }
19
22
  export default SBC;
20
23
  export * from "./dsf";
21
24
  export * from "./CPU";
22
25
  export * from "./Memory";
26
+ export * from "./Upgrade";
@@ -6,7 +6,7 @@ export class RestorePoint extends ModelObject {
6
6
  this.extruderPos = 0;
7
7
  this.fanPwm = 0;
8
8
  this.feedRate = 0;
9
- this.gCommandNumber = 0;
9
+ this.gCommandNumber = -1;
10
10
  this.ioBits = null;
11
11
  this.laserPwm = null;
12
12
  this.toolNumber = -1;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@duet3d/objectmodel",
3
- "version": "3.7.0-beta.2",
3
+ "version": "3.7.0-beta.3",
4
4
  "description": "TypeScript implementation of the Duet3D Object Model",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",