diff --git a/CMakeLists.txt b/CMakeLists.txt index e27990d..9234c38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.15) -project(vxBoot) +project(vxBoot VERSION 0.0.2 LANGUAGES C) include(GenerateG1A) include(GenerateG3A) @@ -24,7 +24,7 @@ set(ASSETS # ... ) set(ASSETS_fx - # ... + assets-fx/fonts/hexa.png ) set(ASSETS_cg # ... diff --git a/assets-cg/icon-sel.png b/assets-cg/icon-sel.png index 7137b50..dc377e6 100644 Binary files a/assets-cg/icon-sel.png and b/assets-cg/icon-sel.png differ diff --git a/assets-cg/icon-uns.png b/assets-cg/icon-uns.png index 3c99f62..d9dc01d 100644 Binary files a/assets-cg/icon-uns.png and b/assets-cg/icon-uns.png differ diff --git a/assets-fx/fonts/fxconv-metadata.txt b/assets-fx/fonts/fxconv-metadata.txt new file mode 100644 index 0000000..5c86424 --- /dev/null +++ b/assets-fx/fonts/fxconv-metadata.txt @@ -0,0 +1,6 @@ +hexa.png: + type: font + name: font_hexa + charset: print + grid.size: 3x5 + grid.padding: 1 diff --git a/assets-fx/fonts/hexa.png b/assets-fx/fonts/hexa.png new file mode 100644 index 0000000..1841de1 Binary files /dev/null and b/assets-fx/fonts/hexa.png differ diff --git a/assets-fx/icon.png b/assets-fx/icon.png index c92f12a..50fe32d 100644 Binary files a/assets-fx/icon.png and b/assets-fx/icon.png differ diff --git a/include/vxBoot/terminal.h b/include/vxBoot/terminal.h index 3465646..afb0e9e 100644 --- a/include/vxBoot/terminal.h +++ b/include/vxBoot/terminal.h @@ -15,8 +15,8 @@ #define FHEIGHT 9 #endif #ifdef FX9860G -#define FWIDTH 5 -#define FHEIGHT 7 +#define FWIDTH 3 +#define FHEIGHT 5 #endif /* define terminal structure */ diff --git a/src/main.c b/src/main.c index b756317..abd272a 100644 --- a/src/main.c +++ b/src/main.c @@ -44,6 +44,12 @@ int main(void) int argc; int ret; + /* change default font on fx9860 */ +#ifdef FX9860G + extern font_t font_hexa; + dfont(&font_hexa); +#endif + /* automated hook */ /* TODO: better way to execute early command */ smemfs_mount();