From 02f0a4b6afa8e5f0dcb73ee25f3f90f6ae09d64c Mon Sep 17 00:00:00 2001
From: Edward Emelianov <edward.emelianoff@gmail.com>
Date: Thu, 29 Apr 2021 22:02:16 +0300
Subject: [PATCH] Working Snake & Tetris

---
 F1-nolib/Tetris/TETRIS.bin  | Bin 19476 -> 20136 bytes
 F1-nolib/Tetris/fontNumb8.h | 987 ++++++++++++++++++++++++++++++------
 F1-nolib/Tetris/hardware.c  |   2 +-
 F1-nolib/Tetris/menu.c      |  19 +-
 F1-nolib/Tetris/screen.c    |   3 +-
 F1-nolib/Tetris/screen.h    |   5 +
 F1-nolib/Tetris/snake.c     |  10 +-
 F1-nolib/Tetris/tetris.c    |  64 ++-
 8 files changed, 885 insertions(+), 205 deletions(-)

diff --git a/F1-nolib/Tetris/TETRIS.bin b/F1-nolib/Tetris/TETRIS.bin
index 4c9d506232dcef72c9b8d5c502400a96eb8abd2a..2b2cb54823c309609dd94761e8ddcb9018070a33 100755
GIT binary patch
delta 5317
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
G?>_;QLt#t+

delta 4668
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
Yr=0x?R^uS5f*MYIz`#o3A6FIr4-me!=l}o!

diff --git a/F1-nolib/Tetris/fontNumb8.h b/F1-nolib/Tetris/fontNumb8.h
index 13e525d..df748d2 100644
--- a/F1-nolib/Tetris/fontNumb8.h
+++ b/F1-nolib/Tetris/fontNumb8.h
@@ -19,171 +19,10 @@
 // this file should be included JUST ONCE!
 // only in fonts.c
 
-#define FONTNUMB8BYTES         8
-#define FONTNUMB8HEIGHT        8
-#define FONTNUMB8BASELINE      0
+#define FONTNUMB8BYTES         11
+#define FONTNUMB8HEIGHT        11
+#define FONTNUMB8BASELINE      2
 
-// this array shows position of every koi8-r symbol in font10_table
-const uint8_t fontNumb8_encoding[256] = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0..31
-      1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 47
-      2,   3,   4,   5,   6,   7,   8,   9,  10,  11,   0,   0,   0,   0,   0,   0, // 63
-      0,  12,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  13, // 79
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 95
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 111
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 127
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 143
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 159
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 175
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 191
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 207
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 223
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 239
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 255
-};
-
-const uint8_t fontNumb8_table[] = {
-    // 0 0x00 - empty
-        0,
-        ________,
-        ________,
-        ________,
-        ________,
-        ________,
-        ________,
-        ________,
-        ________,
-    // 1 0x20 - ' '
-        4,
-        ________,
-        ________,
-        ________,
-        ________,
-        ________,
-        ________,
-        ________,
-        ________,
-    // 2 0x30 - '0'
-        6,
-        _XXX____,
-        XX_XX___,
-        X___X___,
-        X___X___,
-        X___X___,
-        X___X___,
-        XX_XX___,
-        _XXX____,
-    // 3 0x31 - '1'
-        6,
-        _XX_____,
-        X_X_____,
-        __X_____,
-        __X_____,
-        __X_____,
-        __X_____,
-        __X_____,
-        XXXXX___,
-    // 4 0x32 - '2'
-        6,
-        _XXX____,
-        X___X___,
-        ____X___,
-        ____X___,
-        ___X____,
-        __X_____,
-        _X______,
-        XXXXX___,
-    // 5 0x33 - '3'
-        6,
-        XXXX____,
-        ____X___,
-        ____X___,
-        _XXX____,
-        ____X___,
-        ____X___,
-        ____X___,
-        XXXX____,
-    // 6 0x34 - '4'
-        7,
-        ___XX___,
-        ___XX___,
-        __X_X___,
-        _X__X___,
-        _X__X___,
-        XXXXXX__,
-        ____X___,
-        ____X___,
-    // 7 0x35 - '5'
-        5,
-        XXXX____,
-        X_______,
-        X_______,
-        XXX_____,
-        ___X____,
-        ___X____,
-        ___X____,
-        XXX_____,
-    // 8 0x36 - '6'
-        6,
-        _XXX____,
-        X___X___,
-        X_______,
-        XXXX____,
-        X___X___,
-        X___X___,
-        X___X___,
-        _XXX____,
-    // 9 0x37 - '7'
-        5,
-        XXXX____,
-        ___X____,
-        __X_____,
-        __X_____,
-        __X_____,
-        _X______,
-        _X______,
-        _X______,
-    // 10 0x38 - '8'
-        6,
-        _XXX____,
-        X___X___,
-        X___X___,
-        _XXX____,
-        X___X___,
-        X___X___,
-        X___X___,
-        _XXX____,
-    // 11 0x39 - '9'
-        6,
-        _XXX____,
-        X___X___,
-        X___X___,
-        X___X___,
-        _XXXX___,
-        ____X___,
-        X___X___,
-        _XXX____,
-    // 12 0x41 - 'A'
-        6,
-        __X_____,
-        _X_X____,
-        _X_X____,
-        _X_X____,
-        X___X___,
-        XXXXX___,
-        X___X___,
-        X___X___,
-    // 13 0x4f - 'O'
-        7,
-        __XX____,
-        _X__X___,
-        X____X__,
-        X____X__,
-        X____X__,
-        X____X__,
-        _X__X___,
-        __XX____,
-};
 
 /*
 32 (0x20) -     64 (0x40) - @   96 (0x60) - `  128 (0x80) - €  160 (0xa0) -    192 (0xc0) - À  224 (0xe0) - à
