Skip to content

Commit 303cfc5

Browse files
gavinlyonsrepogavinlyonsrepo
committed
updating font info, correcting comment typo + font index
1 parent 32bef56 commit 303cfc5

4 files changed

Lines changed: 14 additions & 12 deletions

File tree

‎extra/doc/fonts/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ static const std::array<uint8_t, 20> FontBinaryExample =
6767

6868
## Sources
6969

70+
Fonts can be made from ttf files using [this tool](https://github.com/gavinlyonsrepo/Colossus_LTSM) also written by author.
71+
7072
Some of the fonts packaged with library came from [rinky dink electronics ](http://rinkydinkelectronics.com/)
7173

7274
## Font Images

‎src/bicolor_graphics_RDL.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bicolor_graphics::bicolor_graphics(int16_t w, int16_t h):
2727
/*!
2828
@brief Write 1 character on display
2929
@param x character starting position on x-axis.
30-
@param y character starting position on x-axis.
30+
@param y character starting position on y-axis.
3131
@param value Character to be written.
3232
@note Horizontal font addressing
3333
@return Will return rdlib::Return_Codes_e enum

‎src/color16_graphics_RDL.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,8 +978,8 @@ void color16_graphics::setCursor(int16_t x, int16_t y) {
978978

979979
/*!
980980
@brief Write 1 character on Display
981-
@param x character starting position on x-axis. Valid values
982-
@param y character starting position on x-axis. Valid values
981+
@param x character starting position on x-axis.
982+
@param y character starting position on y-axis.
983983
@param value Character to be written.
984984
@note uses spiWriteDataBuffer method to write each character as a buffer for speed.
985985
Much faster than pixel by pixel spi byte writes

‎src/font_data_RDL.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ bool display_Fonts::getInvertFont()
9595
Memory usage : 764 bytes
9696
*/
9797
static const std::array<uint8_t, 764> FontDefault = {
98-
0x08,0x08,0x20,0x5F,
98+
0x08,0x08,0x20,0x5E,
9999
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <Space>
100100
0x18,0x3C,0x3C,0x18,0x18,0x00,0x18,0x00, // !
101101
0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00, // "
@@ -297,7 +297,7 @@ static const std::array<uint8_t, 2804> FontSevenSeg=
297297
*/
298298
static const std::array<uint8_t, 764> FontSinclairS=
299299
{
300-
0x08,0x08,0x20,0x5F,
300+
0x08,0x08,0x20,0x5E,
301301
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <space>
302302
0x08,0x08,0x08,0x08,0x08,0x00,0x08,0x00, // !
303303
0x14,0x14,0x00,0x00,0x00,0x00,0x00,0x00, // "
@@ -406,7 +406,7 @@ static const std::array<uint8_t, 764> FontSinclairS=
406406
*/
407407
static const std::array<uint8_t, 1144> FontPico =
408408
{
409-
0x08,0x0C,0x20,0x5F,
409+
0x08,0x0C,0x20,0x5E,
410410
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <space>
411411
0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00, // !
412412
0x00,0x28,0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // "
@@ -516,7 +516,7 @@ static const std::array<uint8_t, 1144> FontPico =
516516
Memory usage : 4564 bytes
517517
*/
518518
static const std::array<uint8_t, 4564> FontOrla={
519-
0x10,0x18,0x20,0x5F,
519+
0x10,0x18,0x20,0x5E,
520520
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <space>
521521
0x00,0x00,0x03,0x80,0x03,0x80,0x03,0x80,0x03,0x80,0x03,0x80,0x03,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x80,0x03,0x80,0x03,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // !
522522
0x00,0x00,0x1F,0xF8,0x1F,0xF8,0x1E,0x78,0x1E,0x78,0x0E,0x70,0x0C,0x30,0x0C,0x30,0x0C,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // "
@@ -625,7 +625,7 @@ static const std::array<uint8_t, 4564> FontOrla={
625625
Memory usage : 1524 bytes
626626
*/
627627
static const std::array<uint8_t, 1524> FontRetro={
628-
0x08,0x10,0x20,0x5F,
628+
0x08,0x10,0x20,0x5E,
629629
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <space>
630630
0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x10,0x10,0x00,0x00, // !
631631
0x24,0x24,0x24,0x24,0x24,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // "
@@ -733,7 +733,7 @@ static const std::array<uint8_t, 1524> FontRetro={
733733
MEGA font X by Y = 16 by 16 .
734734
*/
735735
static const std::array<uint8_t, 3044> FontMega = {
736-
0x10,0x10,0x20,0x5F,
736+
0x10,0x10,0x20,0x5E,
737737
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <space>
738738
0x00,0x00,0x00,0x00,0x07,0x00,0x0F,0x80,0x0F,0x80,0x0F,0x80,0x0F,0x80,0x0F,0x80,0x07,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x00,0x00, // !
739739
0x00,0x00,0x0E,0x38,0x0E,0x38,0x0E,0x38,0x0E,0x38,0x06,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // "
@@ -843,7 +843,7 @@ static const std::array<uint8_t, 3044> FontMega = {
843843
*/
844844
static const std::array<uint8_t, 3044> FontArialBold =
845845
{
846-
0x10,0x10,0x20,0x5F,
846+
0x10,0x10,0x20,0x5E,
847847
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <space>
848848
0x00,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x00,0x00,0x00,0x00, // !
849849
0x00,0x00,0x00,0x00,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // "
@@ -953,7 +953,7 @@ static const std::array<uint8_t, 3044> FontArialBold =
953953
*/
954954
static const std::array<uint8_t, 3044> FontHallfetica =
955955
{
956-
0x10,0x10,0x20,0x5F,
956+
0x10,0x10,0x20,0x5E,
957957
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <space>
958958
0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00, // !
959959
0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x60,0x03,0x60,0x03,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // "
@@ -1063,7 +1063,7 @@ static const std::array<uint8_t, 3044> FontHallfetica =
10631063
*/
10641064
static const std::array<uint8_t, 4564> FontArialRound =
10651065
{
1066-
0x10,0x18,0x20,0x5F,
1066+
0x10,0x18,0x20,0x5E,
10671067
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // <space>
10681068
0x01,0x80,0x03,0xC0,0x03,0xC0,0x03,0xC0,0x03,0xC0,0x03,0xC0,0x03,0xC0,0x03,0xC0,0x03,0xC0,0x03,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x00,0x00,0x00,0x00,0x01,0x80,0x03,0xC0,0x03,0xC0,0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // !
10691069
0x00,0x00,0x00,0x00,0x06,0x30,0x06,0x30,0x0C,0x60,0x0C,0x60,0x0E,0x70,0x0E,0x70,0x06,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // "

0 commit comments

Comments
 (0)