@duet3d/objectmodel 3.5.0-beta.47 → 3.5.0-beta.49

package/dist/boards/directDisplay/DirectDisplayScreen.d.ts

@@ -0,0 +1,6 @@
+import { IModelObject } from "../../ModelObject";
+import DirectDisplayScreenBase from "./DirectDisplayScreenBase";
+export declare class DirectDisplayScreen extends DirectDisplayScreenBase {
+    update(jsonElement: any): IModelObject | null;
+}
+export default DirectDisplayScreen;

package/dist/boards/directDisplay/DirectDisplayScreen.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DirectDisplayScreen = void 0;
+const _1 = require(".");
+const DirectDisplayScreenBase_1 = require("./DirectDisplayScreenBase");
+class DirectDisplayScreen extends DirectDisplayScreenBase_1.default {
+    update(jsonElement) {
+        if (jsonElement === null) {
+            return null;
+        }
+        if (typeof jsonElement.controller === "string" && jsonElement.controller !== this.controller) {
+            return (0, _1.getDirectDisplayScreen)(jsonElement.type).update(jsonElement);
+        }
+        return super.update(jsonElement);
+    }
+}
+exports.DirectDisplayScreen = DirectDisplayScreen;
+exports.default = DirectDisplayScreen;

package/dist/boards/directDisplay/DirectDisplayScreenBase.d.ts

@@ -0,0 +1,11 @@
+import ModelObject from "../../ModelObject";
+import { DirectDisplayController } from ".";
+export declare class DirectDisplayScreenBase extends ModelObject {
+    constructor(type: DirectDisplayController);
+    colourBits: number;
+    controller: DirectDisplayController;
+    height: number;
+    spiFreq: number;
+    width: number;
+}
+export default DirectDisplayScreenBase;

package/dist/boards/directDisplay/DirectDisplayScreenBase.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DirectDisplayScreenBase = void 0;
+const ModelObject_1 = require("../../ModelObject");
+class DirectDisplayScreenBase extends ModelObject_1.default {
+    constructor(type) {
+        super();
+        this.colourBits = 1;
+        this.height = 64;
+        this.spiFreq = 2000000;
+        this.width = 128;
+        this.controller = type;
+    }
+}
+exports.DirectDisplayScreenBase = DirectDisplayScreenBase;
+exports.default = DirectDisplayScreenBase;

package/dist/boards/directDisplay/DirectDisplayScreenST7567.d.ts

@@ -0,0 +1,9 @@
+import { IModelObject } from "../../ModelObject";
+import DirectDisplayScreenBase from "./DirectDisplayScreen";
+export declare class DirectDisplayScreenST7567 extends DirectDisplayScreenBase {
+    constructor();
+    contrast: number;
+    resistorRatio: number;
+    update(jsonElement: any): IModelObject | null;
+}
+export default DirectDisplayScreenST7567;

package/dist/boards/directDisplay/DirectDisplayScreenST7567.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DirectDisplayScreenST7567 = void 0;
+const DirectDisplayScreen_1 = require("./DirectDisplayScreen");
+const _1 = require(".");
+class DirectDisplayScreenST7567 extends DirectDisplayScreen_1.default {
+    constructor() {
+        super(_1.DirectDisplayController.ST7567);
+        this.contrast = 30;
+        this.resistorRatio = 6;
+    }
+    update(jsonElement) {
+        if (jsonElement === null) {
+            return null;
+        }
+        if (typeof jsonElement.controller === "string" && jsonElement.controller !== this.controller) {
+            return (0, _1.getDirectDisplayScreen)(jsonElement.type).update(jsonElement);
+        }
+        return super.update(jsonElement);
+    }
+}
+exports.DirectDisplayScreenST7567 = DirectDisplayScreenST7567;
+exports.default = DirectDisplayScreenST7567;

package/dist/boards/directDisplay/index.d.ts

@@ -0,0 +1,20 @@
+import ModelObject from "../../ModelObject";
+import DirectDisplayScreenBase from "./DirectDisplayScreenBase";
+import DirectDisplayScreen from "./DirectDisplayScreen";
+export declare enum DirectDisplayController {
+    ST7920 = "ST7920",
+    ST7567 = "ST7567",
+    ILI9488 = "ILI9488"
+}
+export declare class DirectDisplayEncoder extends ModelObject {
+    pulsesPerClick: number;
+}
+export declare class DirectDisplay extends ModelObject {
+    constructor();
+    encoder: DirectDisplayEncoder | null;
+    screen: DirectDisplayScreenBase;
+}
+export default DirectDisplay;
+export declare function getDirectDisplayScreen(controller: DirectDisplayController): DirectDisplayScreen;
+export * from "./DirectDisplayScreen";
+export * from "./DirectDisplayScreenST7567";

