diff options
| author | Max Audron <audron@ejected.space> | 2018-07-15 19:31:45 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-07-15 13:31:45 -0400 |
| commit | bbea9dadbcc92c4005188860a44c7b9e2479be2e (patch) | |
| tree | 6771bf1efda890e5747fb48db5ff4b1182051f38 /quantum | |
| parent | 81756d7b219fc2c869c043ee606d491a1e77e1c1 (diff) | |
| download | qmk_firmware-bbea9dadbcc92c4005188860a44c7b9e2479be2e.tar.gz qmk_firmware-bbea9dadbcc92c4005188860a44c7b9e2479be2e.zip | |
Integrating Peter Fleury's HD44780 LCD library (#3209)
* integrated Peter Fleury's LCD library for HD44780 LCDs
* fixed typo
* cleanup finished
* add documentation
* added HD44780 documentation
* removed keyboard from .gitmodules
* resolved merge conflict
* removed edit of kira75s rules.mk made by merge
* moved hd44780 to drivers/avr
* Added licence info to hd44780 files
* Added link to hd44780 docs.
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/quantum.c | 4 | ||||
| -rw-r--r-- | quantum/quantum.h | 4 | ||||
| -rw-r--r-- | quantum/template/avr/config.h | 28 | ||||
| -rw-r--r-- | quantum/template/avr/rules.mk | 1 |
4 files changed, 37 insertions, 0 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index b9934aee8..2bd2c71af 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -1187,6 +1187,10 @@ void backlight_set(uint8_t level) {} | |||
| 1187 | 1187 | ||
| 1188 | #endif // backlight | 1188 | #endif // backlight |
| 1189 | 1189 | ||
| 1190 | #ifdef HD44780_ENABLED | ||
| 1191 | #include "hd44780.h" | ||
| 1192 | #endif | ||
| 1193 | |||
| 1190 | 1194 | ||
| 1191 | // Functions for spitting out values | 1195 | // Functions for spitting out values |
| 1192 | // | 1196 | // |
diff --git a/quantum/quantum.h b/quantum/quantum.h index 2958a0abd..223846412 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h | |||
| @@ -121,6 +121,10 @@ extern uint32_t default_layer_state; | |||
| 121 | #include "process_terminal_nop.h" | 121 | #include "process_terminal_nop.h" |
| 122 | #endif | 122 | #endif |
| 123 | 123 | ||
| 124 | #ifdef HD44780_ENABLE | ||
| 125 | #include "hd44780.h" | ||
| 126 | #endif | ||
| 127 | |||
| 124 | #define STRINGIZE(z) #z | 128 | #define STRINGIZE(z) #z |
| 125 | #define ADD_SLASH_X(y) STRINGIZE(\x ## y) | 129 | #define ADD_SLASH_X(y) STRINGIZE(\x ## y) |
| 126 | #define SYMBOL_STR(x) ADD_SLASH_X(x) | 130 | #define SYMBOL_STR(x) ADD_SLASH_X(x) |
diff --git a/quantum/template/avr/config.h b/quantum/template/avr/config.h index e739c93c9..ac3174502 100644 --- a/quantum/template/avr/config.h +++ b/quantum/template/avr/config.h | |||
| @@ -187,4 +187,32 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 187 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | 187 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ |
| 188 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | 188 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 |
| 189 | 189 | ||
| 190 | /* | ||
| 191 | * HD44780 LCD Display Configuration | ||
| 192 | */ | ||
| 193 | /* | ||
| 194 | #define LCD_LINES 2 //< number of visible lines of the display | ||
| 195 | #define LCD_DISP_LENGTH 16 //< visibles characters per line of the display | ||
| 196 | |||
| 197 | #define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode | ||
| 198 | |||
| 199 | #if LCD_IO_MODE | ||
| 200 | #define LCD_PORT PORTB //< port for the LCD lines | ||
| 201 | #define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 | ||
| 202 | #define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 | ||
| 203 | #define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 | ||
| 204 | #define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 | ||
| 205 | #define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 | ||
| 206 | #define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 | ||
| 207 | #define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 | ||
| 208 | #define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 | ||
| 209 | #define LCD_RS_PORT LCD_PORT //< port for RS line | ||
| 210 | #define LCD_RS_PIN 3 //< pin for RS line | ||
| 211 | #define LCD_RW_PORT LCD_PORT //< port for RW line | ||
| 212 | #define LCD_RW_PIN 2 //< pin for RW line | ||
| 213 | #define LCD_E_PORT LCD_PORT //< port for Enable line | ||
| 214 | #define LCD_E_PIN 1 //< pin for Enable line | ||
| 215 | #endif | ||
| 216 | */ | ||
| 217 | |||
| 190 | #endif | 218 | #endif |
diff --git a/quantum/template/avr/rules.mk b/quantum/template/avr/rules.mk index 45eb6ee37..d567544c7 100644 --- a/quantum/template/avr/rules.mk +++ b/quantum/template/avr/rules.mk | |||
| @@ -66,3 +66,4 @@ UNICODE_ENABLE = no # Unicode | |||
| 66 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 66 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 67 | AUDIO_ENABLE = no # Audio output on port C6 | 67 | AUDIO_ENABLE = no # Audio output on port C6 |
| 68 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | 68 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches |
| 69 | HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) | ||
