Merge branch 'master' into meteor

8 files changed, 314 insertions, 3 deletions

diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h
index 4fb8ba6d96..b9abd137b8 100644
--- a/keyboards/yushakobo/quick7/config.h
+++ b/keyboards/yushakobo/quick7/config.h
@@ -192,7 +192,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 /* disable these deprecated features by default */
-#ifndef LINK_TIME_OPTIMIZATION_ENABLE
+#ifndef LTO_ENABLE
   #define NO_ACTION_MACRO
   #define NO_ACTION_FUNCTION
 #endif
diff --git a/keyboards/yushakobo/quick7/keymaps/tester/config.h b/keyboards/yushakobo/quick7/keymaps/tester/config.h
new file mode 100644
index 0000000000..b9a075bfec
--- /dev/null
+++ b/keyboards/yushakobo/quick7/keymaps/tester/config.h
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 yushakobo
+
+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/>.
+*/
+
+#undef RGBLIGHT_LIMIT_VAL
+#define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_MAX_LAYERS 4
+#define RGBLIGHT_LED_MAP {\
+    0, 1, 2,\
+    5, 4, 3,\
+    6, 7, 8,\
+    9, 10, 11, 12\
+}
diff --git a/keyboards/yushakobo/quick7/keymaps/tester/keymap.c b/keyboards/yushakobo/quick7/keymaps/tester/keymap.c
new file mode 100644
index 0000000000..57e4a28f30
--- /dev/null
+++ b/keyboards/yushakobo/quick7/keymaps/tester/keymap.c
@@ -0,0 +1,157 @@
+/* Copyright 2020 yushakobo
+ *
+ * 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 FAVORITE_COLOR HSV_CYAN
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    YUSHAURL = SAFE_RANGE,
+    KEY_00,
+    KEY_01,
+    KEY_02,
+    KEY_10,
+    KEY_11,
+    KEY_12,
+    KEY_20,
+    KEY_21,
+    KEY_22
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KEY_00, KEY_01, KEY_02,
+        KEY_10, KEY_11, KEY_12,
+        KEY_20, KEY_21, KEY_22
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KEY_00:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 0);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 0);
+            }
+            break;
+        case KEY_01:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 1);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 1);
+            }
+            break;
+        case KEY_02:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 2);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 2);
+            }
+            break;
+        case KEY_10:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 3);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 3);
+            }
+            break;
+        case KEY_11:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 4);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 4);
+            }
+            break;
+        case KEY_12:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 5);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 5);
+            }
+            break;
+        case KEY_20:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 6);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 6);
+            }
+            break;
+        case KEY_21:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 7);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 7);
+            }
+            break;
+        case KEY_22:
+            if (record->event.pressed) {
+                rgblight_sethsv_at(FAVORITE_COLOR, 8);
+            } else {
+                rgblight_sethsv_at(HSV_WHITE, 8);
+            }
+            break;
+    }
+    return true;
+}
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { // Left encoder
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) { // Right encoder
+        if (clockwise) {
+            rgblight_decrease_hue_noeeprom();
+        } else {
+            rgblight_increase_hue_noeeprom();
+        }
+    }
+}
+
+const rgblight_segment_t PROGMEM quick7_capslock[] = RGBLIGHT_LAYER_SEGMENTS(
+    {9,1,FAVORITE_COLOR},
+    {12,1,FAVORITE_COLOR}
+);
+const rgblight_segment_t PROGMEM quick7_numlock[] = RGBLIGHT_LAYER_SEGMENTS(
+    {10,1,FAVORITE_COLOR},
+    {11,1,FAVORITE_COLOR}
+);
+
+const rgblight_segment_t* const PROGMEM quick7_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    quick7_capslock,
+    quick7_numlock
+);
+
+void keyboard_post_init_user(void){
+    rgblight_layers = quick7_rgb_layers;
+    rgblight_sethsv(HSV_WHITE);
+}
+
+bool led_update_user(led_t led_state){
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    rgblight_set_layer_state(1, led_state.num_lock);
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/yushakobo/quick7/keymaps/tester/readme.md b/keyboards/yushakobo/quick7/keymaps/tester/readme.md
new file mode 100644
index 0000000000..41ba72ffc0
--- /dev/null
+++ b/keyboards/yushakobo/quick7/keymaps/tester/readme.md
@@ -0,0 +1,12 @@
+# The default keymap for quick7
+
+### Base Layer
+
+|Left/Right|Clockwise|Counter Clockwise|
+|---|---|---|
+|Left|Vol+|Vol-|
+|Right|RGB HUE-|RGB HUE+|
+
+No input at all. You can just test how deep the key's actuation point is, and when does the key releases.
+
+4 underglow LEDs indicates the status of CapsLock and NumLock.
diff --git a/keyboards/yushakobo/quick7/keymaps/via/keymap.c b/keyboards/yushakobo/quick7/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9c64042bc5
--- /dev/null
+++ b/keyboards/yushakobo/quick7/keymaps/via/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2020 yushakobo
+ *
+ * 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,
+    _FUNC1,
+    _VIA1,
+    _VIA2
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    YUSHAURL = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_MUTE,   MO(_FUNC1), RGB_MOD,
+        S(KC_TAB), KC_UP,      KC_TAB,
+        KC_LEFT,   KC_DOWN,    KC_RGHT
+    ),
+    [_FUNC1] = LAYOUT(
+        RESET,   KC_TRNS, RGB_TOG,
+        KC_HOME, KC_VOLU, KC_END,
+        KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [_VIA1] = LAYOUT(
+        YUSHAURL,XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+    [_VIA2] = LAYOUT(
+        XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case YUSHAURL:
+            if (record->event.pressed) {
+                // when keycode QMKURL is pressed
+                SEND_STRING("https://yushakobo.jp/\n");
+            } else {
+                // when keycode QMKURL is released
+            }
+            break;
+    }
+    return true;
+}
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { // Left encoder
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) { // Right encoder
+        if (clockwise) {
+            rgblight_decrease_hue_noeeprom();
+        } else {
+            rgblight_increase_hue_noeeprom();
+        }
+    }
+}
diff --git a/keyboards/yushakobo/quick7/keymaps/via/readme.md b/keyboards/yushakobo/quick7/keymaps/via/readme.md
new file mode 100644
index 0000000000..ff0978780e
--- /dev/null
+++ b/keyboards/yushakobo/quick7/keymaps/via/readme.md
@@ -0,0 +1,27 @@
+# The default VIA keymap for quick7
+
+#### Rotary Encoder is not configurable through VIA
+
+### Base Layer
+```
+Left Encoder(CW: Vol+, CCW: Vol-)
+Right Encoder(CW: RGB HUE-, CCW: RGB HUE+)
+,----------- --------- ------------,
+|   MUTE    |  Func1  |  RGB MODE  |
+ ----------- --------- ------------
+| Shift+Tab |   UP    |    TAB     |
+ ----------- --------- ------------
+|   LEFT    |  DOWN   |   RIGHT    |
+`----------- --------- ------------'
+```
+
+### Func1 Layer
+```
+,----------- --------- ------------,
+|   RESET   |  Func1  | RGB TOGGLE |
+ ----------- --------- ------------
+|   HOME    |  VOL+   |    END     |
+ ----------- --------- ------------
+| MEDIA <<  |  VOL-   |  MEDIA >>  |
+`----------- --------- ------------'
+```
\ No newline at end of file
diff --git a/keyboards/yushakobo/quick7/keymaps/via/rules.mk b/keyboards/yushakobo/quick7/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/yushakobo/quick7/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/yushakobo/quick7/readme.md b/keyboards/yushakobo/quick7/readme.md
index 5e9f85c248..3c65d46c7f 100644
--- a/keyboards/yushakobo/quick7/readme.md
+++ b/keyboards/yushakobo/quick7/readme.md
@@ -5,8 +5,11 @@
 A simple macropad for the beginners.
 
 * Keyboard Maintainer: [yushakobo](https://github.com/yushakobo)
-* Hardware Supported: quick7, Pro Micro (ATmega32U4)
-* Hardware Availability: (Under Preparation)
+* Hardware Supported: quick7 PCB, Pro Micro (ATmega32U4)
+* Hardware Availability: [yushakobo Shop](https://yushakobo.jp/shop/quick7/)
+
+## How to build
+* Build guide available [here](https://github.com/yushakobo/build-documents/blob/master/Quick7/Buildguide-en.md). (Japanese build guide is [here](https://github.com/yushakobo/build-documents/blob/master/Quick7/BuildGuide.md).)
 
 Make example for this keyboard (after setting up your build environment):