diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 889586c40..b531cfc20 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -11,6 +11,19 @@ "kind": "build", "isDefault": true } + }, + { + "label": "Build analogue fonts", + "type": "shell", + "command": "max7456tool -f generate fonts.yaml", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [], + "options": { + "cwd": "${workspaceFolder}/resources/osd/analogue" + } } ] } \ No newline at end of file diff --git a/resources/osd/analogue/bold.mcm b/resources/osd/analogue/bold.mcm index 7471cf770..039ac6dd2 100644 --- a/resources/osd/analogue/bold.mcm +++ b/resources/osd/analogue/bold.mcm @@ -23103,60 +23103,51 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 -00010101 -01000000 -01000100 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 00010101 -00101010 -00010010 +01010101 +01010100 10000101 -00100000 +01010101 +01010000 +10000101 +01010101 +01001000 +10000101 +01010001 +01001000 +10000001 +01001000 +00001000 +10001000 +01001000 10001000 -00100001 -00101010 -00001010 -10100001 -00100000 10001000 -00100001 -00101010 00001000 -00100001 -01000000 -00010000 -00000101 -00100000 -10001010 -10000101 -00101000 10001000 -00100001 -00101000 10001000 -00100001 -00100010 10001000 -00100001 -00100000 -10001010 -10000101 -01000101 -00010000 -00010101 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00010001 +00010001 +00010001 01010101 01010101 01010101 @@ -23167,60 +23158,69 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010000 00010101 -01000000 -00000100 -00000101 -00101000 -10100000 -10100001 -00100010 -00100010 -00001000 +01010101 +01001010 +10000100 +01000101 +01001000 00100010 +00100001 +01001010 +10000000 +10000101 +01001000 00100010 -00001000 -00100000 +00100001 +01001000 00100010 -00001000 00100001 -00100000 +01010001 +01000100 +01000101 +01001000 +01010100 +00000101 +01001000 +00010010 10100001 -01000000 -00000100 -00000001 -00101010 -10000010 -10101000 +01001010 +10000100 +00100001 +01001000 00100000 +10000101 +01001000 00100010 -00000001 -00100001 +00000101 +01001000 00100010 10100001 -00100000 -00100010 -00000001 -00101010 -10000010 -10101000 -01000000 -00010100 -00000001 +01010001 +01000100 +00000101 +01010101 +01010101 +01010101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/bold.png b/resources/osd/analogue/bold.png index 8359db9bc..cef6bef0c 100644 Binary files a/resources/osd/analogue/bold.png and b/resources/osd/analogue/bold.png differ diff --git a/resources/osd/analogue/clarity.mcm b/resources/osd/analogue/clarity.mcm index e504e8c95..3d217dd69 100644 --- a/resources/osd/analogue/clarity.mcm +++ b/resources/osd/analogue/clarity.mcm @@ -23103,60 +23103,51 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 -00010101 -01000000 -01000100 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 00010101 -00101010 -00010010 +01010101 +01010100 10000101 -00100000 +01010101 +01010000 +10000101 +01010101 +01001000 +10000101 +01010001 +01001000 +10000001 +01001000 +00001000 +10001000 +01001000 10001000 -00100001 -00101010 -00001010 -10100001 -00100000 10001000 -00100001 -00101010 00001000 -00100001 -01000000 -00010000 -00000101 -00100000 -10001010 -10000101 -00101000 10001000 -00100001 -00101000 10001000 -00100001 -00100010 10001000 -00100001 -00100000 -10001010 -10000101 -01000101 -00010000 -00010101 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00010001 +00010001 +00010001 01010101 01010101 01010101 @@ -23167,60 +23158,69 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010000 00010101 -01000000 -00000100 -00000101 -00101000 -10100000 -10100001 -00100010 -00100010 -00001000 +01010101 +01001010 +10000100 +01000101 +01001000 00100010 +00100001 +01001010 +10000000 +10000101 +01001000 00100010 -00001000 -00100000 +00100001 +01001000 00100010 -00001000 00100001 -00100000 +01010001 +01000100 +01000101 +01001000 +01010100 +00000101 +01001000 +00010010 10100001 -01000000 -00000100 -00000001 -00101010 -10000010 -10101000 +01001010 +10000100 +00100001 +01001000 00100000 +10000101 +01001000 00100010 -00000001 -00100001 +00000101 +01001000 00100010 10100001 -00100000 -00100010 -00000001 -00101010 -10000010 -10101000 -01000000 -00010100 -00000001 +01010001 +01000100 +00000101 +01010101 +01010101 +01010101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/clarity.png b/resources/osd/analogue/clarity.png index 253e1b024..6ad388e67 100644 Binary files a/resources/osd/analogue/clarity.png and b/resources/osd/analogue/clarity.png differ diff --git a/resources/osd/analogue/clarity_medium.mcm b/resources/osd/analogue/clarity_medium.mcm index b1dedff6c..7e8b1ed17 100644 --- a/resources/osd/analogue/clarity_medium.mcm +++ b/resources/osd/analogue/clarity_medium.mcm @@ -23103,60 +23103,51 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 -00010101 -01000000 -01000100 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 00010101 -00101010 -00010010 +01010101 +01010100 10000101 -00100000 +01010101 +01010000 +10000101 +01010101 +01001000 +10000101 +01010001 +01001000 +10000001 +01001000 +00001000 +10001000 +01001000 10001000 -00100001 -00101010 -00001010 -10100001 -00100000 10001000 -00100001 -00101010 00001000 -00100001 -01000000 -00010000 -00000101 -00100000 -10001010 -10000101 -00101000 10001000 -00100001 -00101000 10001000 -00100001 -00100010 10001000 -00100001 -00100000 -10001010 -10000101 -01000101 -00010000 -00010101 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00010001 +00010001 +00010001 01010101 01010101 01010101 @@ -23167,60 +23158,69 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010000 00010101 -01000000 -00000100 -00000101 -00101000 -10100000 -10100001 -00100010 -00100010 -00001000 +01010101 +01001010 +10000100 +01000101 +01001000 00100010 +00100001 +01001010 +10000000 +10000101 +01001000 00100010 -00001000 -00100000 +00100001 +01001000 00100010 -00001000 00100001 -00100000 +01010001 +01000100 +01000101 +01001000 +01010100 +00000101 +01001000 +00010010 10100001 -01000000 -00000100 -00000001 -00101010 -10000010 -10101000 +01001010 +10000100 +00100001 +01001000 00100000 +10000101 +01001000 00100010 -00000001 -00100001 +00000101 +01001000 00100010 10100001 -00100000 -00100010 -00000001 -00101010 -10000010 -10101000 -01000000 -00010100 -00000001 +01010001 +01000100 +00000101 +01010101 +01010101 +01010101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/clarity_medium.png b/resources/osd/analogue/clarity_medium.png index 751c38ac9..d763d71db 100644 Binary files a/resources/osd/analogue/clarity_medium.png and b/resources/osd/analogue/clarity_medium.png differ diff --git a/resources/osd/analogue/default.mcm b/resources/osd/analogue/default.mcm index 79423f8f3..b309a713a 100644 --- a/resources/osd/analogue/default.mcm +++ b/resources/osd/analogue/default.mcm @@ -23103,60 +23103,51 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 -00010101 -01000000 -01000100 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 00010101 -00101010 -00010010 +01010101 +01010100 10000101 -00100000 +01010101 +01010000 +10000101 +01010101 +01001000 +10000101 +01010001 +01001000 +10000001 +01001000 +00001000 +10001000 +01001000 10001000 -00100001 -00101010 -00001010 -10100001 -00100000 10001000 -00100001 -00101010 00001000 -00100001 -01000000 -00010000 -00000101 -00100000 -10001010 -10000101 -00101000 10001000 -00100001 -00101000 10001000 -00100001 -00100010 10001000 -00100001 -00100000 -10001010 -10000101 -01000101 -00010000 -00010101 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00010001 +00010001 +00010001 01010101 01010101 01010101 @@ -23167,60 +23158,69 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010000 00010101 -01000000 -00000100 -00000101 -00101000 -10100000 -10100001 -00100010 -00100010 -00001000 +01010101 +01001010 +10000100 +01000101 +01001000 00100010 +00100001 +01001010 +10000000 +10000101 +01001000 00100010 -00001000 -00100000 +00100001 +01001000 00100010 -00001000 00100001 -00100000 +01010001 +01000100 +01000101 +01001000 +01010100 +00000101 +01001000 +00010010 10100001 -01000000 -00000100 -00000001 -00101010 -10000010 -10101000 +01001010 +10000100 +00100001 +01001000 00100000 +10000101 +01001000 00100010 -00000001 -00100001 +00000101 +01001000 00100010 10100001 -00100000 -00100010 -00000001 -00101010 -10000010 -10101000 -01000000 -00010100 -00000001 +01010001 +01000100 +00000101 +01010101 +01010101 +01010101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/default.png b/resources/osd/analogue/default.png index 4e5315239..c7e4550df 100644 Binary files a/resources/osd/analogue/default.png and b/resources/osd/analogue/default.png differ diff --git a/resources/osd/analogue/default/361.png b/resources/osd/analogue/default/361.png index 41e08e714..4a62aaf92 100644 Binary files a/resources/osd/analogue/default/361.png and b/resources/osd/analogue/default/361.png differ diff --git a/resources/osd/analogue/default/362.png b/resources/osd/analogue/default/362.png index 54565bcd3..bf574f554 100644 Binary files a/resources/osd/analogue/default/362.png and b/resources/osd/analogue/default/362.png differ diff --git a/resources/osd/analogue/impact.mcm b/resources/osd/analogue/impact.mcm index f1f8c3235..b3a86d4e7 100644 --- a/resources/osd/analogue/impact.mcm +++ b/resources/osd/analogue/impact.mcm @@ -23103,60 +23103,51 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 -00010101 -01000000 -01000100 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 00010101 -00101010 -00010010 +01010101 +01010100 10000101 -00100000 +01010101 +01010000 +10000101 +01010101 +01001000 +10000101 +01010001 +01001000 +10000001 +01001000 +00001000 +10001000 +01001000 10001000 -00100001 -00101010 -00001010 -10100001 -00100000 10001000 -00100001 -00101010 00001000 -00100001 -01000000 -00010000 -00000101 -00100000 -10001010 -10000101 -00101000 10001000 -00100001 -00101000 10001000 -00100001 -00100010 10001000 -00100001 -00100000 -10001010 -10000101 -01000101 -00010000 -00010101 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00010001 +00010001 +00010001 01010101 01010101 01010101 @@ -23167,60 +23158,69 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010000 00010101 -01000000 -00000100 -00000101 -00101000 -10100000 -10100001 -00100010 -00100010 -00001000 +01010101 +01001010 +10000100 +01000101 +01001000 00100010 +00100001 +01001010 +10000000 +10000101 +01001000 00100010 -00001000 -00100000 +00100001 +01001000 00100010 -00001000 00100001 -00100000 +01010001 +01000100 +01000101 +01001000 +01010100 +00000101 +01001000 +00010010 10100001 -01000000 -00000100 -00000001 -00101010 -10000010 -10101000 +01001010 +10000100 +00100001 +01001000 00100000 +10000101 +01001000 00100010 -00000001 -00100001 +00000101 +01001000 00100010 10100001 -00100000 -00100010 -00000001 -00101010 -10000010 -10101000 -01000000 -00010100 -00000001 +01010001 +01000100 +00000101 +01010101 +01010101 +01010101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/impact.png b/resources/osd/analogue/impact.png index c84e2cb17..70a6525c0 100644 Binary files a/resources/osd/analogue/impact.png and b/resources/osd/analogue/impact.png differ diff --git a/resources/osd/analogue/impact_mini.mcm b/resources/osd/analogue/impact_mini.mcm index 550874602..545a629aa 100644 --- a/resources/osd/analogue/impact_mini.mcm +++ b/resources/osd/analogue/impact_mini.mcm @@ -23103,60 +23103,51 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 -00010101 -01000000 -01000100 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 00010101 -00101010 -00010010 +01010101 +01010100 10000101 -00100000 +01010101 +01010000 +10000101 +01010101 +01001000 +10000101 +01010001 +01001000 +10000001 +01001000 +00001000 +10001000 +01001000 10001000 -00100001 -00101010 -00001010 -10100001 -00100000 10001000 -00100001 -00101010 00001000 -00100001 -01000000 -00010000 -00000101 -00100000 -10001010 -10000101 -00101000 10001000 -00100001 -00101000 10001000 -00100001 -00100010 10001000 -00100001 -00100000 -10001010 -10000101 -01000101 -00010000 -00010101 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00010001 +00010001 +00010001 01010101 01010101 01010101 @@ -23167,60 +23158,69 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010000 00010101 -01000000 -00000100 -00000101 -00101000 -10100000 -10100001 -00100010 -00100010 -00001000 +01010101 +01001010 +10000100 +01000101 +01001000 00100010 +00100001 +01001010 +10000000 +10000101 +01001000 00100010 -00001000 -00100000 +00100001 +01001000 00100010 -00001000 00100001 -00100000 +01010001 +01000100 +01000101 +01001000 +01010100 +00000101 +01001000 +00010010 10100001 -01000000 -00000100 -00000001 -00101010 -10000010 -10101000 +01001010 +10000100 +00100001 +01001000 00100000 +10000101 +01001000 00100010 -00000001 -00100001 +00000101 +01001000 00100010 10100001 -00100000 -00100010 -00000001 -00101010 -10000010 -10101000 -01000000 -00010100 -00000001 +01010001 +01000100 +00000101 +01010101 +01010101 +01010101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/impact_mini.png b/resources/osd/analogue/impact_mini.png index 05d065d88..3e9096560 100644 Binary files a/resources/osd/analogue/impact_mini.png and b/resources/osd/analogue/impact_mini.png differ diff --git a/resources/osd/analogue/large.mcm b/resources/osd/analogue/large.mcm index e0d431f36..667921ab6 100644 --- a/resources/osd/analogue/large.mcm +++ b/resources/osd/analogue/large.mcm @@ -23103,60 +23103,51 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 -00010101 -01000000 -01000100 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 00010101 -00101010 -00010010 +01010101 +01010100 10000101 -00100000 +01010101 +01010000 +10000101 +01010101 +01001000 +10000101 +01010001 +01001000 +10000001 +01001000 +00001000 +10001000 +01001000 10001000 -00100001 -00101010 -00001010 -10100001 -00100000 10001000 -00100001 -00101010 00001000 -00100001 -01000000 -00010000 -00000101 -00100000 -10001010 -10000101 -00101000 10001000 -00100001 -00101000 10001000 -00100001 -00100010 10001000 -00100001 -00100000 -10001010 -10000101 -01000101 -00010000 -00010101 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00010001 +00010001 +00010001 01010101 01010101 01010101 @@ -23167,60 +23158,69 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010000 00010101 -01000000 -00000100 -00000101 -00101000 -10100000 -10100001 -00100010 -00100010 -00001000 +01010101 +01001010 +10000100 +01000101 +01001000 00100010 +00100001 +01001010 +10000000 +10000101 +01001000 00100010 -00001000 -00100000 +00100001 +01001000 00100010 -00001000 00100001 -00100000 +01010001 +01000100 +01000101 +01001000 +01010100 +00000101 +01001000 +00010010 10100001 -01000000 -00000100 -00000001 -00101010 -10000010 -10101000 +01001010 +10000100 +00100001 +01001000 00100000 +10000101 +01001000 00100010 -00000001 -00100001 +00000101 +01001000 00100010 10100001 -00100000 -00100010 -00000001 -00101010 -10000010 -10101000 -01000000 -00010100 -00000001 +01010001 +01000100 +00000101 +01010101 +01010101 +01010101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/large.png b/resources/osd/analogue/large.png index 106e5df8e..73cb916c9 100644 Binary files a/resources/osd/analogue/large.png and b/resources/osd/analogue/large.png differ diff --git a/resources/osd/analogue/vision.mcm b/resources/osd/analogue/vision.mcm index ce134ae1e..77895a7f2 100644 --- a/resources/osd/analogue/vision.mcm +++ b/resources/osd/analogue/vision.mcm @@ -23103,60 +23103,51 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 -00010101 -01000000 -01000100 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 00010101 -00101010 -00010010 +01010101 +01010100 10000101 -00100000 +01010101 +01010000 +10000101 +01010101 +01001000 +10000101 +01010001 +01001000 +10000001 +01001000 +00001000 +10001000 +01001000 10001000 -00100001 -00101010 -00001010 -10100001 -00100000 10001000 -00100001 -00101010 00001000 -00100001 -01000000 -00010000 -00000101 -00100000 -10001010 -10000101 -00101000 10001000 -00100001 -00101000 10001000 -00100001 -00100010 10001000 -00100001 -00100000 -10001010 -10000101 -01000101 -00010000 -00010101 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00010001 +00010001 +00010001 01010101 01010101 01010101 @@ -23167,60 +23158,69 @@ MAX7456 01010101 01010101 01010101 -01010100 01010101 01010101 -01010010 -00000101 01010101 -01010010 -00100001 01010101 -01010010 -00100000 01010101 -01010010 -00100010 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010101 +01010000 00010101 -01000000 -00000100 -00000101 -00101000 -10100000 -10100001 -00100010 -00100010 -00001000 +01010101 +01001010 +10000100 +01000101 +01001000 00100010 +00100001 +01001010 +10000000 +10000101 +01001000 00100010 -00001000 -00100000 +00100001 +01001000 00100010 -00001000 00100001 -00100000 +01010001 +01000100 +01000101 +01001000 +01010100 +00000101 +01001000 +00010010 10100001 -01000000 -00000100 -00000001 -00101010 -10000010 -10101000 +01001010 +10000100 +00100001 +01001000 00100000 +10000101 +01001000 00100010 -00000001 -00100001 +00000101 +01001000 00100010 10100001 -00100000 -00100010 -00000001 -00101010 -10000010 -10101000 -01000000 -00010100 -00000001 +01010001 +01000100 +00000101 +01010101 +01010101 +01010101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/vision.png b/resources/osd/analogue/vision.png index 9859b0777..13089015c 100644 Binary files a/resources/osd/analogue/vision.png and b/resources/osd/analogue/vision.png differ