@@ -219,3 +58,823 @@ const uint8_t fontNumb8_table[] = {
 62 (0x3e) - >   94 (0x5e) - ^  126 (0x7e) - ~  158 (0x9e) - ž  190 (0xbe) - ¾  222 (0xde) - Þ  254 (0xfe) - þ
 63 (0x3f) - ?   95 (0x5f) - _  127 (0x7f) -    159 (0x9f) - Ÿ  191 (0xbf) - ¿  223 (0xdf) - ß  255 (0xff) - ÿ
 */
+
+// this array shows position of every koi8-r symbol in font10_table
+const uint8_t fontNumb8_encoding[256] = {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0..31
+   // 0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+/*20*/1,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28, // 47
+/*30*/2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  29,  30,  31,  32,  33,  34, // 63
+/*40*/35, 12,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,  48,  13, // 79
+/*50*/49, 50,  51,  52,  53,  54,  55,  56,  57,  58,   0,   0,   0,   0,   0,   0, // 95
+/*60*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 111
+/*70*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 127
+/*80*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 143
+/*90*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 159
+/*A0*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 175
+/*B0*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 191
+/*C0*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 207
+/*D0*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 223
+/*E0*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 239
+/*F0*/0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 255
+};
+
+const uint8_t fontNumb8_table[] = {
+    // 0 0x00 - empty
+        0,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+    // 1 0x20 - ' '
+        4,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+    // 2 0x30 - '0'
+        6,
+        ________,
+        _XXX____,
+        XX_XX___,
+        X___X___,
+        X___X___,
+        X___X___,
+        X___X___,
+        XX_XX___,
+        _XXX____,
+        ________,
+        ________,
+    // 3 0x31 - '1'
+        6,
+        ________,
+        _XX_____,
+        X_X_____,
+        __X_____,
+        __X_____,
+        __X_____,
+        __X_____,
+        __X_____,
+        XXXXX___,
+        ________,
+        ________,
+    // 4 0x32 - '2'
+        6,
+        ________,
+        _XXX____,
+        X___X___,
+        ____X___,
+        ____X___,
+        ___X____,
+        __X_____,
+        _X______,
+        XXXXX___,
+        ________,
+        ________,
+    // 5 0x33 - '3'
+        6,
+        ________,
+        XXXX____,
+        ____X___,
+        ____X___,
+        _XXX____,
+        ____X___,
+        ____X___,
+        ____X___,
+        XXXX____,
+        ________,
+        ________,
+    // 6 0x34 - '4'
+        7,
+        ________,
+        ___XX___,
+        ___XX___,
+        __X_X___,
+        _X__X___,
+        _X__X___,
+        XXXXXX__,
+        ____X___,
+        ____X___,
+        ________,
+        ________,
+    // 7 0x35 - '5'
+        5,
+        ________,
+        XXXX____,
+        X_______,
+        X_______,
+        XXX_____,
+        ___X____,
+        ___X____,
+        ___X____,
+        XXX_____,
+        ________,
+        ________,
+    // 8 0x36 - '6'
+        6,
+        ________,
+        _XXX____,
+        X___X___,
+        X_______,
+        XXXX____,
+        X___X___,
+        X___X___,
+        X___X___,
+        _XXX____,
+        ________,
+        ________,
+    // 9 0x37 - '7'
+        5,
+        ________,
+        XXXX____,
+        ___X____,
+        __X_____,
+        __X_____,
+        __X_____,
+        _X______,
+        _X______,
+        _X______,
+        ________,
+        ________,
+    // 10 0x38 - '8'
+        6,
+        ________,
+        _XXX____,
+        X___X___,
+        X___X___,
+        _XXX____,
+        X___X___,
+        X___X___,
+        X___X___,
+        _XXX____,
+        ________,
+        ________,
+    // 11 0x39 - '9'
+        6,
+        ________,
+        _XXX____,
+        X___X___,
+        X___X___,
+        X___X___,
+        _XXXX___,
+        ____X___,
+        X___X___,
+        _XXX____,
+        ________,
+        ________,
+    // 12 0x41 - 'A'
+        6,
+        ________,
+        __X_____,
+        _X_X____,
+        _X_X____,
+        _X_X____,
+        X___X___,
+        XXXXX___,
+        X___X___,
+        X___X___,
+        ________,
+        ________,
+    // 13 0x4f - 'O'
+        7,
+        ________,
+        __XX____,
+        _X__X___,
+        X____X__,
+        X____X__,
+        X____X__,
+        X____X__,
+        _X__X___,
+        __XX____,
+        ________,
+        ________,
+    // 14 0x21 - '!'
+        2,
+        ________,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        ________,
+        X_______,
+        ________,
+        ________,
+    // 15 0x22 - '"'
+        4,
+        ________,
+        ________,
+        X_X_____,
+        X_X_____,
+        X_X_____,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+    // 16 0x23 - '#'
+        7,
+        ________,
+        ________,
+        ____X_X_,
+        ___X_X__,
+        XXXXXXX_,
+        __X_X___,
+        XXXXXXX_,
+        _X_X____,
+        X_X_____,
+        ________,
+        ________,
+    // 17 0x24 - '$'
+        6,
+        ________,
+        __X_____,
+        _XXX____,
+        X_X_X___,
+        X_X_____,
+        _XXX____,
+        __X_X___,
+        X_X_X___,
+        XXXX____,
+        __X_____,
+        ________,
+    // 18 0x25 - '%'
+        8,
+        ________,
+        ________,
+        _XX___X_,
+        X__X_X__,
+        _XX_X___,
+        ___X____,
+        __X_XX__,
+        _X_X__X_,
+        X___XX__,
+        ________,
+        ________,
+    // 19 0x26 - '&'
+        7,
+        ________,
+        ________,
+        _X______,
+        X_X_____,
+        X_X_____,
+        _X__XX__,
+        X_XXX___,
+        X__X____,
+        _XX_XX__,
+        ________,
+        ________,
+    // 20 0x27 - '''
+        2,
+        ________,
+        ________,
+        X_______,
+        X_______,
+        X_______,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+    // 21 0x28 - '('
+        4,
+        ________,
+        __XX____,
+        _X______,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        _X______,
+        __XX____,
+        ________,
+    // 22 0x29 - ')'
+        4,
+        ________,
+        XX______,
+        __X_____,
+        ___X____,
+        ___X____,
+        ___X____,
+        ___X____,
+        ___X____,
+        __X_____,
+        XX______,
+        ________,
+    // 23 0x2A - '*'
+        6,
+        ________,
+        ________,
+        ________,
+        __X_____,
+        XXXXX___,
+        _XXX____,
+        X___X___,
+        ________,
+        ________,
+        ________,
+        ________,
+    // 24 0x2B - '+'
+        6,
+        ________,
+        ________,
+        ________,
+        __X_____,
+        __X_____,
+        XXXXX___,
+        __X_____,
+        __X_____,
+        ________,
+        ________,
+        ________,
+    // 25 0x2C - ','
+        3,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        XX______,
+        _X______,
+        X_______,
+        ________,
+    // 26 0x2D - '-'
+        6,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        XXXXX___,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+    // 27 0x2E - '.'
+        3,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        ________,
+        XX______,
+        XX______,
+        ________,
+        ________,
+    // 28 0x2F - '/'
+        6,
+        ________,
+        ____X___,
+        ___X____,
+        ___X____,
+        __X_____,
+        __X_____,
+        _X______,
+        _X______,
+        _X______,
+        X_______,
+        ________,
+    // 29 0x3A - ':'
+        3,
+        ________,
+        ________,
+        ________,
+        XX______,
+        XX______,
+        ________,
+        XX______,
+        XX______,
+        ________,
+        ________,
+        ________,
+    // 30 0x3B - ';'
+        3,
+        ________,
+        ________,
+        ________,
+        ________,
+        XX______,
+        XX______,
+        ________,
+        XX______,
+        _X______,
+        X_______,
+        ________,
+    // 31 0x3C - '<'
+        4,
+        ________,
+        ________,
+        ________,
+        __X_____,
+        _X______,
+        X_______,
+        _X______,
+        __X_____,
+        ________,
+        ________,
+        ________,
+    // 32 0x3D - '='
+        5,
+        ________,
+        ________,
+        ________,
+        ________,
+        XXXX____,
+        ________,
+        XXXX____,
+        ________,
+        ________,
+        ________,
+        ________,
+    // 33 0x3E - '>'
+        4,
+        ________,
+        ________,
+        ________,
+        X_______,
+        _X______,
+        __X_____,
+        _X______,
+        X_______,
+        ________,
+        ________,
+        ________,
+    // 34 0x3F - '?'
+        5,
+        ________,
+        _XX_____,
+        X__X____,
+        ___X____,
+        __X_____,
+        _X______,
+        _X______,
+        ________,
+        _X______,
+        ________,
+        ________,
+    // 35 0x40 - '@'
+        8,
+        ________,
+        ___XXX__,
+        __X__X__,
+        _X_XXXX_,
+        X__X_XX_,
+        X_X_X_X_,
+        X_X_X_X_,
+        X__X_X__,
+        _X______,
+        __XXXX__,
+        ________,
+    // 36 0x42 - 'B'
+        6,
+        ________,
+        XXX_____,
+        X__X____,
+        X_X_____,
+        XXXX____,
+        X___X___,
+        X___X___,
+        X___X___,
+        XXXX____,
+        ________,
+        ________,
+    // 37 0x43 - 'C'
+        7,
+        ________,
+        __XXX___,
+        _X___X__,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        _X___X__,
+        __XXX___,
+        ________,
+        ________,
+    // 38 0x44 - 'D'
+        6,
+        ________,
+        XXX_____,
+        X__X____,
+        X___X___,
+        X___X___,
+        X___X___,
+        X___X___,
+        X__X____,
+        XXX_____,
+        ________,
+        ________,
+    // 39 0x45 - 'E'
+        6,
+        ________,
+        XXXXX___,
+        X_______,
+        X_______,
+        XXX_____,
+        X_______,
+        X_______,
+        X___X___,
+        XXXXX___,
+        ________,
+        ________,
+    // 40 0x46 - 'F'
+        6,
+        ________,
+        XXXXX___,
+        X___X___,
+        X_______,
+        X_______,
+        XXX_____,
+        X_______,
+        X_______,
+        X_______,
+        ________,
+        ________,
+    // 41 0x47 - 'G'
+        7,
+        ________,
+        __XXX___,
+        _X___X__,
+        X_______,
+        X_______,
+        X_______,
+        X__XXX__,
+        _X___X__,
+        __XXX___,
+        ________,
+        ________,
+    // 42 0x48 - 'H'
+        6,
+        ________,
+        X___X___,
+        X___X___,
+        X___X___,
+        XXXXX___,
+        X___X___,
+        X___X___,
+        X___X___,
+        X___X___,
+        ________,
+        ________,
+    // 43 0x49 - 'I'
+        4,
+        ________,
+        XXX_____,
+        _X______,
+        _X______,
+        _X______,
+        _X______,
+        _X______,
+        _X______,
+        XXX_____,
+        ________,
+        ________,
+    // 44 0x4A - 'J'
+        5,
+        ________,
+        XXXX____,
+        X__X____,
+        ___X____,
+        ___X____,
+        ___X____,
+        ___X____,
+        X_XX____,
+        _X______,
+        ________,
+        ________,
+    // 45 0x4B - 'K'
+        6,
+        ________,
+        X___X___,
+        X__X____,
+        X_X_____,
+        XXX_____,
+        X__X____,
+        X__X____,
+        X___X___,
+        X___X___,
+        ________,
+        ________,
+    // 46 0x4C - 'L'
+        6,
+        ________,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        X_______,
+        X___X___,
+        XXXXX___,
+        ________,
+        ________,
+    // 47 0x4D - 'M'
+        8,
+        ________,
+        X_____X_,
+        XX___XX_,
+        X_X_X_X_,
+        X_X_X_X_,
+        X__X__X_,
+        X_____X_,
+        X_____X_,
+        X_____X_,
+        ________,
+        ________,
+    // 48 0x4E - 'N'
+        6,
+        ________,
+        X___X___,
+        XX__X___,
+        XX__X___,
+        X_X_X___,
+        X_X_X___,
+        X__XX___,
+        X__XX___,
+        X___X___,
+        ________,
+        ________,
+    // 49 0x50 - 'P'
+        6,
+        ________,
+        XXXX____,
+        X__XX___,
+        X___X___,
+        X__XX___,
+        XXXX____,
+        X_______,
+        X_______,
+        X_______,
+        ________,
+        ________,
+    // 50 0x51 - 'Q'
+        7,
+        ________,
+        __XX____,
+        _X__X___,
+        X____X__,
+        X____X__,
+        X____X__,
+        X____X__,
+        _X_XX___,
+        __XX____,
+        ___XXX__,
+        ________,
+    // 51 0x52 - 'R'
+        6,
+        ________,
+        XXXX____,
+        X__XX___,
+        X___X___,
+        X__XX___,
+        XXXX____,
+        X_X_____,
+        X__X____,
+        X__XX___,
+        ________,
+        ________,
+    // 52 0x53 - 'S'
+        6,
+        ________,
+        _XX_____,
+        X__X____,
+        X_______,
+        _XX_____,
+        __XX____,
+        ____X___,
+        XX_XX___,
+        _XXX____,
+        ________,
+        ________,
+    // 53 0x54 - 'T'
+        6,
+        ________,
+        XXXXX___,
+        __X_____,
+        __X_____,
+        __X_____,
+        __X_____,
+        __X_____,
+        __X_____,
+        __X_____,
+        ________,
+        ________,
+    // 54 0x55 - 'U'
+        7,
+        ________,
+        X____X__,
+        X____X__,
+        X____X__,
+        X____X__,
+        X____X__,
+        X____X__,
+        _X__X___,
+        __XX____,
+        ________,
+        ________,
+    // 55 0x56 - 'V'
+        6,
+        ________,
+        X___X___,
+        X___X___,
+        X___X___,
+        X___X___,
+        X___X___,
+        _X_X____,
+        _X_X____,
+        __X_____,
+        ________,
+        ________,
+    // 56 0x57 - 'W'
+        8,
+        ________,
+        X_____X_,
+        X_____X_,
+        X_____X_,
+        X__X__X_,
+        X__X__X_,
+        _X_X_X__,
+        _X_X_X__,
+        __X_X___,
+        ________,
+        ________,
+    // 57 0x58 - 'X'
+        6,
+        ________,
+        X___X___,
+        X___X___,
+        _X_X____,
+        _X_X____,
+        __X_____,
+        _X_X____,
+        X___X___,
+        X___X___,
+        ________,
+        ________,
+    // 58 0x59 - 'Y'
+        6,
+        ________,
+        X___X___,
+        X___X___,
+        X___X___,
+        _X_X____,
+        _XXX____,
+        __X_____,
+        __X_____,
+        __X_____,
+        ________,
+        ________,
+    // 59 0x5A - 'Z'
+        6,
+        ________,
+        XXXXX___,
+        ____X___,
+        ___X____,
+        __X_____,
+        __X_____,
+        _X______,
+        X_______,
+        XXXXX___,
+        ________,
+        ________,
+};
+
+
+#if 0
+// 14 0x21 - '!'
+    0,
+    ________,
+    ________,
+    ________,
+    ________,
+    ________,
+    ________,
+    ________,
+    ________,
+    ________,
+    ________,
+    ________,
+#endif
diff --git a/F1-nolib/Tetris/hardware.c b/F1-nolib/Tetris/hardware.c
index ead0e8a..5b130bd 100644
--- a/F1-nolib/Tetris/hardware.c
+++ b/F1-nolib/Tetris/hardware.c
@@ -75,7 +75,7 @@ static inline void tim_setup(){
     GPIOA->CRL |= CRL(6, CNF_AFPP|MODE_FAST);
     RCC->APB1ENR |= RCC_APB1ENR_TIM3EN;
     // PCS=1 don't work;
-    TIM3->PSC = 9; // 7.2MHz
+    TIM3->PSC = 4; // 7.2MHz
     TIM3->ARR = 7;
     TIM3->CCMR1 = TIM_CCMR1_OC1M; // PWM mode 2 (inactive->active)
     //TIM3->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_1; // PWM mode 1 (active->inactive)
diff --git a/F1-nolib/Tetris/menu.c b/F1-nolib/Tetris/menu.c
index ef83ab6..ee77e42 100644
--- a/F1-nolib/Tetris/menu.c
+++ b/F1-nolib/Tetris/menu.c
@@ -33,17 +33,17 @@
 #define midY (SCREEN_HH - 1)
 
 static const char* items[] = {
-    [MENU_SLEEP]  = " Sleep ",
-    [MENU_BALLS]  = " Balls ",
-    [MENU_SNAKE]  = " Snake ",
-    [MENU_TETRIS] = " Tetris "
+    [MENU_SLEEP]  = " SLEEP ",
+    [MENU_BALLS]  = " BALLS ",
+    [MENU_SNAKE]  = " SNAKE ",
+    [MENU_TETRIS] = " TETRIS "
 };
 
 static menuitem curitem = MENU_SLEEP;
 
 // show menu
 static void _menu(){
-    choose_font(FONT14);
+    choose_font(FONTN8);
     setBGcolor(COLOR_BLACK);
     ClearScreen();
     int charH = curfont->height, charB = curfont->baseline;
@@ -93,9 +93,8 @@ void show_gameover(){
     setBGcolor(COLOR_BLACK);
     setFGcolor(COLOR_RED);
     ClearScreen();
-    choose_font(FONT14);
-    CenterStringAt(SCREEN_HEIGHT/2 - curfont->baseline - 1, "Game Over!");
-    setFGcolor(COLOR_YELLOW);
-    uint8_t l = PutStringAt(0, SCREEN_HEIGHT - curfont->baseline, "Score: ");
-    PutStringAt(l, SCREEN_HEIGHT - curfont->baseline, u2str(score));
+    choose_font(FONTN8);
+    CenterStringAt(SCREEN_HEIGHT/2 - curfont->baseline - 1, "GAME OVER!");
+    setFGcolor(COLOR_LYELLOW);
+    CenterStringAt(SCREEN_HEIGHT - curfont->baseline - 2, u2str(score));
 }
diff --git a/F1-nolib/Tetris/screen.c b/F1-nolib/Tetris/screen.c
index 14bf718..d770ceb 100644
--- a/F1-nolib/Tetris/screen.c
+++ b/F1-nolib/Tetris/screen.c
@@ -107,7 +107,6 @@ uint8_t DrawCharAt(int16_t X, int16_t Y, uint8_t Char){
  * @return - text width in pixels
  */
 uint8_t PutStringAt(int16_t X, int16_t Y, const char *str){
-    DBG("PutStringAt("); DBGU(X); DBG(", "); DBGU(Y); DBG(", \""); DBG(str); DBG("\"\n");
     if(!str) return 0;
     int16_t Xold = X;
     while(*str){
@@ -158,7 +157,7 @@ void process_screen(){
             ConvertScreenBuf(screenbuf, currentB, Ntick); // convert data
             TIM_DMA_transfer(currentB); // start transfer
             ScrnState = SCREEN_ACTIVE;
-            if(++Ntick >= 7){
+            if(++Ntick >= 7 + NBLACK_FRAMES){
                 Ntick = 0;
                 if(++currentB >= NBLOCKS){
                     currentB = 0; // start again
diff --git a/F1-nolib/Tetris/screen.h b/F1-nolib/Tetris/screen.h
index 6ded8e8..87edeea 100644
--- a/F1-nolib/Tetris/screen.h
+++ b/F1-nolib/Tetris/screen.h
@@ -22,6 +22,9 @@
 
 #include <stdint.h>
 
+// additional black frames for display won't be so bright
+#define NBLACK_FRAMES       (7)
+
 // display size in px
 // PANEL_WIDTH is width of one panel
 //#define PANEL_WIDTH         (64)
@@ -53,8 +56,10 @@ typedef enum{ // screen states
 #define COLOR_RED       (0b11100000)
 #define COLOR_LRED      (0b01100000)
 #define COLOR_CYAN      (0b00011111)
+#define COLOR_LCYAN     (0b00000101)
 #define COLOR_PURPLE    (0b11100011)
 #define COLOR_YELLOW    (0b11111100)
+#define COLOR_LYELLOW   (0b00100100)
 
 extern uint32_t score; // current game score
 extern uint8_t screenbuf[SCREENBUF_SZ];
diff --git a/F1-nolib/Tetris/snake.c b/F1-nolib/Tetris/snake.c
index f3df5cd..50d1478 100644
--- a/F1-nolib/Tetris/snake.c
+++ b/F1-nolib/Tetris/snake.c
@@ -27,16 +27,16 @@
 #define SNAKE_MAXLEN        (128)
 // colors                      RRRGGGBB
 #define SNAKE_BGCOLOR       (0)
-#define SNAKE_HEADCOLOR     (0b00001101)
-#define SNAKE_COLOR         (0b00101100)
+#define SNAKE_HEADCOLOR     (0b00001100)
+#define SNAKE_COLOR         (0b00000100)
 // food: +1 to size
-#define FOOD_COLOR          (0b00011100)
+#define FOOD_COLOR          (0b00001101)
 // cut - -1 to size
-#define CUT_COLOR           (0b11100000)
+#define CUT_COLOR           (0b00011100)
 // chance of CUT appears  when drawing food (/1000)
 #define CUT_PROMILLE        (80)
 // score - +10 to score
-#define SCORE_COLOR         (0b00000001)
+#define SCORE_COLOR         (0b00100100)
 // add this to score after each SCORE_COLOR eating
 #define ADDSCORE            (25)
 // chance of SCORE appears when doing move (1/1000)
diff --git a/F1-nolib/Tetris/tetris.c b/F1-nolib/Tetris/tetris.c
index 92981f9..8480398 100644
--- a/F1-nolib/Tetris/tetris.c
+++ b/F1-nolib/Tetris/tetris.c
@@ -25,12 +25,12 @@
 
 // backround color
 #define BACKGROUND_COLOR    (COLOR_BLACK)
-#define FOREGROUND_COLOR    (COLOR_YELLOW)
-#define CUP_COLOR           (COLOR_CYAN)
+#define FOREGROUND_COLOR    (COLOR_LYELLOW)
+#define CUP_COLOR           (COLOR_LRED)
 
 // height of cup
-#define CUPHEIGHT       (30)
-#define CUPWIDTH        (20)
+#define CUPHEIGHT       (31)
+#define CUPWIDTH        (14)
 // screen coordinate of x=0 @ cup
 #define CUPX0           (7)
 // screen coordinate of y=0 @ cup (Y grows upside down)
@@ -67,7 +67,7 @@ static const figure L = {
 // J: 00, 01, 02, -10 + 2 = 0x22, 0x23, 0x24, 0x12
 static const figure J = {
     .f = {0x22, 0x23, 0x24, 0x12},
-    .color = 0b00000100
+    .color = 0b00000001
 };
 // O: 00, 01, 10, 11 + 2 = 0x22, 0x23, 0x32, 0x33
 static const figure O = {
@@ -84,13 +84,13 @@ static const figure I = {
 // S: -10, 00, 01, 11 + 2 = 0x12, 0x22, 0x23, 0x33
 static const figure S = {
     .f = {0x12, 0x22, 0x23, 0x33},
-    .color = 0b00100001
+    .color = 0b00000100
 };
 
 // Z: -11, 01, 00, 10 + 2 = 0x13, 0x23, 0x22, 0x32
 static const figure Z = {
     .f = {0x13, 0x23, 0x22, 0x32},
-    .color = 0b00100100
+    .color = 0b00000100
 };
 
 // T: -10, 01, 00, 10 + 2 = 0x12, 0x23, 0x22, 0x32
@@ -210,7 +210,7 @@ static int getrand(){
     return r;
 }
 
-// return 0 if cannot move
+// return 0 if cannot move by y
 static int mvfig(int *x, int *y, int dx){
     register int xx = *x, yy = *y;
     DBG("MVFIG: x="); DBGU(*x); DBG(", y="); DBGU(*y); DBG(", dx="); DBGU(dx); NL();
@@ -218,9 +218,14 @@ static int mvfig(int *x, int *y, int dx){
     clearfigure(xx, yy);
     // check dx:
     if(dx){
-        if(chkfigure(xx+dx, yy, &curfigure)){
-            xx = xx + dx; *x = xx;
-        }else ret = 0;
+        int step = 1;
+        if(dx < 0){step = -1; dx = -dx;}
+        while(dx){
+            if(chkfigure(xx + step, yy, &curfigure)){
+                xx = xx + step; *x = xx;
+            }else break;
+            --dx;
+        }
     }
     if(chkfigure(xx, yy+1, &curfigure)){
         ++yy; *y = yy;
@@ -260,7 +265,7 @@ static int drawnext(){
 void tetris_init(){
     setBGcolor(BACKGROUND_COLOR);
     setFGcolor(FOREGROUND_COLOR);
-    choose_font(FONT14);
+    choose_font(FONTN8);
     ClearScreen();
     ScreenON();
     score = 0;
@@ -274,7 +279,8 @@ void tetris_init(){
     for(int x = 0; x < CUPWIDTH + 2; ++x)
         DrawPix(CUPX0 - 1 + x, CUPY0 + CUPHEIGHT, CUP_COLOR);
     nextfigure = *figures[getrand()];
-    PutStringAt(CUPX0 + CUPWIDTH + 5, CUPY0 + 5 + curfont->height, "0       ");
+    PutStringAt(CUPX0 + CUPWIDTH + 3, CUPY0 + 3 + curfont->height, "SCORE:");
+    PutStringAt(CUPX0 + CUPWIDTH + 3, CUPY0 + 3 + 2*curfont->height, "0       ");
     drawnext();
 }
 
@@ -284,7 +290,8 @@ int tetris_process(){
     static uint8_t paused = 0;
     keyevent evt;
     if(Tms == Tlast) return 1;
-#define EVENT(x)    ((keystate(x, &evt) && evt == EVT_PRESS) || keyevt(x) == EVT_HOLD)
+#define PRESS(x)    (keystate(x, &evt) && evt == EVT_PRESS)
+#define HOLD(x)     (keyevt(x) == EVT_HOLD)
     // change moving direction
     if(keystate(KEY_U, &evt) && (evt == EVT_PRESS || evt == EVT_HOLD)){ // UP - pause
         if(paused){
@@ -299,20 +306,23 @@ int tetris_process(){
         if(keystate(KEY_D, &evt) && evt == EVT_PRESS){ // Down - drop
             incSpd = MINSTEPMS;
         }
-        if(EVENT(KEY_L)){ // L - left
+        if(PRESS(KEY_L)) // L - left
             moveX = -1;
-        }
-        if(EVENT(KEY_R)){ // Right
+        else if(HOLD(KEY_L))
+            moveX = -2;
+        if(PRESS(KEY_R)) // Right
             moveX = 1;
-        }
-        if(EVENT(KEY_M)){ // Menu - rotate CCW
+        else if(HOLD(KEY_R))
+            moveX = 2;
+        if(PRESS(KEY_M)){ // Menu - rotate CCW
             rot = 1;
         }
-        if(EVENT(KEY_S)){ // Set - rotate CW
+        if(PRESS(KEY_S)){ // Set - rotate CW
             rot = -1;
         }
     }
-#undef EVENT
+#undef PRESS
+#undef HOLD
     clear_events();
     if(Tms - Tlast > incSpd){
         Tlast = Tms;
@@ -323,7 +333,7 @@ int tetris_process(){
             rot = 0;
         }
         DBG("Move down 1px\n");
-        if(!mvfig(&xnew, &ynew, moveX) && ynew == yf){ // can't move: end of moving?
+        if(!mvfig(&xnew, &ynew, moveX)){ // can't move: end of moving?
             moveX = 0;
             int s = checkandroll();
             switch(s){ // add score
@@ -346,10 +356,18 @@ int tetris_process(){
                 default:
                 break;
             }
-            PutStringAt(CUPX0 + CUPWIDTH + 5, CUPY0 + 5 + curfont->height, u2str(score));
+            DBG("Score: "); DBG(u2str(score)); DBG("\n");
+            if(s){
+                setBGcolor(BACKGROUND_COLOR);
+                setFGcolor(FOREGROUND_COLOR);
+                choose_font(FONTN8);
+                uint8_t l = PutStringAt(CUPX0 + CUPWIDTH + 3, CUPY0 + 3 + 2*curfont->height, u2str(score));
+                PutStringAt(l+CUPX0 + CUPWIDTH + 3, CUPY0 + 3 + 2*curfont->height, "   ");
+            }
             if(StepMS > MINSTEPMS && score > nextSpeedScore){ // increase speed
                 --StepMS;
                 nextSpeedScore += NXTSPEEDSCORE;
+                DBG("Increase speed, StepMS="); DBG(u2str(StepMS)); DBG("\n");
             }
             if(!drawnext()) return 0;
         }else{