summaryrefslogtreecommitdiff
path: root/keyboards/dp60
diff options
context:
space:
mode:
authoryulei <yuleiz@gmail.com>2020-11-06 13:36:04 +0800
committerGitHub <noreply@github.com>2020-11-05 21:36:04 -0800
commitd7c90d805f414198a44d1b714363721df38950d6 (patch)
tree59272ae6712596bd5fb81d7d79e343681456a512 /keyboards/dp60
parent5f2c4349543e06821d3c0b724f36e12767a04e54 (diff)
add dp60 indicator mode (#8801)
* add dp60 indicator mode * update according to #7720 * added license header and move the ws2812 codes to a seperate c file * fixed conflict with master
Diffstat (limited to 'keyboards/dp60')
-rw-r--r--keyboards/dp60/config.h11
-rw-r--r--keyboards/dp60/dp60.c12
-rw-r--r--keyboards/dp60/dp60.h11
-rw-r--r--keyboards/dp60/keymaps/allleds/keymap.c15
-rw-r--r--keyboards/dp60/keymaps/default/keymap.c15
-rw-r--r--keyboards/dp60/keymaps/indicator/config.h25
-rw-r--r--keyboards/dp60/keymaps/indicator/indicator.c101
-rw-r--r--keyboards/dp60/keymaps/indicator/keymap.c32
-rw-r--r--keyboards/dp60/keymaps/indicator/led_driver.c26
-rw-r--r--keyboards/dp60/keymaps/indicator/readme.md10
-rw-r--r--keyboards/dp60/keymaps/indicator/rules.mk4
-rw-r--r--keyboards/dp60/keymaps/via/keymap.c15
-rw-r--r--keyboards/dp60/matrix.c17
13 files changed, 293 insertions, 1 deletions
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index 2bedf51970..d1cbd65004 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -1,6 +1,17 @@
/**
* 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
diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c
index 3e47802463..475084b049 100644
--- a/keyboards/dp60/dp60.c
+++ b/keyboards/dp60/dp60.c
@@ -1,5 +1,17 @@
/**
* dp60.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 "dp60.h"
diff --git a/keyboards/dp60/dp60.h b/keyboards/dp60/dp60.h
index a197ac2fa3..9d8bffa64a 100644
--- a/keyboards/dp60/dp60.h
+++ b/keyboards/dp60/dp60.h
@@ -1,6 +1,17 @@
/**
* dp60.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
diff --git a/keyboards/dp60/keymaps/allleds/keymap.c b/keyboards/dp60/keymaps/allleds/keymap.c
index f3862c38fb..66cc628d4c 100644
--- a/keyboards/dp60/keymaps/allleds/keymap.c
+++ b/keyboards/dp60/keymaps/allleds/keymap.c
@@ -1,3 +1,18 @@
+/**
+ * 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] = {
diff --git a/keyboards/dp60/keymaps/default/keymap.c b/keyboards/dp60/keymaps/default/keymap.c
index f3862c38fb..66cc628d4c 100644
--- a/keyboards/dp60/keymaps/default/keymap.c
+++ b/keyboards/dp60/keymaps/default/keymap.c
@@ -1,3 +1,18 @@
+/**
+ * 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] = {
diff --git a/keyboards/dp60/keymaps/indicator/config.h b/keyboards/dp60/keymaps/indicator/config.h
new file mode 100644
index 0000000000..0476faca94
--- /dev/null
+++ b/keyboards/dp60/keymaps/indicator/config.h
@@ -0,0 +1,25 @@
+/**
+ * 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
+
+#include "config_common.h"
+
+#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
new file mode 100644
index 0000000000..a3a826e8a0
--- /dev/null
+++ b/keyboards/dp60/keymaps/indicator/indicator.c
@@ -0,0 +1,101 @@
+/**
+ * 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 "dp60.h"
+
+#include "rgblight_list.h"
+#include "rgblight.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(LED_TYPE *start_led, uint8_t num_leds);
+
+void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
+{
+ ws2812_setleds(start_led, RGBLED_NUM-RGB_INDICATOR_NUM);
+
+ indicator_write(start_led + (RGBLED_NUM - RGB_INDICATOR_NUM), RGB_INDICATOR_NUM);
+}
+
+bool led_update_kb(led_t led_state) {
+ bool res = led_update_user(led_state);
+ if (res) {
+ 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);
+ }
+ return res;
+}
+
+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
new file mode 100644
index 0000000000..170d4eb954
--- /dev/null
+++ b/keyboards/dp60/keymaps/indicator/keymap.c
@@ -0,0 +1,32 @@
+/**
+ * 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,
+ RESET, 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
new file mode 100644
index 0000000000..2a1ac5a385
--- /dev/null
+++ b/keyboards/dp60/keymaps/indicator/led_driver.c
@@ -0,0 +1,26 @@
+/**
+ * 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 RGB_DI_PIN
+#define RGB_DI_PIN RGB_INDICATOR_PIN
+#define ws2812_setleds indicator_setleds
+#define ws2812_setleds_pin indicator_setleds_pin
+#include "ws2812.c"
+
+void indicator_write(LED_TYPE *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
new file mode 100644
index 0000000000..bb3fbbbe0b
--- /dev/null
+++ b/keyboards/dp60/keymaps/indicator/readme.md
@@ -0,0 +1,10 @@
+
+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
new file mode 100644
index 0000000000..a8891659f7
--- /dev/null
+++ b/keyboards/dp60/keymaps/indicator/rules.mk
@@ -0,0 +1,4 @@
+
+RGBLIGHT_ENABLE = yes # Use RGB underglow light
+
+SRC += indicator.c led_driver.c
diff --git a/keyboards/dp60/keymaps/via/keymap.c b/keyboards/dp60/keymaps/via/keymap.c
index 1742f17b50..5f2b007274 100644
--- a/keyboards/dp60/keymaps/via/keymap.c
+++ b/keyboards/dp60/keymaps/via/keymap.c
@@ -1,3 +1,18 @@
+/**
+ * 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] = {
diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c
index 3aa5925fe6..a9974757dd 100644
--- a/keyboards/dp60/matrix.c
+++ b/keyboards/dp60/matrix.c
@@ -1,3 +1,18 @@
+/**
+ * matrix.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 "quantum.h"
static uint8_t debouncing = DEBOUNCE;
@@ -242,4 +257,4 @@ static void select_col(uint8_t col) {
writePinHigh(D5);
break;
}
-} \ No newline at end of file
+}