-
-
Notifications
You must be signed in to change notification settings - Fork 41.7k
add support for m65 and simple 5x13 ortholinear #12315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 30 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
b35abd9
add support for m65 and simple 5x13 ortholinear
52b91b8
Update keyboards/m65/keymaps/default/keymap.c
c60a9fa
Update keyboards/m65/keymaps/default/keymap.c
f3037f0
Update keyboards/m65/keymaps/default/keymap.c
557f26a
Update keyboards/m65/keymaps/default/keymap.c
756f674
Update keyboards/m65/keymaps/default/keymap.c
e2145f0
Update keyboards/m65/keymaps/default/keymap.c
5c0485d
updates as per @sigprof review plus reformat
alinelena 4635228
pins all now are defined at microcontroller level
alinelena e1564c8
profuct id defined at microcontroller level
alinelena 3ed6df8
put leds on when _ADJ is on
alinelena c67c3bd
add danish keymap
alinelena 5999719
make default uk centric iso as per readme
alinelena b9ac18f
default is now iso generic, uk is its own business
alinelena 9acefc6
add license
alinelena cd137d9
update imgur links to reflect the layout
alinelena 16b3a49
leds for _ADJ layer now do not prevent the other layers leds to get on
alinelena 76a791a
Update keyboards/m65/keymaps/uk/keymap.c
649e8b3
Update keyboards/m65/keymaps/dk/keymap.c
f0d2635
Update keyboards/m65/keymaps/uk/readme.md
0778b5e
Update keyboards/m65/readme.md
4ad3834
add support for gd32f303cct6 by we act in rev2
alinelena 211f7c3
Merge remote-tracking branch 'origin/develop' into m65-dev
alinelena fe012db
Revert "add support for gd32f303cct6 by we act in rev2"
alinelena 9b9f8fe
Update keyboards/m65/rev1/rules.mk
d9bdff8
Update keyboards/m65/keymaps/dk/readme.md
90a443a
Update keyboards/m65/keymaps/uk/readme.md
522bbbc
Update keyboards/m65/keymaps/default/readme.md
bb80969
remove empty hal
alinelena d49da48
add capslock
alinelena 9b56186
Update keyboards/m65/readme.md
87bab39
Update keyboards/m65/config.h
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/* | ||
Copyright 2021 Alin M Elena <[email protected]> | ||
|
||
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/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include "config_common.h" | ||
|
||
#define VENDOR_ID 0xBABA | ||
#define MANUFACTURER m65 | ||
#define PRODUCT keyboard | ||
|
||
#define MATRIX_ROWS 5 | ||
#define MATRIX_COLS 13 | ||
|
||
#define DIODE_DIRECTION COL2ROW | ||
#define DEBOUNCE 5 | ||
|
||
#define LOCKING_SUPPORT_ENABLE | ||
#define LOCKING_RESYNC_ENABLE |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
{ | ||
"keyboard_name": "M65", | ||
"keyboard_folder": "m65", | ||
"url": "https://alin.elena.space/blog/keeblego/", | ||
"maintainer": "alinelena", | ||
"width": 13, | ||
"height": 5, | ||
"layouts": { | ||
"LAYOUT_ortho_5x13": { | ||
"layout": [ | ||
{"x": 0, "y": 0}, | ||
{"x": 1, "y": 0}, | ||
{"x": 2, "y": 0}, | ||
{"x": 3, "y": 0}, | ||
{"x": 4, "y": 0}, | ||
{"x": 5, "y": 0}, | ||
{"x": 6, "y": 0}, | ||
{"x": 7, "y": 0}, | ||
{"x": 8, "y": 0}, | ||
{"x": 9, "y": 0}, | ||
{"x": 10, "y": 0}, | ||
{"x": 11, "y": 0}, | ||
{"x": 12, "y": 0}, | ||
|
||
{"x": 0, "y": 1}, | ||
{"x": 1, "y": 1}, | ||
{"x": 2, "y": 1}, | ||
{"x": 3, "y": 1}, | ||
{"x": 4, "y": 1}, | ||
{"x": 5, "y": 1}, | ||
{"x": 6, "y": 1}, | ||
{"x": 7, "y": 1}, | ||
{"x": 8, "y": 1}, | ||
{"x": 9, "y": 1}, | ||
{"x": 10, "y": 1}, | ||
{"x": 11, "y": 1}, | ||
{"x": 12, "y": 1}, | ||
|
||
{"x": 0, "y": 2}, | ||
{"x": 1, "y": 2}, | ||
{"x": 2, "y": 2}, | ||
{"x": 3, "y": 2}, | ||
{"x": 4, "y": 2}, | ||
{"x": 5, "y": 2}, | ||
{"x": 6, "y": 2}, | ||
{"x": 7, "y": 2}, | ||
{"x": 8, "y": 2}, | ||
{"x": 9, "y": 2}, | ||
{"x": 10, "y": 2}, | ||
{"x": 11, "y": 2}, | ||
{"x": 12, "y": 2}, | ||
|
||
{"x": 0, "y": 3}, | ||
{"x": 1, "y": 3}, | ||
{"x": 2, "y": 3}, | ||
{"x": 3, "y": 3}, | ||
{"x": 4, "y": 3}, | ||
{"x": 5, "y": 3}, | ||
{"x": 6, "y": 3}, | ||
{"x": 7, "y": 3}, | ||
{"x": 8, "y": 3}, | ||
{"x": 9, "y": 3}, | ||
{"x": 10, "y": 3}, | ||
{"x": 11, "y": 3}, | ||
{"x": 12, "y": 3}, | ||
|
||
{"x": 0, "y": 4}, | ||
{"x": 1, "y": 4}, | ||
{"x": 2, "y": 4}, | ||
{"x": 3, "y": 4}, | ||
{"x": 4, "y": 4}, | ||
{"x": 5, "y": 4}, | ||
{"x": 6, "y": 4}, | ||
{"x": 7, "y": 4}, | ||
{"x": 8, "y": 4}, | ||
{"x": 9, "y": 4}, | ||
{"x": 10, "y": 4}, | ||
{"x": 11, "y": 4} | ||
{"x": 12, "y": 4} | ||
] | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
/* | ||
Copyright 2021 Alin M Elena <[email protected]> | ||
|
||
alinelena marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#define TAPPING_TOGGLE 2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
/* | ||
Copyright 2021 Alin M Elena <[email protected]> | ||
|
||
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 layer_names { _QW = 0, _LWR, _RSE, _ADJ }; | ||
|
||
alinelena marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// clang-format off | ||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
|
||
[_QW] = LAYOUT_ortho_5x13( | ||
KC_ESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_BSPC , | ||
KC_TAB, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC , | ||
KC_NUHS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , | ||
KC_LSPO, KC_NUBS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_UP , KC_SLSH , | ||
KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT), | ||
|
||
[_LWR] = LAYOUT_ortho_5x13( | ||
KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL , | ||
KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_TRNS, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS , | ||
KC_TRNS, KC_BTN4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R), | ||
|
||
[_RSE] = LAYOUT_ortho_5x13( | ||
KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , | ||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS , | ||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R), | ||
|
||
[_ADJ] = LAYOUT_ortho_5x13( | ||
KC_TRNS, KC_TRNS, A(KC_F2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, RESET , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | ||
}; | ||
// clang-format on | ||
|
||
alinelena marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// let us assume we start with both layers off | ||
bool toggle_lwr = false; | ||
bool toggle_rse = false; | ||
|
||
static inline void led_lwr(const bool on) { | ||
#ifdef LED_NUM_LOCK_PIN | ||
writePin(LED_NUM_LOCK_PIN, on); | ||
#endif | ||
} | ||
|
||
static inline void led_rse(const bool on) { | ||
#ifdef LED_SCROLL_LOCK_PIN | ||
writePin(LED_SCROLL_LOCK_PIN, on); | ||
#endif | ||
} | ||
|
||
alinelena marked this conversation as resolved.
Show resolved
Hide resolved
|
||
static inline void led_caps(const bool on) { | ||
#ifdef LED_CAPS_LOCK_PIN | ||
writePin(LED_CAPS_LOCK_PIN, on); | ||
#endif | ||
} | ||
|
||
bool led_update_user(led_t led_state) { | ||
// Disable the default LED update code, so that lock LEDs could be reused to show layer status. | ||
return false; | ||
} | ||
|
||
void matrix_scan_user(void) { | ||
led_lwr(toggle_lwr); | ||
led_rse(toggle_rse); | ||
led_t led_state = host_keyboard_led_state(); | ||
led_caps(!led_state.caps_lock); | ||
if (layer_state_is(_ADJ)) { | ||
led_lwr(true); | ||
led_rse(true); | ||
} | ||
} | ||
|
||
bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
switch (keycode) { | ||
case (TT(_LWR)): | ||
if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) { | ||
// This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle. | ||
toggle_lwr = !layer_state_is(_LWR); | ||
} | ||
return true; | ||
break; | ||
case (TT(_RSE)): | ||
if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) { | ||
toggle_rse = !layer_state_is(_RSE); | ||
} | ||
return true; | ||
break; | ||
default: | ||
return true; | ||
} | ||
} | ||
|
||
layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LWR, _RSE, _ADJ); } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
 | ||
|
||
# Default M65 Layout | ||
|
||
This is the default layout for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a UK | ||
turn. The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR. Similarly | ||
number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE, KC_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN, KC_MEDIA_PREV_TRACK, | ||
KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, M_EXTDISP, KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, KC_EQL in layer 2 aka | ||
RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2. | ||
|
||
flashing is done by LWR+RSE+r | ||
|
||
full layout below see in keymap.c |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
/* | ||
Copyright 2021 Alin M Elena <[email protected]> | ||
|
||
alinelena marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#define TAPPING_TOGGLE 2 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.