aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEddie Ehlin <eddiex@eddiex.se>2021-08-16 21:22:12 +0200
committerEddie Ehlin <eddiex@eddiex.se>2021-08-16 21:22:12 +0200
commita5e8be0c76128c734142e15ef12d261d2ebd77b8 (patch)
tree9b5bc030a31b2beaf7e848e9e2735141f9c283e8
parent5c58fffefc32cc716382c18e8c1e8fb49bfbffe9 (diff)
downloadplanck-keyboard-a5e8be0c76128c734142e15ef12d261d2ebd77b8.tar.gz
planck-keyboard-a5e8be0c76128c734142e15ef12d261d2ebd77b8.zip
Bumped keymap to support latest release of QMK. Re-enabled process_record_user content as well.
-rw-r--r--compiled-keymaps/checksums.md1
-rwxr-xr-xcompiled-keymaps/planck_rev6_0xedd1e-20210816.binbin0 -> 53852 bytes
-rw-r--r--keymap/0xedd1e/config.h3
-rw-r--r--keymap/0xedd1e/keymap.c8
4 files changed, 5 insertions, 7 deletions
diff --git a/compiled-keymaps/checksums.md b/compiled-keymaps/checksums.md
index 046c3e2..f23d3c2 100644
--- a/compiled-keymaps/checksums.md
+++ b/compiled-keymaps/checksums.md
@@ -5,3 +5,4 @@ SHA256sums:
158c969dd56f9db82102cfe0553da958e1cde0bca173e881e7ce5f1f30a9fdc7 planck_rev6_0xedd1e-20210122.bin
ebe204911bb2c3503ff10d30fa7980a04bfa2d59eb9aa67cff772e1f33365a6c planck_rev6_0xedd1e-20210125.bin
66f8107875ffdab38806b1793e5c30e3f7768608813ff9bcc0cc6f04e2411c59 planck_rev6_0xedd1e-20210301.bin
+44a0aad45fa687e21c79b31c1c603abfed06a27bb665386bffff27e4abc9537d planck_rev6_0xedd1e-20210816.bin
diff --git a/compiled-keymaps/planck_rev6_0xedd1e-20210816.bin b/compiled-keymaps/planck_rev6_0xedd1e-20210816.bin
new file mode 100755
index 0000000..6126e03
--- /dev/null
+++ b/compiled-keymaps/planck_rev6_0xedd1e-20210816.bin
Binary files differ
diff --git a/keymap/0xedd1e/config.h b/keymap/0xedd1e/config.h
index 6fa31cc..9020d2b 100644
--- a/keymap/0xedd1e/config.h
+++ b/keymap/0xedd1e/config.h
@@ -14,9 +14,6 @@
* MIDI options
*/
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
/* enable basic MIDI features:
- MIDI notes can be sent when in Music mode is on
*/
diff --git a/keymap/0xedd1e/keymap.c b/keymap/0xedd1e/keymap.c
index 302779e..ddbbcf2 100644
--- a/keymap/0xedd1e/keymap.c
+++ b/keymap/0xedd1e/keymap.c
@@ -123,11 +123,10 @@ layer_state_t layer_state_set_user(layer_state_t state) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- /*
switch (keycode) {
case QWERTY:
if (record->event.pressed) {
- print("mode just switched to qwerty and this is a huge string\n");
+ print("Base layer set to: QWERTY\n");
set_single_persistent_default_layer(_QWERTY);
}
return false;
@@ -150,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
break;
}
- */
+
return true;
}
@@ -160,7 +159,7 @@ uint16_t muse_counter = 0;
uint8_t muse_offset = 70;
uint16_t muse_tempo = 50;
-void encoder_update(bool clockwise) {
+bool encoder_update(bool clockwise) {
if (muse_mode) {
if (IS_LAYER_ON(_RAISE)) {
if (clockwise) {
@@ -190,6 +189,7 @@ void encoder_update(bool clockwise) {
#endif
}
}
+ return true;
}
void dip_switch_update_user(uint8_t index, bool active) {