aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-12-02 16:49:00 +0000
committerQMK Bot <[email protected]>2024-12-02 16:49:00 +0000
commit750a3f1e602f81ad79b4ac59354d156fae8af917 (patch)
tree5e5add2314fb9c6256270cba87e1463e65b7a145 /keyboards
parent777ae4fb8d87fd2fbb98019f6e2bc4ef9e52e99d (diff)
parente4e66c61ad9278124699dd452c7f7e5518e772a3 (diff)
downloadqmk_firmware-750a3f1e602f81ad79b4ac59354d156fae8af917.tar.gz
qmk_firmware-750a3f1e602f81ad79b4ac59354d156fae8af917.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/murcielago/rev1/config.h1
-rw-r--r--keyboards/murcielago/rev1/keymaps/default/keymap.c16
2 files changed, 17 insertions, 0 deletions
diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h
index 17f316d6af..0d61c034de 100644
--- a/keyboards/murcielago/rev1/config.h
+++ b/keyboards/murcielago/rev1/config.h
@@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* split options, use EEPROM for side detection */
#define EE_HANDS
#define SPLIT_USB_DETECT
+#define SPLIT_WATCHDOG_ENABLE
/*
* Feature disable options
diff --git a/keyboards/murcielago/rev1/keymaps/default/keymap.c b/keyboards/murcielago/rev1/keymaps/default/keymap.c
index 63fbb04f7b..8dc5e21074 100644
--- a/keyboards/murcielago/rev1/keymaps/default/keymap.c
+++ b/keyboards/murcielago/rev1/keymaps/default/keymap.c
@@ -1,3 +1,19 @@
+/*
+Copyright 2020 elagil
+
+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 <http://www.gnu.org/licenses/>.
+*/
#include QMK_KEYBOARD_H
enum layers {