summaryrefslogtreecommitdiff
path: root/keyboards/meira/keymaps/default
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-03-19 12:57:40 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-03-19 12:57:40 -0700
commit0072fdd799ffe61bf64f12c23335da3adeb083e5 (patch)
tree7f30d26e4542c5ff3f6da38a75c329f5d0235938 /keyboards/meira/keymaps/default
parent29bfd634e16e196c86b0a5f63e179af1f9a52902 (diff)
Cleanup Default Keymaps (#5442)
* Cleanup Default Keymaps to conform to QMK Firmware standards * Minor fixes * Revert some changes
Diffstat (limited to 'keyboards/meira/keymaps/default')
-rw-r--r--keyboards/meira/keymaps/default/config.h7
-rw-r--r--keyboards/meira/keymaps/default/keymap.c2
2 files changed, 3 insertions, 6 deletions
diff --git a/keyboards/meira/keymaps/default/config.h b/keyboards/meira/keymaps/default/config.h
index 5f5844a70a..e3776d2eff 100644
--- a/keyboards/meira/keymaps/default/config.h
+++ b/keyboards/meira/keymaps/default/config.h
@@ -14,10 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+#pragma once
-#include "../../config.h"
+// place overrides here
// place overrides here
#define MUSIC_MASK (keycode != KC_NO)
@@ -30,5 +29,3 @@
SONG(DVORAK_SOUND) \
}
#endif
-
-#endif
diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/meira/keymaps/default/keymap.c
index b25d789192..5703999a04 100644
--- a/keyboards/meira/keymaps/default/keymap.c
+++ b/keyboards/meira/keymaps/default/keymap.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "meira.h"
+#include QMK_KEYBOARD_H
#include "lighting.h"
#ifdef RGBLIGHT_ENABLE