From e9f0711f01099ddd2513bf302ac545a335089f52 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Wed, 24 Dec 2014 16:44:24 +0100 Subject: [PATCH] getting subtree included... --- atmega32u4/cooler/Makefile | 5 +- lcdlib/.gitattributes | 4 - lcdlib/.gitignore | 18 - lcdlib/Fonts/digits_24px.c | 118 ---- lcdlib/Fonts/digits_24px.font | Bin 1452 -> 0 bytes lcdlib/Fonts/digits_32px.c | 112 ---- lcdlib/Fonts/digits_32px.font | Bin 1348 -> 0 bytes lcdlib/Fonts/font_fixed_16bit.c | 146 ----- lcdlib/Fonts/font_fixed_16bit.font | Bin 2002 -> 0 bytes lcdlib/Fonts/font_fixed_8px.c | 270 --------- lcdlib/Fonts/font_proportional_16px.c | 139 ----- lcdlib/Fonts/font_proportional_16px.font | Bin 1792 -> 0 bytes lcdlib/Fonts/font_proportional_8px.c | 98 ---- lcdlib/Fonts/font_proportional_8px.font | Bin 1112 -> 0 bytes lcdlib/Fonts/symbols_16px.c | 46 -- lcdlib/Fonts/symbols_16px.font | Bin 304 -> 0 bytes lcdlib/Fonts/symbols_8px.c | 37 -- lcdlib/Fonts/symbols_8px.font | Bin 140 -> 0 bytes lcdlib/Fonts/template_simplefont.c | 28 - lcdlib/LICENSE | 674 ----------------------- lcdlib/README.md | 63 --- lcdlib/dogm-graphic.c | 322 ----------- lcdlib/dogm-graphic.h | 418 -------------- lcdlib/font.c | 395 ------------- lcdlib/font.h | 200 ------- lcdlib/lcd-color-graphic.c | 223 -------- lcdlib/lcd-color-graphic.h | 184 ------- 27 files changed, 3 insertions(+), 3497 deletions(-) delete mode 100644 lcdlib/.gitattributes delete mode 100644 lcdlib/.gitignore delete mode 100644 lcdlib/Fonts/digits_24px.c delete mode 100644 lcdlib/Fonts/digits_24px.font delete mode 100644 lcdlib/Fonts/digits_32px.c delete mode 100644 lcdlib/Fonts/digits_32px.font delete mode 100644 lcdlib/Fonts/font_fixed_16bit.c delete mode 100644 lcdlib/Fonts/font_fixed_16bit.font delete mode 100644 lcdlib/Fonts/font_fixed_8px.c delete mode 100644 lcdlib/Fonts/font_proportional_16px.c delete mode 100644 lcdlib/Fonts/font_proportional_16px.font delete mode 100644 lcdlib/Fonts/font_proportional_8px.c delete mode 100644 lcdlib/Fonts/font_proportional_8px.font delete mode 100644 lcdlib/Fonts/symbols_16px.c delete mode 100644 lcdlib/Fonts/symbols_16px.font delete mode 100644 lcdlib/Fonts/symbols_8px.c delete mode 100644 lcdlib/Fonts/symbols_8px.font delete mode 100644 lcdlib/Fonts/template_simplefont.c delete mode 100644 lcdlib/LICENSE delete mode 100644 lcdlib/README.md delete mode 100644 lcdlib/dogm-graphic.c delete mode 100644 lcdlib/dogm-graphic.h delete mode 100644 lcdlib/font.c delete mode 100644 lcdlib/font.h delete mode 100644 lcdlib/lcd-color-graphic.c delete mode 100644 lcdlib/lcd-color-graphic.h diff --git a/atmega32u4/cooler/Makefile b/atmega32u4/cooler/Makefile index ff46822..6384206 100644 --- a/atmega32u4/cooler/Makefile +++ b/atmega32u4/cooler/Makefile @@ -8,7 +8,8 @@ MCU = atmega32u4 FORMAT = ihex TARGET = cooler -SRC = $(TARGET).c usb/usb_serial.c +SRC = $(TARGET).c usb/usb_serial.c ../../lcdlib/lcd-color-graphic.c ../../lcdlib/font.c \ + ../../lcdlib/Fonts/digits_24px.c ../../lcdlib/Fonts/digits_32px.c ../../lcdlib/Fonts/font_proportional_16px.c ../../lcdlib/Fonts/symbols_16px.c ../../lcdlib/Fonts/font_proportional_8px.c ASRC = OPT = s @@ -28,7 +29,7 @@ DEBUG = stabs CSTANDARD = -std=gnu99 # Place -D or -U options here -CDEFS = +CDEFS = -DF_CPU=8000000 # Place -I options here CINCS = diff --git a/lcdlib/.gitattributes b/lcdlib/.gitattributes deleted file mode 100644 index 0ab96b6..0000000 --- a/lcdlib/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -* text=auto -*.c text -*.h text -*.font binary \ No newline at end of file diff --git a/lcdlib/.gitignore b/lcdlib/.gitignore deleted file mode 100644 index 9fa3b1b..0000000 --- a/lcdlib/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# Object files -*.o -*.ko - -# Libraries -*.lib -*.a - -# Shared objects (inc. Windows DLLs) -*.dll -*.so -*.so.* -*.dylib - -# Executables -*.exe -*.out -*.app diff --git a/lcdlib/Fonts/digits_24px.c b/lcdlib/Fonts/digits_24px.c deleted file mode 100644 index e0af34c..0000000 --- a/lcdlib/Fonts/digits_24px.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - created with FontEditor written by H. Reddmann HaReddmann at t-online dot de - using template file by J. Michel jan at mueschelsoft.de - - File Name : digits_24px.c - Date : 13.03.2010 - Font size in bytes : 0x05AC, 1452 - Font width : 19 - Font height : 24 - Font first char : 0x25 - Font last char : 0xBE - Font bits per pixel : 1 -*/ - -#include "../font.h" -#ifdef FONTS_INCLUDE_digits_24px - - - -const uint8_t digits_24px_data[] PROGMEM = { - 0x12, 0x00, 0x03, 0x05, 0x05, 0x00, 0x0D, 0x06, 0x08, 0x04, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, - 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x04, 0x00, 0x11, 0x11, 0x11, 0x0C, 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, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x00, 0x0D, - 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, 0x0A, 0x0D, 0x09, 0x09, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x11, 0x11, 0x11, - 0xF0, 0x00, 0x00, 0xFC, 0x83, 0x01, 0x0C, 0xC3, 0x00, 0x06, 0xC6, 0x00, 0x06, 0x46, 0x00, 0x06, - 0x66, 0x00, 0x06, 0x26, 0x00, 0x0C, 0x33, 0x00, 0xFC, 0x33, 0x1E, 0xF0, 0x98, 0x7F, 0x00, 0x98, - 0x61, 0x00, 0xC8, 0xC0, 0x00, 0xCC, 0xC0, 0x00, 0xC4, 0xC0, 0x00, 0xC6, 0xC0, 0x00, 0x86, 0x61, - 0x00, 0x83, 0x7F, 0x00, 0x00, 0x1E, 0xFE, 0x01, 0x00, 0xFE, 0x01, 0x00, 0xFE, 0x01, 0x00, 0x00, - 0xFF, 0x01, 0xF0, 0xFF, 0x1F, 0xF8, 0xFF, 0x3F, 0x7C, 0x00, 0x7C, 0x0C, 0x00, 0x60, 0x0C, 0x00, - 0x60, 0x7C, 0x00, 0x7C, 0xF8, 0xFF, 0x3F, 0xF0, 0xFF, 0x1F, 0x00, 0xFF, 0x01, 0x00, 0x38, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x38, 0x00, 0x00, 0x38, 0x00, 0x00, 0x38, 0x00, 0xE0, 0xFF, 0x0F, 0xE0, - 0xFF, 0x0F, 0xE0, 0xFF, 0x0F, 0x00, 0x38, 0x00, 0x00, 0x38, 0x00, 0x00, 0x38, 0x00, 0x00, 0x38, - 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0xF0, 0x00, 0x80, 0x7F, 0x00, 0x80, 0x3F, - 0x00, 0x80, 0x0F, 0x00, 0x80, 0x07, 0x00, 0xE0, 0x00, 0x00, 0xE0, 0x00, 0x00, 0xE0, 0x00, 0x00, - 0xE0, 0x00, 0x00, 0xE0, 0x00, 0x00, 0xE0, 0x00, 0x00, 0xE0, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, - 0x7C, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x80, 0x00, 0x00, 0xE0, - 0x00, 0x00, 0xFC, 0x00, 0x00, 0x7F, 0x00, 0xC0, 0x1F, 0x00, 0xF0, 0x03, 0x00, 0xFC, 0x00, 0x00, - 0x3F, 0x00, 0xE0, 0x0F, 0x00, 0xF8, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x07, 0x00, - 0x00, 0x01, 0x00, 0x00, 0xC0, 0xFF, 0x01, 0xF0, 0xFF, 0x07, 0xFC, 0xFF, 0x1F, 0x7E, 0x00, 0x3F, - 0x0E, 0x00, 0x3C, 0x0F, 0x00, 0x78, 0x07, 0x08, 0x70, 0x07, 0x1C, 0x70, 0x07, 0x08, 0x70, 0x0F, - 0x00, 0x78, 0x0E, 0x00, 0x38, 0x7E, 0x00, 0x3F, 0xFC, 0xFF, 0x1F, 0xF0, 0xFF, 0x07, 0xC0, 0xFF, - 0x01, 0x00, 0x00, 0x70, 0x00, 0x00, 0x70, 0x0E, 0x00, 0x70, 0x0E, 0x00, 0x70, 0x0F, 0x00, 0x70, - 0x07, 0x00, 0x70, 0x07, 0x00, 0x70, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0x7F, 0x00, - 0x00, 0x70, 0x00, 0x00, 0x70, 0x00, 0x00, 0x70, 0x00, 0x00, 0x70, 0x00, 0x00, 0x70, 0x0E, 0x00, - 0x70, 0x0E, 0x00, 0x78, 0x07, 0x00, 0x7C, 0x07, 0x00, 0x7E, 0x07, 0x00, 0x77, 0x07, 0x80, 0x77, - 0x07, 0xC0, 0x73, 0x07, 0xE0, 0x71, 0x07, 0xF0, 0x70, 0x07, 0xF8, 0x70, 0x0E, 0x7C, 0x70, 0x1E, - 0x3E, 0x70, 0xFC, 0x1F, 0x70, 0xFC, 0x0F, 0x70, 0xF0, 0x03, 0x70, 0x00, 0x00, 0x38, 0x0E, 0x00, - 0x38, 0x0E, 0x00, 0x70, 0x07, 0x00, 0x70, 0x07, 0x0E, 0x70, 0x07, 0x0E, 0x70, 0x07, 0x0E, 0x70, - 0x07, 0x0E, 0x70, 0x07, 0x0E, 0x70, 0x0F, 0x1F, 0x70, 0x0E, 0x1B, 0x38, 0xFE, 0x3B, 0x3C, 0xFC, - 0xF1, 0x1F, 0xF8, 0xF0, 0x1F, 0x00, 0xC0, 0x07, 0x00, 0xC0, 0x03, 0x00, 0xE0, 0x03, 0x00, 0xF8, - 0x03, 0x00, 0xBE, 0x03, 0x00, 0x8F, 0x03, 0xC0, 0x83, 0x03, 0xE0, 0x81, 0x03, 0x78, 0x80, 0x03, - 0x1E, 0x80, 0x03, 0x0F, 0x80, 0x03, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0x7F, 0x00, - 0x80, 0x03, 0x00, 0x80, 0x03, 0x00, 0x00, 0x38, 0xFF, 0x0F, 0x38, 0xFF, 0x07, 0x70, 0xFF, 0x07, - 0x70, 0x07, 0x07, 0x70, 0x07, 0x07, 0x70, 0x07, 0x07, 0x70, 0x07, 0x07, 0x70, 0x07, 0x07, 0x70, - 0x07, 0x0F, 0x78, 0x07, 0x0E, 0x38, 0x07, 0x1E, 0x3C, 0x07, 0xFC, 0x1F, 0x00, 0xF8, 0x0F, 0x00, - 0xE0, 0x03, 0x80, 0xFF, 0x01, 0xF0, 0xFF, 0x0F, 0xF8, 0xFF, 0x1F, 0xFC, 0x30, 0x3C, 0x1E, 0x1C, - 0x38, 0x0F, 0x0C, 0x70, 0x07, 0x0E, 0x70, 0x07, 0x0E, 0x70, 0x07, 0x0E, 0x70, 0x07, 0x0E, 0x70, - 0x07, 0x1E, 0x78, 0x07, 0x3C, 0x3C, 0x0E, 0xFC, 0x3F, 0x00, 0xF8, 0x1F, 0x00, 0xE0, 0x07, 0x07, - 0x00, 0x00, 0x07, 0x00, 0x00, 0x07, 0x00, 0x00, 0x07, 0x00, 0x40, 0x07, 0x00, 0x78, 0x07, 0x00, - 0x7E, 0x07, 0xC0, 0x3F, 0x07, 0xF0, 0x0F, 0x07, 0xFE, 0x01, 0x87, 0x7F, 0x00, 0xF7, 0x0F, 0x00, - 0xFF, 0x03, 0x00, 0xFF, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xC0, 0x07, 0xF8, - 0xF0, 0x1F, 0xFC, 0xF9, 0x3F, 0xFE, 0x3B, 0x3C, 0x0F, 0x1B, 0x78, 0x07, 0x0E, 0x70, 0x07, 0x0E, - 0x70, 0x07, 0x0E, 0x70, 0x07, 0x0E, 0x70, 0x07, 0x0E, 0x70, 0x0F, 0x1B, 0x78, 0xFE, 0x3B, 0x3C, - 0xFC, 0xF9, 0x3F, 0xF8, 0xF0, 0x1F, 0x00, 0xC0, 0x07, 0xF0, 0x03, 0x00, 0xFC, 0x0F, 0x00, 0xFE, - 0x1F, 0x38, 0x1E, 0x1E, 0x70, 0x0F, 0x3C, 0x70, 0x07, 0x38, 0x70, 0x07, 0x38, 0x70, 0x07, 0x38, - 0x70, 0x07, 0x38, 0x70, 0x07, 0x18, 0x78, 0x0E, 0x1C, 0x3C, 0x1E, 0x86, 0x1F, 0xFC, 0xFF, 0x0F, - 0xF8, 0xFF, 0x07, 0xC0, 0xFF, 0x00, 0xF0, 0x01, 0x1F, 0xF0, 0x01, 0x1F, 0xF0, 0x01, 0x1F, 0xF0, - 0x01, 0x1F, 0x00, 0x30, 0x00, 0x00, 0x78, 0x00, 0x00, 0x78, 0x00, 0x00, 0xFC, 0x00, 0x00, 0xFC, - 0x00, 0x00, 0xCC, 0x00, 0x00, 0xCE, 0x01, 0x00, 0x86, 0x01, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, - 0x00, 0x03, 0x03, 0x80, 0x03, 0x07, 0x80, 0x03, 0x07, 0xC0, 0x01, 0x0E, 0xC0, 0x01, 0x0E, 0xC0, - 0x00, 0x0C, 0xE0, 0x00, 0x1C, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, - 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, - 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, - 0x87, 0x03, 0x00, 0x87, 0x03, 0x00, 0x87, 0x03, 0xE0, 0x00, 0x1C, 0xC0, 0x00, 0x0C, 0xC0, 0x01, - 0x0E, 0xC0, 0x01, 0x0E, 0x80, 0x03, 0x07, 0x80, 0x03, 0x07, 0x00, 0x03, 0x03, 0x00, 0x87, 0x03, - 0x00, 0x87, 0x03, 0x00, 0x86, 0x01, 0x00, 0xCE, 0x01, 0x00, 0xCC, 0x00, 0x00, 0xFC, 0x00, 0x00, - 0xFC, 0x00, 0x00, 0x78, 0x00, 0x00, 0x78, 0x00, 0x00, 0x30, 0x00, 0x1C, 0x00, 0x00, 0x0E, 0x00, - 0x00, 0x0E, 0x00, 0x00, 0x07, 0x00, 0x00, 0x07, 0xF0, 0x79, 0x07, 0xFC, 0x79, 0x07, 0xFE, 0x79, - 0x07, 0x1F, 0x00, 0x8F, 0x07, 0x00, 0xFE, 0x03, 0x00, 0xFC, 0x01, 0x00, 0xF8, 0x00, 0x00, 0x00, - 0x78, 0x00, 0x00, 0x38, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x1C, - 0x00, 0x00, 0x1C, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x38, 0x00, 0x00, 0x38, 0x00, 0x00, 0x70, 0x00, - 0x00, 0x70, 0x00, 0x00, 0x70, 0x00, 0x00, 0x70, 0x00, 0x00, 0x70, 0x00, 0x00, 0x38, 0x00, 0x00, - 0x3C, 0x00, 0xFF, 0xFF, 0xFF, 0x80, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x3F, 0x00, - 0x00, 0x1F, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x80, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x7F, 0x00, 0x00, - 0x3F, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0xE0, - 0x00, 0x00, 0x7F, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x78, 0x00, - 0x00, 0xFE, 0x01, 0x00, 0x86, 0x01, 0x00, 0x03, 0x03, 0x00, 0x03, 0x03, 0x00, 0x03, 0x03, 0x00, - 0x03, 0x03, 0x00, 0x86, 0x01, 0x00, 0xFE, 0x01, 0x00, 0x78, 0x00, 0x00, 0x00, 0x07, 0x1C, 0x00, - 0x07, 0x1C, 0x00, 0x07, 0x1C, 0x00, 0x07, 0x1C, 0x00, 0x07, 0x1C, 0xF8, 0xFF, 0x1C, 0xF8, 0xFF, - 0x1C, 0xF8, 0xFF, 0x1C, 0x00, 0x07, 0x1C, 0x00, 0x07, 0x1C, 0x00, 0x07, 0x1C, 0x00, 0x07, 0x1C, - 0x00, 0x07, 0x1C, 0x06, 0x18, 0x00, 0x03, 0x1C, 0x00, 0x03, 0x1E, 0x00, 0x03, 0x1F, 0x00, 0x83, - 0x1B, 0x00, 0xC3, 0x19, 0x00, 0xE7, 0x18, 0x00, 0x7E, 0x18, 0x00, 0x3C, 0x18, 0x00, 0x06, 0x0C, - 0x00, 0x03, 0x18, 0x00, 0x03, 0x18, 0x00, 0x63, 0x18, 0x00, 0x63, 0x18, 0x00, 0x63, 0x18, 0x00, - 0xF7, 0x1C, 0x00, 0xFE, 0x0F, 0x00, 0x9C, 0x07, 0x00, 0x06, 0x18, 0x00, 0x06, 0x18, 0x00, 0x03, - 0x18, 0x00, 0xFF, 0x1F, 0x00, 0xFF, 0x1F, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, - 0x00, 0x06, 0x00, 0x00, 0x06, 0x18, 0x00, 0x03, 0x18, 0x10, 0xFF, 0x1F, 0x08, 0xFF, 0x1F, 0x06, - 0x00, 0x18, 0x01, 0x00, 0x98, 0x00, 0x00, 0x40, 0x1C, 0x00, 0x30, 0x1E, 0x00, 0x88, 0x1B, 0x00, - 0xC4, 0x18, 0x00, 0x62, 0x18, 0x80, 0x39, 0x18, 0x40, 0xF8, 0xFF, 0x20, 0xF8, 0xFF, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00, 0x06, 0x18, 0x00, 0x03, 0x18, 0x10, 0xFF, 0x1F, 0x0C, - 0xFF, 0x1F, 0x02, 0x00, 0x18, 0x01, 0x00, 0xD8, 0x00, 0x00, 0x20, 0x00, 0x00, 0x10, 0xC0, 0x00, - 0x0C, 0xE0, 0x00, 0x32, 0xF0, 0x00, 0x19, 0xF8, 0xC0, 0x18, 0xDC, 0x20, 0x18, 0xCE, 0x10, 0x38, - 0xC7, 0x00, 0xF0, 0xC3, 0x00, 0xE0, 0xC1, 0x06, 0x0C, 0x00, 0x03, 0x18, 0x00, 0x03, 0x18, 0x10, - 0x63, 0x18, 0x08, 0x63, 0x18, 0x04, 0x63, 0x18, 0x03, 0xF7, 0x9C, 0x00, 0xFE, 0x47, 0x1C, 0x9C, - 0x27, 0x1E, 0x00, 0x90, 0x1B, 0x00, 0xC8, 0x18, 0x00, 0x66, 0x18, 0x00, 0x39, 0x18, 0x80, 0xF8, - 0xFF, 0x40, 0xF8, 0xFF, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00 -}; - -const struct font_info digits_24px PROGMEM = {0xAC+(0x05<<8),0x13,0x18,0x25,0xBE,digits_24px_data,(uint8_t*)digits_24px_data+0xBE -0x25+1}; - -#endif - - diff --git a/lcdlib/Fonts/digits_24px.font b/lcdlib/Fonts/digits_24px.font deleted file mode 100644 index 7caee3a9076dea7ad4842bf94d716af1d74d4ea8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1452 zcmbu9O;6N77{~v0pwD8K4(MgbHXSbNmB^*U#&XiHA(C*e@xYR7*cuY>rbiBZ1V00* zfglIM*@K7Pyw(#XX*xdBvP%&UCN{rJW}bOo{`1z^FOQY;@4Qp-i#-w-wYNP z7yJ0HZ}EP#<6{24b!vGyKR4G5da(5ipxSf#CveZ;zJj|2_bK|Ts8)mGaE!wZoM*Vm zaGK#P!~O>L#z0UzXn}DGqe~NyFzVwC!yO*7k*5%%OKxOK*J%4lfdc6mX^d1NCFJ-! z7~vLv3y^GjGBr&93LVm(6_dSGc=UMh)Pat8u z28o0kj2XAIv(vV58xlr@UBWh{+myYh{2dhum5Db>f|p69lS(Fq;Itvv;t-qDyMxq; zHwfz&QT0ogg+@lm1ae_laxCykWP2k2Acm<3QXx}ut0xs;5E>a8N*MYBIV3NnAfig6 zl$%WnE5NXUkDIvw zE*)rW5o_t zJ5=wG#wS9}i*-<=eoNQLeOE#F5CMe7-T)^{_^Gg~5GlBQ2%c5goN(o%mN+7Clnqp{ ze*z7t8(g&Z1*3aLyHE}efps4%0X`0Js_<5&YihkT%cW^!Iw5_dAJ~xZz%sDV9Pjf2 zOJ$~hEUU|f@EeK~;g=m8>BFs9Lo@Ovt^fS2*?E(qzH=%CvPO%SOmMqRx9H{ zw#@na=F^Aok6)&*-yY=QqkO(ypG1LHfz<(E>`~QCK8sqVv$Mdb^-A~g%3!+Y+4wU#S3*Q~`*gZ%?$X$f| zU8%vrK~7tk?j#j9OFNBw2ZixBiD_Po=E}&MkDcfv!mMfmChbP=MYIxhsn1Oo@}Ex! z>UyLt^n2tMdTz6pK6{;I*Vi?ELcb?8PnLTeX`40fig^|3fl zSW63)#4VD1ZeavK?fW{i3E#+#y%77J=t-RO4l|D;eL25?va_9OEE>wv?Vwp+9OPcA z#bvdb{-+eW|#yWWF)vuaXsBWWI4Gcy$M zdGIr14&S%${<$~&_u+#$F1y;}Jl^wozUMwzG1x{Q%>pgXXT_g~Ph%g*SZeBdO}w8s mcwZCVrhbj|^27Vdj++nNU4P$0V03ryK2GIDc9Y~YL*ndICLaqsk4mS!ct1W`l99O$A z!9T%2AOt~RtHXv=R|I=VaaD?egP=l4dESxs?o5(0^MGdN{h0T2M!|2NPQCf&lmB@_|^Na7D&jBoBsCdAz!~T_Ofo#7g;yl&9335?PWT@g9hV=gl zrmI*Y>|B_j_E~S@JQ81v(-)_2y^hwDA%Cro)$a6E-A2BW$tuE6tF#%^^#jy${BbKx2Am?@}%bK)_OmJV9^_e@;yz>zug>?Ts zmV2dNrh^=N&$v5%f5Kqd<;VGeJ^Pxr5z!#c*(#$fiL+20j&@1j!zkB~<;n-Bj*FGQ zp!sz~qZi<%O*%vyD_-Bm=AyXtTCYKaLJoOxaz)%UADVaO$Kgyw>t6=&Zdodl<*Y$* zFQv=sBG$7M1wtMegZ#LTpn)1VpU3DRL5=Tfleud7+$1f|CSAj?8Z)%eSE!5PTDd$V z>=jXr+FLRjn%ZI=Q>el$T!#Am;pO7bqgJj_P0lL6BYn^JeSh}@ygxlP=nJ06u+*ME zNHc}dsm5z@OA~l%P&<(7e}R)dz)cZ!=+^ke`LfV*A&=xEn_BotveS%QNsK~)me#=* zKA5yn(ovZ+pKc=q4bYt2pv5%EJ;sTPVqq8Nas8Ql6p-ak_j*MGAot9ED1Mh$@~XJ9 zJy4Bysc^~XcMRU#HqVV_jBe-B$eMA}-&9N;tp_HuX^}}al{Ci#Gh*Pf?(jYqn2qKy z&jT(0$nJI@uZxXi+6Kzr^;2PllW<^D_!Lup)$D;p8Q&!_2U_EBr2-!)vRVYCWk)-Jy`k6(wYVd3( z<#g_Je>LyWKUED)OH+awB{R8{58o{8k(C7q+(TQhtNOm`?)r~2cE8VfKX9wA@4Je1 Pn6!0o9=`6s!@Iu$1{HAQ diff --git a/lcdlib/Fonts/font_fixed_8px.c b/lcdlib/Fonts/font_fixed_8px.c deleted file mode 100644 index 849c7c4..0000000 --- a/lcdlib/Fonts/font_fixed_8px.c +++ /dev/null @@ -1,270 +0,0 @@ -#include "../font.h" -#ifdef FONTS_INCLUDE_font_fixed_8px - - -//LCD Font by Benedikt K. http://www.mikrocontroller.net/topic/54860 -const uint8_t font_fixed_8px_data[] PROGMEM={ -0x00,0x00,0x00,0x00,0x00,0x00, // 0x00 -0x00,0x3E,0x45,0x51,0x45,0x3E, // 0x01 -0x00,0x3E,0x6B,0x6F,0x6B,0x3E, // 0x02 -0x00,0x1C,0x3E,0x7C,0x3E,0x1C, // 0x03 -0x00,0x18,0x3C,0x7E,0x3C,0x18, // 0x04 -0x00,0x30,0x36,0x7F,0x36,0x30, // 0x05 -0x00,0x18,0x5C,0x7E,0x5C,0x18, // 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,0x30,0x48,0x4A,0x36,0x0E, // 0x0B -0x00,0x06,0x29,0x79,0x29,0x06, // 0x0C -0x00,0x00,0x00,0x00,0x00,0x00, // 0x0D -0x00,0x60,0x7E,0x0A,0x35,0x3F, // 0x0E -0x00,0x2A,0x1C,0x36,0x1C,0x2A, // 0x0F -0x00,0x00,0x7F,0x3E,0x1C,0x08, // 0x10 -0x00,0x08,0x1C,0x3E,0x7F,0x00, // 0x11 -0x00,0x14,0x36,0x7F,0x36,0x14, // 0x12 -0x00,0x00,0x5F,0x00,0x5F,0x00, // 0x13 -0x00,0x06,0x09,0x7F,0x01,0x7F, // 0x14 -0x00,0x22,0x4D,0x55,0x59,0x22, // 0x15 -0x00,0x60,0x60,0x60,0x60,0x00, // 0x16 -0x00,0x14,0xB6,0xFF,0xB6,0x14, // 0x17 -0x00,0x04,0x06,0x7F,0x06,0x04, // 0x18 -0x00,0x10,0x30,0x7F,0x30,0x10, // 0x19 -0x00,0x08,0x08,0x3E,0x1C,0x08, // 0x1A -0x00,0x08,0x1C,0x3E,0x08,0x08, // 0x1B -0x00,0x78,0x40,0x40,0x40,0x40, // 0x1C -0x00,0x08,0x3E,0x08,0x3E,0x08, // 0x1D -0x00,0x30,0x3C,0x3F,0x3C,0x30, // 0x1E -0x00,0x03,0x0F,0x3F,0x0F,0x03, // 0x1F -0x00,0x00,0x00,0x00,0x00,0x00, // 0x20 -0x00,0x00,0x06,0x5F,0x06,0x00, // 0x21 -0x00,0x07,0x03,0x00,0x07,0x03, // 0x22 -0x00,0x24,0x7E,0x24,0x7E,0x24, // 0x23 -0x00,0x24,0x2B,0x6A,0x12,0x00, // 0x24 -0x00,0x63,0x13,0x08,0x64,0x63, // 0x25 -0x00,0x36,0x49,0x56,0x20,0x50, // 0x26 -0x00,0x00,0x07,0x03,0x00,0x00, // 0x27 -0x00,0x00,0x3E,0x41,0x00,0x00, // 0x28 -0x00,0x00,0x41,0x3E,0x00,0x00, // 0x29 -0x00,0x08,0x3E,0x1C,0x3E,0x08, // 0x2A -0x00,0x08,0x08,0x3E,0x08,0x08, // 0x2B -0x00,0x00,0xE0,0x60,0x00,0x00, // 0x2C -0x00,0x08,0x08,0x08,0x08,0x08, // 0x2D -0x00,0x00,0x60,0x60,0x00,0x00, // 0x2E -0x00,0x20,0x10,0x08,0x04,0x02, // 0x2F -0x00,0x3E,0x51,0x49,0x45,0x3E, // 0x30 -0x00,0x00,0x42,0x7F,0x40,0x00, // 0x31 -0x00,0x62,0x51,0x49,0x49,0x46, // 0x32 -0x00,0x22,0x49,0x49,0x49,0x36, // 0x33 -0x00,0x18,0x14,0x12,0x7F,0x10, // 0x34 -0x00,0x2F,0x49,0x49,0x49,0x31, // 0x35 -0x00,0x3C,0x4A,0x49,0x49,0x30, // 0x36 -0x00,0x01,0x71,0x09,0x05,0x03, // 0x37 -0x00,0x36,0x49,0x49,0x49,0x36, // 0x38 -0x00,0x06,0x49,0x49,0x29,0x1E, // 0x39 -0x00,0x00,0x6C,0x6C,0x00,0x00, // 0x3A -0x00,0x00,0xEC,0x6C,0x00,0x00, // 0x3B -0x00,0x08,0x14,0x22,0x41,0x00, // 0x3C -0x00,0x24,0x24,0x24,0x24,0x24, // 0x3D -0x00,0x00,0x41,0x22,0x14,0x08, // 0x3E -0x00,0x02,0x01,0x59,0x09,0x06, // 0x3F -0x00,0x3E,0x41,0x5D,0x55,0x1E, // 0x40 -0x00,0x7E,0x11,0x11,0x11,0x7E, // 0x41 -0x00,0x7F,0x49,0x49,0x49,0x36, // 0x42 -0x00,0x3E,0x41,0x41,0x41,0x22, // 0x43 -0x00,0x7F,0x41,0x41,0x41,0x3E, // 0x44 -0x00,0x7F,0x49,0x49,0x49,0x41, // 0x45 -0x00,0x7F,0x09,0x09,0x09,0x01, // 0x46 -0x00,0x3E,0x41,0x49,0x49,0x7A, // 0x47 -0x00,0x7F,0x08,0x08,0x08,0x7F, // 0x48 -0x00,0x00,0x41,0x7F,0x41,0x00, // 0x49 -0x00,0x30,0x40,0x40,0x40,0x3F, // 0x4A -0x00,0x7F,0x08,0x14,0x22,0x41, // 0x4B -0x00,0x7F,0x40,0x40,0x40,0x40, // 0x4C -0x00,0x7F,0x02,0x04,0x02,0x7F, // 0x4D -0x00,0x7F,0x02,0x04,0x08,0x7F, // 0x4E -0x00,0x3E,0x41,0x41,0x41,0x3E, // 0x4F -0x00,0x7F,0x09,0x09,0x09,0x06, // 0x50 -0x00,0x3E,0x41,0x51,0x21,0x5E, // 0x51 -0x00,0x7F,0x09,0x09,0x19,0x66, // 0x52 -0x00,0x26,0x49,0x49,0x49,0x32, // 0x53 -0x00,0x01,0x01,0x7F,0x01,0x01, // 0x54 -0x00,0x3F,0x40,0x40,0x40,0x3F, // 0x55 -0x00,0x1F,0x20,0x40,0x20,0x1F, // 0x56 -0x00,0x3F,0x40,0x3C,0x40,0x3F, // 0x57 -0x00,0x63,0x14,0x08,0x14,0x63, // 0x58 -0x00,0x07,0x08,0x70,0x08,0x07, // 0x59 -0x00,0x71,0x49,0x45,0x43,0x00, // 0x5A -0x00,0x00,0x7F,0x41,0x41,0x00, // 0x5B -0x00,0x02,0x04,0x08,0x10,0x20, // 0x5C -0x00,0x00,0x41,0x41,0x7F,0x00, // 0x5D -0x00,0x04,0x02,0x01,0x02,0x04, // 0x5E -0x80,0x80,0x80,0x80,0x80,0x80, // 0x5F -0x00,0x00,0x03,0x07,0x00,0x00, // 0x60 -0x00,0x20,0x54,0x54,0x54,0x78, // 0x61 -0x00,0x7F,0x44,0x44,0x44,0x38, // 0x62 -0x00,0x38,0x44,0x44,0x44,0x28, // 0x63 -0x00,0x38,0x44,0x44,0x44,0x7F, // 0x64 -0x00,0x38,0x54,0x54,0x54,0x08, // 0x65 -0x00,0x08,0x7E,0x09,0x09,0x00, // 0x66 -0x00,0x18,0xA4,0xA4,0xA4,0x7C, // 0x67 -0x00,0x7F,0x04,0x04,0x78,0x00, // 0x68 -0x00,0x00,0x00,0x7D,0x40,0x00, // 0x69 -0x00,0x40,0x80,0x84,0x7D,0x00, // 0x6A -0x00,0x7F,0x10,0x28,0x44,0x00, // 0x6B -0x00,0x00,0x00,0x7F,0x40,0x00, // 0x6C -0x00,0x7C,0x04,0x18,0x04,0x78, // 0x6D -0x00,0x7C,0x04,0x04,0x78,0x00, // 0x6E -0x00,0x38,0x44,0x44,0x44,0x38, // 0x6F -0x00,0xFC,0x44,0x44,0x44,0x38, // 0x70 -0x00,0x38,0x44,0x44,0x44,0xFC, // 0x71 -0x00,0x44,0x78,0x44,0x04,0x08, // 0x72 -0x00,0x08,0x54,0x54,0x54,0x20, // 0x73 -0x00,0x04,0x3E,0x44,0x24,0x00, // 0x74 -0x00,0x3C,0x40,0x20,0x7C,0x00, // 0x75 -0x00,0x1C,0x20,0x40,0x20,0x1C, // 0x76 -0x00,0x3C,0x60,0x30,0x60,0x3C, // 0x77 -0x00,0x6C,0x10,0x10,0x6C,0x00, // 0x78 -0x00,0x9C,0xA0,0x60,0x3C,0x00, // 0x79 -0x00,0x64,0x54,0x54,0x4C,0x00, // 0x7A -0x00,0x08,0x3E,0x41,0x41,0x00, // 0x7B -0x00,0x00,0x00,0x77,0x00,0x00, // 0x7C -0x00,0x00,0x41,0x41,0x3E,0x08, // 0x7D -0x00,0x02,0x01,0x02,0x01,0x00, // 0x7E -0x00,0x3C,0x26,0x23,0x26,0x3C, // 0x7F -0x00,0x1E,0xA1,0xE1,0x21,0x12, // 0x80 -0x00,0x3D,0x40,0x20,0x7D,0x00, // 0x81 -0x00,0x38,0x54,0x54,0x55,0x09, // 0x82 -0x00,0x20,0x55,0x55,0x55,0x78, // 0x83 -0x00,0x20,0x55,0x54,0x55,0x78, // 0x84 -0x00,0x20,0x55,0x55,0x54,0x78, // 0x85 -0x00,0x20,0x57,0x55,0x57,0x78, // 0x86 -0x00,0x1C,0xA2,0xE2,0x22,0x14, // 0x87 -0x00,0x38,0x55,0x55,0x55,0x08, // 0x88 -0x00,0x38,0x55,0x54,0x55,0x08, // 0x89 -0x00,0x38,0x55,0x55,0x54,0x08, // 0x8A -0x00,0x00,0x01,0x7C,0x41,0x00, // 0x8B -0x00,0x00,0x01,0x7D,0x41,0x00, // 0x8C -0x00,0x00,0x01,0x7C,0x40,0x00, // 0x8D -0x00,0x70,0x29,0x24,0x29,0x70, // 0x8E -0x00,0x78,0x2F,0x25,0x2F,0x78, // 0x8F -0x00,0x7C,0x54,0x54,0x55,0x45, // 0x90 -0x00,0x34,0x54,0x7C,0x54,0x58, // 0x91 -0x00,0x7E,0x09,0x7F,0x49,0x49, // 0x92 -0x00,0x38,0x45,0x45,0x39,0x00, // 0x93 -0x00,0x38,0x45,0x44,0x39,0x00, // 0x94 -0x00,0x39,0x45,0x44,0x38,0x00, // 0x95 -0x00,0x3C,0x41,0x21,0x7D,0x00, // 0x96 -0x00,0x3D,0x41,0x20,0x7C,0x00, // 0x97 -0x00,0x9C,0xA1,0x60,0x3D,0x00, // 0x98 -0x00,0x3D,0x42,0x42,0x3D,0x00, // 0x99 -0x00,0x3C,0x41,0x40,0x3D,0x00, // 0x9A -0x80,0x70,0x68,0x58,0x38,0x04, // 0x9B -0x00,0x48,0x3E,0x49,0x49,0x62, // 0x9C -0x00,0x7E,0x61,0x5D,0x43,0x3F, // 0x9D -0x00,0x22,0x14,0x08,0x14,0x22, // 0x9E -0x00,0x40,0x88,0x7E,0x09,0x02, // 0x9F -0x00,0x20,0x54,0x55,0x55,0x78, // 0xA0 -0x00,0x00,0x00,0x7D,0x41,0x00, // 0xA1 -0x00,0x38,0x44,0x45,0x39,0x00, // 0xA2 -0x00,0x3C,0x40,0x21,0x7D,0x00, // 0xA3 -0x00,0x7A,0x09,0x0A,0x71,0x00, // 0xA4 -0x00,0x7A,0x11,0x22,0x79,0x00, // 0xA5 -0x00,0x08,0x55,0x55,0x55,0x5E, // 0xA6 -0x00,0x4E,0x51,0x51,0x4E,0x00, // 0xA7 -0x00,0x30,0x48,0x4D,0x40,0x20, // 0xA8 -0x3E,0x41,0x5D,0x4B,0x55,0x3E, // 0xA9 -0x04,0x04,0x04,0x04,0x04,0x1C, // 0xAA -0x00,0x17,0x08,0x4C,0x6A,0x50, // 0xAB -0x00,0x17,0x08,0x34,0x2A,0x78, // 0xAC -0x00,0x00,0x30,0x7D,0x30,0x00, // 0xAD -0x00,0x08,0x14,0x00,0x08,0x14, // 0xAE -0x00,0x14,0x08,0x00,0x14,0x08, // 0xAF -0x44,0x11,0x44,0x11,0x44,0x11, // 0xB0 -0xAA,0x55,0xAA,0x55,0xAA,0x55, // 0xB1 -0xBB,0xEE,0xBB,0xEE,0xBB,0xEE, // 0xB2 -0x00,0x00,0x00,0xFF,0x00,0x00, // 0xB3 -0x08,0x08,0x08,0xFF,0x00,0x00, // 0xB4 -0x00,0x70,0x28,0x25,0x29,0x70, // 0xB5 -0x00,0x70,0x29,0x25,0x29,0x70, // 0xB6 -0x00,0x70,0x29,0x25,0x28,0x70, // 0xB7 -0x3E,0x41,0x5D,0x55,0x41,0x3E, // 0xB8 -0x0A,0xFB,0x00,0xFF,0x00,0x00, // 0xB9 -0x00,0xFF,0x00,0xFF,0x00,0x00, // 0xBA -0x0A,0xFA,0x02,0xFE,0x00,0x00, // 0xBB -0x0A,0x0B,0x08,0x0F,0x00,0x00, // 0xBC -0x00,0x18,0x24,0x66,0x24,0x00, // 0xBD -0x00,0x29,0x2A,0x7C,0x2A,0x29, // 0xBE -0x08,0x08,0x08,0xF8,0x00,0x00, // 0xBF -0x00,0x00,0x00,0x0F,0x08,0x08, // 0xC0 -0x08,0x08,0x08,0x0F,0x08,0x08, // 0xC1 -0x08,0x08,0x08,0xF8,0x08,0x08, // 0xC2 -0x00,0x00,0x00,0xFF,0x08,0x08, // 0xC3 -0x08,0x08,0x08,0x08,0x08,0x08, // 0xC4 -0x08,0x08,0x08,0xFF,0x08,0x08, // 0xC5 -0x00,0x20,0x56,0x55,0x56,0x79, // 0xC6 -0x00,0x70,0x2A,0x25,0x2A,0x71, // 0xC7 -0x00,0x0F,0x08,0x0B,0x0A,0x0A, // 0xC8 -0x00,0xFE,0x02,0xFA,0x0A,0x0A, // 0xC9 -0x0A,0x0B,0x08,0x0B,0x0A,0x0A, // 0xCA -0x0A,0xFA,0x02,0xFA,0x0A,0x0A, // 0xCB -0x00,0xFF,0x00,0xFB,0x0A,0x0A, // 0xCC -0x0A,0x0A,0x0A,0x0A,0x0A,0x0A, // 0xCD -0x0A,0xFB,0x00,0xFB,0x0A,0x0A, // 0xCE -0x00,0x5D,0x22,0x22,0x22,0x5D, // 0xCF -0x00,0x22,0x55,0x59,0x30,0x00, // 0xD0 -0x00,0x08,0x7F,0x49,0x41,0x3E, // 0xD1 -0x00,0x7C,0x55,0x55,0x55,0x44, // 0xD2 -0x00,0x7C,0x55,0x54,0x55,0x44, // 0xD3 -0x00,0x7C,0x55,0x55,0x54,0x44, // 0xD4 -0x00,0x00,0x00,0x07,0x00,0x00, // 0xD5 -0x00,0x00,0x44,0x7D,0x45,0x00, // 0xD6 -0x00,0x00,0x45,0x7D,0x45,0x00, // 0xD7 -0x00,0x00,0x45,0x7C,0x45,0x00, // 0xD8 -0x08,0x08,0x08,0x0F,0x00,0x00, // 0xD9 -0x00,0x00,0x00,0xF8,0x08,0x08, // 0xDA -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, // 0xDB -0xF0,0xF0,0xF0,0xF0,0xF0,0xF0, // 0xDC -0x00,0x00,0x00,0x77,0x00,0x00, // 0xDD -0x00,0x00,0x45,0x7D,0x44,0x00, // 0xDE -0x0F,0x0F,0x0F,0x0F,0x0F,0x0F, // 0xDF -0x00,0x3C,0x42,0x43,0x3D,0x00, // 0xE0 -0x00,0xFE,0x4A,0x4A,0x34,0x00, // 0xE1 -0x00,0x3C,0x43,0x43,0x3D,0x00, // 0xE2 -0x00,0x3D,0x43,0x42,0x3C,0x00, // 0xE3 -0x00,0x32,0x49,0x4A,0x31,0x00, // 0xE4 -0x00,0x3A,0x45,0x46,0x39,0x00, // 0xE5 -0x00,0xFC,0x20,0x20,0x1C,0x00, // 0xE6 -0x00,0xFE,0xAA,0x28,0x10,0x00, // 0xE7 -0x00,0xFF,0xA5,0x24,0x18,0x00, // 0xE8 -0x00,0x3C,0x40,0x41,0x3D,0x00, // 0xE9 -0x00,0x3C,0x41,0x41,0x3D,0x00, // 0xEA -0x00,0x3D,0x41,0x40,0x3C,0x00, // 0xEB -0x00,0x9C,0xA0,0x61,0x3D,0x00, // 0xEC -0x00,0x04,0x08,0x71,0x09,0x04, // 0xED -0x00,0x00,0x02,0x02,0x02,0x00, // 0xEE -0x00,0x00,0x07,0x03,0x00,0x00, // 0xEF -0x00,0x00,0x08,0x08,0x08,0x00, // 0xF0 -0x00,0x00,0x24,0x2E,0x24,0x00, // 0xF1 -0x00,0x24,0x24,0x24,0x24,0x24, // 0xF2 -0x05,0x17,0x0A,0x34,0x2A,0x78, // 0xF3 -0x00,0x06,0x09,0x7F,0x01,0x7F, // 0xF4 -0x00,0x22,0x4D,0x55,0x59,0x22, // 0xF5 -0x00,0x08,0x08,0x2A,0x08,0x08, // 0xF6 -0x00,0x00,0x08,0x18,0x18,0x00, // 0xF7 -0x00,0x06,0x09,0x09,0x06,0x00, // 0xF8 -0x00,0x00,0x08,0x00,0x08,0x00, // 0xF9 -0x00,0x00,0x08,0x00,0x00,0x00, // 0xFA -0x00,0x02,0x0F,0x00,0x00,0x00, // 0xFB -0x00,0x09,0x0F,0x05,0x00,0x00, // 0xFC -0x00,0x09,0x0D,0x0A,0x00,0x00, // 0xFD -0x00,0x3C,0x3C,0x3C,0x3C,0x00, // 0xFE -0x00,0x00,0x00,0x00,0x00,0x00 // 0xFF -}; - -//the main information about font -const struct font_info font_fixed_8px PROGMEM = {256*6,6,8,0x00,0xFF,0,font_fixed_8px_data}; - - -#endif - diff --git a/lcdlib/Fonts/font_proportional_16px.c b/lcdlib/Fonts/font_proportional_16px.c deleted file mode 100644 index 9d574f5..0000000 --- a/lcdlib/Fonts/font_proportional_16px.c +++ /dev/null @@ -1,139 +0,0 @@ -/* - created with FontEditor written by H. Reddmann HaReddmann at t-online dot de - using template file by J. Michel jan at mueschelsoft.de - - File Name : font_proportional_16px.c - Date : 05.09.2010 - Font size in bytes : 0x0700, 1792 - Font width : 11 - Font height : 16 - Font first char : 0x20 - Font last char : 0xFC - Font bits per pixel : 1 -*/ - -#include "../font.h" -#ifdef FONTS_INCLUDE_font_proportional_16px - - - -const uint8_t font_proportional_16px_data[] PROGMEM = { - 0x04, 0x02, 0x05, 0x08, 0x07, 0x09, 0x07, 0x02, 0x04, 0x04, 0x06, 0x07, 0x03, 0x05, 0x02, 0x07, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x02, 0x03, 0x05, 0x08, 0x05, 0x06, - 0x09, 0x08, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x07, 0x04, 0x05, 0x07, 0x06, 0x08, 0x07, 0x07, - 0x07, 0x07, 0x07, 0x07, 0x06, 0x07, 0x08, 0x0A, 0x08, 0x08, 0x06, 0x04, 0x05, 0x04, 0x08, 0x08, - 0x03, 0x06, 0x06, 0x05, 0x06, 0x06, 0x05, 0x06, 0x06, 0x02, 0x03, 0x06, 0x02, 0x08, 0x06, 0x06, - 0x06, 0x06, 0x05, 0x06, 0x05, 0x06, 0x07, 0x08, 0x06, 0x07, 0x06, 0x06, 0x02, 0x06, 0x07, 0x00, - 0x07, 0x00, 0x03, 0x00, 0x06, 0x08, 0x07, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x03, 0x03, 0x06, 0x06, 0x07, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, - 0x06, 0x09, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x08, 0x0A, 0x0A, 0x0A, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x0D, 0xF8, 0x0D, 0x3C, 0x00, 0x3C, 0x00, - 0x00, 0x00, 0x3C, 0x00, 0x3C, 0x00, 0x00, 0x03, 0x60, 0x0F, 0xE0, 0x03, 0x78, 0x03, 0x60, 0x0F, - 0xE0, 0x03, 0x78, 0x03, 0x60, 0x00, 0x70, 0x04, 0xF8, 0x08, 0x88, 0x08, 0xFC, 0x1F, 0x88, 0x08, - 0x88, 0x0F, 0x10, 0x07, 0xF8, 0x00, 0x88, 0x00, 0xF8, 0x0C, 0x00, 0x03, 0x80, 0x00, 0x60, 0x00, - 0x98, 0x0F, 0x80, 0x08, 0x80, 0x0F, 0x70, 0x07, 0xF8, 0x0F, 0x88, 0x08, 0xF8, 0x09, 0x70, 0x07, - 0x00, 0x0E, 0x00, 0x0B, 0x3C, 0x00, 0x3C, 0x00, 0xE0, 0x0F, 0xF8, 0x3F, 0x1C, 0x70, 0x04, 0x40, - 0x04, 0x40, 0x1C, 0x70, 0xF8, 0x3F, 0xE0, 0x0F, 0x28, 0x00, 0x10, 0x00, 0x7C, 0x00, 0x7C, 0x00, - 0x10, 0x00, 0x28, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0xF0, 0x07, 0x80, 0x00, 0x80, 0x00, - 0x80, 0x00, 0x00, 0x18, 0x00, 0x1E, 0x00, 0x06, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, - 0x80, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x03, 0xC0, 0x00, 0x30, 0x00, - 0x0C, 0x00, 0x00, 0x00, 0xF0, 0x07, 0xF8, 0x0F, 0x08, 0x08, 0x08, 0x08, 0xF8, 0x0F, 0xF0, 0x07, - 0x10, 0x08, 0x10, 0x08, 0xF8, 0x0F, 0xF8, 0x0F, 0x00, 0x08, 0x00, 0x08, 0x30, 0x0C, 0x08, 0x0E, - 0x08, 0x0B, 0x88, 0x09, 0xF8, 0x08, 0x70, 0x08, 0x10, 0x04, 0x08, 0x08, 0x88, 0x08, 0x88, 0x08, - 0xF8, 0x0F, 0x70, 0x07, 0x80, 0x01, 0x60, 0x01, 0x10, 0x01, 0xF8, 0x0F, 0xF8, 0x0F, 0x00, 0x01, - 0x00, 0x04, 0x78, 0x08, 0x78, 0x08, 0x48, 0x08, 0xC8, 0x0F, 0x88, 0x07, 0xE0, 0x07, 0xF0, 0x0F, - 0x58, 0x08, 0x48, 0x08, 0xC8, 0x0F, 0x80, 0x07, 0x08, 0x00, 0x08, 0x0E, 0x88, 0x0F, 0xE8, 0x01, - 0x78, 0x00, 0x18, 0x00, 0x70, 0x07, 0xF8, 0x0F, 0x88, 0x08, 0x88, 0x08, 0xF8, 0x0F, 0x70, 0x07, - 0xF0, 0x00, 0xF8, 0x09, 0x08, 0x09, 0x08, 0x0D, 0xF8, 0x07, 0xF0, 0x03, 0x60, 0x0C, 0x60, 0x0C, - 0x00, 0x18, 0x30, 0x1E, 0x30, 0x06, 0x80, 0x01, 0xC0, 0x03, 0x60, 0x06, 0x30, 0x0C, 0x18, 0x18, - 0x30, 0x03, 0x30, 0x03, 0x30, 0x03, 0x30, 0x03, 0x30, 0x03, 0x30, 0x03, 0x30, 0x03, 0x30, 0x03, - 0x18, 0x18, 0x30, 0x0C, 0x60, 0x06, 0xC0, 0x03, 0x80, 0x01, 0x10, 0x00, 0x08, 0x00, 0x88, 0x0D, - 0xC8, 0x0D, 0x78, 0x00, 0x30, 0x00, 0xE0, 0x07, 0x10, 0x08, 0xC8, 0x13, 0xE8, 0x17, 0x28, 0x14, - 0xE8, 0x13, 0xE8, 0x17, 0x10, 0x14, 0xE0, 0x03, 0x00, 0x0C, 0x80, 0x0F, 0xE0, 0x03, 0x38, 0x01, - 0x38, 0x01, 0xE0, 0x03, 0x80, 0x0F, 0x00, 0x0C, 0xF8, 0x0F, 0xF8, 0x0F, 0x88, 0x08, 0x88, 0x08, - 0x88, 0x08, 0xF8, 0x0F, 0x70, 0x07, 0xF0, 0x07, 0xF8, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x30, 0x06, 0xF8, 0x0F, 0xF8, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x18, 0x0C, 0xF0, 0x07, - 0xE0, 0x03, 0xF8, 0x0F, 0xF8, 0x0F, 0x88, 0x08, 0x88, 0x08, 0x88, 0x08, 0x08, 0x08, 0xF8, 0x0F, - 0xF8, 0x0F, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x08, 0x00, 0xF0, 0x07, 0xF8, 0x0F, 0x08, 0x08, - 0x08, 0x08, 0x88, 0x08, 0x88, 0x0F, 0xB0, 0x0F, 0xF8, 0x0F, 0xF8, 0x0F, 0x80, 0x00, 0x80, 0x00, - 0x80, 0x00, 0xF8, 0x0F, 0xF8, 0x0F, 0x08, 0x08, 0xF8, 0x0F, 0xF8, 0x0F, 0x08, 0x08, 0x00, 0x08, - 0x08, 0x08, 0x08, 0x08, 0xF8, 0x0F, 0xF8, 0x07, 0xF8, 0x0F, 0xF8, 0x0F, 0xC0, 0x01, 0x60, 0x03, - 0x30, 0x06, 0x18, 0x0C, 0x08, 0x08, 0xF8, 0x0F, 0xF8, 0x0F, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, - 0x00, 0x08, 0xF8, 0x0F, 0x78, 0x00, 0xE0, 0x01, 0x80, 0x07, 0x80, 0x01, 0x60, 0x00, 0xF8, 0x0F, - 0xF8, 0x0F, 0xF8, 0x0F, 0x18, 0x00, 0x78, 0x00, 0xE0, 0x01, 0x80, 0x07, 0x00, 0x0E, 0xF8, 0x0F, - 0xF0, 0x07, 0xF8, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xF8, 0x0F, 0xF0, 0x07, 0xF8, 0x0F, - 0xF8, 0x0F, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01, 0xF8, 0x01, 0xF0, 0x00, 0xF0, 0x07, 0xF8, 0x0F, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x18, 0xF8, 0x1F, 0xF0, 0x17, 0xF8, 0x0F, 0xF8, 0x0F, 0x88, 0x00, - 0x88, 0x01, 0x88, 0x03, 0xF8, 0x06, 0x70, 0x0C, 0x70, 0x06, 0xF8, 0x08, 0x88, 0x08, 0x88, 0x08, - 0x88, 0x08, 0x88, 0x0F, 0x30, 0x07, 0x08, 0x00, 0x08, 0x00, 0xF8, 0x0F, 0xF8, 0x0F, 0x08, 0x00, - 0x08, 0x00, 0xF8, 0x07, 0xF8, 0x0F, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0xF8, 0x0F, 0xF8, 0x07, - 0x38, 0x00, 0xF8, 0x00, 0xC0, 0x03, 0x00, 0x0F, 0x00, 0x0F, 0xC0, 0x03, 0xF8, 0x00, 0x38, 0x00, - 0xF8, 0x03, 0xF8, 0x0F, 0x00, 0x0F, 0xC0, 0x03, 0xF0, 0x00, 0xF0, 0x00, 0xC0, 0x03, 0x00, 0x0F, - 0xF8, 0x0F, 0xF8, 0x03, 0x18, 0x0C, 0x38, 0x0E, 0x60, 0x03, 0xC0, 0x01, 0xC0, 0x01, 0x60, 0x03, - 0x38, 0x0E, 0x18, 0x0C, 0x18, 0x00, 0x78, 0x00, 0xE0, 0x00, 0x80, 0x0F, 0x80, 0x0F, 0xE0, 0x00, - 0x78, 0x00, 0x18, 0x00, 0x08, 0x0E, 0x08, 0x0F, 0x88, 0x09, 0xC8, 0x08, 0x78, 0x08, 0x38, 0x08, - 0xFC, 0x1F, 0xFC, 0x1F, 0x04, 0x10, 0x04, 0x10, 0x0C, 0x00, 0x30, 0x00, 0xC0, 0x00, 0x00, 0x03, - 0x00, 0x0C, 0x04, 0x10, 0x04, 0x10, 0xFC, 0x1F, 0xFC, 0x1F, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00, - 0x08, 0x00, 0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, - 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x04, 0x00, 0x0C, 0x00, 0x08, 0x00, - 0x00, 0x06, 0x40, 0x0F, 0x20, 0x09, 0x20, 0x09, 0xE0, 0x0F, 0xC0, 0x0F, 0xFC, 0x0F, 0xFC, 0x0F, - 0x40, 0x08, 0x20, 0x08, 0xE0, 0x0F, 0xC0, 0x07, 0xC0, 0x07, 0xE0, 0x0F, 0x20, 0x08, 0x20, 0x08, - 0x40, 0x04, 0xC0, 0x07, 0xE0, 0x0F, 0x20, 0x08, 0x20, 0x04, 0xFC, 0x0F, 0xFC, 0x0F, 0xC0, 0x07, - 0xE0, 0x0F, 0x20, 0x09, 0x20, 0x09, 0xE0, 0x09, 0xC0, 0x05, 0x20, 0x00, 0xF8, 0x0F, 0xFC, 0x0F, - 0x24, 0x00, 0x04, 0x00, 0xC0, 0x27, 0xE0, 0x4F, 0x20, 0x48, 0x20, 0x44, 0xE0, 0x7F, 0xE0, 0x3F, - 0xFC, 0x0F, 0xFC, 0x0F, 0x40, 0x00, 0x20, 0x00, 0xE0, 0x0F, 0xC0, 0x0F, 0xEC, 0x0F, 0xEC, 0x0F, - 0x20, 0x40, 0xEC, 0x7F, 0xEC, 0x3F, 0xFC, 0x0F, 0xFC, 0x0F, 0x80, 0x03, 0xC0, 0x06, 0x60, 0x0C, - 0x20, 0x08, 0xFC, 0x0F, 0xFC, 0x0F, 0xE0, 0x0F, 0xE0, 0x0F, 0x20, 0x00, 0xE0, 0x0F, 0xC0, 0x0F, - 0x20, 0x00, 0xE0, 0x0F, 0xC0, 0x0F, 0xE0, 0x0F, 0xE0, 0x0F, 0x40, 0x00, 0x20, 0x00, 0xE0, 0x0F, - 0xC0, 0x0F, 0xC0, 0x07, 0xE0, 0x0F, 0x20, 0x08, 0x20, 0x08, 0xE0, 0x0F, 0xC0, 0x07, 0xE0, 0x7F, - 0xE0, 0x7F, 0x40, 0x08, 0x20, 0x08, 0xE0, 0x0F, 0xC0, 0x07, 0xC0, 0x07, 0xE0, 0x0F, 0x20, 0x08, - 0x20, 0x04, 0xE0, 0x7F, 0xE0, 0x7F, 0xE0, 0x0F, 0xE0, 0x0F, 0x40, 0x00, 0x60, 0x00, 0x60, 0x00, - 0xC0, 0x04, 0xE0, 0x09, 0xA0, 0x09, 0x20, 0x0B, 0x20, 0x0F, 0x40, 0x06, 0x20, 0x00, 0xF8, 0x07, - 0xF8, 0x0F, 0x20, 0x08, 0x20, 0x08, 0xE0, 0x07, 0xE0, 0x0F, 0x00, 0x08, 0x00, 0x04, 0xE0, 0x0F, - 0xE0, 0x0F, 0xE0, 0x00, 0xE0, 0x03, 0x00, 0x0F, 0x00, 0x0C, 0x00, 0x0F, 0xE0, 0x03, 0xE0, 0x00, - 0xE0, 0x00, 0xE0, 0x07, 0x00, 0x0E, 0xC0, 0x03, 0xC0, 0x03, 0x00, 0x0E, 0xE0, 0x07, 0xE0, 0x00, - 0x60, 0x0C, 0xE0, 0x0E, 0x80, 0x03, 0x80, 0x03, 0xE0, 0x0E, 0x60, 0x0C, 0xE0, 0x00, 0xE0, 0x03, - 0x00, 0x6F, 0x00, 0x7C, 0x00, 0x1F, 0xE0, 0x03, 0xE0, 0x00, 0x20, 0x0C, 0x20, 0x0E, 0x20, 0x0B, - 0xA0, 0x09, 0xE0, 0x08, 0x60, 0x08, 0x80, 0x00, 0x80, 0x00, 0xF8, 0x1F, 0x7C, 0x3F, 0x04, 0x20, - 0x04, 0x20, 0xFC, 0x3F, 0xFC, 0x3F, 0x04, 0x20, 0x04, 0x20, 0x7C, 0x3F, 0xF8, 0x1F, 0x80, 0x00, - 0x80, 0x00, 0x80, 0x03, 0xC0, 0x00, 0xC0, 0x00, 0x80, 0x01, 0x00, 0x03, 0x00, 0x03, 0xC0, 0x01, - 0xE0, 0x03, 0xF0, 0x07, 0x58, 0x0D, 0x48, 0x09, 0x48, 0x09, 0x48, 0x09, 0x10, 0x04, 0x00, 0x20, - 0x00, 0x3C, 0x00, 0x1C, 0x00, 0x20, 0x00, 0x3C, 0x00, 0x1C, 0x00, 0x20, 0x00, 0x3C, 0x00, 0x1C, - 0x00, 0x0C, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x0C, - 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0xFC, 0x07, 0xFC, 0x07, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x10, 0x01, 0x10, 0x01, 0xFC, 0x07, 0xFC, 0x07, 0x10, 0x01, 0x10, 0x01, 0x00, 0x00, 0x08, 0x00, - 0x0C, 0x00, 0x04, 0x00, 0x0C, 0x00, 0x08, 0x00, 0x1C, 0x00, 0x3C, 0x00, 0x20, 0x00, 0x20, 0x00, - 0x3C, 0x00, 0x1C, 0x00, 0x1C, 0x00, 0x3C, 0x00, 0x20, 0x00, 0x1C, 0x00, 0x3C, 0x00, 0x20, 0x00, - 0x20, 0x00, 0x3C, 0x00, 0x1C, 0x00, 0x20, 0x00, 0x3C, 0x00, 0x1C, 0x00, 0x00, 0x00, 0xC0, 0x03, - 0xE0, 0x07, 0xE0, 0x07, 0xE0, 0x07, 0xE0, 0x07, 0xC0, 0x03, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, - 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x01, 0xC0, 0x03, - 0x60, 0x06, 0x00, 0x00, 0x80, 0x01, 0xC0, 0x03, 0x60, 0x06, 0x00, 0x00, 0x70, 0x00, 0x88, 0x00, - 0x88, 0x00, 0x88, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x80, 0x08, 0x80, 0x08, - 0xF0, 0x0F, 0x80, 0x08, 0x80, 0x08, 0x80, 0x08, 0x00, 0x00, 0x10, 0x01, 0x88, 0x01, 0xC8, 0x01, - 0x78, 0x01, 0x30, 0x01, 0x00, 0x00, 0x90, 0x00, 0x08, 0x01, 0x28, 0x01, 0xF8, 0x01, 0xD0, 0x00, - 0xF0, 0x00, 0xF8, 0x01, 0x08, 0x01, 0x08, 0x01, 0xF8, 0x01, 0xF0, 0x00, 0x00, 0x00, 0x60, 0x06, - 0xC0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x60, 0x06, 0xC0, 0x03, 0x80, 0x01, 0x10, 0x00, 0xF8, 0x09, - 0x00, 0x04, 0x00, 0x03, 0x80, 0x00, 0x60, 0x06, 0x10, 0x05, 0x88, 0x04, 0xC0, 0x0F, 0x00, 0x04, - 0x10, 0x00, 0xF8, 0x09, 0x00, 0x04, 0x00, 0x03, 0x80, 0x00, 0x60, 0x00, 0x90, 0x08, 0x48, 0x0C, - 0x40, 0x0A, 0x80, 0x09, 0x88, 0x00, 0xA8, 0x08, 0xD8, 0x04, 0x00, 0x02, 0x80, 0x01, 0x60, 0x06, - 0x10, 0x05, 0x88, 0x04, 0xC0, 0x0F, 0x00, 0x04, 0x00, 0x0C, 0x86, 0x0F, 0xE6, 0x03, 0x38, 0x01, - 0x38, 0x01, 0xE6, 0x03, 0x86, 0x0F, 0x00, 0x0C, 0xE0, 0x07, 0xF6, 0x0F, 0x16, 0x08, 0x10, 0x08, - 0x10, 0x08, 0x16, 0x08, 0xF6, 0x0F, 0xE0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x02, - 0x40, 0x01, 0x80, 0x00, 0x40, 0x01, 0x20, 0x02, 0xF0, 0x07, 0xF6, 0x0F, 0x06, 0x08, 0x00, 0x08, - 0x06, 0x08, 0xF6, 0x0F, 0xF0, 0x07, 0xF8, 0x0F, 0xFC, 0x0F, 0x04, 0x00, 0x44, 0x08, 0x7C, 0x08, - 0xF8, 0x0F, 0x80, 0x07, 0x00, 0x06, 0x4C, 0x0F, 0x2C, 0x09, 0x20, 0x09, 0x2C, 0x09, 0xEC, 0x0F, - 0xC0, 0x0F, 0xC0, 0x07, 0xEC, 0x0F, 0x2C, 0x08, 0x20, 0x08, 0x2C, 0x08, 0xEC, 0x0F, 0xC0, 0x07, - 0xC0, 0x17, 0xE0, 0x0F, 0x20, 0x0E, 0x20, 0x09, 0xE0, 0x08, 0xE0, 0x0F, 0xD0, 0x07, 0xE0, 0x07, - 0xEC, 0x0F, 0x0C, 0x08, 0x00, 0x08, 0x0C, 0x04, 0xEC, 0x0F, 0xE0, 0x0F -}; - -const struct font_info font_proportional_16px PROGMEM = {0x00+(0x07<<8),0x0B,0x10,0x20,0xFC,font_proportional_16px_data,(uint8_t*)font_proportional_16px_data+0xFC-0x20+1}; - -#endif - - diff --git a/lcdlib/Fonts/font_proportional_16px.font b/lcdlib/Fonts/font_proportional_16px.font deleted file mode 100644 index b6ed3affb397ccf6da4cf5700ca0a6647d662d73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1792 zcmZWpp>8BO5G{{Ac6H)uw{)w`fM}<|Nf!_>a6qJKupr>1qYL{FZs34OX|!s%@ZiFO z_X!OH7alZP1q^7kG8k~L+%wrk*VU>jm&@hna+MujR;oUl*_>VBX2w{j=QC$tzL}o$ z+!pK{jLw<4v!ct;@ddLrbHl8yo#%h1?Tlsd9OT$y(abt>q)FCUI(-@|9G^$8Wj5Nv zo?IyqG7fv1| zTo1I)>WJu!FNM)nTtTKlOuY77@?~En-f@LQ10Cjeu2Ze5RQ6J2_PpnNehR&dZVaEY z-XXnQ_TgFWvHgU8T02rIxZp){qi%icX}SKeww)SuYuA3cTQvzj#{g zfjR=`(=X3gH}9Uot9Mb8?~u`r+Nh|zKwi)Z-qWt96Ur&qR^~)o`q4%G(^E2lRmgsi zz0O%djPMWaDNH$>R!^KHjI2WZ6b9AmwO#rt4nkx~VNX$Yk~I>q6qYnusFaLPSY(ap z7%8Eo#uo&u|aEo0<{D^y-t<5pw%hD;rTM-*=ksFeQz<%Nb| diff --git a/lcdlib/Fonts/font_proportional_8px.c b/lcdlib/Fonts/font_proportional_8px.c deleted file mode 100644 index 0d32ba8..0000000 --- a/lcdlib/Fonts/font_proportional_8px.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - created with FontEditor written by H. Reddmann (HaReddmann at t-online dot de) - using template file by J. Michel (jan at mueschelsoft.de) - - File Name : font_proportional_8px.c - Date : 05.07.2009 - Font size in bytes : 0x0458, 1112 - Font width : 8 - Font height : 8 - Font first char : 0x20 - Font last char : 0xFF - Font bits per pixel : 1 -*/ - -#include "../font.h" -#ifdef FONTS_INCLUDE_font_proportional_8px - - - -const uint8_t font_proportional_8px_data[] PROGMEM = { - 0x02, 0x01, 0x03, 0x05, 0x05, 0x07, 0x05, 0x01, 0x03, 0x03, 0x05, 0x05, 0x02, 0x03, 0x01, 0x04, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x01, 0x01, 0x04, 0x05, 0x04, 0x04, - 0x07, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x03, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x03, 0x04, 0x03, 0x05, 0x05, - 0x02, 0x05, 0x05, 0x04, 0x05, 0x05, 0x04, 0x05, 0x04, 0x01, 0x02, 0x04, 0x02, 0x05, 0x04, 0x04, - 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x05, 0x04, 0x04, 0x04, 0x02, 0x04, 0x05, 0x00, - 0x04, 0x05, 0x02, 0x00, 0x04, 0x08, 0x03, 0x03, 0x04, 0x09, 0x00, 0x03, 0x06, 0x00, 0x00, 0x00, - 0x00, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x06, 0x00, 0x03, 0x05, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x04, 0x05, 0x05, 0x02, 0x04, 0x05, 0x06, 0x03, 0x05, 0x04, 0x03, 0x07, 0x05, - 0x04, 0x05, 0x03, 0x03, 0x02, 0x04, 0x05, 0x02, 0x03, 0x02, 0x04, 0x05, 0x06, 0x06, 0x06, 0x04, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, 0x03, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, - 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x03, 0x03, - 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, - - 0x00, 0x00, 0x5F, 0x07, 0x00, 0x07, 0x74, 0x1C, 0x77, 0x1C, 0x17, 0x2E, 0x6A, 0x3E, 0x2B, 0x3A, - 0x06, 0x49, 0x36, 0x08, 0x36, 0x49, 0x30, 0x36, 0x49, 0x59, 0x76, 0x48, 0x07, 0x3C, 0x42, 0x81, - 0x81, 0x42, 0x3C, 0x0A, 0x04, 0x1F, 0x04, 0x0A, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x80, 0x60, 0x08, - 0x08, 0x08, 0x40, 0xC0, 0x30, 0x0C, 0x03, 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x44, 0x42, 0x7F, 0x40, - 0x40, 0x46, 0x61, 0x51, 0x49, 0x46, 0x22, 0x41, 0x49, 0x49, 0x36, 0x18, 0x14, 0x12, 0x7F, 0x10, - 0x27, 0x45, 0x45, 0x45, 0x39, 0x3E, 0x49, 0x49, 0x49, 0x30, 0x01, 0x01, 0x71, 0x0D, 0x03, 0x36, - 0x49, 0x49, 0x49, 0x36, 0x06, 0x49, 0x49, 0x29, 0x1E, 0x36, 0xD0, 0x08, 0x14, 0x22, 0x41, 0x14, - 0x14, 0x14, 0x14, 0x14, 0x41, 0x22, 0x14, 0x08, 0x02, 0x51, 0x09, 0x06, 0x3C, 0x42, 0x99, 0xA5, - 0xBD, 0x42, 0x1C, 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x7F, 0x49, 0x49, 0x49, 0x36, 0x3E, 0x41, 0x41, - 0x41, 0x22, 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x7F, 0x49, 0x49, 0x49, 0x41, 0x7F, 0x09, 0x09, 0x09, - 0x01, 0x3E, 0x41, 0x49, 0x49, 0x7A, 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x41, 0x7F, 0x41, 0x40, 0x41, - 0x41, 0x3F, 0x7F, 0x08, 0x14, 0x22, 0x41, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x7F, 0x06, 0x0C, 0x06, - 0x7F, 0x7F, 0x06, 0x08, 0x30, 0x7F, 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x7F, 0x09, 0x09, 0x09, 0x06, - 0x3E, 0x41, 0x61, 0xC1, 0xBE, 0x7F, 0x09, 0x19, 0x29, 0x46, 0x26, 0x49, 0x49, 0x49, 0x32, 0x01, - 0x01, 0x7F, 0x01, 0x01, 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x07, 0x38, 0x40, 0x38, 0x07, 0x1F, 0x60, - 0x1F, 0x60, 0x1F, 0x63, 0x14, 0x08, 0x14, 0x63, 0x01, 0x06, 0x78, 0x06, 0x01, 0x61, 0x51, 0x49, - 0x45, 0x43, 0x7F, 0x41, 0x41, 0x03, 0x0C, 0x30, 0xC0, 0x41, 0x41, 0x7F, 0x04, 0x02, 0x01, 0x02, - 0x04, 0x80, 0x80, 0x80, 0x80, 0x80, 0x01, 0x02, 0x20, 0x54, 0x54, 0x54, 0x78, 0x7F, 0x44, 0x44, - 0x44, 0x38, 0x38, 0x44, 0x44, 0x44, 0x38, 0x44, 0x44, 0x44, 0x7F, 0x38, 0x54, 0x54, 0x54, 0x58, - 0x08, 0x7E, 0x09, 0x01, 0x18, 0xA4, 0xA4, 0xA4, 0x78, 0x7F, 0x04, 0x04, 0x78, 0x7D, 0x80, 0x7D, - 0x7F, 0x10, 0x28, 0x44, 0x3F, 0x40, 0x7C, 0x04, 0x78, 0x04, 0x78, 0x7C, 0x04, 0x04, 0x78, 0x38, - 0x44, 0x44, 0x38, 0xFC, 0x24, 0x24, 0x24, 0x18, 0x18, 0x24, 0x24, 0x24, 0xFC, 0x7C, 0x08, 0x04, - 0x04, 0x48, 0x54, 0x54, 0x24, 0x04, 0x3F, 0x44, 0x40, 0x3C, 0x40, 0x40, 0x7C, 0x1C, 0x20, 0x40, - 0x20, 0x1C, 0x1C, 0x60, 0x60, 0x1C, 0x60, 0x60, 0x1C, 0x44, 0x28, 0x10, 0x28, 0x44, 0x9C, 0xA0, - 0x60, 0x1C, 0x64, 0x54, 0x54, 0x4C, 0x18, 0x7E, 0x81, 0x81, 0xFF, 0xFF, 0x81, 0x81, 0x7E, 0x18, - 0x18, 0x04, 0x08, 0x10, 0x0C, 0x14, 0x3E, 0x55, 0x55, 0xFF, 0x81, 0x81, 0x81, 0xFF, 0x80, 0x60, - 0x80, 0x60, 0x80, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x04, 0x7F, 0x04, 0x14, - 0x7F, 0x14, 0x02, 0x01, 0x01, 0x02, 0x46, 0x29, 0x16, 0x08, 0x34, 0x4A, 0x31, 0x48, 0x30, 0x00, - 0x18, 0x24, 0x3E, 0x41, 0x22, 0x7F, 0x49, 0x41, 0x03, 0x04, 0x04, 0x03, 0x03, 0x04, 0x03, 0x04, - 0x04, 0x03, 0x04, 0x03, 0x18, 0x3C, 0x3C, 0x18, 0x08, 0x08, 0x08, 0x08, 0x03, 0x01, 0x02, 0x03, - 0x02, 0x0E, 0x02, 0x0E, 0x06, 0x0E, 0x00, 0x48, 0x30, 0x38, 0x44, 0x38, 0x54, 0x48, 0x38, 0x44, - 0xFE, 0x44, 0x48, 0x7E, 0x49, 0x01, 0x44, 0x38, 0x28, 0x38, 0x44, 0x03, 0x14, 0x7C, 0x14, 0x03, - 0xE7, 0xE7, 0x4E, 0x55, 0x55, 0x39, 0x01, 0x01, 0x00, 0x01, 0x01, 0x1C, 0x2A, 0x55, 0x55, 0x22, - 0x1C, 0x1D, 0x15, 0x1E, 0x18, 0x24, 0x00, 0x18, 0x24, 0x08, 0x08, 0x08, 0x18, 0x08, 0x08, 0x08, - 0x3C, 0x42, 0xBD, 0x95, 0xA9, 0x42, 0x3C, 0x01, 0x01, 0x01, 0x01, 0x01, 0x06, 0x09, 0x09, 0x06, - 0x44, 0x44, 0x5F, 0x44, 0x44, 0x19, 0x15, 0x12, 0x15, 0x15, 0x0A, 0x02, 0x01, 0xFC, 0x20, 0x20, - 0x1C, 0x0E, 0x7F, 0x01, 0x7F, 0x01, 0x18, 0x18, 0x00, 0x80, 0x40, 0x02, 0x1F, 0x06, 0x09, 0x09, - 0x06, 0x24, 0x18, 0x00, 0x24, 0x18, 0x82, 0x4F, 0x30, 0x4C, 0x62, 0xF1, 0x82, 0x4F, 0x30, 0x0C, - 0xD2, 0xB1, 0x95, 0x5F, 0x30, 0x4C, 0x62, 0xF1, 0x30, 0x48, 0x45, 0x20, 0x60, 0x39, 0x2E, 0x38, - 0x60, 0x60, 0x38, 0x2E, 0x39, 0x60, 0x70, 0x1D, 0x13, 0x1D, 0x70, 0x72, 0x1D, 0x12, 0x1E, 0x71, - 0x70, 0x1D, 0x12, 0x1D, 0x70, 0x60, 0x3B, 0x25, 0x3B, 0x60, 0x7E, 0x11, 0x7F, 0x49, 0x41, 0x1E, - 0x21, 0x61, 0x92, 0x7C, 0x55, 0x56, 0x44, 0x7C, 0x56, 0x55, 0x44, 0x7C, 0x56, 0x55, 0x46, 0x7D, - 0x54, 0x54, 0x45, 0x45, 0x7E, 0x44, 0x44, 0x7E, 0x45, 0x46, 0x7D, 0x46, 0x45, 0x7C, 0x45, 0x08, - 0x7F, 0x49, 0x41, 0x3E, 0x7E, 0x09, 0x12, 0x22, 0x7D, 0x38, 0x45, 0x46, 0x44, 0x38, 0x38, 0x44, - 0x46, 0x45, 0x38, 0x38, 0x46, 0x45, 0x46, 0x38, 0x3A, 0x45, 0x45, 0x46, 0x39, 0x38, 0x45, 0x44, - 0x45, 0x38, 0x22, 0x14, 0x08, 0x14, 0x22, 0xBC, 0x62, 0x5A, 0x46, 0x3D, 0x3C, 0x41, 0x42, 0x3C, - 0x3C, 0x42, 0x41, 0x3C, 0x3C, 0x42, 0x41, 0x3E, 0x3D, 0x40, 0x40, 0x3D, 0x06, 0x08, 0xF2, 0x09, - 0x06, 0x7F, 0x22, 0x22, 0x1C, 0xFE, 0x09, 0x89, 0x76, 0x20, 0x55, 0x56, 0x78, 0x20, 0x56, 0x55, - 0x78, 0x22, 0x55, 0x55, 0x7A, 0x23, 0x55, 0x56, 0x7B, 0x20, 0x55, 0x54, 0x79, 0x27, 0x55, 0x57, - 0x78, 0x20, 0x54, 0x38, 0x54, 0x48, 0x38, 0x44, 0xC4, 0x38, 0x55, 0x56, 0x58, 0x38, 0x56, 0x55, - 0x58, 0x3A, 0x55, 0x55, 0x5A, 0x39, 0x54, 0x54, 0x59, 0x01, 0x7A, 0x7A, 0x01, 0x02, 0x79, 0x02, - 0x02, 0x78, 0x02, 0x60, 0x91, 0x92, 0x7C, 0x7B, 0x09, 0x0A, 0x73, 0x38, 0x45, 0x46, 0x38, 0x38, - 0x46, 0x45, 0x38, 0x3A, 0x45, 0x45, 0x3A, 0x3B, 0x45, 0x46, 0x3B, 0x39, 0x44, 0x44, 0x39, 0x08, - 0x08, 0x2A, 0x08, 0x08, 0xB8, 0x64, 0x4C, 0x3A, 0x3C, 0x41, 0x42, 0x7C, 0x3C, 0x42, 0x41, 0x7C, - 0x3A, 0x41, 0x41, 0x7A, 0x3D, 0x40, 0x40, 0x7D, 0x98, 0x62, 0x19, 0xFF, 0x42, 0x3C, 0x9A, 0x60, - 0x1A -}; - -const struct font_info font_proportional_8px PROGMEM = {0x58+(0x04<<8),0x08,0x08,0x20,0xFF,font_proportional_8px_data,(uint8_t*)font_proportional_8px_data+0xFF-0x20+1}; - -#endif - - diff --git a/lcdlib/Fonts/font_proportional_8px.font b/lcdlib/Fonts/font_proportional_8px.font deleted file mode 100644 index 35924605836d34a7ee589318eb7a9d6e9d779b7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1112 zcmYjP&u`pB6!!eEcN~Q%T^w+bH!)^QlOjb6LaW)0nOMpL?^%hCe6*=^leD- z9zqhK0bmCW9`eR^3FDr{tb53)3)&(F^*Noh5iP2~EH7=$&gXjOv;fc&D}Zre7fi<(h7%=0!Kh|mwi+HphIamrFn zu>+Cc|4=&j^Zd}B&gYB8d_J{p%GOt{peVqaFJ`40WvMMEmDG|JMhK_7ud(+(e0SK< z>~;Vp%OYqjG*@X#Y~Qz`V2mJmCTn=jSks0bE_goV;-wf)GbH#97sRS9^5VruMbSe@ zL&&*V6rR)C*s|M@7UESBKYsS~r`ShI45+UV$3kpwG&eR@FuHJEXH7zhZCjg#cv}J5 zw$`@4ywy28{TuY^Uq3%RR{PE{am(HwFH64HE6-Z5w$46nHMbs|wVJK7a{u~%IlTtI zvGwN3le!p*dQ_;DPVziSrb0}Ubdn}@!T=LY&89cuNve92CY+~9%KJ%@_IM%^4v)+7 zem%XL9{5r0`*EaJa1e$E2K&b}q~|#=&95H1#i(*eMdcO6_^o2}*e&u$H;RudH(%E2 z4_=Ip_^3GQ7scIPp5H;^F~W~9u5kJFllrl_@)_JfaVzTnev?Fi2d)%H~t0od*Ac` diff --git a/lcdlib/Fonts/symbols_16px.c b/lcdlib/Fonts/symbols_16px.c deleted file mode 100644 index 3ed4bd3..0000000 --- a/lcdlib/Fonts/symbols_16px.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - created with FontEditor written by H. Reddmann HaReddmann at t-online dot de - using template file by J. Michel jan at mueschelsoft.de - - File Name : symbols_16px.c - Date : 05.09.2010 - Font size in bytes : 0x0130, 304 - Font width : 20 - Font height : 16 - Font first char : 0x00 - Font last char : 0x09 - Font bits per pixel : 1 -*/ - -#include "../font.h" -#ifdef FONTS_INCLUDE_symbols_16px - - - -const uint8_t symbols_16px_data[] PROGMEM = { - 0x0F, 0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x13, - 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x84, 0x43, 0x8C, 0x63, 0x9C, 0x73, - 0xBC, 0x7B, 0xF8, 0x3F, 0xF0, 0x1F, 0xE0, 0x0F, 0xC0, 0x07, 0x80, 0x03, 0x00, 0x01, 0x00, 0x01, - 0x80, 0x03, 0xC0, 0x07, 0xE0, 0x0F, 0xF0, 0x1F, 0xF8, 0x3F, 0xBC, 0x7B, 0x9C, 0x73, 0x8C, 0x63, - 0x84, 0x43, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x00, 0x0F, 0x80, 0x07, - 0xC0, 0x03, 0xE0, 0x01, 0xF0, 0x00, 0xF8, 0xFF, 0xFC, 0xFF, 0xF8, 0xFF, 0xF0, 0x00, 0xE0, 0x01, - 0xC0, 0x03, 0x80, 0x07, 0x00, 0x0F, 0xC0, 0x03, 0x80, 0x07, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x3C, - 0xFC, 0x7F, 0xFC, 0xFF, 0xFC, 0x7F, 0x00, 0x3C, 0x00, 0x1E, 0x00, 0x0F, 0x80, 0x07, 0xC0, 0x03, - 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0xFC, 0x7F, 0xFC, 0x7F, 0xFC, 0x7F, - 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, - 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, - 0x80, 0x03, 0x80, 0x03, 0x00, 0x00, 0x00, 0x20, 0x30, 0x70, 0x78, 0x78, 0xF8, 0x3C, 0xE0, 0x1F, - 0x80, 0x0F, 0x80, 0x07, 0xC0, 0x0F, 0xE0, 0x1E, 0x70, 0x3C, 0x78, 0x38, 0x30, 0x18, 0x00, 0x04, - 0x00, 0x0E, 0x00, 0x3E, 0x00, 0xF8, 0x00, 0x78, 0x00, 0x3C, 0x00, 0x0E, 0x80, 0x03, 0xC0, 0x01, - 0x60, 0x00, 0x30, 0x00, 0x18, 0x00, 0x0C, 0x00, 0x02, 0x00, 0xE0, 0x0F, 0xF0, 0x1F, 0x10, 0x10, - 0x10, 0x10, 0x10, 0x10, 0xF0, 0x1F, 0xE0, 0x0F, 0x00, 0x00, 0xF0, 0x1F, 0xF0, 0x1F, 0x80, 0x03, - 0xC0, 0x06, 0x60, 0x0C, 0x30, 0x18, 0x10, 0x10, 0xF0, 0x1F, 0xF0, 0x1F, 0x10, 0x11, 0x10, 0x11, - 0x10, 0x10, 0x00, 0x00, 0xE0, 0x0C, 0xF0, 0x11, 0x10, 0x11, 0x10, 0x11, 0x10, 0x1F, 0x60, 0x0E, - 0x00, 0x00, 0xE0, 0x0F, 0xF0, 0x1F, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x60, 0x0C, 0x00 -}; - -const struct font_info symbols_16px PROGMEM = {0x30+(0x01<<8),0x14,0x10,0x00,0x09,symbols_16px_data,(uint8_t*)symbols_16px_data+0x09-0x00+1}; - -#endif - - diff --git a/lcdlib/Fonts/symbols_16px.font b/lcdlib/Fonts/symbols_16px.font deleted file mode 100644 index 572a60875059da29211099f7b5dc054106c70564..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmZ`!Jqp4w7=1Bf5o(j7L#M_gWOOKY=tT-%Kh-7b6pU!#}t+_si5hhERLugiQ1aR3ZHIe+J;FuYDgXr%aq8TzReflP<7E yhBE?s+K|z$tc6B_6f4B590?w_|Nq%|BqR(H{{K%f0Eztn z4 - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/lcdlib/README.md b/lcdlib/README.md deleted file mode 100644 index 67adfe1..0000000 --- a/lcdlib/README.md +++ /dev/null @@ -1,63 +0,0 @@ -lcdlib -====== - -Library for EA-DOG LCDs, including font-generator (also usable with color LCD) -Further information and discussion (in german) can be found at: -http://www.mikrocontroller.net/topic/144500 - - -Files -===== - -dogm-graphic .c/.h ------------------- - -Provides all basic functions to access the display for -- EA-DOGS102 GLCD (102px x 64px) -- EA-DOGM128 GLCD (128px x 64px) -- EA-DOGM132 GLCD (132px x 32px) -- EA-DOGL128 GLCD (128px x 64px) -- EA-DOGXL160 GLCD (160px x 104px) -- can be easily adapted for other displays with similar characteristics - -Since no graphics ram is used, the memory footprint is rather small but -also does not allow to change single pixels. Data written to the LCD can -not be read back! Because of that, no drawing functions (lines, circles) -are included. -Thanks to Oliver Schwaneberg for adding several functions to this library! - - -font .c/.h ----------- -Font Generator -designed for GLCD with memory organized in vertical bytes - -Own character sets or symbols can easily be added: -The structure of font data is compatible with Hagen Reddmanns FontEditor -http://www.mikrocontroller.net/topic/99701#865331 -when using the attached template_simplefont.c and template_simplefont.h -files, saving in uncompressed format and using font heights of multiples -of 8. - -Fixed width fonts are treated as proportional fonts, but do not have a -table for the width of each character (D'OH!) - -When using with other GLCDs, make sure the byte orientation of the LCDs -memory matches the design of the ea-dogm series or link the LCD access -functions (see header file) to functions converting the data. - - -lcd-color-graphic .c/.h ------------------------ -An alternative lcd library controlling a LCD with an ILI9341 driver in -16 Bit color mode using 4-wire SPI or any other display with similar -features. Just use this file instead of dogm-graphic. The function -lcd_write_font_byte() provides the conversion from the font-generator -byte format to the format used by the display. - - -Fonts/template_simplefont.c ---------------------------- -A template file to be used with Hagen Reddmanns FontEditor to create -compatible fonts. - diff --git a/lcdlib/dogm-graphic.c b/lcdlib/dogm-graphic.c deleted file mode 100644 index acb6962..0000000 --- a/lcdlib/dogm-graphic.c +++ /dev/null @@ -1,322 +0,0 @@ -/****************************************************************************** - * Display Library - * for EA-DOGS102 GLCD (102px x 64px) - * EA-DOGM128 GLCD (128px x 64px) - * EA-DOGM132 GLCD (132px x 32px) - * EA-DOGL128 GLCD (128px x 64px) - * EA-DOGXL160 GLCD (160px x 104px) - * - * Provides all basic functions to access the display - * Since no graphics ram is used, the memory footprint is rather small but - * also does not allow to change single pixels. Data written to the LCD can - * not be read back! - * Text can be displayed using the attached font generator containing several - * character sets and font variants. - * Thanks to Oliver Schwaneberg for adding several functions to this library! - * - * Author: Jan Michel (jan at mueschelsoft dot de) - * License: GNU General Public License, version 3 - * Version: v0.95a November 2012 - * **************************************************************************** - * New features in v0.95 - * - added initialization for top-view - * - automatic shifting column addresses (e.g. top-view) - * New features in v0.94 - * - corrected order of arguments in lcd_clear_area_xy() - * - added command definitions for DOGXL160 - * - cleaned up dogm_graphic.h command area - * New features in v0.93 - * - modified initialization for DOGM128 and DOGS102 - * New features in v0.92 - * - Added initialization for DOGS102 and DOGL128 - * New features in v0.91 - * - Control of chip select pin - * - backlight & chip select are optional - can be turned of in header file - * - added function lcd_draw_image_P - * - added function lcd_draw_image_xy_P - * - added function lcd_clear_area - * - added SPI initialization - *****************************************************************************/ - -#include "dogm-graphic.h" - -//============================================================================= -//keeping track of current position in ram - necessary for big fonts & bitmaps -//============================================================================= - -uint8_t lcd_current_page = 0; -uint8_t lcd_current_column = 0; - - - -/****************************************************************************** - * Changes the internal cursor by s pages - * s - number of pages to move - */ -uint8_t lcd_inc_page(int8_t s) { - uint8_t p = lcd_current_page; - p += s; - p %= LCD_RAM_PAGES; //all lcd have lcd_ram_pages which is power of two - lcd_current_page = p; - return p; - } - -/****************************************************************************** - * Changes the internal cursor by s columns, including wrapping (if selected) - * s - number of columns to move - */ -uint8_t lcd_inc_column(int16_t s) { - uint16_t c = lcd_current_column; - c += s; -#if LCD_WRAP_AROUND == 1 - while (c >= LCD_WIDTH) { - if (s > 0) lcd_inc_page(1); - else lcd_inc_page(-1); - if (s > 0) c -= LCD_WIDTH; - else c += LCD_WIDTH; - } -#endif - lcd_current_column = c; - return c; - } - - -/****************************************************************************** - * Moves the cursor to the given position - * pages - page to move to - * columns - column to move to - */ -void lcd_moveto_xy(uint8_t page, uint8_t column) { - LCD_GOTO_ADDRESS(page,column); - lcd_current_column = column; - lcd_current_page = page; - } - -/****************************************************************************** - * Moves the cursor relative to the current position - * pages - number of pages to move - * columns - number of columns to move - */ -void lcd_move_xy(int8_t pages, int16_t columns) { - lcd_moveto_xy(lcd_inc_page(pages),lcd_inc_column(columns)); - } - - -//============================================================================= -//Basic Byte Access to Display -//============================================================================= - -/****************************************************************************** - * Writes one data byte - * data - the data byte - */ -void lcd_data(uint8_t data) { - LCD_SELECT(); - LCD_DRAM(); - spi_write(data); - LCD_UNSELECT(); - lcd_inc_column(1); - } - -/****************************************************************************** - * Writes one command byte - * cmd - the command byte - */ -void lcd_command(uint8_t cmd) { - LCD_SELECT(); - LCD_CMD(); - spi_write(cmd); - LCD_UNSELECT(); - } - - -//============================================================================= -//Puts raw data from Flash to the Display -//============================================================================= -#if LCD_INCLUDE_GRAPHIC_FUNCTIONS >= 1 -/****************************************************************************** - * This function draws a bitmap from the current position on the screen. - * Parameters: - * progmem_image - prog_uint8_t array of columns aka the bitmap image - * pages - height of image in pages - * columns - width of image in pixels (or columns) - * style - Bit2: sets inverse mode - */ -void lcd_draw_image_P(PGM_VOID_P progmem_image, uint8_t pages, uint8_t columns, uint8_t style) { - uint8_t i,j = 0; - uint8_t inv = (style & INVERT_BIT); - while(j cut image - if(pages > LCD_RAM_PAGES - lcd_get_position_page()) - pages = LCD_RAM_PAGES - lcd_get_position_page(); - //Goto starting point and draw - lcd_moveto_xy((y>>3), x); - for (j=0; j 0 && offset) - data |= pgm_read_byte(progmem_image+(j-1)*columns + i) >> (8-offset); - if(inv) lcd_data(~data); - else lcd_data(data); - } - if(j+1 != pages) - lcd_move_xy(1,-columns); - } - } -#endif - - -/****************************************************************************** - * This function clears an area of the screen - * pages - height of area in pages - * columns - width of area in pixels - * style - Bit2: sets inverse mode - * Cursor is moved to start of area after clear - */ -void lcd_clear_area(uint8_t pages, uint8_t columns, uint8_t style) { - uint8_t i,j,max; - uint8_t inv = (style & INVERT_BIT)?0xFF:0; - - if(pages > (max = LCD_RAM_PAGES - lcd_get_position_page())) - pages = max; - if(columns > (max = LCD_WIDTH - lcd_get_position_column())) - columns = max; - - for(j=0; j -#include -#include -#include -#include -#include "font.h" - -/***************************************************************************** - * BEGIN CONFIG BLOCK - *****************************************************************************/ -//Select the display type: DOGS102: 102, DOGM128/DOGL128: 128, DOGM132: 132, DOGXL160: 160 -#define DISPLAY_TYPE 132 - -//Display Orientation: Normal (0) or upside-down (1)? -#define ORIENTATION_UPSIDEDOWN 0 - -//Should chip select (CS) be used? -#define LCD_USE_CHIPSELECT 0 - -//Use Backlight? (0: no backlight, 1: backlight (on when pin is high), 2: backlight (on when pin is low)) -#define LCD_USE_BACKLIGHT 1 - -//A0 Port (CD on DOGS & DOGXL) -#define PORT_A0 PORTD -#define DDR_A0 DDRD -#define PIN_A0 2 - -//Reset Port -#define PORT_RST PORTD -#define DDR_RST DDRD -#define PIN_RST 5 - -//Backlight Port -#if LCD_USE_BACKLIGHT != 0 - #define PORT_LED PORTB - #define DDR_LED DDRB - #define PIN_LED 4 -#endif - -//Chip select -#if LCD_USE_CHIPSELECT == 1 - #define PORT_CS PORTC - #define DDR_CS DDRC - #define PIN_CS PORTC0 -#endif - -//SPI routines -//Define a function that initializes the SPI interface, see below for an example -extern void init_spi_lcd(void); -#define LCD_INIT_SPI() init_spi_lcd() - -//Define a function that waits until SPI interface is idle -#define spi_wait_for_idle() while(! (UCSR1A & _BV(TXC1)));UCSR1A |= _BV(TXC1) - -//Define how to write to SPI data register -#define spi_write(i) UDR1 = i - -//Define this if LCD Output should continue in next line when reaching edge of display -//Used for all outputs. To enable this feature for text only, use the appropriate flag in font.h -#define LCD_WRAP_AROUND 1 - -//Include graphic functions, i.e. lcd_draw_image_P, lcd_draw_image_xy_P, lcd_clear_area ? -#define LCD_INCLUDE_GRAPHIC_FUNCTIONS 1 - -/*Example SPI setup (Atmega162) - *init spi: msb first, update on falling edge , read on rising edge, 9 MHz - *void init_spi_lcd() { - * SPCR = 0 << SPIE | 1 << SPE | 0 << DORD | 1 << MSTR | 1 << CPOL | 1 << CPHA | 0 << SPR1 | 0 << SPR0; - * SPSR = 1 << SPI2X; - * SPDR = LCD_NO_OP; //Do not use 0 here, only LCD_NOP is allowed! - * } - */ -/***************************************************************************** - * END CONFIG BLOCK - *****************************************************************************/ - - - - -/***************************************************************************** - * Public Functions - *****************************************************************************/ - -//initializes the display in standard settings -//for DOGS, DOGM, DOGL and DOGXL -void lcd_init(void); - -//write data word or command to the LCD -void lcd_data (uint8_t data); -void lcd_command (uint8_t cmd); - - -//Function to read the current position -extern uint8_t lcd_current_page; -extern uint8_t lcd_current_column; -static inline uint8_t lcd_get_position_page(void) {return lcd_current_page;} -static inline uint8_t lcd_get_position_column(void) {return lcd_current_column;} - -//User functions to write raw data from flash -#if LCD_INCLUDE_GRAPHIC_FUNCTIONS >= 1 - void lcd_draw_image_P(PGM_VOID_P progmem_image, uint8_t pages, uint8_t columns, uint8_t style); - void lcd_draw_image_xy_P(PGM_VOID_P progmem_image, uint8_t x, uint8_t y, uint8_t pages, uint8_t columns, uint8_t style); -#endif - -void lcd_clear_area(uint8_t pages, uint8_t columns, uint8_t style); -void lcd_clear_area_xy(uint8_t pages, uint8_t columns, uint8_t style, uint8_t page, uint8_t col); - - -//Move cursor -void lcd_moveto_xy (uint8_t page, uint8_t column); -void lcd_move_xy (int8_t pages, int16_t columns); - - - -//Text functions are included in font.c / font.h - -/***************************************************************************** - * LCD Size, based on type selection above - *****************************************************************************/ -#if DISPLAY_TYPE == 160 - #define LCD_WIDTH 160 //width of the LCD - #define LCD_HEIGHT 104 //height of the LCD - #define LCD_RAM_PAGES 26 //size of LCD RAM - #define LCD_PIXEL_PER_BYTE 4 //using double pixels - #define LCD_DOUBLE_PIXEL 1 - #define SHIFT_ADDR_NORMAL 0 //column offset for normal orientation - #define SHIFT_ADDR_TOPVIEW 0 //column offset for bottom view orientation -#endif - - #if DISPLAY_TYPE == 132 - #define LCD_WIDTH 132 //width of the LCD - #define LCD_HEIGHT 32 //height of the LCD - #define LCD_RAM_PAGES 4 //size of LCD RAM - #define LCD_PIXEL_PER_BYTE 8 //using single pixels - #define SHIFT_ADDR_NORMAL 0 //column offset for normal orientation - #define SHIFT_ADDR_TOPVIEW 0 //column offset for bottom view orientation -#endif - -#if DISPLAY_TYPE == 128 - #define LCD_WIDTH 128 //width of the LCD - #define LCD_HEIGHT 64 //height of the LCD - #define LCD_RAM_PAGES 8 //size of LCD RAM - #define LCD_PIXEL_PER_BYTE 8 //using single pixels - #define SHIFT_ADDR_NORMAL 0 //column offset for normal orientation - #define SHIFT_ADDR_TOPVIEW 4 //column offset for bottom view orientation -#endif - -#if DISPLAY_TYPE == 102 - #define LCD_WIDTH 102 //width of the LCD - #define LCD_HEIGHT 64 //height of the LCD - #define LCD_RAM_PAGES 8 //size of LCD RAM - #define LCD_PIXEL_PER_BYTE 8 //using single pixels - #define SHIFT_ADDR_NORMAL 0 //column offset for normal orientation - #define SHIFT_ADDR_TOPVIEW 30 //column offset for bottom view orientation -#endif - -#if ORIENTATION_UPSIDEDOWN == 0 - #define SHIFT_ADDR SHIFT_ADDR_NORMAL -#endif - -#if ORIENTATION_UPSIDEDOWN == 1 - #define SHIFT_ADDR SHIFT_ADDR_TOPVIEW -#endif - -/***************************************************************************** - * Command Codes - *****************************************************************************/ -#if DISPLAY_TYPE == 128 || DISPLAY_TYPE == 132 || DISPLAY_TYPE == 102 - #define LCD_DISPLAY_ENABLE 0xAE //1: Display on/off - #define LCD_START_LINE 0x40 //2: display start line set - #define LCD_PAGE_ADDRESS 0xB0 //3: Page address set (lower 4 bits select one of the pages) - #define LCD_COL_ADDRESS 0x10 //4: column address - #define LCD_BOTTOMVIEW 0xA0 //8: select orientation - #define LCD_DISPLAY_INVERT 0xA6 //9: inverted display - #define LCD_ALL_PIXEL 0xA4 //10: show memory content or switch all pixels on - #define LCD_BIAS 0xA2 //11: lcd bias set - #define LCD_RESET_CMD 0xE2 //14: Reset Controller - #define LCD_SCAN_DIR 0xC0 //15: output mode select (turns display upside-down) - #define LCD_POWER_CONTROL 0x28 //16: power control set - #define LCD_VOLTAGE 0x20 //17: voltage regulator resistor ratio set - #define LCD_VOLUME_MODE 0x81 //18: Volume mode set - #define LCD_NO_OP 0xE3 //22: NOP command -#endif - -#if DISPLAY_TYPE == 128 || DISPLAY_TYPE == 132 - #define LCD_INDICATOR 0xAC //19: static indicator (2-byte command) - #define LCD_BOOSTER_SET 0xF8 //20: booster ratio set -#endif - -#if DISPLAY_TYPE == 102 - #define LCD_ADV_PROG_CTRL 0xFA //25: advanced program control - #define LCD_ADV_PROG_CTRL2 0x10 //25: advanced program control -#endif - -#if DISPLAY_TYPE == 160 - #define LCD_COL_ADDRESS 0x10 //4: column address - #define LCD_TEMP_COMP 0x24 //5: Set Temperature Compensation - #define LCD_PANEL_LOAD 0x28 //6: Set Panel loading - #define LCD_PUMP_CTRL 0x2C //7: Set pump control - #define LCD_ADV_PROG_CTRL 0x30 //8: advanced program control first word - #define LCD_START_LINE 0x40 //9: display scroll line set LSB - #define LCD_START_LINE2 0x50 //9: display scroll line set MSB - #define LCD_PAGE_ADDRESS 0x60 //10: Page address set - #define LCD_VOLTAGE_BIAS 0x81 //11: Bias set - #define LCD_PARTIAL_CTRL 0x84 //12: Set partial display control - #define LCD_RAM_ADDR_CTRL 0x88 //13: Set RAM address control - #define LCD_FIXED_LINES 0x90 //14: Set display fixed lines - #define LCD_LINE_RATE 0xA0 //15: Set line rate - #define LCD_ALL_PIXEL 0xA4 //16: show all points - #define LCD_INVERSE 0xA6 //17: Inverse display - #define LCD_DISPLAY_ENABLE 0xAE //18: Display enable - #define LCD_MAPPING_CTRL 0xC0 //19: LCD mapping control - #define LCD_GRAY_SHADE 0xD0 //20: LCD gray shade - #define LCD_RESET_CMD 0xE2 //21: System reset - #define LCD_NO_OP 0xE3 //22: NOP - #define LCD_BIAS_RATIO 0xE8 //24: Bias Ratio - #define LCD_CURSOR_MODE_RESET 0xEE //25: Reset cursor update mode - #define LCD_CURSOR_MODE_SET 0xEF //26: Set cursor update mode - #define LCD_COM_END 0xF1 //27: Set COM End - #define LCD_PARTIAL_START 0xF2 //28: Set partial display start - #define LCD_PARTIAL_END 0xF3 //29: Set partial display end - #define LCD_WINDOW_START_COL 0xF4 //30: Window program start column - #define LCD_WINDOW_START_PAGE 0xF5 //31: Window program start column - #define LCD_WINDOW_END_COL 0xF6 //32: Window program start column - #define LCD_WINDOW_END_PAGE 0xF7 //33: Window program start column - #define LCD_WINDOW_PROGRAM 0xF8 //34: Enable window programming -#endif - -/***************************************************************************** - * Makros to execute commands - *****************************************************************************/ - - #if DISPLAY_TYPE == 160 - #define LCD_SET_TEMP_COMP(i) lcd_command(LCD_TEMP_COMP | ((i) & 0x3)) - #define LCD_SET_PANEL_LOAD(i) lcd_command(LCD_PANEL_LOAD | ((i) & 0x3)) - #define LCD_SET_PUMP_CTRL(i) lcd_command(LCD_PUMP_CTRL | ((i) & 0x3)) - #define LCD_SET_ADV_PROG_CTRL(i) lcd_command(LCD_ADV_PROG_CTRL); \ - lcd_command((i)&0x3F) - #define LCD_SET_START_LINE(i) lcd_command(LCD_START_LINE | ((i)&0xF)); \ - lcd_command(LCD_START_LINE2 | (((i)>>4)&0x7)) - #define LCD_SET_VOLTAGE_BIAS(i) lcd_command(LCD_VOLTAGE_BIAS); \ - lcd_command((i)&0xFF) - #define LCD_SET_PARTIAL_DISPLAY_CTRL(i) lcd_command(LCD_PARTIAL_CTRL | ((i) & 0x3)) - #define LCD_SET_RAM_ADDR_CTRL(i) lcd_command(LCD_RAM_ADDR_CTRL | ((i) & 0x7)) - #define LCD_SET_FIXED_LINES(i) lcd_command(LCD_FIXED_LINES | ((i) & 0xF)) - #define LCD_SET_LINE_RATE(i) lcd_command(LCD_LINE_RATE | ((i) & 0x3)) - #define LCD_SHOW_ALL_PIXELS_ON() lcd_command(LCD_ALL_PIXEL | 1) - #define LCD_SHOW_ALL_PIXELS_OFF() lcd_command(LCD_ALL_PIXEL | 0) - #define LCD_INVERT_DISPLAY(i) lcd_command(LCD_INVERSE | ((i)&1)) - #define LCD_SWITCH_ON() lcd_command(LCD_DISPLAY_ENABLE | 1) - #define LCD_SWITCH_OFF() lcd_command(LCD_DISPLAY_ENABLE | 0) - #define LCD_SET_MAPPING_CTRL(i) lcd_command(LCD_MAPPING_CTRL | ((i) & 0x7)) - #define LCD_SET_BOTTOM_VIEW() lcd_command(LCD_MAPPING_CTRL | 0) - #define LCD_SET_TOP_VIEW() lcd_command(LCD_MAPPING_CTRL | 6) - #define LCD_SET_GRAY_SHADE(i) lcd_command(LCD_GRAY_SHADE | ((i) & 0x3)) - #define LCD_SET_PAGE_ADDR(i) lcd_command(LCD_PAGE_ADDRESS | ((i) & 0x1F)) - #define LCD_SET_COLUMN_ADDR(col) lcd_command(LCD_COL_ADDRESS | ((((col)+SHIFT_ADDR)>>4) & 0x0F)); \ - lcd_command((((col)+SHIFT_ADDR) & 0x0F)) - #define LCD_GOTO_ADDRESS(page,col) lcd_command(LCD_PAGE_ADDRESS | ((page) & 0x1F)); \ - lcd_command(LCD_COL_ADDRESS | ((((col)+SHIFT_ADDR)>>4) & 0x0F)); \ - lcd_command((((col)+SHIFT_ADDR) & 0x0F)) - - #define LCD_NOP() lcd_command(LCD_NO_OP) - #define LCD_SET_BIAS_RATIO(i) lcd_command(LCD_BIAS_RATIO | ((i) & 0x3)) - #define LCD_SET_CURSOR_UPDATE_MODE lcd_command(LCD_CURSOR_MODE_SET) - #define LCD_RESET_CURSOR_UPDATE_MODE lcd_command(LCD_CURSOR_MODE_RESET) - #define LCD_SET_COM_END(i) lcd_command(LCD_COM_END); \ - lcd_command(i) - #define LCD_SET_PARTIAL_DISPLAY(start,end) \ - lcd_command(LCD_PARTIAL_START); \ - lcd_command((start) & 0x7F) \ - lcd_command(LCD_PARTIAL_END); \ - lcd_command((end) & 0x7F) - #define LCD_SET_PROGRAM_WINDOW(startpage,startcol,endpage,endcol) \ - lcd_command(LCD_WINDOW_START_PAGE); \ - lcd_command(startpage); \ - lcd_command(LCD_WINDOW_START_COL); \ - lcd_command(startcol); \ - lcd_command(LCD_WINDOW_END_PAGE); \ - lcd_command(endpage); \ - lcd_command(LCD_WINDOW_END_COL); \ - lcd_command(endcol) - #define LCD_ENABLE_WINDOW_PROGRAM lcd_command(LCD_WINDOW_PROGRAM | 1) - #define LCD_DISABLE_WINDOW_PROGRAM lcd_command(LCD_WINDOW_PROGRAM | 0) -#endif - -#if DISPLAY_TYPE == 128 || DISPLAY_TYPE == 132 || DISPLAY_TYPE == 102 - #define LCD_SWITCH_ON() lcd_command(LCD_DISPLAY_ENABLE | 1) - #define LCD_SWITCH_OFF() lcd_command(LCD_DISPLAY_ENABLE | 0) - #define LCD_SET_FIRST_LINE(i) lcd_command(LCD_START_LINE | ((i) & 0x3F)) - #define LCD_SET_BOTTOM_VIEW() lcd_command(LCD_BOTTOMVIEW | 1) - #define LCD_SET_TOP_VIEW() lcd_command(LCD_BOTTOMVIEW | 0) - #define LCD_SET_MODE_POSITIVE() lcd_command(LCD_DISPLAY_INVERT | 0) - #define LCD_SET_MODE_INVERTED() lcd_command(LCD_DISPLAY_INVERT | 1) - #define LCD_SHOW_ALL_PIXELS_ON() lcd_command(LCD_ALL_PIXEL | 1) - #define LCD_SHOW_ALL_PIXELS_OFF() lcd_command(LCD_ALL_PIXEL | 0) - #define LCD_SET_BIAS_RATIO_1_7() lcd_command(LCD_BIAS | 1) - #define LCD_SET_BIAS_RATIO_1_9() lcd_command(LCD_BIAS | 0) - #define LCD_SEND_RESET() lcd_command(LCD_RESET_CMD) - #define LCD_ORIENTATION_NORMAL() lcd_command(LCD_SCAN_DIR | 0x0) - #define LCD_ORIENTATION_UPSIDEDOWN() lcd_command(LCD_SCAN_DIR | 0x8) - #define LCD_SET_POWER_CONTROL(i) lcd_command(LCD_POWER_CONTROL | ((i) & 0x07)) - #define LCD_SET_LOW_POWER() lcd_command(LCD_POWER_CONTROL | 0x7) - #define LCD_SET_WIDE_RANGE() lcd_command(LCD_POWER_CONTROL | 0x7) - #define LCD_SET_LOW_VOLTAGE() lcd_command(LCD_POWER_CONTROL | 0x3) - #define LCD_SET_BIAS_VOLTAGE(i) lcd_command(LCD_VOLTAGE | ((i) & 0x07)) - #define LCD_SET_VOLUME_MODE(i) lcd_command(LCD_VOLUME_MODE); \ - lcd_command(((i) & 0x3F)) - #define LCD_NOP() lcd_command(LCD_NO_OP) -#endif - -#if DISPLAY_TYPE == 128 || DISPLAY_TYPE == 132 - #define LCD_SET_PAGE_ADDR(i) lcd_command(LCD_PAGE_ADDRESS | ((i) & 0x0F)) - #define LCD_SET_COLUMN_ADDR(col) lcd_command(LCD_COL_ADDRESS | ((((col)+SHIFT_ADDR)>>4) & 0x0F)); \ - lcd_command((((col)+SHIFT_ADDR) & 0x0F)) - #define LCD_GOTO_ADDRESS(page,col) lcd_command(LCD_PAGE_ADDRESS | ((page) & 0x1F)); \ - lcd_command(LCD_COL_ADDRESS | ((((col)+SHIFT_ADDR)>>4) & 0x0F)); \ - lcd_command((((col)+SHIFT_ADDR) & 0x0F)) - #define LCD_SET_INDICATOR_OFF() lcd_command(LCD_INDICATOR | 0); \ - lcd_command(0x00) - #define LCD_SET_INDICATOR_STATIC() lcd_command(LCD_INDICATOR | 1); \ - lcd_command(0x11) - #define LCD_SET_INDICATOR_1HZ() lcd_command(LCD_INDICATOR | 1); \ - lcd_command(0x01) - #define LCD_SET_INDICATOR_2HZ() lcd_command(LCD_INDICATOR | 1); \ - lcd_command(0x10) - #define LCD_SET_INDICATOR(i,j) lcd_command(LCD_INDICATOR | ((i) & 1)); \ - lcd_command(((j) & 2)) - #define LCD_SET_BOOSTER_MODE(i) lcd_command(LCD_BOOSTER_SET); \ - lcd_command(((i) & 0x03)) - #define LCD_SET_BOOSTER_MODE_234 lcd_command(LCD_BOOSTER_SET); \ - lcd_command(0x0) - #define LCD_SET_BOOSTER_MODE_5 lcd_command(LCD_BOOSTER_SET); \ - lcd_command(0x1) - #define LCD_SET_BOOSTER_MODE_6 lcd_command(LCD_BOOSTER_SET); \ - lcd_command(0x3) - #define LCD_SLEEP_MODE lcd_command(LCD_INDICATOR_OFF); \ - lcd_command(LCD_DISPLAY_ENABLE | 0); \ - lcd_command(LCD_ALL_PIXEL | 1) -#endif - -#if DISPLAY_TYPE == 102 - #define LCD_SET_PAGE_ADDR(i) lcd_command(LCD_PAGE_ADDRESS | ((i) & 0x0F)) - #define LCD_SET_COLUMN_ADDR(col) lcd_command((((col)+SHIFT_ADDR) & 0x0F)); \ - lcd_command(LCD_COL_ADDRESS | ((((col)+SHIFT_ADDR)>>4) & 0x0F)) - #define LCD_GOTO_ADDRESS(page,col) lcd_command(LCD_PAGE_ADDRESS | ((page) & 0x1F)); \ - lcd_command((((col)+SHIFT_ADDR) & 0x0F)); \ - lcd_command(LCD_COL_ADDRESS | ((((col)+SHIFT_ADDR)>>4) & 0x0F)) - #define LCD_TEMPCOMP_HIGH 0x80 - #define LCD_COLWRAP 0x02 - #define LCD_PAGEWRAP 0x01 - #define LCD_SET_ADV_PROG_CTRL(i) lcd_command(LCD_ADV_PROG_CTRL); \ - lcd_command(LCD_ADV_PROG_CTRL2 | i) -#endif - - - - - -/***************************************************************************** - * Output pin controlling makros - *****************************************************************************/ - -//Control A0 input of LCD -#define LCD_DRAM() PORT_A0 |= _BV(PIN_A0) -#define LCD_CMD() PORT_A0 &= ~_BV(PIN_A0) -#define LCD_SET_OUTPUT_A0() DDR_A0 |= _BV(PIN_A0) - -//Control reset input of LCD -#define LCD_RESET_OFF() PORT_RST |= _BV(PIN_RST) -#define LCD_RESET_ON() PORT_RST &= ~_BV(PIN_RST) -#define LCD_SET_OUTPUT_RST() DDR_RST |= _BV(PIN_RST) -#define LCD_RESET() LCD_RESET_ON(); _delay_ms(1); LCD_RESET_OFF(); _delay_ms(1) - -//Control pin for Backlight -#if LCD_USE_BACKLIGHT == 1 //normal - #define LCD_SET_OUTPUT_LED() DDR_LED |= _BV(PIN_LED) - #define BACKLIGHT_ON() PORT_LED |= (1<data)); - else - memcpy_P((char*)&tmp,&(font->data),sizeof(tmp)); - return tmp; - } - - -/****************************************************************************** - * Loads the pointer to the width table for the selected font - */ -inline PGM_P font_widthtable(FONT_P font) { - PGM_P tmp; - if (sizeof(tmp) == 2) - tmp = (PGM_P)pgm_read_word(&(font->widthtable)); - else - memcpy_P((char*)&tmp,&(font->widthtable),sizeof(tmp)); - return tmp; - } - - -/****************************************************************************** - * Loads the height (in bytes) of the given font - */ -inline uint8_t font_get_height_bytes(FONT_P font) { - FONT_P tmp = font; - uint8_t t = pgm_read_byte(&tmp->height); - return (((uint8_t)(t-1)>>3)+1); - } - - - - -/****************************************************************************** - * Get the number of the character in the given font - */ -inline int16_t font_get_char_number(FONT_P font, char character) { - FONT_P tmp = font; - if (character > pgm_read_byte(&tmp->lastchar)) - return -1; - uint8_t first = pgm_read_byte(&tmp->firstchar); - if (character < first) - return -1; - return character - first; - } - - -/****************************************************************************** - * Read the width of the selected character from the font width table - */ -inline uint8_t font_get_char_width(FONT_P font, char character) { - PGM_P table = font_widthtable(font); - if (table) - return pgm_read_byte(table+font_get_char_number(font,character)); - else - return pgm_read_byte(&font->width); - } - - -/****************************************************************************** - * Calculate the pointer to the requested character inside the Flash ROM - */ -PGM_P font_get_char_position(FONT_P font, char character) { - uint16_t ret = 0; - int16_t charnum_ret = font_get_char_number(font, character); - uint8_t charnum = charnum_ret; - PGM_P base = font_widthtable(font); - - if (charnum_ret < 0) //char not found - return 0; - if(base == 0) //fixed width - return font_data(font) + (uint16_t)charnum * (uint8_t)(font_get_height_bytes(font) * font_get_char_width(font,character)); - if (charnum) //proportional width - while(charnum--) - ret += (uint8_t) pgm_read_byte(base++); - return (font_data(font))+ret*font_get_height_bytes(font); - } - - -/****************************************************************************** - * Doubles the bytes of either the upper of lower nibble of the given byte - * part = 0: abcdefgh -> eeffgghh - * part = 1: abcdefgh -> aabbccdd - * Used for double height font - */ -inline unsigned char double_bits(uint8_t part, char c) { - uint8_t t = 0; - if (part) c = c>>4; - if (c & 0x08) t = 0xC0; - if (c & 0x04) t |= 0x30; - if (c & 0x02) t |= 0x0C; - if (c & 0x01) t |= 0x03; - return t; - } - -/****************************************************************************** - * Output functions for characters and strings - *****************************************************************************/ - -/****************************************************************************** - * Outputs a character on the display, using the given font and style - */ -uint8_t lcd_put_char(FONT_P font, uint8_t style, char character) { - uint16_t i; - uint8_t row = 0; //current row of char - #ifdef LCD_DOUBLE_PIXEL - uint8_t hc = 1; //height forced - #else - uint8_t hc = (style & DOUBLE_HEIGHT)?1:0; //height changed - #endif - uint8_t wc = (style & DOUBLE_WIDTH)?1:0; //width changed - uint8_t ul = (style & UNDERLINE)?0x80:0x00; //underline - uint8_t inv = (style & INVERT)?0xFF:0; //inverted - uint8_t spc = (style & SPACING)?3:1; //spacing - uint8_t tmp; - - //load information about character - uint8_t char_width = font_get_char_width(font,character); - uint8_t font_height = font_get_height_bytes(font); - uint8_t free_space = spc; - PGM_P tableposition = font_get_char_position(font,character); - - //final size of character - uint8_t char_final_width = (uint8_t)(char_width+free_space) << wc; - uint8_t char_final_height = (uint8_t)font_height << hc; - - //check for avail. space on display - if ((style & WRAP) && (LCD_CURRENT_COL() + char_final_width > LCD_WIDTH)) { - LCD_MOVE_TO(LCD_CURRENT_PAGE()+char_final_height,0); - if (character == ' ') return 0; - } - - //write character - do { - for(i=(row>>hc); i>1; - } - for(uint8_t x = free_space; x>0;x--) { - LCD_WRITE(c); - } - } - LCD_MOVE(1,-char_final_width); - } while (++row < char_final_height); - - //move cursor to upper right corner of character - LCD_MOVE(-char_final_height,char_final_width); - return char_final_width; - } - - -/****************************************************************************** - * Outputs a string on the display, loading it from the program memory, - * using the given font and style - */ -uint16_t lcd_put_string_P(FONT_P font, uint8_t style, PGM_P str) { - unsigned char t; - uint16_t length = 0; - while((t = pgm_read_byte(str++))) - length += lcd_put_char(font,style,t); - return length; - } - - -/****************************************************************************** - * Outputs a string on the display, using the given font and style - */ -uint16_t lcd_put_string(FONT_P font, uint8_t style, char* str) { - unsigned char t; - uint16_t length = 0; - while((t = *str++)) - length += lcd_put_char(font,style,t); - return length; - } - - -/****************************************************************************** - * Outputs a string on the display, using the given font and style, reading - * length characters from the memory - */ -uint16_t lcd_put_string_length(FONT_P font, uint8_t style, char* str, uint8_t length) { - unsigned char t; - uint16_t total_len = 0; - for(t=0;t -#include -#include -#include -#include - -//Include your LCD graphics library here -#include "dogm-graphic.h" -//declare font info structure defined below -struct font_info; -typedef const struct font_info * FONT_P; - -/***************************************************************************** - * BEGIN CONFIG BLOCK - *****************************************************************************/ - -//Select which of the available features will be included -//If a font is not needed, then you don't need to put it to the Flash -//Just comment one of the defines below - -#define FONTS_INCLUDE_font_proportional_16px font_proportional_16px -#define FONTS_INCLUDE_font_proportional_8px font_proportional_8px -#define FONTS_INCLUDE_font_fixed_8px font_fixed_8px -#define FONTS_INCLUDE_font_fixed_16px font_fixed_16px -#define FONTS_INCLUDE_symbols_8px symbols_8px -#define FONTS_INCLUDE_symbols_16px symbols_16px -#define FONTS_INCLUDE_digits_24px digits_24px -#define FONTS_INCLUDE_digits_32px digits_32px - -//Set to 1 to include functions for direct output of integer & float values -#define INCLUDE_FLOAT_OUTPUT 0 -#define INCLUDE_INTEGER_OUTPUT 1 - - -/***************************************************************************** - * All font structures + verbose name defines - *****************************************************************************/ -#ifdef FONTS_INCLUDE_font_fixed_8px - extern const struct font_info font_fixed_8px PROGMEM ; - #define FONT_FIXED_8 &font_fixed_8px -#endif - -#ifdef FONTS_INCLUDE_font_fixed_16px - extern const struct font_info font_fixed_16px PROGMEM ; - #define FONT_FIXED_16 &font_fixed_16px -#endif - -#ifdef FONTS_INCLUDE_font_proportional_16px - extern const struct font_info font_proportional_16px PROGMEM ; - #define FONT_PROP_16 &font_proportional_16px -#endif - -#ifdef FONTS_INCLUDE_font_proportional_8px - extern const struct font_info font_proportional_8px PROGMEM; - #define FONT_PROP_8 &font_proportional_8px -#endif - -#ifdef FONTS_INCLUDE_symbols_8px - extern const struct font_info symbols_8px PROGMEM; - #define FONT_SYMBOL_8 &symbols_8px -#endif - -#ifdef FONTS_INCLUDE_symbols_16px - extern const struct font_info symbols_16px PROGMEM; - #define FONT_SYMBOL_16 &symbols_16px -#endif - -#ifdef FONTS_INCLUDE_digits_24px - extern const struct font_info digits_24px PROGMEM; - #define FONT_DIGITS_24 &digits_24px -#endif - -#ifdef FONTS_INCLUDE_digits_32px - extern const struct font_info digits_32px PROGMEM; - #define FONT_DIGITS_32 &digits_32px -#endif - -//Assign real functions, provided by the LCD library to these macros -//used within the font generator - -#define LCD_MOVE(x,y) lcd_move_xy((x),(y)) //relative cursor movement -#define LCD_MOVE_TO(x,y) lcd_moveto_xy((x),(y)) //absolute cursor movement -#define LCD_WRITE(x) lcd_data((x)) //write data to display - -//Functions to read the current position as provided by the LCD library -#define LCD_CURRENT_COL() lcd_get_position_column() -#define LCD_CURRENT_PAGE() lcd_get_position_page() - - -/****************************************************************************** - * END CONFIG BLOCK - *****************************************************************************/ - - - - -/****************************************************************************** - * Internal Functions to locate and display characters - *****************************************************************************/ -/* -PGM_P font_data (FONT_P font); -PGM_P font_widthtable (FONT_P font); -uint8_t font_get_height_bytes (FONT_P font); -uint8_t font_get_type (FONT_P font); -uint8_t font_get_char_width (FONT_P font, char character); -int16_t font_get_char_number (FONT_P font, char character); -PGM_P font_get_char_position (FONT_P font, char character); -*/ - - -/****************************************************************************** - * Functions to display characters and strings - *****************************************************************************/ -//where font is a pointer to a FONT_P struct, -//style is one or more of the defines for different font sizes & styles shown below -//and str and c are the string or the character to be displayed - -uint16_t lcd_put_string (FONT_P font, uint8_t style, char* str); -uint16_t lcd_put_string_length(FONT_P font, uint8_t style, char* str, uint8_t length); -uint16_t lcd_put_string_P (FONT_P font, uint8_t style, PGM_P str); -uint8_t lcd_put_char (FONT_P font, uint8_t style, char c); -uint16_t lcd_put_string_xy_P (FONT_P font, uint8_t style, PGM_P str, uint8_t page, uint8_t col); -uint8_t lcd_put_char_xy (FONT_P font, uint8_t style, char character, uint8_t page, uint8_t col); - -void lcd_set_font (FONT_P font, uint8_t style); -uint8_t lcd_putc (char c); -uint8_t lcd_putc_xy (char c, uint8_t page, uint8_t col); -uint16_t lcd_putstr (char* str); -uint16_t lcd_putstr_P (PGM_P str); -uint16_t lcd_putstr_xy_P (PGM_P str, uint8_t page, uint8_t col); - -#if INCLUDE_INTEGER_OUTPUT == 1 -uint16_t lcd_put_long (int32_t integer); -uint16_t lcd_put_int (int16_t integer); -uint16_t lcd_put_uint (uint16_t integer); -uint16_t lcd_put_short(int8_t integer); -#endif -#if INCLUDE_FLOAT_OUTPUT == 1 -uint16_t lcd_put_float (float integer); -#endif - - - -/****************************************************************************** - * Define font styles - * These names are used as the style attribute to above put* functions - *****************************************************************************/ - -#define NORMAL 0 -#define NORMAL_SIZE 0 -#define DOUBLE_HEIGHT 1 //double the height of each character -#define DOUBLE_WIDTH 2 //double the width of each character -#define DOUBLE_SIZE 3 //double height and double width -#define INVERT 4 //draw white letters with black background -#define WRAP 8 //wrap around text that does not fit in the current line -#define UNDERLINE 16 //underline the text -#define SPACING 32 //increase spacing between character - - -//used for internal functions: -#define DOUBLE_HEIGHT_BIT 1 -#define DOUBLE_WIDTH_BIT 2 -#define INVERT_BIT 4 -#define WRAP_BIT 8 -#define UNDERLINE_BIT 16 - -/****************************************************************************** - * Documentation: Example Font File - * A c-template to use with Hagen Reddmanns font generator is - * included (template_simplefont.c) - *****************************************************************************/ -/* -#include "font.h" -#ifdef %FONT INCLUDE IDENTIFIER% -const char fontname_length[] PROGMEM = {...} -const char fontname_data[] PROGMEM = {...} -const struct font_info fontname PROGMEM = {...}; -#endif -*/ - - -/****************************************************************************** - * Structure holds information about fonts - *****************************************************************************/ -struct font_info { - uint16_t size; //size of data array - uint8_t width; //(maximum) width of character - uint8_t height; //height of character - uint8_t firstchar; //the number of the first included character (often 0x20) - uint8_t lastchar; //the last included character (often 0xFF) - PGM_VOID_P widthtable; //Pointer to the table holding character widths (NULL for monospaced fonts) - PGM_VOID_P data; //Pointer to data arrray - }; - - - -#endif diff --git a/lcdlib/lcd-color-graphic.c b/lcdlib/lcd-color-graphic.c deleted file mode 100644 index 8403f96..0000000 --- a/lcdlib/lcd-color-graphic.c +++ /dev/null @@ -1,223 +0,0 @@ -/****************************************************************************** - * Display Library - * for an LCD with ILI9341 driver in 16 Bit color mode using 4-wire SPI - * New features in v0.01 - * - well... everything. - *****************************************************************************/ - -#include "lcd-color-graphic.h" - - -/****************************************************************************** - * Global variables for color handling - * Foreground is the normal drawing color - * Background is used as background, e.g. when writing fonts. - */ - -color_t foreground = {.red=0x1F, .green=0x3F, .blue=0x1F}; -color_t background = {.red=0, .green=0, .blue=0}; - - -/****************************************************************************** - * Initializes the display - */ -void lcd_init() { - LCD_SET_PIN_DIRECTIONS(); //set outputs - _delay_ms(1); - LCD_INIT_SPI(); //Initialize SPI Interface - _delay_ms(50); - LCD_RESET_ON(); //Apply Reset to the Display Controller - _delay_ms(100); - LCD_RESET_OFF(); - _delay_ms(100); - LCD_SELECT(); //Switches chip select on - lcd_command(LCD_SLEEP_OUT); //Wake up LCD - _delay_ms(70); - return; - } - - -/****************************************************************************** - * Sends a command to the display - */ -inline void lcd_command(uint8_t c) { - spi_wait_for_idle(); - LCD_CMD(); - spi_write(c); - } - -/****************************************************************************** - * Sends a command with one argument - */ -inline void lcd_command_1(uint8_t c, uint8_t data) { - lcd_command(c); - lcd_data(data); -} - -/****************************************************************************** - * Sends a data word to the display - */ -inline void lcd_data(uint8_t c) { - spi_wait_for_idle(); - LCD_DATA(); - spi_write(c); -} - - - -/****************************************************************************** - * Stores the main drawing color for later use - */ -inline void lcd_set_foreground(uint8_t r, uint8_t g, uint8_t b) { - foreground.red = r; - foreground.green = g; - foreground.blue = b; - } - - -/****************************************************************************** - * Stores the background color for later use - */ -inline void lcd_set_background(uint8_t r, uint8_t g, uint8_t b) { - background.red = r; - background.green = g; - background.blue = b; - } - - -/****************************************************************************** - * Sets the column range used for the next write operation - */ -inline void lcd_set_column(uint16_t start, uint16_t end) { - lcd_command(LCD_SET_COLUMN); - lcd_data(start >> 8); - lcd_data(start); - lcd_data(end >> 8); - lcd_data(end); - } - -/****************************************************************************** - * Sets the page range used for the next write operation - */ -inline void lcd_set_page(uint16_t start, uint16_t end) { - lcd_command(LCD_SET_PAGE); - lcd_data(start >> 8); - lcd_data(start); - lcd_data(end >> 8); - lcd_data(end); - } - -/****************************************************************************** - * Writes a pixel to the display using 16 Bit color mode - */ -inline void lcd_send_pixel(color_t c) { - lcd_data((c.red<<3) | (c.green>>3)); - lcd_data((c.green<<5) | c.blue); - } - -/****************************************************************************** - * Sets a pixel at a given position - */ -inline void lcd_set_pixel_xy(uint16_t column, uint16_t page) { - lcd_set_page(page,page); - lcd_set_column(column,column); - lcd_command(LCD_WRITE_MEM); - lcd_send_pixel(foreground); - } - - -/****************************************************************************** - * This function sets an area of the screen to a given color - * col0 - left edge of the area - * col1 - right edge of the area - * page0 - top edge of the area - * page1 - bottom edge of the area - * r,g,b - the color to be used - */ -void lcd_set_area_xy(uint16_t col0, uint16_t col1, uint16_t page0, uint16_t page1) { - lcd_set_column(col0,col1); - lcd_set_page(page0,page1); - lcd_command(LCD_WRITE_MEM); - for(uint16_t y = page0; y <= page1; y++) - for(uint16_t x = col0; x <= col1; x++) { - lcd_send_pixel(background); - } - } - - - -//============================================================================= -//Compatibility functions to accept output of font generator -// Pages are counted in units of 8 pixels! -//============================================================================= - -uint16_t lcd_current_page = 0; -uint16_t lcd_current_column = 0; - - -/****************************************************************************** - * Changes the internal cursor by s pages - * s - number of pages to move - */ -uint16_t lcd_inc_page(int16_t s) { - uint16_t p = lcd_current_page; - p += s; - if (p > LCD_HEIGHT/8) - p = 0; - lcd_current_page = p; - - return p; - } - -/****************************************************************************** - * Changes the internal cursor by s columns, including wrapping (if selected) - * s - number of columns to move - */ -uint16_t lcd_inc_column(int16_t s) { - uint16_t c = lcd_current_column; - c += s; - if (c > LCD_WIDTH) - c = 0; - lcd_current_column = c; - return c; - } - - -/****************************************************************************** - * Moves the cursor to the given position - * pages - page to move to - * columns - column to move to - */ -void lcd_moveto_xy(uint16_t page, uint16_t column) { - lcd_current_column = column; - lcd_current_page = page; - } - -/****************************************************************************** - * Moves the cursor relative to the current position - * pages - number of pages to move - * columns - number of columns to move - */ -void lcd_move_xy(int16_t pages, int16_t columns) { - lcd_moveto_xy(lcd_inc_page(pages),lcd_inc_column(columns)); - } - - -/****************************************************************************** - * Takes a vertical byte from the font generator and prints it on the display - * b - Bit pattern to display - */ -void lcd_write_font_byte(uint8_t b) { - lcd_set_page(8*lcd_current_page,8*lcd_current_page+8); - lcd_set_column(lcd_current_column,lcd_current_column); - lcd_command(LCD_WRITE_MEM); - for(uint8_t i=0;i<8;i++) { - if(b&1) - lcd_send_pixel(foreground); - else - lcd_send_pixel(background); - b = b>>1; - } - lcd_inc_column(1); - } - \ No newline at end of file diff --git a/lcdlib/lcd-color-graphic.h b/lcdlib/lcd-color-graphic.h deleted file mode 100644 index 41cd6ce..0000000 --- a/lcdlib/lcd-color-graphic.h +++ /dev/null @@ -1,184 +0,0 @@ -#ifndef LCD_H_INCLUDED -#define LCD_H_INCLUDED - -#include -#include -#include -#include -#include - - -/***************************************************************************** - * BEGIN CONFIG BLOCK - *****************************************************************************/ -#define LCD_WIDTH 240 -#define LCD_HEIGHT 320 - -//Should chip select (CS) be used? -#define LCD_USE_CHIPSELECT 1 - -//CD Port -#define PORT_DC PORTB -#define DDR_DC DDRB -#define PIN_DC 0 - -//Reset Port -#define PORT_RST PORTA -#define DDR_RST DDRA -#define PIN_RST 4 - -//Chip select -#if LCD_USE_CHIPSELECT == 1 - #define PORT_CS PORTB - #define DDR_CS DDRB - #define PIN_CS 1 -#endif - -//SPI routines -//Define a function that initializes the SPI interface, see below for an example -extern void init_spi_lcd(void); -#define LCD_INIT_SPI() init_spi_lcd() - -//Define a function that waits until SPI interface is idle -#define spi_wait_for_idle() while(! (SPSR0 & _BV(SPIF0))); - -//Define how to write to SPI data register -#define spi_write(i) SPDR0 = i - -/*Example SPI setup (Atmega162) - *init spi: msb first, update on falling edge , read on rising edge, 9 MHz - *void init_spi_lcd() { - * SPCR = 0 << SPIE | 1 << SPE | 0 << DORD | 1 << MSTR | 1 << CPOL | 1 << CPHA | 0 << SPR1 | 0 << SPR0; - * SPSR = 1 << SPI2X; - * SPDR = LCD_NO_OP; //Do not use 0 here, only LCD_NOP is allowed! - * } - */ -/***************************************************************************** - * END CONFIG BLOCK - *****************************************************************************/ - -//In case of an color LCD, this struct will keep the necessary information -//Color struct - no bit fields are used for better performance (i.e. bit shifts -//can be done while waiting for SPI, not while preparing to write the pixel) -typedef struct { - uint8_t red; - uint8_t green; - uint8_t blue; - } color_t; - - -/***************************************************************************** - * Public Functions - *****************************************************************************/ -//initializes the display in standard settings - void lcd_init(void); - -//write data word or command to the LCD - void lcd_data (uint8_t data); - void lcd_command (uint8_t cmd); - void lcd_command_1 (uint8_t cmd, uint8_t data); - -//Set the drawing and background colors - void lcd_set_foreground(uint8_t r, uint8_t g, uint8_t b); - void lcd_set_background(uint8_t r, uint8_t g, uint8_t b); - -//set display area for next write accesses - void lcd_set_page(uint16_t start, uint16_t end); - void lcd_set_column(uint16_t start, uint16_t end); - -//write pixel data in 16 bit color mode. Display must be in write mode - void lcd_send_pixel(color_t c); - -//Set a pixel at a given location to the foreground color - void lcd_set_pixel_xy(uint16_t column, uint16_t page); -//Set an area to the background color - void lcd_set_area_xy(uint16_t col0, uint16_t col1, uint16_t page0, uint16_t page1); - - - - -//Text functions are included in font.c / font.h -//These functions provide compatibility to the old font generator - uint16_t lcd_inc_page(int16_t s); - uint16_t lcd_inc_column(int16_t s); - void lcd_moveto_xy(uint16_t page, uint16_t column); - void lcd_move_xy(int16_t pages, int16_t columns); -//Function to read the current position - extern uint16_t lcd_current_page; - extern uint16_t lcd_current_column; - static inline uint16_t lcd_get_position_page(void) {return lcd_current_page;} - static inline uint16_t lcd_get_position_column(void) {return lcd_current_column;} - void lcd_write_font_byte(uint8_t b); - - -/***************************************************************************** - * Command Codes - *****************************************************************************/ - #define LCD_NOP 0x00 - #define LCD_SOFT_RESET 0x01 - #define LCD_SLEEP_ENTER 0x10 - #define LCD_SLEEP_OUT 0x11 - #define LCD_OFF 0x28 - #define LCD_ON 0x29 - #define LCD_SET_COLUMN 0x2A - #define LCD_SET_PAGE 0x2B - #define LCD_WRITE_MEM 0x2C - #define LCD_MIRROR 0x36 - #define LCD_IDLE_MODE_OFF 0x38 - #define LCD_IDLE_MODE_ON 0x39 - #define LCD_COLOR_MODE 0x3A - #define LCD_WRITE_CONTINUE 0x3C - - -/***************************************************************************** - * Commands Arguments - *****************************************************************************/ - #define LCD_16BIT 0x55 - #define LCD_18BIT 0x66 - -//Settings for LCD_MIRROR (0x36) - #define LCD_MIRROR_Y 0x80 - #define LCD_MIRROR_X 0x40 - #define LCD_FLIP_XY 0x20 - #define LCD_BGR 0x08 - - - - -/***************************************************************************** - * Output pin controlling makros - *****************************************************************************/ - -//Control A0 input of LCD -#define LCD_DATA() PORT_DC |= _BV(PIN_DC) -#define LCD_CMD() PORT_DC &= ~_BV(PIN_DC) -#define LCD_SET_OUTPUT_DC() DDR_DC |= _BV(PIN_DC) - -//Control reset input of LCD -#define LCD_RESET_OFF() PORT_RST |= _BV(PIN_RST) -#define LCD_RESET_ON() PORT_RST &= ~_BV(PIN_RST) -#define LCD_SET_OUTPUT_RST() DDR_RST |= _BV(PIN_RST) - - -//Control pin for chip select -#if LCD_USE_CHIPSELECT == 1 - #define LCD_SET_OUTPUT_CS() DDR_CS |= _BV(PIN_CS) - #define LCD_SELECT() PORT_CS &= ~_BV(PIN_CS) - #define LCD_UNSELECT() spi_wait_for_idle(); PORT_CS |= _BV(PIN_CS) -#else - #define LCD_SET_OUTPUT_CS() - #define LCD_SELECT() spi_wait_for_idle(); - #define LCD_UNSELECT() -#endif - -//combined direction selection for all pins -#define LCD_SET_PIN_DIRECTIONS() LCD_SET_OUTPUT_DC(); \ - LCD_SET_OUTPUT_RST(); \ - LCD_SET_OUTPUT_CS() - - - - - -#endif - -- 2.43.0