From 05a4583ce89ae12c8f978fe015ebab387f649575 Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Sat, 23 Jan 2021 07:32:10 -1000 Subject: [Keymap] Adding Fancy and Bongocat Keymap to Mercutio Keyboard (#11520) * Initial commit on new clean branch. Testing out functionality of oled and encoder for default features. * Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly. * Cleaned up the readme some more, compiled and tested both default and via keymaps, and did another round of checks to prepare for starting the PR. * Cleaning up the keymap to meet expected formatting in a couple places and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies. * Initial commit of branch specifically for implementing the more complicated fancy keymap as I expect the main PR to be approved first. * testing bongo cat out * Progress with intended OLED behavior. Needs to be cleaned up still. * Cleaned up bongocat and added WPM display on it. * Almost there. Need to rethink the layer checking in encoder. * Fixing all the merge issues I didn't check before doing the last commit. Learn from my mistakes, check your commits. * Fixed and updated fancy firmware and bongocat firmware. * Updating license year since I will be doing a PR anyway. * Update keyboards/mechwild/mercutio/keymaps/fancy/keymap.c Co-authored-by: Ryan Co-authored-by: Ryan --- keyboards/mechwild/mercutio/keymaps/fancy/config.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 keyboards/mechwild/mercutio/keymaps/fancy/config.h (limited to 'keyboards/mechwild/mercutio/keymaps/fancy/config.h') diff --git a/keyboards/mechwild/mercutio/keymaps/fancy/config.h b/keyboards/mechwild/mercutio/keymaps/fancy/config.h new file mode 100644 index 0000000000..235effacd7 --- /dev/null +++ b/keyboards/mechwild/mercutio/keymaps/fancy/config.h @@ -0,0 +1,20 @@ +/* Copyright 2021 Kyle McCreery + * + * 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 2 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 . + */ + +#pragma once + +/* Define custom font */ +#define OLED_FONT_H "keyboards/mechwild/mercutio/lib/mercutiofont.c" \ No newline at end of file -- cgit v1.2.3