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

8 files changed, 0 insertions, 229 deletions

diff --git a/keyboards/dp60/keymaps/allleds/keymap.c b/keyboards/dp60/keymaps/allleds/keymap.c
deleted file mode 100644
index 3d49bd268f..0000000000
--- a/keyboards/dp60/keymaps/allleds/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * keymap.c
- *
-  Copyright 2020 astro <yuleiz@gmail.com>
-    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] = {
-    [0] = LAYOUT_60_ansi_split_bs_rshift(
-      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_DEL, 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_BSLS,
-      KC_CAPS,    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_LSFT,     KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,  KC_RSFT,   MO(1),
-      KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,  TG(1),   KC_RCTL),
-
-    [1] = LAYOUT_60_ansi_split_bs_rshift(
-      _______, 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_PSCR,
-      QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
-      _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
-      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______,_______,_______,                        _______,                        _______,_______,TG(0),_______),
-};
diff --git a/keyboards/dp60/keymaps/allleds/rules.mk b/keyboards/dp60/keymaps/allleds/rules.mk
deleted file mode 100644
index 1e3cebb145..0000000000
--- a/keyboards/dp60/keymaps/allleds/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/dp60/keymaps/indicator/config.h b/keyboards/dp60/keymaps/indicator/config.h
deleted file mode 100644
index c7b52b27a5..0000000000
--- a/keyboards/dp60/keymaps/indicator/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * config.h
- *
-  Copyright 2020 astro <yuleiz@gmail.com>
-    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 RGB_INDICATOR_NUM 8
-#undef RGBLED_NUM
-#define RGBLED_NUM  (18+RGB_INDICATOR_NUM)
-
-#define RGB_INDICATOR_PIN B1
-#define RGBLIGHT_LAYERS
diff --git a/keyboards/dp60/keymaps/indicator/indicator.c b/keyboards/dp60/keymaps/indicator/indicator.c
deleted file mode 100644
index d7b628cc56..0000000000
--- a/keyboards/dp60/keymaps/indicator/indicator.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * indicator.c
- *
-  Copyright 2020 astro <yuleiz@gmail.com>
-    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
-#include "ws2812.h"
-
-// caps led
-const rgblight_segment_t PROGMEM dp60_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {18, 1, HSV_RED}
-);
-
-// scroll led
-const rgblight_segment_t PROGMEM dp60_scrolllock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {19, 1, HSV_GREEN}
-);
-
-// num led
-const rgblight_segment_t PROGMEM dp60_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {20, 1, HSV_BLUE}
-);
-
-// light 21 to 26 for layer 1-5
-const rgblight_segment_t PROGMEM dp60_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {21, 1, HSV_PURPLE}
-);
-const rgblight_segment_t PROGMEM dp60_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {22, 1, HSV_CYAN}
-);
-const rgblight_segment_t PROGMEM dp60_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {23, 1, HSV_YELLOW}
-);
-const rgblight_segment_t PROGMEM dp60_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {24, 1, HSV_PINK}
-);
-const rgblight_segment_t PROGMEM dp60_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {25, 1, HSV_ORANGE}
-);
-
-// rgb light layers
-const rgblight_segment_t* const PROGMEM dp60_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    dp60_capslock_layer,
-    dp60_scrolllock_layer,
-    dp60_numlock_layer,
-    dp60_layer1_layer,
-    dp60_layer2_layer,
-    dp60_layer3_layer,
-    dp60_layer4_layer,
-    dp60_layer5_layer
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = dp60_rgb_layers;
-}
-
-extern rgblight_config_t rgblight_config;
-extern void              rgblight_layers_write(void);
-extern void              indicator_write(rgb_led_t *start_led, uint8_t num_leds);
-
-void setleds_custom(rgb_led_t *start_led, uint16_t num_leds)
-{
-    ws2812_setleds(start_led, RGBLED_NUM-RGB_INDICATOR_NUM);
-
-    indicator_write(start_led + (RGBLED_NUM - RGB_INDICATOR_NUM), RGB_INDICATOR_NUM);
-}
-
-const rgblight_driver_t rgblight_driver = {
-    .setleds = setleds_custom,
-};
-
-void led_update_ports(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    rgblight_set_layer_state(1, led_state.scroll_lock);
-    rgblight_set_layer_state(2, led_state.num_lock);
-}
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
-    state = layer_state_set_user(state);
-    rgblight_set_layer_state(3, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(4, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(5, layer_state_cmp(state, 3));
-    rgblight_set_layer_state(6, layer_state_cmp(state, 4));
-    rgblight_set_layer_state(7, layer_state_cmp(state, 5));
-    return state;
-}
diff --git a/keyboards/dp60/keymaps/indicator/keymap.c b/keyboards/dp60/keymaps/indicator/keymap.c
deleted file mode 100644
index 0cfe07f3ae..0000000000
--- a/keyboards/dp60/keymaps/indicator/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * keymap.c
- *
-  Copyright 2020 astro <yuleiz@gmail.com>
-    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] = {
-    [0] = LAYOUT_60_hhkb(
-      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_BSLS, KC_GRV,
-      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_BSPC,
-      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_ENT,
-      KC_LSFT,    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,       KC_RSFT,  MO(1),
-               KC_LGUI,  KC_LALT,                     LT(1,KC_SPC),                  KC_RALT,KC_RGUI                   ),
-
-    [1] = LAYOUT_60_hhkb(
-      _______, 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_PSCR,
-      QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
-      KC_CAPS,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
-      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-              _______,_______,                        _______,                        _______,_______),
-};
diff --git a/keyboards/dp60/keymaps/indicator/led_driver.c b/keyboards/dp60/keymaps/indicator/led_driver.c
deleted file mode 100644
index b31e2daacd..0000000000
--- a/keyboards/dp60/keymaps/indicator/led_driver.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * led_driver.c
- *
- Copyright 2020 astro <yuleiz@gmail.com>
-    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 WS2812_DI_PIN
-#define WS2812_DI_PIN RGB_INDICATOR_PIN
-#define ws2812_setleds indicator_setleds
-#define ws2812_setleds_pin indicator_setleds_pin
-#include "ws2812_bitbang.c"
-
-void indicator_write(rgb_led_t *start_led, uint8_t num_leds)
-{
-    indicator_setleds(start_led, num_leds);
-}
diff --git a/keyboards/dp60/keymaps/indicator/readme.md b/keyboards/dp60/keymaps/indicator/readme.md
deleted file mode 100644
index bb3fbbbe0b..0000000000
--- a/keyboards/dp60/keymaps/indicator/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Indicator RGB leds support for the open source viper/eagle fr4 [plate](https://github.com/yulei/viper_plate.git)
-
-Three wires need to be soldered:  
-
-B1 pin (SCLK at the board) to the plate's D pin
-
-VCC to plate's V
-
-GND to plate's G
diff --git a/keyboards/dp60/keymaps/indicator/rules.mk b/keyboards/dp60/keymaps/indicator/rules.mk
deleted file mode 100644
index 853666e4f4..0000000000
--- a/keyboards/dp60/keymaps/indicator/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-
-RGBLIGHT_ENABLE = yes       	# Use RGB underglow light
-RGBLIGHT_DRIVER = custom
-WS2812_DRIVER_REQUIRED = yes
-
-SRC += indicator.c led_driver.c