oleksiy/GravityHW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new "big" font

Browse Source
This commit is contained in:
Oleksiy
2023-08-10 21:16:53 +03:00
parent ebd5005942
commit 9d4142b46b
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Software/Gravity/Gravity.ino
View File

@ -141,6 +141,39 @@ const uint8_t velvetscreen[437] U8G2_FONT_SECTION("velvetscreen") =
"\7p\10\255\364V\266\323\2q\7\255\364\216\257\5r\10\253d\242\32*\2t\6\255t\376#w\11" "\7p\10\255\364V\266\323\2q\7\255\364\216\257\5r\10\253d\242\32*\2t\6\255t\376#w\11"
"\255\364V\245FN\13x\6\233dR\7\0\0\0\4\377\377\0"; "\255\364V\245FN\13x\6\233dR\7\0\0\0\4\377\377\0";
const uint8_t fabryka[450] U8G2_FONT_SECTION("fabryka") =
"\17\0\4\4\4\5\2\1\6\17\30\1\0\30\0\0\0\1K\0\0\1\245%'\17\37\313\330R#&"
"\32!F\14\211I\310\24!\65\204(MF\21)Cd\304\10\62b\14\215\60Vb\334\20\0/\15"
"\376\36\357\244$\351\77\35;\26\0\60$\216\37\17*\65,\210\35\264\335\61T\42\14\11\61#\306\210"
" \23\242\220\235\63h\303c$\330\250B\3\0\61\27\216\37\27\311\202\346\216\221\30Ed\324\230Q\202"
"\306\316\377\263\26\35\62\33\216\37\17*\65,\210\35\64\70v\246\344\316h\203\252$\321\261s\373\340\1"
"\3\63\35\216\37\17*\65,\210\35\64\70v(IZZKv\266\6\15\36#\301F\25\32\0\64\37"
"\216\37\227\240\331\20\32Bj\310\260\21\304F\214\33\61n\304\70\203\366\360\301\203\20m\347\3\65\32\216"
"\37\7\213.\306\316'\205\326\60!E\226\354\334\32<F\202\215*\64\0\66\33\216\37\17*\65,\210"
"\35\64;/\316\60iA\354\240=<F\202\215*\64\0\67\25\216\37C\213\7m\347S\222\364\351\264"
"C\307\16\35;)\0\70 \216\37\17*\65,\210\35\264\341\61\22\204\310\250B\245\206\20\11b\7\355"
"\360\30\11\66\252\320\0\71\33\216\37\17*\65,\210\35\264\207\307H\64asb\354|\61\214\4\33U"
"h\0A\30\216\37\223\71Tj\10\21\31\66d\330\210\201\366\360\301\7\3\355\17\7B&\216\37\203\242"
"\65L\206\221\30\67b\334\210q#\306\215\30\67b\30\11&\234\14#\61\356\240\275{ \242\5\23\0"
"x\32\336\36\303\300c$\10\221!B\12\235I\222\346P\21!C\210\4\261\203\3\0\0\0\4\377\377"
"\0";
static const uint16_t fabryka_first_encoding_table[4] = {
47, 49, 55, 65535};
static const uint16_t fabryka_index_to_second_table[4] = {
0, 5, 6, 11};
static const uint16_t fabryka_second_encoding_table[11] = {
47, 49, 50, 51, 55, 52, 37, 52, 65, 66, 120};
static const uint8_t fabryka_kerning_values[11] = {
10, 6, 2, 4, 9, 5, 2, 3, 2, 2, 2};
u8g2_kerning_t fabryka_k = {
4, 11,
fabryka_first_encoding_table,
fabryka_index_to_second_table,
fabryka_second_encoding_table,
fabryka_kerning_values};
void setup() { void setup() {
//Serial.begin(9600); //Serial.begin(9600);

10
Software/Gravity/UI.ino
View File

@ -84,9 +84,9 @@ void updateScreen() {
} }
char bpmChar[5]; char bpmChar[5];
bpmStr.toCharArray(bpmChar, 5); bpmStr.toCharArray(bpmChar, 5);
u8g2.setFont(u8g2_font_logisoso24_tn); u8g2.setFont(fabryka);
if (((!insideTab && shiftBtnPushed) || (insideTab && menuItem == 0)) && masterClockMode == 0) { if (((!insideTab && shiftBtnPushed) || (insideTab && menuItem == 0)) && masterClockMode == 0) {
u8g2.drawButtonUTF8(28, 26, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, 56, 0, 0, bpmChar ); u8g2.drawButtonUTF8(28, 26, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, 56, 0, 5, bpmChar );
u8g2.setFont(velvetscreen); u8g2.setFont(velvetscreen);
if (masterClockMode == 0) { if (masterClockMode == 0) {
if (insideTab && menuItem == 0 && !menuItemSelected && !shiftBtnPushed) { if (insideTab && menuItem == 0 && !menuItemSelected && !shiftBtnPushed) {
@ -255,11 +255,11 @@ void updateScreen() {
} }
} }
valueStr.toCharArray(valueChar, 8); valueStr.toCharArray(valueChar, 8);
u8g2.setFont(u8g2_font_logisoso24_tr); u8g2.setFont(fabryka);
if ((!insideTab && shiftBtnPushed) || (insideTab && menuItem == 0)) { if ((!insideTab && shiftBtnPushed) || (insideTab && menuItem == 0)) {
u8g2.drawButtonUTF8(96, 26, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, 56, 0, 0, valueChar ); u8g2.drawButtonUTF8(96, 26, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, 56, 0, 5, valueChar );
} else { } else {
u8g2.drawButtonUTF8(96, 26, U8G2_BTN_BW0|U8G2_BTN_HCENTER, 56, 0, 0, valueChar ); u8g2.drawButtonUTF8(96, 26, U8G2_BTN_BW0|U8G2_BTN_HCENTER, 56, 0, 5, valueChar );
} }
} }