From f026e06af1b07f96cba8e162653d705c52295677 Mon Sep 17 00:00:00 2001 From: Valdis Thomann Date: Sun, 29 Jan 2023 21:36:00 +1100 Subject: [PATCH] Added KLE types for text size, profile, switch info --- package.json | 2 +- src/types.common.ts | 21 ++++++++++++++++++++- test/data/v2_invalid_label_map.json | 7 +++++++ test/data/v2_valid_definition.json | 7 +++++++ test/data/v3_invalid_label_map.json | 7 +++++++ test/data/v3_valid_definition.json | 7 +++++++ 6 files changed, 49 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fc46e68..5339587 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@the-via/reader", - "version": "1.5.3", + "version": "1.5.4", "repository": { "type": "git", "url": "git+ssh://git@github.com/the-via/reader.git" diff --git a/src/types.common.ts b/src/types.common.ts index a9a4328..8785b34 100644 --- a/src/types.common.ts +++ b/src/types.common.ts @@ -38,6 +38,22 @@ export type Decal = { d: boolean; }; +export type TextSize = { + f: number; // default text size + f2: number; + fa: number[]; +}; + +export type Profile = { + p: string; +}; + +export type SwitchInfo = { + sm: string; // switch mount + sb: string; // switch brand + st: string; // switch type +}; + export type KeyColor = string; export type LegendColor = string; @@ -62,7 +78,10 @@ export type KLEElem = Ghosted & Stepped & Homing & - Decal + Decal & + TextSize & + Profile & + SwitchInfo > | string; export type ColorCount = {[key: string]: number}; diff --git a/test/data/v2_invalid_label_map.json b/test/data/v2_invalid_label_map.json index 7149f27..0f3dd45 100644 --- a/test/data/v2_invalid_label_map.json +++ b/test/data/v2_invalid_label_map.json @@ -25,6 +25,13 @@ "g": true, "l": true, "n": true, + "f": 3, + "f2": 4, + "fa": [1, 2], + "p": "profile", + "sm": "5 pin", + "sb": "gateron", + "st": "linear", "a": 1 }, "0,0", diff --git a/test/data/v2_valid_definition.json b/test/data/v2_valid_definition.json index e38bc5e..2b4bc91 100644 --- a/test/data/v2_valid_definition.json +++ b/test/data/v2_valid_definition.json @@ -25,6 +25,13 @@ "g": true, "l": true, "n": true, + "f": 3, + "f2": 4, + "fa": [1, 2], + "p": "profile", + "sm": "5 pin", + "sb": "gateron", + "st": "linear", "a": 0 }, "0,0", diff --git a/test/data/v3_invalid_label_map.json b/test/data/v3_invalid_label_map.json index 3919957..6cfd36c 100644 --- a/test/data/v3_invalid_label_map.json +++ b/test/data/v3_invalid_label_map.json @@ -164,6 +164,13 @@ "g": true, "l": true, "n": true, + "f": 3, + "f2": 4, + "fa": [1, 2], + "p": "profile", + "sm": "5 pin", + "sb": "gateron", + "st": "linear", "a": 1 }, "0,0", diff --git a/test/data/v3_valid_definition.json b/test/data/v3_valid_definition.json index dbaaa3e..8384add 100644 --- a/test/data/v3_valid_definition.json +++ b/test/data/v3_valid_definition.json @@ -164,6 +164,13 @@ "g": true, "l": true, "n": true, + "f": 3, + "f2": 4, + "fa": [1, 2], + "p": "profile", + "sm": "5 pin", + "sb": "gateron", + "st": "linear", "a": 0 }, "0,0",