Fix Abstraction.getPrinterModel for older models

This commit is contained in:
MultiMote 2024-10-07 10:48:13 +03:00
parent c10de9f96c
commit 2a90d61e23
2 changed files with 10 additions and 4 deletions

@ -154,6 +154,12 @@ export class Abstraction {
public async getPrinterModel(): Promise<number> { public async getPrinterModel(): Promise<number> {
const packet = await this.send(PacketGenerator.getPrinterInfo(PrinterInfoType.PrinterModelId)); const packet = await this.send(PacketGenerator.getPrinterInfo(PrinterInfoType.PrinterModelId));
Validators.u8ArrayLengthAtLeast(packet.data, 1);
if (packet.data.length === 1) {
return Utils.bytesToI16(packet.data) << 8;
}
Validators.u8ArrayLengthEquals(packet.data, 2); Validators.u8ArrayLengthEquals(packet.data, 2);
return Utils.bytesToI16(packet.data); return Utils.bytesToI16(packet.data);
} }

@ -3,10 +3,10 @@ import { PrinterModel as M } from "./printer_models";
export const getPrintTaskVersion = (model: M): PrintTaskVersion | undefined => { export const getPrintTaskVersion = (model: M): PrintTaskVersion | undefined => {
switch (model) { switch (model) {
case M.D11: // case M.D11:
case M.D11_H: // case M.D11_H:
case M.D11S: // case M.D11S:
return PrintTaskVersion.V1; // return PrintTaskVersion.V1;
case M.D110: case M.D110:
case M.D110_M: case M.D110_M:
return PrintTaskVersion.V3; return PrintTaskVersion.V3;