Merge remote-tracking branch 'origin/master' into develop

keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c

@@ -0,0 +1,168 @@
+/* Copyright 2022 Abigail Fassl
+ *
+ * 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
+
+#define RAISE    MO(_RAISE)
+#define LOWER    MO(_LOWER)
+#define FUN      MO(_FUNC)
+#define MOUSE    MO(_MOUSE)
+
+enum layers {
+    _QWERTY = 0,
+    _FUNC,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+    _MOUSE,
+    _NUMPAD
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc* |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Ent  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |  '   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Alt  | GUI  | Func |Lower |Space | Bksp |Raise | DEL  | Bksl | NUM  | Ctrl |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_ortho_4x12(
+  LT(_NUMPAD, KC_ESC), KC_Q,    KC_W,    KC_E,  KC_R,   KC_T,   KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,        KC_ENT    ,
+  KC_TAB,              KC_A,    KC_S,    KC_D,  KC_F,   KC_G,   KC_H,    KC_J,  KC_K,    KC_L,    KC_SCLN,     KC_QUOT   ,
+  KC_LSHIFT,           KC_Z,    KC_X,    KC_C,  KC_V,   KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH,     KC_RSHIFT ,
+  KC_LCTL,             KC_LALT, KC_LGUI, FUN,   LOWER,  KC_SPC, KC_BSPC, RAISE, KC_DEL,  KC_BSLS, TG(_NUMPAD), KC_RCTL
+),
+
+/* Function
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |  1!  |  2"  |  3£  |  4$  |  5%  |  6^  |  7&  |  8*  |  9(  |  0)  |  ~   |INSERT|
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|      |      |   _  |   -  |   +  |  =   |  \|  |  [{  |  ]}  |      |Shift |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  ___ |  ___ | ___  | ___  |  ___ |Space | Bksp |Mouse | DEL  |      |      |      | 
+ * `-----------------------------------------------------------------------------------'
+ */
+[_FUNC] = LAYOUT_ortho_4x12(
+  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_1,      KC_2,         KC_3,     KC_4,          KC_5,    KC_6,         KC_7,   KC_8,     KC_9,    KC_0,    LSFT(KC_GRV), KC_INSERT ,
+  KC_LSHIFT, KC_NO,        KC_NO,    LSFT(KC_MINS), KC_MINS, LSFT(KC_EQL), KC_EQL, KC_BSLS,  KC_LBRC, KC_RBRC, KC_NO,        KC_RSHIFT ,
+  _______,   _______,      _______,  _______,       _______, _______,      _______, _______, _______, _______, _______,      _______
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |  1!  |  2@  |  3#  |  4$  |  5%  |  6^  |  7&  |  8*  |  9(  |  0)  | DEL  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |  !   |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |WrdDel|WrdBks|
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift| PSCRN|  |   |  \|  |   _  |   -  |   +  |  =   |      |BL ON | BLSP |Shift |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |Lower |      |      | ADJ  |      | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_4x12(
+  KC_1,    KC_2,    KC_3,       KC_4,    KC_5,          KC_6,       KC_7,         KC_8,    KC_9,    KC_0,    KC_DEL,       KC_BSPC       ,
+  KC_EXLM, KC_AT,   KC_HASH,    KC_DLR,  KC_PERC,       KC_CIRC,    KC_AMPR,      KC_ASTR, KC_LPRN, KC_RPRN, LCTL(KC_DEL), LCTL(KC_BSPC) ,
+  KC_LSFT, KC_PSCR, S(KC_NUHS), KC_BSLS, LSFT(KC_MINS), KC_MINS,    LSFT(KC_EQL), KC_EQL,  _______, BL_ON,   BL_STEP,      KC_RSFT       ,    
+  _______, _______, _______,    _______, _______,       _______,    _______,      _______, _______, KC_VOLD, KC_VOLU,      KC_MPLY
+),
+
+/* Raise 
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |  \|  |      |  [   |   ]  |      |      | PGUP | HOME |PGDOWN|      |PRNTSC|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   |  |  _   |  =   |  (   |   )  |      |      | HOME |  UP  | END  |      |ZOOM +|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   ~  |  -   |  +   |  {   |   }  |      |  |<  | LEFT | DOWN |RIGHT |  >|  |ZOOM -|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      | ADJ  |      |CtrlBk|Raise |CtrlDl|      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_4x12(
+  KC_GRV,        KC_BSLS,       KC_NO,        KC_LBRC,       KC_RBRC,       KC_NO,   KC_NO,         KC_PGUP, KC_HOME,      KC_PGDOWN, KC_NO,          KC_PSCREEN         ,
+  LSFT(KC_BSLS), LSFT(KC_MINS), KC_EQL,       LSFT(KC_9),    LSFT(KC_0),    KC_NO,   KC_NO,         KC_HOME, KC_UP,        KC_END,    KC_NO,          LCTL(LSFT(KC_EQL)) ,
+  LSFT(KC_GRV),  KC_MINS,       LSFT(KC_EQL), LSFT(KC_LBRC), LSFT(KC_RBRC), KC_NO,   LCTL(KC_LEFT), KC_LEFT, KC_DOWN,      KC_RIGHT,  LCTL(KC_RIGHT), LCTL(KC_MINS)      ,
+  _______,       _______,       _______,      _______,       _______,       KC_SPC,  LCTL(KC_BSPC), _______, LCTL(KC_DEL), _______,   _______,        _______
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * | Reset|      |      |  BLON| BLOFF|      |      |      |      |      |      |  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | CAPS |  RGB | MODE |  VAD |  VAI |      |      | Vol- | Vol+ | Play |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  HUD |  HUI |  SAD |  SAI |      |      | Prev | Next | Mute |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_ortho_4x12(
+  QK_BOOT,   KC_NO,   KC_NO,   BL_ON,   BL_OFF,  KC_NO,   KC_NO,   _______,             _______,             _______,             _______, KC_DEL  ,
+  KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, KC_NO,   KC_NO,   KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP,     KC_MEDIA_PLAY_PAUSE, _______, _______ ,
+  KC_NO,   RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_NO,   KC_NO,   KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE,       _______, _______ ,
+  _______, _______, _______, _______, _______, _______, _______, _______,             _______,             _______,             _______, _______
+),
+
+/* Mouse
+ * ,-----------------------------------------------------------------------------------.
+ * | ESC  |      |      |      |      |      | WH_L | WH_UP| BTN3 | WH_D | WH_R |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | ACC0 | ACC1 | ACC2 |      |      |      |      | BTN1 |  UP  | BTN2 |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | ACC0 | ACC1 | ACC2 |      |      |      |      | LEFT | DOWN |RIGHT |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_MOUSE] = LAYOUT_ortho_4x12(
+    KC_ESC ,      _______,      _______,      _______, _______, _______,   KC_MS_WH_LEFT, KC_MS_WH_UP, KC_MS_BTN3, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, _______,
+    KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______,   _______,       KC_MS_BTN1,  KC_MS_UP,   KC_MS_BTN2,    _______,        _______,
+    KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______,   _______,       KC_MS_LEFT,  KC_MS_DOWN, KC_MS_RIGHT,   _______,        _______,
+    _______,      _______,      _______,      _______, _______, _______,   _______,       _______,     _______,    _______,       _______,        _______
+),
+
+/* Num Pad
+ * ,-----------------------------------------------------------------------------------.
+ * | ESC  |      |      |      |      |      |NMLOCK|   7  |   8  |   9  |   /  |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   4  |   5  |   6  |   *  |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   1  |   2  |   3  |   +  |  -   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   0  |   .  |   ,  |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_NUMPAD] = LAYOUT_ortho_4x12(
+    _______, _______, _______, _______, _______, _______, KC_NLCK, KC_7, KC_8,      KC_9,    KC_KP_SLASH,    _______        ,
+    _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5,      KC_6,    KC_KP_ASTERISK, _______        ,
+    _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2,      KC_3,    KC_KP_PLUS,     KC_KP_MINUS    ,
+    _______, _______, _______, _______, _______, _______, _______, KC_0, KC_KP_DOT, KC_COMM, _______,        _______
+)
+
+};
+
+layer_state_t layer_state_set_user (layer_state_t state) {
+    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+    state = update_tri_layer_state(state, _FUNC, _RAISE, _MOUSE);
+    return state;
+}

keyboards/kprepublic/jj40/keymaps/brdlf/readme.md

@@ -0,0 +1,69 @@
+# BRDLF custom layout
+
+> This is my personal configuration for 4x12 ortho keyboard JJ40.
+
+## Layers
+
+### Default QWERTY
+
+|            |         |          |          |           |        |          |          |        |        |        |           |
+| :--------: | :-----: | :------: | :------: | :-------: | :----: | :------: | :------: | :----: | :----: | :----: | :-------: |
+| Esc<br>NUM | Q<br>q  | W<br>w   | E<br>e   | R<br>r    | T<br>t | Y<br>y   | U<br>u   | I<br>i | O<br>o | P<br>p | <br>Enter |
+| <br>Tab    | A<br>a  | S<br>s   | D<br>d   | F<br>f    | G<br>g | H<br>h   | J<br>j   | K<br>k | L<br>l | :<br>; |  "<br>'   |
+| <br>Shift  | Z<br>z  | X<br>x   | C<br>c   | V<br>v    | B<br>b | N<br>n   | M<br>m   | <<br>, | ><br>. | ?<br>/ | <br>Shift |
+| <br>Ctrl   | <br>Alt |  <br>GUI | <br>Func | <br>Lower | <br>Sp | <br>Bksp | <br>Raise| <br>Del| <br>\  |<br>NUM | <br>Ctrl  |
+
+### Function
+
+|           |         |         |             |           |           |          |           |         |         |          |          |
+| :-------: | :-----: | :-----: | :---------: | :-------: | :-------: | :------: | :-------: | :-----: | :-----: | :------: | :------: |
+| <br>F1    | <br>F2  | <br>F3  | <br>F4      | <br>F5    | <br>F6    | <br>F7   | <br>F8    | <br>F9  | <br>F10 | <br>F11  | <br>F12  |
+| !<br>1    | @<br>2  | #<br>3  | \$<br>4     | %<br>5    | ^<br>6    | &<br>7   | \*<br>8   | (<br>9  | )<br>0  | <br>~    | <br>INS  |
+| <br>Shift |         | |<br>_  | <br>-       | <br>+     | <br>=     | |<br>\   | {<br>[    | }<br>]  |         | <br>Shft |          |
+| <br>Ctrl  | <br>Alt | <br>GUI | <br>**Fun** | <br>Lower | <br>Space | <br>Bksp | <br>Raise | <br>Del | \|<br>\  | <br>NUM  | <br>Ctrl |
+
+
+### Lower
+
+|           |              |        |         |           |        |        |         |        |           |            |            |
+| :-------: | :----------: | :----: | :-----: | :-------: | :----: | :----: | :-----: | :----: | :-------: | :--------: | :--------: |
+| !<br>1    | @<br>2       | #<br>3 | $<br>4  | %<br>5    | ^<br>6 | &<br>7 | \*<br>8 | (<br>9 | )<br>0    | <br>Del    | <br>Bksp   |
+| <br>!     | <br>@        | <br>#  | <br>\$  | <br>%     | <br>^  | <br>&  | <br>\*  | <br>(  | <br>)     | Wrd<br>Del | Wrd<br>Bks |
+| <br>Shift | Prnt<br>Scrn | <br>\| | \|<br>\ | <br>\_    | <br>-  | <br>+  | <br>=   |        | <br>BL_ON | <br>BLSP   | <br>Shift  |
+|           |              |        |         | **Lower** | Space  | Bksp   |         |        | Vol-      | Vol+       |  Play      |
+
+### Raise
+
+|        |         |       |       |            |     |              |               |             |           |              |              |
+| :----: | :-----: | :---: | :---: | :--------: | :-: | :----------: | :-----------: | :---------: | :-------: | :----------: | :----------: |
+| <br>\` | \|<br>\ |       | <br>[ | <br>]      |     |              | <br>PgUp      | <br>Home    | <br>PgDn  |              | Prnt<br>Scrn |
+| <br>\| | <br>\_  | <br>= | <br>( | <br>)      |     |              | <br>Home      | <br>Up      | <br>End   |              | <br>Zoom +   |
+| <br>~  | <br>-   | <br>+ | <br>{ | <br>}      |     | Prev<br>Word | <br>Left      | <br>Down    | <br>Right | Next<br>Word | <br>Zoom -   |
+|        |         |       |       | <br>Adjust |     | Word<br>Bksp | <br>**Raise** | Word<br>Del |           |              |              |
+
+### Adjust
+
+|           |             |             |             |             |        |         |            |      |      |     |     |
+| :-------: | :---------: | :---------: | :---------: | :---------: | :----: | :-----: | :--------: | :--: | :--: | :-: | :-: |
+|  Reset    |             |             | BL_ON       | BL_OFF      |        |         |            |      |      |     | DEL |
+| <br>Caps  | RGB<br>Togl | RGB<br>Mode | RGB<br>Brt- | RGB<br>Brt+ |        |         | Vol-       | Vol+ | Play |     |     |
+|           |  <br>Hue-   | RGB<br>Hue+ | RGB<br>Sat- | RGB<br>Sat+ |        |         | Prev       | Next | Mute |     |     |
+|           |             |             |             | **Lower**   |  Space |  Bksp   | **Raise**  |      |      |     |     |
+
+### Mouse
+
+|         |        |        |              |       |       |                |               |                 |                |                 |     |
+| :-----: | :----: | :----: | :----------: | :---: | :---: | :------------: | :-----------: | :-------------: | :------------: | :-------------: | :-: |
+| <br>ESC |        |        |              |       |       | Scroll<br>Left | Scroll<br>up  | Middle<br>Click | Scroll<br>Down | Scroll<br>Right |     |
+| Speed0  | Speed1 | Speed2 |              |       |       |                | Left<br>Click | Mouse<br>Up     | Right<br>Click |                 |     |
+| Speed0  | Speed1 | Speed2 |              |       |       |                | Mouse<br>Left | Mouse<br>Down   | Mouse<br>Right |                 |     |
+|         |        |        | **Function** | Lower | Space | Bksp           | **Raise**     |                 |                |                 |     |
+
+### Numpad
+
+|     |     |     |     |     |     |         |     |     |     |     |     |
+| :-: | :-: | :-: | :-: | :-: | :-: | :-----: | :-: | :-: | :-: | :-: | :-: |
+| ESC |     |     |     |     |     | Numlock |  7  |  8  |  9  |  /  |     |
+|     |     |     |     |     |     |         |  4  |  5  |  6  |  *  |     |
+|     |     |     |     |     |     |         |  1  |  2  |  3  |  +  |  -  |
+|     |     |     |     |     |     |         |  0  |  .  |  ,  |     |     |

keyboards/kprepublic/jj40/keymaps/brdlf/rules.mk

@@ -0,0 +1 @@
+MOUSEKEY_ENABLE = yes