diff --git a/CHANGELOG.md b/CHANGELOG.md index e03256c6..6bdf33e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ ## [Unreleased] - ReleaseDate +- [#137](https://github.com/jamwaffles/ssd1306/pull/137) Replaced `TerminalMode` font with a new, more consistent one. This now uses the `zxpix` font from . + ## [0.4.0] - 2020-08-03 ### Added @@ -110,9 +112,9 @@ - Builder docs clarify the order of method calls (#89) + [unreleased]: https://github.com/jamwaffles/ssd1306/compare/v0.4.0...HEAD [0.4.0]: https://github.com/jamwaffles/ssd1306/compare/v0.3.1...v0.4.0 - [0.3.1]: https://github.com/jamwaffles/ssd1306/compare/v0.3.0...v0.3.1 [0.3.0]: https://github.com/jamwaffles/ssd1306/compare/v0.3.0-alpha.4...v0.3.0 [0.3.0-alpha.4]: https://github.com/jamwaffles/ssd1306/compare/v0.3.0-alpha.3...v0.3.0-alpha.4 diff --git a/src/mode/terminal.rs b/src/mode/terminal.rs index 85dfee18..425e65cf 100644 --- a/src/mode/terminal.rs +++ b/src/mode/terminal.rs @@ -361,99 +361,100 @@ where fn char_to_bitmap(input: char) -> [u8; 8] { // Populate the array with the data from the character array at the right index match input { - '!' => [0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x00], - '"' => [0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00], - '#' => [0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 0x00, 0x00], - '$' => [0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 0x00, 0x00], - '%' => [0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 0x00, 0x00], - '&' => [0x36, 0x49, 0x55, 0x22, 0x50, 0x00, 0x00, 0x00], - '\'' => [0x00, 0x05, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00], - '(' => [0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 0x00, 0x00], - ')' => [0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 0x00, 0x00], - '*' => [0x08, 0x2A, 0x1C, 0x2A, 0x08, 0x00, 0x00, 0x00], - '+' => [0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 0x00, 0x00], - ',' => [0x00, 0x50, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00], - '-' => [0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00], - '.' => [0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00], - '/' => [0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x00, 0x00], - '0' => [0x1C, 0x3E, 0x61, 0x41, 0x43, 0x3E, 0x1C, 0x00], - '1' => [0x40, 0x42, 0x7F, 0x7F, 0x40, 0x40, 0x00, 0x00], - '2' => [0x62, 0x73, 0x79, 0x59, 0x5D, 0x4F, 0x46, 0x00], - '3' => [0x20, 0x61, 0x49, 0x4D, 0x4F, 0x7B, 0x31, 0x00], - '4' => [0x18, 0x1C, 0x16, 0x13, 0x7F, 0x7F, 0x10, 0x00], - '5' => [0x27, 0x67, 0x45, 0x45, 0x45, 0x7D, 0x38, 0x00], - '6' => [0x3C, 0x7E, 0x4B, 0x49, 0x49, 0x79, 0x30, 0x00], - '7' => [0x03, 0x03, 0x71, 0x79, 0x0D, 0x07, 0x03, 0x00], - '8' => [0x36, 0x7F, 0x49, 0x49, 0x49, 0x7F, 0x36, 0x00], - '9' => [0x06, 0x4F, 0x49, 0x49, 0x69, 0x3F, 0x1E, 0x00], - ':' => [0x00, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00], - ';' => [0x00, 0x56, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00], - '<' => [0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 0x00, 0x00], - '=' => [0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00, 0x00], - '>' => [0x41, 0x22, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00], - '?' => [0x02, 0x01, 0x51, 0x09, 0x06, 0x00, 0x00, 0x00], - '@' => [0x32, 0x49, 0x79, 0x41, 0x3E, 0x00, 0x00, 0x00], - 'A' => [0x7E, 0x11, 0x11, 0x11, 0x7E, 0x00, 0x00, 0x00], - 'B' => [0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 0x00, 0x00], - 'C' => [0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 0x00, 0x00], - 'D' => [0x7F, 0x7F, 0x41, 0x41, 0x63, 0x3E, 0x1C, 0x00], - 'E' => [0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 0x00, 0x00], - 'F' => [0x7F, 0x09, 0x09, 0x01, 0x01, 0x00, 0x00, 0x00], - 'G' => [0x3E, 0x41, 0x41, 0x51, 0x32, 0x00, 0x00, 0x00], - 'H' => [0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 0x00, 0x00], - 'I' => [0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 0x00, 0x00], - 'J' => [0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, 0x00, 0x00], - 'K' => [0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 0x00, 0x00], - 'L' => [0x7F, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00], - 'M' => [0x7F, 0x02, 0x04, 0x02, 0x7F, 0x00, 0x00, 0x00], - 'N' => [0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 0x00, 0x00], - 'O' => [0x3E, 0x7F, 0x41, 0x41, 0x41, 0x7F, 0x3E, 0x00], - 'P' => [0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 0x00, 0x00], - 'Q' => [0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 0x00, 0x00], - 'R' => [0x7F, 0x7F, 0x11, 0x31, 0x79, 0x6F, 0x4E, 0x00], - 'S' => [0x46, 0x49, 0x49, 0x49, 0x31, 0x00, 0x00, 0x00], - 'T' => [0x01, 0x01, 0x7F, 0x01, 0x01, 0x00, 0x00, 0x00], - 'U' => [0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 0x00, 0x00], - 'V' => [0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 0x00, 0x00], - 'W' => [0x7F, 0x7F, 0x38, 0x1C, 0x38, 0x7F, 0x7F, 0x00], - 'X' => [0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 0x00, 0x00], - 'Y' => [0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 0x00, 0x00], - 'Z' => [0x61, 0x51, 0x49, 0x45, 0x43, 0x00, 0x00, 0x00], - '[' => [0x00, 0x00, 0x7F, 0x41, 0x41, 0x00, 0x00, 0x00], - '\\' => [0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, 0x00], - ']' => [0x41, 0x41, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00], - '^' => [0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 0x00, 0x00], - '_' => [0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00], - '`' => [0x00, 0x01, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00], - 'a' => [0x20, 0x54, 0x54, 0x54, 0x78, 0x00, 0x00, 0x00], - 'b' => [0x7F, 0x48, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00], - 'c' => [0x38, 0x44, 0x44, 0x44, 0x20, 0x00, 0x00, 0x00], - 'd' => [0x38, 0x44, 0x44, 0x48, 0x7F, 0x00, 0x00, 0x00], - 'e' => [0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 0x00, 0x00], - 'f' => [0x08, 0x7E, 0x09, 0x01, 0x02, 0x00, 0x00, 0x00], - 'g' => [0x08, 0x14, 0x54, 0x54, 0x3C, 0x00, 0x00, 0x00], - 'h' => [0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 0x00, 0x00], - 'i' => [0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, 0x00, 0x00], - 'j' => [0x20, 0x40, 0x44, 0x3D, 0x00, 0x00, 0x00, 0x00], - 'k' => [0x00, 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00], - 'l' => [0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00], - 'm' => [0x7C, 0x04, 0x18, 0x04, 0x78, 0x00, 0x00, 0x00], - 'n' => [0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, 0x00, 0x00], - 'o' => [0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00], - 'p' => [0x7C, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00], - 'q' => [0x08, 0x14, 0x14, 0x18, 0x7C, 0x00, 0x00, 0x00], - 'r' => [0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, 0x00, 0x00], - 's' => [0x48, 0x54, 0x54, 0x54, 0x20, 0x00, 0x00, 0x00], - 't' => [0x04, 0x3F, 0x44, 0x40, 0x20, 0x00, 0x00, 0x00], - 'u' => [0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, 0x00, 0x00], - 'v' => [0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, 0x00, 0x00], - 'w' => [0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, 0x00, 0x00], - 'x' => [0x00, 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 0x00], - 'y' => [0x0C, 0x50, 0x50, 0x50, 0x3C, 0x00, 0x00, 0x00], - 'z' => [0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x00, 0x00], - '{' => [0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x00], - '|' => [0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00], - '}' => [0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x00, 0x00], + '!' => [0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00], + '"' => [0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00], + '#' => [0x00, 0x12, 0x3f, 0x12, 0x12, 0x3f, 0x12, 0x00], + '$' => [0x00, 0x2e, 0x2a, 0x7f, 0x2a, 0x3a, 0x00, 0x00], + '%' => [0x00, 0x23, 0x13, 0x08, 0x04, 0x32, 0x31, 0x00], + '&' => [0x00, 0x10, 0x2a, 0x25, 0x2a, 0x10, 0x20, 0x00], + '\'' => [0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00], + '(' => [0x00, 0x1e, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00], + ')' => [0x00, 0x21, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00], + '*' => [0x00, 0x08, 0x2a, 0x1c, 0x2a, 0x08, 0x00, 0x00], + '+' => [0x00, 0x08, 0x08, 0x3e, 0x08, 0x08, 0x00, 0x00], + ',' => [0x00, 0x80, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00], + '-' => [0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00], + '.' => [0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00], + '/' => [0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x00], + '0' => [0x00, 0x1e, 0x31, 0x29, 0x25, 0x23, 0x1e, 0x00], + '1' => [0x00, 0x22, 0x21, 0x3f, 0x20, 0x20, 0x20, 0x00], + '2' => [0x00, 0x32, 0x29, 0x29, 0x29, 0x29, 0x26, 0x00], + '3' => [0x00, 0x12, 0x21, 0x21, 0x25, 0x25, 0x1a, 0x00], + '4' => [0x00, 0x18, 0x14, 0x12, 0x3f, 0x10, 0x00, 0x00], + '5' => [0x00, 0x17, 0x25, 0x25, 0x25, 0x25, 0x19, 0x00], + '6' => [0x00, 0x1e, 0x25, 0x25, 0x25, 0x25, 0x18, 0x00], + '7' => [0x00, 0x01, 0x01, 0x31, 0x09, 0x05, 0x03, 0x00], + '8' => [0x00, 0x1a, 0x25, 0x25, 0x25, 0x25, 0x1a, 0x00], + '9' => [0x00, 0x06, 0x29, 0x29, 0x29, 0x29, 0x1e, 0x00], + ':' => [0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], + ';' => [0x00, 0x80, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00], + '<' => [0x00, 0x08, 0x14, 0x22, 0x00, 0x00, 0x00, 0x00], + '=' => [0x00, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00], + '>' => [0x00, 0x22, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00], + '?' => [0x00, 0x02, 0x01, 0x01, 0x29, 0x05, 0x02, 0x00], + '@' => [0x00, 0x1e, 0x21, 0x2d, 0x2b, 0x2d, 0x0e, 0x00], + 'A' => [0x00, 0x3e, 0x09, 0x09, 0x09, 0x09, 0x3e, 0x00], + 'B' => [0x00, 0x3f, 0x25, 0x25, 0x25, 0x25, 0x1a, 0x00], + 'C' => [0x00, 0x1e, 0x21, 0x21, 0x21, 0x21, 0x12, 0x00], + 'D' => [0x00, 0x3f, 0x21, 0x21, 0x21, 0x12, 0x0c, 0x00], + 'E' => [0x00, 0x3f, 0x25, 0x25, 0x25, 0x25, 0x21, 0x00], + 'F' => [0x00, 0x3f, 0x05, 0x05, 0x05, 0x05, 0x01, 0x00], + 'G' => [0x00, 0x1e, 0x21, 0x21, 0x21, 0x29, 0x1a, 0x00], + 'H' => [0x00, 0x3f, 0x04, 0x04, 0x04, 0x04, 0x3f, 0x00], + 'I' => [0x00, 0x21, 0x21, 0x3f, 0x21, 0x21, 0x00, 0x00], + 'J' => [0x00, 0x10, 0x20, 0x20, 0x20, 0x20, 0x1f, 0x00], + 'K' => [0x00, 0x3f, 0x04, 0x0c, 0x0a, 0x11, 0x20, 0x00], + 'L' => [0x00, 0x3f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00], + 'M' => [0x00, 0x3f, 0x02, 0x04, 0x04, 0x02, 0x3f, 0x00], + 'N' => [0x00, 0x3f, 0x02, 0x04, 0x08, 0x10, 0x3f, 0x00], + 'O' => [0x00, 0x1e, 0x21, 0x21, 0x21, 0x21, 0x1e, 0x00], + 'P' => [0x00, 0x3f, 0x09, 0x09, 0x09, 0x09, 0x06, 0x00], + 'Q' => [0x00, 0x1e, 0x21, 0x29, 0x31, 0x21, 0x5e, 0x00], + 'R' => [0x00, 0x3f, 0x09, 0x09, 0x09, 0x19, 0x26, 0x00], + 'S' => [0x00, 0x12, 0x25, 0x25, 0x25, 0x25, 0x18, 0x00], + 'T' => [0x00, 0x01, 0x01, 0x01, 0x3f, 0x01, 0x01, 0x00], + 'U' => [0x00, 0x1f, 0x20, 0x20, 0x20, 0x20, 0x1f, 0x00], + 'V' => [0x00, 0x0f, 0x10, 0x20, 0x20, 0x10, 0x0f, 0x00], + 'W' => [0x00, 0x1f, 0x20, 0x10, 0x10, 0x20, 0x1f, 0x00], + 'X' => [0x00, 0x21, 0x12, 0x0c, 0x0c, 0x12, 0x21, 0x00], + 'Y' => [0x00, 0x01, 0x02, 0x3c, 0x02, 0x01, 0x00, 0x00], + 'Z' => [0x00, 0x21, 0x31, 0x29, 0x25, 0x23, 0x21, 0x00], + '[' => [0x00, 0x3f, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00], + '\\' => [0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00], + ']' => [0x00, 0x21, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00], + '^' => [0x00, 0x04, 0x02, 0x3f, 0x02, 0x04, 0x00, 0x00], + '_' => [0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00], + '`' => [0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00], + 'a' => [0x00, 0x10, 0x2a, 0x2a, 0x2a, 0x3c, 0x00, 0x00], + 'b' => [0x00, 0x3f, 0x24, 0x24, 0x24, 0x18, 0x00, 0x00], + 'c' => [0x00, 0x1c, 0x22, 0x22, 0x22, 0x00, 0x00, 0x00], + 'd' => [0x00, 0x18, 0x24, 0x24, 0x24, 0x3f, 0x00, 0x00], + 'e' => [0x00, 0x1c, 0x2a, 0x2a, 0x2a, 0x24, 0x00, 0x00], + 'f' => [0x00, 0x00, 0x3e, 0x05, 0x01, 0x00, 0x00, 0x00], + 'g' => [0x00, 0x18, 0xa4, 0xa4, 0xa4, 0x7c, 0x00, 0x00], + 'h' => [0x00, 0x3f, 0x04, 0x04, 0x04, 0x38, 0x00, 0x00], + 'i' => [0x00, 0x00, 0x24, 0x3d, 0x20, 0x00, 0x00, 0x00], + 'j' => [0x00, 0x20, 0x40, 0x40, 0x3d, 0x00, 0x00, 0x00], + 'k' => [0x00, 0x3f, 0x0c, 0x12, 0x20, 0x00, 0x00, 0x00], + 'l' => [0x00, 0x1f, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00], + 'm' => [0x00, 0x3e, 0x02, 0x3c, 0x02, 0x3c, 0x00, 0x00], + 'n' => [0x00, 0x3e, 0x02, 0x02, 0x02, 0x3c, 0x00, 0x00], + 'o' => [0x00, 0x1c, 0x22, 0x22, 0x22, 0x1c, 0x00, 0x00], + 'p' => [0x00, 0xfc, 0x24, 0x24, 0x24, 0x18, 0x00, 0x00], + 'q' => [0x00, 0x18, 0x24, 0x24, 0x24, 0xfc, 0x00, 0x00], + 'r' => [0x00, 0x3e, 0x04, 0x02, 0x02, 0x00, 0x00, 0x00], + 's' => [0x00, 0x24, 0x2a, 0x2a, 0x2a, 0x10, 0x00, 0x00], + 't' => [0x00, 0x02, 0x1f, 0x22, 0x20, 0x00, 0x00, 0x00], + 'u' => [0x00, 0x1e, 0x20, 0x20, 0x20, 0x1e, 0x00, 0x00], + 'v' => [0x00, 0x06, 0x18, 0x20, 0x18, 0x06, 0x00, 0x00], + 'w' => [0x00, 0x1e, 0x30, 0x1c, 0x30, 0x1e, 0x00, 0x00], + 'x' => [0x00, 0x22, 0x14, 0x08, 0x14, 0x22, 0x00, 0x00], + 'y' => [0x00, 0x1c, 0xa0, 0xa0, 0xa0, 0x7c, 0x00, 0x00], + 'z' => [0x00, 0x22, 0x32, 0x2a, 0x26, 0x22, 0x00, 0x00], + '{' => [0x00, 0x0c, 0x3f, 0x21, 0x00, 0x00, 0x00, 0x00], + '|' => [0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], + '}' => [0x00, 0x21, 0x3f, 0x0c, 0x00, 0x00, 0x00, 0x00], + '~' => [0x00, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00], _ => [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], } }