From 694a3508cc71edd27a1efed1a5af9dcbec4b40d4 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Sat, 1 Aug 2026 22:16:10 -0400 Subject: [PATCH] Use custom, monospaced version of LECO font --- clangd.zsh | 20 - package.json | 28 ++ resources/lecoish_mono_bold_20.bdf | 343 +++++++++++++ resources/lecoish_mono_bold_40.bdf | 563 +++++++++++++++++++++ resources/lecoish_mono_bold_60.bdf | 783 +++++++++++++++++++++++++++++ src/c/main.c | 29 +- 6 files changed, 1734 insertions(+), 32 deletions(-) delete mode 100755 clangd.zsh create mode 100644 resources/lecoish_mono_bold_20.bdf create mode 100644 resources/lecoish_mono_bold_40.bdf create mode 100644 resources/lecoish_mono_bold_60.bdf diff --git a/clangd.zsh b/clangd.zsh deleted file mode 100755 index 10a19d6..0000000 --- a/clangd.zsh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env zsh -echo "CompileFlags: - Add: - [ - -DPBL_DISPLAY_WIDTH=200, - -DPBL_DISPLAY_HEIGHT=228, - -xc, - -nostdinc, - -DPBL_COLOR, - -DPBL_RECT, - -I${HOME}/.pebble-sdk/SDKs/current/sdk-core/pebble/emery/include, - -include$(pwd)/build/include/message_keys.auto.h, - -I$(pwd)/build/emery, - -include${HOME}/.pebble-sdk/SDKs/current/toolchain/arm-none-eabi/arm-none-eabi/include/stdint.h, - -include${HOME}/.pebble-sdk/SDKs/current/toolchain/arm-none-eabi/arm-none-eabi/include/stdlib.h, - -include${HOME}/.pebble-sdk/SDKs/current/toolchain/arm-none-eabi/arm-none-eabi/include/time.h, - -include${HOME}/.pebble-sdk/SDKs/current/toolchain/arm-none-eabi/arm-none-eabi/include/string.h, - -include${HOME}/.pebble-sdk/SDKs/current/toolchain/arm-none-eabi/lib/gcc/arm-none-eabi/14.2.1/include/stddef.h, - -include${HOME}/.pebble-sdk/SDKs/current/toolchain/arm-none-eabi/lib/gcc/arm-none-eabi/14.2.1/include/stdbool.h, - ]" > ./.clangd diff --git a/package.json b/package.json index 7c32d4a..3daf473 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,34 @@ "name": "CHECK", "spaceOptimization": "storage", "type": "bitmap" + }, + { + "characterRegex": "[:0-9]", + "file": "lecoish_mono_bold_20.bdf", + "name": "FONT_LECOISH_MONO_BOLD_20", + "type": "font", + "targetPlatforms": [ + "emery", + "gabbro" + ] + }, + { + "characterRegex": "[:0-9]", + "file": "lecoish_mono_bold_40.bdf", + "name": "FONT_LECOISH_MONO_BOLD_40", + "type": "font", + "targetPlatforms": [ + "emery" + ] + }, + { + "characterRegex": "[:0-9]", + "file": "lecoish_mono_bold_60.bdf", + "name": "FONT_LECOISH_MONO_BOLD_60", + "type": "font", + "targetPlatforms": [ + "gabbro" + ] } ] } diff --git a/resources/lecoish_mono_bold_20.bdf b/resources/lecoish_mono_bold_20.bdf new file mode 100644 index 0000000..d789812 --- /dev/null +++ b/resources/lecoish_mono_bold_20.bdf @@ -0,0 +1,343 @@ +STARTFONT 2.1 +FONT -bited-LECOISH-Regular-R-Normal--20-720-72-20-M-150-ISO10646-1 +SIZE 72 72 20 +FONTBOUNDINGBOX 14 20 0 0 +STARTPROPERTIES 24 +FOUNDRY "bited" +FAMILY_NAME "LECOISH" +WEIGHT_NAME "Regular" +SLANT "R" +SETWIDTH_NAME "Normal" +ADD_STYLE_NAME "" +PIXEL_SIZE 20 +POINT_SIZE 720 +RESOLUTION_X 72 +RESOLUTION_Y 20 +SPACING "M" +AVERAGE_WIDTH 150 +CHARSET_REGISTRY "ISO10646" +CHARSET_ENCODING "1" +FONT_ASCENT 20 +FONT_DESCENT 0 +CAP_HEIGHT 0 +X_HEIGHT 0 +COPYRIGHT "" +BITED_DWIDTH 16 +BITED_TABLE_WIDTH -16 +BITED_TABLE_CELL_SCALE 2 +BITED_EDITOR_GRID_SIZE 32 +BITED_EDITOR_CELL_SIZE 12 +ENDPROPERTIES +CHARS 13 +STARTCHAR U+0020 +ENCODING 32 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 0 0 0 0 +BITMAP +ENDCHAR +STARTCHAR U+002E +ENCODING 46 +SWIDTH 714 0 +DWIDTH 10 0 +BBX 4 3 3 0 +BITMAP +F0 +F0 +F0 +ENDCHAR +STARTCHAR U+0030 +ENCODING 48 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FFFC +FFFC +FFFC +FFFC +F03C +F03C +F03C +F03C +F03C +F03C +F03C +F03C +F03C +F03C +F03C +F03C +FFFC +FFFC +FFFC +FFFC +ENDCHAR +STARTCHAR U+0031 +ENCODING 49 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FF80 +FF80 +FF80 +FF80 +0780 +0780 +0780 +0780 +0780 +0780 +0780 +0780 +0780 +0780 +0780 +0780 +FFFC +FFFC +FFFC +FFFC +ENDCHAR +STARTCHAR U+0032 +ENCODING 50 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FFFC +FFFC +FFFC +FFFC +F03C +F03C +003C +003C +FFFC +FFFC +FFFC +FFFC +F000 +F000 +F000 +F000 +FFFC +FFFC +FFFC +FFFC +ENDCHAR +STARTCHAR U+0033 +ENCODING 51 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FFFC +FFFC +FFFC +FFFC +003C +003C +003C +003C +7FFC +7FFC +7FFC +7FFC +003C +003C +003C +003C +FFFC +FFFC +FFFC +FFFC +ENDCHAR +STARTCHAR U+0034 +ENCODING 52 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +F03C +F03C +F03C +F03C +F03C +F03C +F03C +F03C +FFFC +FFFC +FFFC +FFFC +003C +003C +003C +003C +003C +003C +003C +003C +ENDCHAR +STARTCHAR U+0035 +ENCODING 53 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FFFC +FFFC +FFFC +FFFC +F000 +F000 +F000 +F000 +FFFC +FFFC +FFFC +FFFC +003C +003C +F03C +F03C +FFFC +FFFC +FFFC +FFFC +ENDCHAR +STARTCHAR U+0036 +ENCODING 54 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FFFC +FFFC +FFFC +FFFC +F000 +F000 +F000 +F000 +FFFC +FFFC +FFFC +FFFC +F03C +F03C +F03C +F03C +FFFC +FFFC +FFFC +FFFC +ENDCHAR +STARTCHAR U+0037 +ENCODING 55 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FFFC +FFFC +FFFC +FFFC +F03C +F03C +003C +003C +003C +003C +003C +003C +003C +003C +003C +003C +003C +003C +003C +003C +ENDCHAR +STARTCHAR U+0038 +ENCODING 56 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FFFC +FFFC +FFFC +FFFC +F03C +F03C +F03C +F03C +FFFC +FFFC +FFFC +FFFC +F03C +F03C +F03C +F03C +FFFC +FFFC +FFFC +FFFC +ENDCHAR +STARTCHAR U+0039 +ENCODING 57 +SWIDTH 1142 0 +DWIDTH 16 0 +BBX 14 20 1 0 +BITMAP +FFFC +FFFC +FFFC +FFFC +F03C +F03C +F03C +F03C +FFFC +FFFC +FFFC +FFFC +001C +001C +001C +001C +FFFC +FFFC +FFFC +FFFC +ENDCHAR +STARTCHAR U+003A +ENCODING 58 +SWIDTH 714 0 +DWIDTH 10 0 +BBX 4 17 3 0 +BITMAP +F0 +F0 +F0 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +F0 +F0 +F0 +ENDCHAR +ENDFONT diff --git a/resources/lecoish_mono_bold_40.bdf b/resources/lecoish_mono_bold_40.bdf new file mode 100644 index 0000000..85a3510 --- /dev/null +++ b/resources/lecoish_mono_bold_40.bdf @@ -0,0 +1,563 @@ +STARTFONT 2.1 +FONT -bited-LECOISH-Regular-R-Normal--40-1440-72-20-M-150-ISO10646-1 +SIZE 144 72 20 +FONTBOUNDINGBOX 28 40 0 0 +STARTPROPERTIES 24 +FOUNDRY "bited" +FAMILY_NAME "LECOISH" +WEIGHT_NAME "Regular" +SLANT "R" +SETWIDTH_NAME "Normal" +ADD_STYLE_NAME "" +PIXEL_SIZE 40 +POINT_SIZE 1440 +RESOLUTION_X 72 +RESOLUTION_Y 20 +SPACING "M" +AVERAGE_WIDTH 300 +CHARSET_REGISTRY "ISO10646" +CHARSET_ENCODING "1" +FONT_ASCENT 40 +FONT_DESCENT 0 +CAP_HEIGHT 0 +X_HEIGHT 0 +COPYRIGHT "" +BITED_DWIDTH 32 +BITED_TABLE_WIDTH -16 +BITED_TABLE_CELL_SCALE 2 +BITED_EDITOR_GRID_SIZE 32 +BITED_EDITOR_CELL_SIZE 12 +ENDPROPERTIES +CHARS 13 +STARTCHAR U+0020 +ENCODING 32 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 0 0 0 0 +BITMAP +ENDCHAR +STARTCHAR U+002E +ENCODING 46 +SWIDTH 1428 0 +DWIDTH 20 0 +BBX 8 6 6 0 +BITMAP +FF +FF +FF +FF +FF +FF +ENDCHAR +STARTCHAR U+0030 +ENCODING 48 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +ENDCHAR +STARTCHAR U+0031 +ENCODING 49 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFC000 +FFFFC000 +FFFFC000 +FFFFC000 +FFFFC000 +FFFFC000 +FFFFC000 +FFFFC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +003FC000 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +ENDCHAR +STARTCHAR U+0032 +ENCODING 50 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +ENDCHAR +STARTCHAR U+0033 +ENCODING 51 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +3FFFFFF0 +3FFFFFF0 +3FFFFFF0 +3FFFFFF0 +3FFFFFF0 +3FFFFFF0 +3FFFFFF0 +3FFFFFF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +ENDCHAR +STARTCHAR U+0034 +ENCODING 52 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +ENDCHAR +STARTCHAR U+0035 +ENCODING 53 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +ENDCHAR +STARTCHAR U+0036 +ENCODING 54 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FF000000 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +ENDCHAR +STARTCHAR U+0037 +ENCODING 55 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +00000FF0 +ENDCHAR +STARTCHAR U+0038 +ENCODING 56 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +ENDCHAR +STARTCHAR U+0039 +ENCODING 57 +SWIDTH 2284 0 +DWIDTH 32 0 +BBX 28 40 2 0 +BITMAP +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FF000FF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +000003F0 +000003F0 +000003F0 +000003F0 +000003F0 +000003F0 +000003F0 +000003F0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +FFFFFFF0 +ENDCHAR +STARTCHAR U+003A +ENCODING 58 +SWIDTH 1428 0 +DWIDTH 20 0 +BBX 8 34 6 0 +BITMAP +FF +FF +FF +FF +FF +FF +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +FF +FF +FF +FF +FF +FF +ENDCHAR +ENDFONT diff --git a/resources/lecoish_mono_bold_60.bdf b/resources/lecoish_mono_bold_60.bdf new file mode 100644 index 0000000..f3e1f96 --- /dev/null +++ b/resources/lecoish_mono_bold_60.bdf @@ -0,0 +1,783 @@ +STARTFONT 2.1 +FONT -bited-LECOISH-Regular-R-Normal--60-2160-72-20-M-150-ISO10646-1 +SIZE 216 72 20 +FONTBOUNDINGBOX 42 60 0 0 +STARTPROPERTIES 24 +FOUNDRY "bited" +FAMILY_NAME "LECOISH" +WEIGHT_NAME "Regular" +SLANT "R" +SETWIDTH_NAME "Normal" +ADD_STYLE_NAME "" +PIXEL_SIZE 60 +POINT_SIZE 2160 +RESOLUTION_X 72 +RESOLUTION_Y 20 +SPACING "M" +AVERAGE_WIDTH 450 +CHARSET_REGISTRY "ISO10646" +CHARSET_ENCODING "1" +FONT_ASCENT 60 +FONT_DESCENT 0 +CAP_HEIGHT 0 +X_HEIGHT 0 +COPYRIGHT "" +BITED_DWIDTH 48 +BITED_TABLE_WIDTH -16 +BITED_TABLE_CELL_SCALE 2 +BITED_EDITOR_GRID_SIZE 32 +BITED_EDITOR_CELL_SIZE 12 +ENDPROPERTIES +CHARS 13 +STARTCHAR U+0020 +ENCODING 32 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 0 0 0 0 +BITMAP +ENDCHAR +STARTCHAR U+002E +ENCODING 46 +SWIDTH 2142 0 +DWIDTH 30 0 +BBX 12 9 9 0 +BITMAP +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +ENDCHAR +STARTCHAR U+0030 +ENCODING 48 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +ENDCHAR +STARTCHAR U+0031 +ENCODING 49 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +FFFFFFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +0001FFE00000 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +ENDCHAR +STARTCHAR U+0032 +ENCODING 50 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +ENDCHAR +STARTCHAR U+0033 +ENCODING 51 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +1FFFFFFFFFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +ENDCHAR +STARTCHAR U+0034 +ENCODING 52 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +ENDCHAR +STARTCHAR U+0035 +ENCODING 53 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +ENDCHAR +STARTCHAR U+0036 +ENCODING 54 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFF000000000 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +ENDCHAR +STARTCHAR U+0037 +ENCODING 55 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +00000003FFC0 +ENDCHAR +STARTCHAR U+0038 +ENCODING 56 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +ENDCHAR +STARTCHAR U+0039 +ENCODING 57 +SWIDTH 3426 0 +DWIDTH 48 0 +BBX 42 60 3 0 +BITMAP +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFF00003FFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +000000007FC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +FFFFFFFFFFC0 +ENDCHAR +STARTCHAR U+003A +ENCODING 58 +SWIDTH 2142 0 +DWIDTH 30 0 +BBX 12 51 9 0 +BITMAP +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +0000 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +FFF0 +ENDCHAR +ENDFONT diff --git a/src/c/main.c b/src/c/main.c index 0a1192d..48650fc 100644 --- a/src/c/main.c +++ b/src/c/main.c @@ -1,3 +1,4 @@ +#include "src/resource_ids.auto.h" #include // types @@ -33,7 +34,7 @@ static const GColor s_highlight_color = GColorMediumAquamarine; ///////////////////////////////// -static void update_countdown_display(struct tm *tick_time, TimeUnits units_changed) { +static void seconds_handler(struct tm *tick_time, TimeUnits units_changed) { struct tm now_tm = *tick_time; // Build the target time today @@ -61,9 +62,14 @@ static void update_countdown_display(struct tm *tick_time, TimeUnits units_chang text_layer_set_text(s_countdown_txt_layer, s_countdown_buffer); } +static void update_countdown_display() { + time_t now = time(NULL); + seconds_handler(localtime(&now), SECOND_UNIT); +} + static void update_setter_display() { static char s_setter_buffer[8]; - snprintf(s_setter_buffer, sizeof(s_setter_buffer), "%02d:%02d", s_setter_time.HourWIP, s_setter_time.MinuteWIP); + snprintf(s_setter_buffer, sizeof(s_setter_buffer), PBL_IF_ROUND_ELSE("%02d:%02d", "%02d:%02d"), s_setter_time.HourWIP, s_setter_time.MinuteWIP); text_layer_set_text(s_setter_txt_layer, s_setter_buffer); } @@ -115,8 +121,7 @@ static void select_click_handler(void *recognizer, void *ctx) { if (s_highlight_pos == 2) { s_setter_time.HourSet = s_setter_time.HourWIP; s_setter_time.MinuteSet = s_setter_time.MinuteWIP; - time_t now = time(NULL); - update_countdown_display(localtime(&now), SECOND_UNIT); + update_countdown_display(); s_highlight_pos = 0; } else { s_highlight_pos++; @@ -200,14 +205,14 @@ static void setter_window_load() { bitmap_layer_set_compositing_mode(s_check_bmp_layer, GCompOpSet); layer_add_child(window_layer, bitmap_layer_get_layer(s_check_bmp_layer)); - // remaining time - s_countdown_txt_layer = text_layer_create(GRect(PBL_IF_ROUND_ELSE(0, 39), PBL_IF_ROUND_ELSE(37, (top_bar_grect.size.h / 2) - (top_bar_grect.size.h / 3)), PBL_IF_ROUND_ELSE(top_bar_grect.size.w, top_bar_grect.size.w - 39), 32)); + // countdown + s_countdown_txt_layer = text_layer_create(GRect(PBL_IF_ROUND_ELSE(0, 39), (top_bar_grect.size.h / 2) + PBL_IF_ROUND_ELSE(10, -10), PBL_IF_ROUND_ELSE(top_bar_grect.size.w, top_bar_grect.size.w - 39), 32)); text_layer_set_text_alignment(s_countdown_txt_layer, GTextAlignmentCenter); text_layer_set_text_color(s_countdown_txt_layer, GColorWhite); text_layer_set_background_color(s_countdown_txt_layer, GColorClear); - text_layer_set_font(s_countdown_txt_layer, fonts_get_system_font(FONT_KEY_LECO_32_BOLD_NUMBERS)); - text_layer_set_text(s_countdown_txt_layer, "00:00:00"); + text_layer_set_font(s_countdown_txt_layer, fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_LECOISH_MONO_BOLD_20))); layer_add_child(window_layer, text_layer_get_layer(s_countdown_txt_layer)); + update_countdown_display(); // highlighter s_highlight_layer = layer_create(GRect(0, top_bar_grect.size.h, PBL_DISPLAY_WIDTH, PBL_DISPLAY_HEIGHT - (2 * top_bar_grect.size.h))); @@ -215,14 +220,14 @@ static void setter_window_load() { layer_add_child(window_layer, s_highlight_layer); // setter - s_setter_txt_layer = text_layer_create(GRect(0, (PBL_DISPLAY_HEIGHT / 2) - 39, PBL_DISPLAY_WIDTH, 60)); + s_setter_txt_layer = text_layer_create(GRect(0, (PBL_DISPLAY_HEIGHT / 2) - PBL_IF_ROUND_ELSE(30, 20), PBL_DISPLAY_WIDTH, PBL_IF_ROUND_ELSE(60, 40))); text_layer_set_text_alignment(s_setter_txt_layer, GTextAlignmentCenter); text_layer_set_background_color(s_setter_txt_layer, GColorClear); - text_layer_set_font(s_setter_txt_layer, fonts_get_system_font(FONT_KEY_LECO_60_NUMBERS_AM_PM)); - text_layer_set_text(s_setter_txt_layer, PBL_IF_ROUND_ELSE("00 : 00", "00:00")); + text_layer_set_font(s_setter_txt_layer, fonts_load_custom_font(resource_get_handle(PBL_IF_ROUND_ELSE(RESOURCE_ID_FONT_LECOISH_MONO_BOLD_60, RESOURCE_ID_FONT_LECOISH_MONO_BOLD_40)))); layer_add_child(window_layer, text_layer_get_layer(s_setter_txt_layer)); + update_setter_display(); - tick_timer_service_subscribe(SECOND_UNIT, update_countdown_display); + tick_timer_service_subscribe(SECOND_UNIT, seconds_handler); } static void setter_window_unload() {