@duet3d/objectmodel 3.4.0-b10 → 3.4.0-b13

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.
@@ -2,7 +2,6 @@ import ModelCollection from "./ModelCollection";
2
2
  import ModelDictionary from "./ModelDictionary";
3
3
  import ModelObject from "./ModelObject";
4
4
  import Board from "./boards";
5
- import State from "./state";
6
5
  import Directories from "./directories";
7
6
  import Fan from "./fans";
8
7
  import Heat from "./heat";
@@ -17,6 +16,8 @@ import Plugin from "./plugins";
17
16
  import Scanner from "./scanner";
18
17
  import Sensors from "./sensors";
19
18
  import Spindle from "./spindles";
19
+ import State from "./state";
20
+ import Tool from "./tools";
20
21
  import UserSession from "./userSessions";
21
22
  import Volume from "./volumes";
22
23
  /**
@@ -40,6 +41,7 @@ export declare class ObjectModel extends ModelObject {
40
41
  readonly sensors: Sensors;
41
42
  readonly spindles: ModelCollection<Spindle | null>;
42
43
  readonly state: State;
44
+ readonly tools: ModelCollection<Tool | null>;
43
45
  readonly userSessions: ModelCollection<UserSession>;
44
46
  readonly volumes: ModelCollection<Volume>;
45
47
  }
@@ -5,7 +5,6 @@ const ModelCollection_1 = require("./ModelCollection");
5
5
  const ModelDictionary_1 = require("./ModelDictionary");
6
6
  const ModelObject_1 = require("./ModelObject");
7
7
  const boards_1 = require("./boards");
8
- const state_1 = require("./state");
9
8
  const directories_1 = require("./directories");
10
9
  const fans_1 = require("./fans");
11
10
  const heat_1 = require("./heat");
@@ -20,6 +19,8 @@ const plugins_1 = require("./plugins");
20
19
  const scanner_1 = require("./scanner");
21
20
  const sensors_1 = require("./sensors");
22
21
  const spindles_1 = require("./spindles");
22
+ const state_1 = require("./state");
23
+ const tools_1 = require("./tools");
23
24
  const userSessions_1 = require("./userSessions");
24
25
  const volumes_1 = require("./volumes");
25
26
  /**
@@ -45,6 +46,7 @@ class ObjectModel extends ModelObject_1.default {
45
46
  this.sensors = new sensors_1.default();
46
47
  this.spindles = new ModelCollection_1.default(spindles_1.default);
47
48
  this.state = new state_1.default();
49
+ this.tools = new ModelCollection_1.default(tools_1.default);
48
50
  this.userSessions = new ModelCollection_1.default(userSessions_1.default);
49
51
  this.volumes = new ModelCollection_1.default(volumes_1.default);
50
52
  }
package/dist/index.d.ts CHANGED
@@ -17,6 +17,7 @@ export * from "./plugins";
17
17
  export * from "./scanner";
18
18
  export * from "./sensors";
19
19
  export * from "./spindles";
20
+ export * from "./tools";
20
21
  export * from "./userSessions";
21
22
  export * from "./volumes";
22
23
  export * from "./ObjectModel";
package/dist/index.js CHANGED
@@ -35,6 +35,7 @@ __exportStar(require("./plugins"), exports);
35
35
  __exportStar(require("./scanner"), exports);
36
36
  __exportStar(require("./sensors"), exports);
37
37
  __exportStar(require("./spindles"), exports);
38
+ __exportStar(require("./tools"), exports);
38
39
  __exportStar(require("./userSessions"), exports);
39
40
  __exportStar(require("./volumes"), exports);
40
41
  __exportStar(require("./ObjectModel"), exports);
@@ -7,6 +7,17 @@ export declare enum NetworkProtocol {
7
7
  Telnet = "telnet",
8
8
  SSH = "ssh"
9
9
  }
10
+ export declare enum NetworkInterfaceState {
11
+ disabled = "disabled",
12
+ enabled = "enabled",
13
+ starting1 = "starting1",
14
+ starting2 = "starting2",
15
+ changingMode = "changingMode",
16
+ establishingLink = "establishingLink",
17
+ obtainingIP = "obtainingIP",
18
+ connected = "connected",
19
+ active = "active"
20
+ }
10
21
  export declare enum NetworkInterfaceType {
11
22
  lan = "lan",
12
23
  wifi = "wifi"
@@ -22,6 +33,7 @@ export declare class NetworkInterface extends ModelObject {
22
33
  numReconnects: number | null;
23
34
  signal: number | null;
24
35
  speed: number | null;
36
+ state: NetworkInterfaceState | null;
25
37
  subnet: string | null;
26
38
  type: NetworkInterfaceType;
27
39
  }
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.NetworkInterface = exports.NetworkInterfaceType = exports.NetworkProtocol = void 0;
3
+ exports.NetworkInterface = exports.NetworkInterfaceType = exports.NetworkInterfaceState = exports.NetworkProtocol = void 0;
4
4
  const ModelObject_1 = require("../ModelObject");
5
5
  var NetworkProtocol;
6
6
  (function (NetworkProtocol) {
@@ -11,6 +11,18 @@ var NetworkProtocol;
11
11
  NetworkProtocol["Telnet"] = "telnet";
12
12
  NetworkProtocol["SSH"] = "ssh";
13
13
  })(NetworkProtocol = exports.NetworkProtocol || (exports.NetworkProtocol = {}));
14
+ var NetworkInterfaceState;
15
+ (function (NetworkInterfaceState) {
16
+ NetworkInterfaceState["disabled"] = "disabled";
17
+ NetworkInterfaceState["enabled"] = "enabled";
18
+ NetworkInterfaceState["starting1"] = "starting1";
19
+ NetworkInterfaceState["starting2"] = "starting2";
20
+ NetworkInterfaceState["changingMode"] = "changingMode";
21
+ NetworkInterfaceState["establishingLink"] = "establishingLink";
22
+ NetworkInterfaceState["obtainingIP"] = "obtainingIP";
23
+ NetworkInterfaceState["connected"] = "connected";
24
+ NetworkInterfaceState["active"] = "active";
25
+ })(NetworkInterfaceState = exports.NetworkInterfaceState || (exports.NetworkInterfaceState = {}));
14
26
  var NetworkInterfaceType;
15
27
  (function (NetworkInterfaceType) {
16
28
  NetworkInterfaceType["lan"] = "lan";
@@ -29,6 +41,7 @@ class NetworkInterface extends ModelObject_1.default {
29
41
  this.numReconnects = null;
30
42
  this.signal = null;
31
43
  this.speed = null;
44
+ this.state = null;
32
45
  this.subnet = null;
33
46
  this.type = NetworkInterfaceType.wifi;
34
47
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@duet3d/objectmodel",
3
- "version": "3.4.0-b10",
3
+ "version": "3.4.0-b13",
4
4
  "description": "TypeScript implementation of the Duet3D Object Model",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",