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

4 files changed, 215 insertions, 0 deletions

diff --git a/keyboards/handwired/sono1/keymaps/debug/keymap.c b/keyboards/handwired/sono1/keymaps/debug/keymap.c
new file mode 100644
index 0000000000..3e4eb6eae3
--- /dev/null
+++ b/keyboards/handwired/sono1/keymaps/debug/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2020 DmNosachev
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_debug(
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // If console is enabled, it will print the matrix position and status of each key pressed
+#ifdef CONSOLE_ENABLE
+    uprintf("row: %u, col: %u, pressed: %u\n", record->event.key.row, record->event.key.col, record->event.pressed);
+#endif 
+  return true;
+}
\ No newline at end of file
diff --git a/keyboards/handwired/sono1/keymaps/debug/readme.md b/keyboards/handwired/sono1/keymaps/debug/readme.md
new file mode 100644
index 0000000000..8342cd4974
--- /dev/null
+++ b/keyboards/handwired/sono1/keymaps/debug/readme.md
@@ -0,0 +1 @@
+# The default keymap for sono1
diff --git a/keyboards/handwired/sono1/keymaps/default/keymap.c b/keyboards/handwired/sono1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..40a4932660
--- /dev/null
+++ b/keyboards/handwired/sono1/keymaps/default/keymap.c
@@ -0,0 +1,168 @@
+/* Copyright 2020 DmNosachev
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+    _MUS,
+    _LOCK
+};
+
+enum custom_keycodes {
+    MC3Z = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+,---------------------------------------------------------------------------------------------------------,  ,-----,
+| F11 |  | F12 |  |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  | F10  | |PgUp |PgDn |  |LOCK |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----|-----------------,
+| Esc  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  —- | +=  |  ~` |BkSpc | |Home | End |  |  *  |  /  |  -  |  +  |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|  Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | {[  | }]  |   Enter   | | Ins | Del |  |  7  |  8  |  9  | +=  |
+|--------------------------------------------------------------------------------|          | `-----------'  |-----------------------|
+|  Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  | :;  | "'  | |\  |          | |    Up     |  |  4  |  5  |  6  |  .  |
+|--------------------------------------------------------------------------------`----------' |-----------|  |-----------------------|
+|   Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  <, |  >. | ?/  | MUS |    Shift     | |Left |Right|  |  1  |  2  |  3  | <,  |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|Caps | Alt | App | GUI |   Space     |   Space     |    Enter        | Ctrl  |       | Alt | |   Down    |  |  0  | 000 |   Enter   |
+`-------------------------------------------------------------------------------------------' `-----------'  '-----------------------'
+                               |  FN  | BackSp|
+                               `--------------'
+*/
+    [_BASE] = LAYOUT(
+    KC_F11,   KC_F12,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,     KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_PGUP, KC_PGDN,   MO(_LOCK),
+    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_EQL, KC_GRV, KC_BSPC,   KC_HOME, KC_END,    KC_PAST, KC_PSLS, KC_PMNS, KC_PPLS,
+    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_ENT,        KC_INS,  KC_DEL,    KC_P7,   KC_P8,   KC_P9,   KC_EQL,
+    KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,                     KC_UP,         KC_P4,   KC_P5,   KC_P6,   KC_PDOT,
+    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(_MUS), KC_RSFT,          KC_LEFT, KC_RIGHT,  KC_P1,   KC_P2,   KC_P3,   KC_COMM,
+    KC_CAPS, KC_LALT, KC_APP,  KC_LGUI,     KC_SPACE,    KC_SPACE,      KC_ENT,     KC_RCTL,   KC_RALT,           KC_DOWN,       KC_P0,   MC3Z,    KC_PENT,
+                                              MO(_FN), KC_BSPC
+    ),
+/*
+,---------------------------------------------------------------------------------------------------------,  ,-----,
+|Reset|  |     |  |      |      |      |      |      |   |      |      |PrnSc |ScrLk |Pause | |     |NumLk|  |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----|-----------------,
+|      |     |     |     |     |     |     |     |     |     |     |     |     |     |      | |     |     |  |     |     |     |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|       |     |     |     |     |     |     |     | Up  |     |Home |PgUp |     |           | |     |     |  |     |     |     |     |
+|--------------------------------------------------------------------------------|          | `-----------'  |-----------------------|
+|        |     |     |     |     |     |     |Left |Down |Right| End |PgDn |     |          | |           |  |     |     |     |     |
+|--------------------------------------------------------------------------------`----------' |-----------|  |-----------------------|
+|          |     |     |     |     |     |     |     |     |     |     |     |              | |     |     |  |     |     |     |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|     |     |     |     |             |             |    BackSpace    |       |       |     | |           |  |     |     |           |
+`-------------------------------------------------------------------------------------------' `-----------'  '-----------------------'
+                               |      |Delete|
+                               `-------------'
+*/
+[_FN] = LAYOUT(
+    RESET,    _______,   _______,  _______,  _______,  _______,  _______,     _______,  _______,  KC_PSCR,  KC_LSCR,  KC_PAUS,               _______, _______,  _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, KC_HOME, KC_PGUP, _______,    _______,            _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, KC_PGDN, _______,                           _______,      _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______,          _______,       _______,         _______,      KC_BSPC,     _______,   _______,                             _______,      _______, _______,    _______,
+                                          _______, KC_DEL
+    ),
+/*
+,---------------------------------------------------------------------------------------------------------,  ,-----,
+|     |  |     |  |      |      |      |      |      |   |      |      |      |      |      | |     |     |  |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----|-----------------,
+|      |     |     |     |     |     |     |     |     |     |     |     |     |     |      | |     |     |  |     |     |     |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|       |MWh+ |  M1 | MUp |  M2 |     |     |     |     |     |     |     |     |           | |     |     |  |     |     |     |     |
+|--------------------------------------------------------------------------------|          | `-----------'  |-----------------------|
+|        |MWh- | ML  | MDn | MR  |     |     |     |     |     |     |     |     |          | |           |  |     |     |     |     |
+|--------------------------------------------------------------------------------`----------' |-----------|  |-----------------------|
+|          |     |     |     |     |     |     |     |     |     |     |     |              | |     |     |  |     |     |     |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|     |     |     |     |             |             |                 |       |       |     | |           |  |     |     |           |
+`-------------------------------------------------------------------------------------------' `-----------'  '-----------------------'
+                               |      |      |
+                               `-------------'
+*/
+[_MUS] = LAYOUT(
+    _______,   _______,   _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,               _______, _______,  _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______,  _______, _______, _______, _______,
+    _______, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______,    _______,          _______, _______,  _______, _______, _______, _______,
+    _______, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______,                           _______,      _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______,          _______,       _______,         _______,      _______,     _______,   _______,                             _______,      _______, _______,    _______,
+                                          _______, _______
+    ),
+/*
+,---------------------------------------------------------------------------------------------------------,  ,-----,
+|     |  |     |  |      |      |      |      |      |   |      |      |      |      |      | |     |     |  |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----|-----------------,
+|      |     |     |     |     |     |     |     |     |     |     |     |     |     |      | |     |     |  |     |     |     |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|       |     |     |     |     |     |     |     |     |     |     |     |     |           | |     |     |  |     |     |     |     |
+|--------------------------------------------------------------------------------|          | `-----------'  |-----------------------|
+|        |     |     |     |     |     |     |     |     |     |     |     |     |          | |           |  |     |     |     |     |
+|--------------------------------------------------------------------------------`----------' |-----------|  |-----------------------|
+|          |     |     |     |     |     |     |     |     |     |     |     |              | |     |     |  |     |     |     |     |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|     |     |     |     |             |             |                 |       |       |     | |           |  |     |     |           |
+`-------------------------------------------------------------------------------------------' `-----------'  '-----------------------'
+                               |      |      |
+                               `-------------'
+*/
+[_LOCK] = LAYOUT(
+    KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,     KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,        KC_NO, KC_NO,  _______,
+    KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO,       KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                      KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                 KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_NO, KC_NO, KC_NO,          KC_NO,       KC_NO,         KC_NO,      KC_NO,     KC_NO,   KC_NO,                KC_NO,    KC_NO, KC_NO,    KC_NO,
+                                KC_NO, KC_NO
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MC3Z:
+            if (record->event.pressed) {
+                SEND_STRING("000");
+            } else {
+            }
+            break;
+    }
+    return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    /* Use LED0 and 4 (Kana and KB Lock as layer indicators) */
+    switch (get_highest_layer(state)) {
+    case _FN:
+        writePinLow(LED_KANA_PIN);
+        break;
+    case _MUS:
+        writePinLow(LED_KB_LOCK_PIN);
+        break;
+    case _LOCK:
+        writePinLow(LED_KANA_PIN);
+        writePinLow(LED_KB_LOCK_PIN);
+        break;
+    default: //  for any other layers, or the default layer
+        writePinHigh(LED_KANA_PIN);
+        writePinHigh(LED_KB_LOCK_PIN);
+        break;
+    }
+  return state;
+}
diff --git a/keyboards/handwired/sono1/keymaps/default/readme.md b/keyboards/handwired/sono1/keymaps/default/readme.md
new file mode 100644
index 0000000000..8342cd4974
--- /dev/null
+++ b/keyboards/handwired/sono1/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for sono1