package/dist/boards/directDisplay/index.js

@@ -0,0 +1,56 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDirectDisplayScreen = exports.DirectDisplay = exports.DirectDisplayEncoder = exports.DirectDisplayController = void 0;
+const ModelObject_1 = require("../../ModelObject");
+const DirectDisplayScreen_1 = require("./DirectDisplayScreen");
+const DirectDisplayScreenST7567_1 = require("./DirectDisplayScreenST7567");
+var DirectDisplayController;
+(function (DirectDisplayController) {
+    DirectDisplayController["ST7920"] = "ST7920";
+    DirectDisplayController["ST7567"] = "ST7567";
+    DirectDisplayController["ILI9488"] = "ILI9488";
+})(DirectDisplayController = exports.DirectDisplayController || (exports.DirectDisplayController = {}));
+class DirectDisplayEncoder extends ModelObject_1.default {
+    constructor() {
+        super(...arguments);
+        this.pulsesPerClick = 1;
+    }
+}
+exports.DirectDisplayEncoder = DirectDisplayEncoder;
+class DirectDisplay extends ModelObject_1.default {
+    constructor() {
+        super();
+        this.encoder = new DirectDisplayEncoder();
+        this.screen = new DirectDisplayScreen_1.default(DirectDisplayController.ST7920);
+        ModelObject_1.default.wrapModelProperty(this, "encoder", DirectDisplayEncoder);
+    }
+}
+exports.DirectDisplay = DirectDisplay;
+exports.default = DirectDisplay;
+function getDirectDisplayScreen(controller) {
+    switch (controller) {
+        case DirectDisplayController.ST7920:
+        case DirectDisplayController.ILI9488:
+        default:
+            return new DirectDisplayScreen_1.default(controller);
+        case DirectDisplayController.ST7567:
+            return new DirectDisplayScreenST7567_1.DirectDisplayScreenST7567();
+    }
+}
+exports.getDirectDisplayScreen = getDirectDisplayScreen;
+__exportStar(require("./DirectDisplayScreen"), exports);
+__exportStar(require("./DirectDisplayScreenST7567"), exports);

package/dist/boards/index.d.ts

@@ -1,4 +1,5 @@
 import ModelObject from "../ModelObject";
+import DirectDisplay from "./directDisplay";
 export declare class Accelerometer extends ModelObject {
     points: number;
     runs: number;
@@ -19,11 +20,6 @@ export declare class MinMaxCurrent extends ModelObject {
     min: number;
     max: number;
 }
-export declare class DirectDisplay extends ModelObject {
-    pulsesPerClick: number;
-    spiFreq: number;
-    typeName: string;
-}
 export declare class Board extends ModelObject {
     constructor();
     accelerometer: Accelerometer | null;

package/dist/boards/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Board = exports.DirectDisplay = exports.MinMaxCurrent = exports.ClosedLoop = exports.BoardState = exports.Accelerometer = void 0;
+exports.Board = exports.MinMaxCurrent = exports.ClosedLoop = exports.BoardState = exports.Accelerometer = void 0;
 const ModelObject_1 = require("../ModelObject");
+const directDisplay_1 = require("./directDisplay");
 class Accelerometer extends ModelObject_1.default {
     constructor() {
         super(...arguments);
@@ -35,15 +36,6 @@ class MinMaxCurrent extends ModelObject_1.default {
     }
 }
 exports.MinMaxCurrent = MinMaxCurrent;
-class DirectDisplay extends ModelObject_1.default {
-    constructor() {
-        super(...arguments);
-        this.pulsesPerClick = 0;
-        this.spiFreq = 0;
-        this.typeName = "";
-    }
-}
-exports.DirectDisplay = DirectDisplay;
 class Board extends ModelObject_1.default {
     constructor() {
         super();
@@ -71,7 +63,7 @@ class Board extends ModelObject_1.default {
         this.wifiFirmwareFileName = null;
         ModelObject_1.default.wrapModelProperty(this, "accelerometer", Accelerometer);
         ModelObject_1.default.wrapModelProperty(this, "closedLoop", ClosedLoop);
-        ModelObject_1.default.wrapModelProperty(this, "directDisplay", DirectDisplay);
+        ModelObject_1.default.wrapModelProperty(this, "directDisplay", directDisplay_1.default);
         ModelObject_1.default.wrapModelProperty(this, "mcuTemp", MinMaxCurrent);
         ModelObject_1.default.wrapModelProperty(this, "v12", MinMaxCurrent);
         ModelObject_1.default.wrapModelProperty(this, "vIn", MinMaxCurrent);

package/package.json

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