summaryrefslogtreecommitdiffstats
path: root/layouts/community/ergodox/german-manuneo
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-26 12:13:19 +1100
committerAlex Ong <the.onga@gmail.com>2019-01-26 12:13:19 +1100
commitc9ba618654417ec115809a031d315f8327c79ad4 (patch)
treecd5b907af5bebde7062897ff847e473232ed1214 /layouts/community/ergodox/german-manuneo
parent2bb2977c133646c4e056960e72029270d77cc1eb (diff)
parentd977daa8dc9136746425f9e1414e1f93cb161877 (diff)
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce. # Conflicts: # quantum/matrix.c
Diffstat (limited to 'layouts/community/ergodox/german-manuneo')
-rw-r--r--layouts/community/ergodox/german-manuneo/compile_keymap.py3
-rw-r--r--layouts/community/ergodox/german-manuneo/keymap.c2
2 files changed, 0 insertions, 5 deletions
diff --git a/layouts/community/ergodox/german-manuneo/compile_keymap.py b/layouts/community/ergodox/german-manuneo/compile_keymap.py
index 44f31b1c6e..9ad5c88ecc 100644
--- a/layouts/community/ergodox/german-manuneo/compile_keymap.py
+++ b/layouts/community/ergodox/german-manuneo/compile_keymap.py
@@ -668,9 +668,6 @@ def iter_keymap_parts(config, keymaps):
yield "};\n\n"
- # no idea what this is for
- yield "const uint16_t PROGMEM fn_actions[] = {};\n"
-
# macros
yield MACROCODE.format(
macro_cases="",
diff --git a/layouts/community/ergodox/german-manuneo/keymap.c b/layouts/community/ergodox/german-manuneo/keymap.c
index 71988b7dda..9198bf6e30 100644
--- a/layouts/community/ergodox/german-manuneo/keymap.c
+++ b/layouts/community/ergodox/german-manuneo/keymap.c
@@ -376,8 +376,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
-const uint16_t PROGMEM fn_actions[] = {};
-
#define UC_MODE_WIN 0
#define UC_MODE_LINUX 1
#define UC_MODE_OSX 2