Rework font code, add new fonts, also proportional, rework watch usage - "SET" button...

[oswald.git] / ui / fonts / 4x6_horizontal_LSB_1.h

diff --git a/ui/fonts/4x6_horizontal_LSB_1.h b/ui/fonts/4x6_horizontal_LSB_1.h
deleted file mode 100644 (file)
index 658e507..0000000
--- a/ui/fonts/4x6_horizontal_LSB_1.h
+++ /dev/null
@@ -1,258 +0,0 @@
-const char font_4x6[256][6]={
-{0x00,0x00,0x00,0x00,0x00,0x00},       // 0x00
-{0x40,0xA0,0xE0,0xA0,0x40,0x00},       // 0x01
-{0x40,0xE0,0xA0,0xE0,0x40,0x00},       // 0x02
-{0x00,0xA0,0xE0,0xE0,0x40,0x00},       // 0x03
-{0x00,0x40,0xE0,0xE0,0x40,0x00},       // 0x04
-{0x40,0xE0,0xE0,0x40,0xE0,0x00},       // 0x05
-{0x40,0x40,0xE0,0x40,0xE0,0x00},       // 0x06
-{0x00,0x00,0x00,0x00,0x00,0x00},       // 0x07
-{0x00,0x00,0x00,0x00,0x00,0x00},       // 0x08
-{0x00,0x00,0x00,0x00,0x00,0x00},       // 0x09
-{0x00,0x00,0x00,0x00,0x00,0x00},       // 0x0A
-{0x00,0xC0,0x80,0x60,0x60,0x00},       // 0x0B
-{0x40,0xA0,0x40,0xE0,0x40,0x00},       // 0x0C
-{0x00,0x00,0x00,0x00,0x00,0x00},       // 0x0D
-{0x40,0xC0,0xA0,0x80,0x40,0x00},       // 0x0E
-{0x40,0xE0,0xA0,0xE0,0x40,0x00},       // 0x0F
-{0x20,0x60,0xE0,0x60,0x20,0x00},       // 0x10
-{0x80,0xC0,0xE0,0xC0,0x80,0x00},       // 0x11
-{0x40,0xE0,0x40,0xE0,0x40,0x00},       // 0x12
-{0xA0,0xA0,0xA0,0x00,0xA0,0x00},       // 0x13
-{0x00,0x80,0x40,0x40,0x40,0x40},       // 0x14
-{0x40,0x40,0x40,0x40,0x20,0x00},       // 0x15
-{0x00,0x00,0x00,0x00,0xE0,0x00},       // 0x16
-{0x40,0xE0,0x40,0xE0,0x40,0xE0},       // 0x17
-{0x40,0xE0,0x40,0x40,0x40,0x00},       // 0x18
-{0x40,0x40,0x40,0xE0,0x40,0x00},       // 0x19
-{0x00,0x40,0xF0,0x40,0x00,0x00},       // 0x1A
-{0x00,0x20,0xF0,0x20,0x00,0x00},       // 0x1B
-{0x00,0x00,0x20,0xE0,0x00,0x00},       // 0x1C
-{0x00,0xA0,0xE0,0xA0,0x00,0x00},       // 0x1D
-{0x00,0x40,0xE0,0xE0,0x00,0x00},       // 0x1E
-{0x00,0xE0,0xE0,0x40,0x00,0x00},       // 0x1F
-{0x00,0x00,0x00,0x00,0x00,0x00},       // 0x20
-{0x40,0x40,0x40,0x00,0x40,0x00},       // 0x21
-{0xA0,0xA0,0x00,0x00,0x00,0x00},       // 0x22
-{0xA0,0xE0,0xA0,0xE0,0xA0,0x00},       // 0x23
-{0x40,0xC0,0x60,0xC0,0x60,0x40},       // 0x24
-{0x20,0x80,0x40,0x20,0x80,0x00},       // 0x25
-{0x40,0xA0,0xC0,0xA0,0xE0,0x00},       // 0x26
-{0x60,0x20,0x00,0x00,0x00,0x00},       // 0x27
-{0x40,0x20,0x20,0x20,0x40,0x00},       // 0x28
-{0x20,0x40,0x40,0x40,0x20,0x00},       // 0x29
-{0xA0,0x40,0xE0,0x40,0xA0,0x00},       // 0x2A
-{0x00,0x40,0xE0,0x40,0x00,0x00},       // 0x2B
-{0x00,0x00,0x00,0x00,0x60,0x20},       // 0x2C
-{0x00,0x00,0xE0,0x00,0x00,0x00},       // 0x2D
-{0x00,0x00,0x00,0x00,0x40,0x00},       // 0x2E
-{0x80,0x80,0x40,0x20,0x20,0x00},       // 0x2F
-{0xC0,0xA0,0xA0,0xA0,0x60,0x00},       // 0x30
-{0x40,0x60,0x40,0x40,0xE0,0x00},       // 0x31
-{0x60,0x80,0x40,0x20,0xE0,0x00},       // 0x32
-{0x60,0x80,0x40,0x80,0x60,0x00},       // 0x33
-{0x80,0xA0,0xE0,0x80,0x80,0x00},       // 0x34
-{0xE0,0x20,0x60,0x80,0x60,0x00},       // 0x35
-{0x40,0x20,0x60,0xA0,0x40,0x00},       // 0x36
-{0xE0,0x80,0xC0,0x40,0x40,0x00},       // 0x37
-{0x40,0xA0,0x40,0xA0,0x40,0x00},       // 0x38
-{0x40,0xA0,0xC0,0x80,0x40,0x00},       // 0x39
-{0x00,0x00,0x40,0x00,0x40,0x00},       // 0x3A
-{0x00,0x00,0x40,0x00,0x60,0x20},       // 0x3B
-{0x80,0x40,0x20,0x40,0x80,0x00},       // 0x3C
-{0x00,0x00,0xE0,0x00,0xE0,0x00},       // 0x3D
-{0x20,0x40,0x80,0x40,0x20,0x00},       // 0x3E
-{0x60,0x80,0x40,0x00,0x40,0x00},       // 0x3F
-{0xE0,0xA0,0xA0,0x20,0xE0,0x00},       // 0x40
-{0x40,0xA0,0xE0,0xA0,0xA0,0x00},       // 0x41
-{0x60,0xA0,0x60,0xA0,0x60,0x00},       // 0x42
-{0xC0,0x20,0x20,0x20,0xC0,0x00},       // 0x43
-{0x60,0xA0,0xA0,0xA0,0x60,0x00},       // 0x44
-{0xE0,0x20,0x60,0x20,0xE0,0x00},       // 0x45
-{0xE0,0x20,0x60,0x20,0x20,0x00},       // 0x46
-{0xC0,0x20,0xA0,0xA0,0xC0,0x00},       // 0x47
-{0xA0,0xA0,0xE0,0xA0,0xA0,0x00},       // 0x48
-{0xE0,0x40,0x40,0x40,0xE0,0x00},       // 0x49
-{0x80,0x80,0x80,0xA0,0x40,0x00},       // 0x4A
-{0xA0,0xA0,0x60,0xA0,0xA0,0x00},       // 0x4B
-{0x20,0x20,0x20,0x20,0xE0,0x00},       // 0x4C
-{0xA0,0xE0,0xE0,0xA0,0xA0,0x00},       // 0x4D
-{0xA0,0xE0,0xA0,0xA0,0xA0,0x00},       // 0x4E
-{0x40,0xA0,0xA0,0xA0,0x40,0x00},       // 0x4F
-{0x60,0xA0,0x60,0x20,0x20,0x00},       // 0x50
-{0x40,0xA0,0xA0,0xE0,0xC0,0x00},       // 0x51
-{0x60,0xA0,0x60,0xA0,0xA0,0x00},       // 0x52
-{0xC0,0x20,0xE0,0x80,0x60,0x00},       // 0x53
-{0xE0,0x40,0x40,0x40,0x40,0x00},       // 0x54
-{0xA0,0xA0,0xA0,0xA0,0xE0,0x00},       // 0x55
-{0xA0,0xA0,0xA0,0xA0,0x40,0x00},       // 0x56
-{0xA0,0xA0,0xE0,0xE0,0xA0,0x00},       // 0x57
-{0xA0,0xA0,0x40,0xA0,0xA0,0x00},       // 0x58
-{0xA0,0xA0,0x40,0x40,0x40,0x00},       // 0x59
-{0xE0,0x80,0x40,0x20,0xE0,0x00},       // 0x5A
-{0x60,0x20,0x20,0x20,0x60,0x00},       // 0x5B
-{0x20,0x20,0x40,0x80,0x80,0x00},       // 0x5C
-{0x60,0x40,0x40,0x40,0x60,0x00},       // 0x5D
-{0x40,0xA0,0x00,0x00,0x00,0x00},       // 0x5E
-{0x00,0x00,0x00,0x00,0x00,0xF0},       // 0x5F
-{0x60,0x40,0x00,0x00,0x00,0x00},       // 0x60
-{0x00,0x00,0xC0,0xA0,0xE0,0x00},       // 0x61
-{0x20,0x20,0x60,0xA0,0x60,0x00},       // 0x62
-{0x00,0x00,0xC0,0x20,0xC0,0x00},       // 0x63
-{0x80,0x80,0xC0,0xA0,0xC0,0x00},       // 0x64
-{0x00,0x00,0xE0,0x60,0xC0,0x00},       // 0x65
-{0x80,0x40,0xE0,0x40,0x40,0x00},       // 0x66
-{0x00,0x00,0xE0,0xA0,0x80,0xE0},       // 0x67
-{0x20,0x20,0x60,0xA0,0xA0,0x00},       // 0x68
-{0x40,0x00,0x40,0x40,0x40,0x00},       // 0x69
-{0x40,0x00,0x40,0x40,0x40,0x60},       // 0x6A
-{0x20,0x20,0xA0,0x60,0xA0,0x00},       // 0x6B
-{0x40,0x40,0x40,0x40,0x40,0x00},       // 0x6C
-{0x00,0x00,0xE0,0xE0,0xA0,0x00},       // 0x6D
-{0x00,0x00,0x60,0xA0,0xA0,0x00},       // 0x6E
-{0x00,0x00,0x40,0xA0,0x40,0x00},       // 0x6F
-{0x00,0x00,0x60,0xA0,0x60,0x20},       // 0x70
-{0x00,0x00,0xC0,0xA0,0xC0,0x80},       // 0x71
-{0x00,0x00,0x60,0x20,0x20,0x00},       // 0x72
-{0x00,0x00,0xC0,0x40,0x60,0x00},       // 0x73
-{0x00,0x40,0xE0,0x40,0xC0,0x00},       // 0x74
-{0x00,0x00,0xA0,0xA0,0xE0,0x00},       // 0x75
-{0x00,0x00,0xA0,0xA0,0x40,0x00},       // 0x76
-{0x00,0x00,0xA0,0xE0,0xE0,0x00},       // 0x77
-{0x00,0x00,0xA0,0x40,0xA0,0x00},       // 0x78
-{0x00,0x00,0xA0,0xA0,0x40,0x20},       // 0x79
-{0x00,0x00,0x60,0x40,0xC0,0x00},       // 0x7A
-{0xC0,0x40,0x60,0x40,0xC0,0x00},       // 0x7B
-{0x40,0x40,0x40,0x40,0x40,0x00},       // 0x7C
-{0x60,0x40,0xC0,0x40,0x60,0x00},       // 0x7D
-{0xA0,0x50,0x00,0x00,0x00,0x00},       // 0x7E
-{0x00,0x40,0xA0,0xE0,0x00,0x00},       // 0x7F
-{0xC0,0x20,0x20,0xE0,0x40,0x20},       // 0x80
-{0xA0,0x00,0xA0,0xA0,0xC0,0x00},       // 0x81
-{0x80,0x40,0xE0,0x60,0xC0,0x00},       // 0x82
-{0x40,0xA0,0xC0,0xA0,0xE0,0x00},       // 0x83
-{0xA0,0x00,0xC0,0xA0,0xE0,0x00},       // 0x84
-{0x20,0x40,0xC0,0xA0,0xE0,0x00},       // 0x85
-{0x40,0x00,0xC0,0xA0,0xE0,0x00},       // 0x86
-{0x00,0xE0,0x20,0xE0,0x40,0x60},       // 0x87
-{0x40,0xA0,0xE0,0x60,0xC0,0x00},       // 0x88
-{0xA0,0x00,0xE0,0x60,0xC0,0x00},       // 0x89
-{0x20,0x40,0xE0,0x60,0xC0,0x00},       // 0x8A
-{0xA0,0x00,0x40,0x40,0x40,0x00},       // 0x8B
-{0x40,0xA0,0x00,0x40,0x40,0x00},       // 0x8C
-{0x20,0x40,0x00,0x40,0x40,0x00},       // 0x8D
-{0xA0,0x40,0xA0,0xE0,0xA0,0x00},       // 0x8E
-{0x40,0x40,0xA0,0xE0,0xA0,0x00},       // 0x8F
-{0x80,0x40,0xE0,0x60,0xE0,0x00},       // 0x90
-{0x00,0x00,0xC0,0xE0,0x60,0x00},       // 0x91
-{0xC0,0x60,0xE0,0x60,0xE0,0x00},       // 0x92
-{0x40,0xA0,0x40,0xA0,0x40,0x00},       // 0x93
-{0xA0,0x00,0x40,0xA0,0x40,0x00},       // 0x94
-{0x20,0x40,0x40,0xA0,0x40,0x00},       // 0x95
-{0x40,0xA0,0x00,0xA0,0xE0,0x00},       // 0x96
-{0x20,0x40,0xA0,0xA0,0xE0,0x00},       // 0x97
-{0xA0,0x00,0xA0,0xA0,0x40,0x20},       // 0x98
-{0xA0,0x40,0xA0,0xA0,0x40,0x00},       // 0x99
-{0xA0,0x00,0xA0,0xA0,0xE0,0x00},       // 0x9A
-{0x40,0xE0,0x20,0xE0,0x40,0x00},       // 0x9B
-{0x80,0x40,0xE0,0x40,0xE0,0x00},       // 0x9C
-{0xA0,0xE0,0x40,0xE0,0x40,0x00},       // 0x9D
-{0x00,0x60,0x60,0xA0,0xA0,0x00},       // 0x9E
-{0xC0,0x40,0xC0,0x40,0x60,0x00},       // 0x9F
-{0x80,0x40,0xC0,0xA0,0xE0,0x00},       // 0xA0
-{0x80,0x40,0x00,0x40,0x40,0x00},       // 0xA1
-{0x80,0x40,0xE0,0xA0,0xE0,0x00},       // 0xA2
-{0x80,0x40,0x00,0xA0,0xE0,0x00},       // 0xA3
-{0xE0,0x00,0xE0,0xA0,0xA0,0x00},       // 0xA4
-{0xE0,0x00,0xA0,0xE0,0xA0,0x00},       // 0xA5
-{0xC0,0xA0,0xE0,0x00,0xE0,0x00},       // 0xA6
-{0x40,0xA0,0x40,0x00,0xE0,0x00},       // 0xA7
-{0x40,0x00,0x40,0x20,0xC0,0x00},       // 0xA8
-{0x00,0xE0,0x20,0x20,0x00,0x00},       // 0xA9
-{0x00,0x70,0x40,0x40,0x00,0x00},       // 0xAA
-{0x20,0xA0,0x40,0xA0,0xC0,0x00},       // 0xAB
-{0x20,0xA0,0x40,0xE0,0x80,0x00},       // 0xAC
-{0x40,0x00,0x40,0x40,0x40,0x00},       // 0xAD
-{0x00,0xA0,0x50,0xA0,0x00,0x00},       // 0xAE
-{0x00,0x50,0xA0,0x50,0x00,0x00},       // 0xAF
-{0x20,0x80,0x20,0x80,0x20,0x80},       // 0xB0
-{0xA0,0x50,0xA0,0x50,0xA0,0x50},       // 0xB1
-{0xD0,0x70,0xD0,0x70,0xD0,0x70},       // 0xB2
-{0x40,0x40,0x40,0x40,0x40,0x40},       // 0xB3
-{0x40,0x40,0x70,0x40,0x40,0x40},       // 0xB4
-{0x40,0x70,0x40,0x70,0x40,0x40},       // 0xB5
-{0xA0,0xA0,0xB0,0xA0,0xA0,0xA0},       // 0xB6
-{0x00,0x00,0xF0,0xA0,0xA0,0xA0},       // 0xB7
-{0x00,0x70,0x40,0x70,0x40,0x40},       // 0xB8
-{0xA0,0xB0,0x80,0xB0,0xA0,0xA0},       // 0xB9
-{0xA0,0xA0,0xA0,0xA0,0xA0,0xA0},       // 0xBA
-{0x00,0xF0,0x80,0xB0,0xA0,0xA0},       // 0xBB
-{0xA0,0xB0,0x80,0xF0,0x00,0x00},       // 0xBC
-{0xA0,0xA0,0xF0,0x00,0x00,0x00},       // 0xBD
-{0x40,0x70,0x40,0x70,0x00,0x00},       // 0xBE
-{0x00,0x00,0x70,0x40,0x40,0x40},       // 0xBF
-{0x40,0x40,0xC0,0x00,0x00,0x00},       // 0xC0
-{0x40,0x40,0xF0,0x00,0x00,0x00},       // 0xC1
-{0x00,0x00,0xF0,0x40,0x40,0x40},       // 0xC2
-{0x40,0x40,0xC0,0x40,0x40,0x40},       // 0xC3
-{0x00,0x00,0xF0,0x00,0x00,0x00},       // 0xC4
-{0x40,0x40,0xF0,0x40,0x40,0x40},       // 0xC5
-{0x40,0xC0,0x40,0xC0,0x40,0x40},       // 0xC6
-{0xA0,0xA0,0xA0,0xA0,0xA0,0xA0},       // 0xC7
-{0xA0,0xA0,0x20,0xE0,0x00,0x00},       // 0xC8
-{0x00,0xE0,0x20,0xA0,0xA0,0xA0},       // 0xC9
-{0xA0,0xB0,0x00,0xF0,0x00,0x00},       // 0xCA
-{0x00,0xF0,0x00,0xB0,0xA0,0xA0},       // 0xCB
-{0xA0,0xA0,0x20,0xA0,0xA0,0xA0},       // 0xCC
-{0x00,0xF0,0x00,0xF0,0x00,0x00},       // 0xCD
-{0xA0,0xB0,0x00,0xB0,0xA0,0xA0},       // 0xCE
-{0x40,0xF0,0x00,0xF0,0x00,0x00},       // 0xCF
-{0xA0,0xA0,0xF0,0x00,0x00,0x00},       // 0xD0
-{0x00,0xF0,0x00,0xF0,0x40,0x40},       // 0xD1
-{0x00,0x00,0xF0,0xA0,0xA0,0xA0},       // 0xD2
-{0xA0,0xA0,0xE0,0x00,0x00,0x00},       // 0xD3
-{0x40,0xC0,0x40,0xC0,0x00,0x00},       // 0xD4
-{0x00,0xC0,0x40,0xC0,0x40,0x40},       // 0xD5
-{0x00,0x00,0xE0,0xA0,0xA0,0xA0},       // 0xD6
-{0xA0,0xA0,0xB0,0xA0,0xA0,0xA0},       // 0xD7
-{0x40,0xF0,0x00,0xF0,0x40,0x40},       // 0xD8
-{0x40,0x40,0x70,0x00,0x00,0x00},       // 0xD9
-{0x00,0x00,0xC0,0x40,0x40,0x40},       // 0xDA
-{0xF0,0xF0,0xF0,0xF0,0xF0,0xF0},       // 0xDB
-{0x00,0x00,0x00,0xF0,0xF0,0xF0},       // 0xDC
-{0x30,0x30,0x30,0x30,0x30,0x30},       // 0xDD
-{0xC0,0xC0,0xC0,0xC0,0xC0,0xC0},       // 0xDE
-{0xF0,0xF0,0xF0,0x00,0x00,0x00},       // 0xDF
-{0x00,0x00,0xE0,0x60,0xE0,0x00},       // 0xE0
-{0x40,0xA0,0x60,0xA0,0x60,0x20},       // 0xE1
-{0xE0,0xA0,0x20,0x20,0x20,0x00},       // 0xE2
-{0xE0,0xA0,0xA0,0xA0,0xA0,0x00},       // 0xE3
-{0xE0,0x20,0x40,0x20,0xE0,0x00},       // 0xE4
-{0x00,0x00,0xC0,0xA0,0x40,0x00},       // 0xE5
-{0x00,0x00,0xA0,0xA0,0xE0,0x20},       // 0xE6
-{0x00,0x80,0x60,0x40,0x40,0x00},       // 0xE7
-{0xE0,0x40,0xA0,0x40,0xE0,0x00},       // 0xE8
-{0x40,0xA0,0xE0,0xA0,0x40,0x00},       // 0xE9
-{0x00,0x40,0xA0,0xA0,0xA0,0x00},       // 0xEA
-{0xC0,0x20,0x40,0xA0,0x40,0x00},       // 0xEB
-{0x00,0x00,0xE0,0xA0,0xE0,0x00},       // 0xEC
-{0x40,0xE0,0xA0,0xE0,0x40,0x00},       // 0xED
-{0xC0,0x20,0xE0,0x20,0xC0,0x00},       // 0xEE
-{0x40,0xA0,0xA0,0xA0,0xA0,0x00},       // 0xEF
-{0xE0,0x00,0xE0,0x00,0xE0,0x00},       // 0xF0
-{0x40,0xE0,0x40,0x00,0xE0,0x00},       // 0xF1
-{0x60,0x80,0x60,0x00,0xE0,0x00},       // 0xF2
-{0xC0,0x20,0xC0,0x00,0xE0,0x00},       // 0xF3
-{0x00,0x80,0x40,0x40,0x40,0x40},       // 0xF4
-{0x40,0x40,0x40,0x40,0x20,0x00},       // 0xF5
-{0x40,0x00,0xE0,0x00,0x40,0x00},       // 0xF6
-{0x00,0xA0,0x50,0xA0,0x50,0x00},       // 0xF7
-{0x40,0xA0,0x40,0x00,0x00,0x00},       // 0xF8
-{0x00,0x40,0xE0,0x40,0x00,0x00},       // 0xF9
-{0x00,0x00,0x40,0x00,0x00,0x00},       // 0xFA
-{0xC0,0x40,0x40,0x60,0x40,0x00},       // 0xFB
-{0xE0,0xA0,0xA0,0x00,0x00,0x00},       // 0xFC
-{0x60,0x40,0x20,0x60,0x00,0x00},       // 0xFD
-{0x00,0x00,0x60,0x60,0x00,0x00},       // 0xFE
-{0x00,0x00,0x00,0x00,0x00,0x00}        // 0xFF
-};
\ No newline at end of file