From 01281a7dc33022dd3cf60f6263e2df3655ea8cdc Mon Sep 17 00:00:00 2001 From: depermana12 Date: Fri, 30 Jun 2023 08:30:25 +0700 Subject: [PATCH 01/30] add dp3000 --- keyboards/dp3000/config.h | 54 ++++++++++++++ keyboards/dp3000/dp3000.c | 29 ++++++++ keyboards/dp3000/info.json | 53 ++++++++++++++ keyboards/dp3000/keymaps/default/keymap.c | 83 ++++++++++++++++++++++ keyboards/dp3000/keymaps/via/keymap.c | 83 ++++++++++++++++++++++ keyboards/dp3000/keymaps/via/rules.mk | Bin 0 -> 97 bytes keyboards/dp3000/rules.mk | Bin 0 -> 115 bytes 7 files changed, 302 insertions(+) create mode 100644 keyboards/dp3000/config.h create mode 100644 keyboards/dp3000/dp3000.c create mode 100644 keyboards/dp3000/info.json create mode 100644 keyboards/dp3000/keymaps/default/keymap.c create mode 100644 keyboards/dp3000/keymaps/via/keymap.c create mode 100644 keyboards/dp3000/keymaps/via/rules.mk create mode 100644 keyboards/dp3000/rules.mk diff --git a/keyboards/dp3000/config.h b/keyboards/dp3000/config.h new file mode 100644 index 000000000000..400fd4bc4aa5 --- /dev/null +++ b/keyboards/dp3000/config.h @@ -0,0 +1,54 @@ +/* Copyright 2023 deddia permana (@depermana12) + * + * 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 . + */ + +#pragma once + +#define LAYER_STATE_8BIT +#define DRIVER_LED_TOTAL 8 +#define RGB_MATRIX_LED_COUNT 8 +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_BAND_SAT +#define ENABLE_RGB_MATRIX_BAND_VAL +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_HUE_BREATHING +#define ENABLE_RGB_MATRIX_HUE_PENDULUM +#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define ENABLE_RGB_MATRIX_SPLASH +#define ENABLE_RGB_MATRIX_SOLID_SPLASH +#define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_KEYRELEASES +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_DISABLE_WHEN_USB_SUSPENDED +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 + diff --git a/keyboards/dp3000/dp3000.c b/keyboards/dp3000/dp3000.c new file mode 100644 index 000000000000..85b7438e7658 --- /dev/null +++ b/keyboards/dp3000/dp3000.c @@ -0,0 +1,29 @@ +/* Copyright 2023 deddia permana (@depermana12) + * + * 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 . + */ +#include "quantum.h" + +led_config_t g_led_config = {{ + { NO_LED, NO_LED, NO_LED, NO_LED}, + { 3, 2, 1, 0 }, + { 4, 5, 6, 7 } +}, { + { 0, 32 }, { 25, 32 }, { 37, 32 }, { 75, 32 }, + { 75, 16 }, { 37, 16 }, { 25, 16 }, { 0, 16 } +}, { + 4, 4, 4, 4, 4, 4, 4, 4 + } +}; + diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json new file mode 100644 index 000000000000..3f46d7cef1fe --- /dev/null +++ b/keyboards/dp3000/info.json @@ -0,0 +1,53 @@ +{ + "manufacturer": "depermana12", + "keyboard_name": "dp3000", + "maintainer": "depermana12", + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "build": { + "lto": true + }, + "url": "https://github.com/depermana12", + "usb": { + "device_version": "1.0.1", + "vid": "0x4450", + "pid": "0x6470" + }, + "encoder": { + "rotary": [ + { "pin_a": "B2", "pin_b": "B1"}, + { "pin_a": "F4", "pin_b": "F5"} + ] + }, + "ws2812": { "pin": "B5" + }, + "matrix_pins": { + "cols": ["D4", "D7", "B4", "C6"], + "rows": ["F6", "F7", "B3"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 } + ] + } + } +} diff --git a/keyboards/dp3000/keymaps/default/keymap.c b/keyboards/dp3000/keymaps/default/keymap.c new file mode 100644 index 000000000000..52e5cee70d09 --- /dev/null +++ b/keyboards/dp3000/keymaps/default/keymap.c @@ -0,0 +1,83 @@ + /* Copyright 2023 deddia permana (@depermana12) + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌─────────┐ ┌─────────┐ + * │ mute │ │ MO(1) │ + * ├─────────┼─────────┬─────────┼─────────┤ + * │ 1 │ 2 │ 3 │ 4 │ + * ├─────────┼─────────┼─────────┼─────────┤ + * │ 5 │ 6 │ 7 │ 8 │ + * └─────────┴─────────┴─────────┴─────────┘ + */ + [0] = LAYOUT( + KC_MUTE, MO(1), + KC_1, KC_2, KC_3, KC_4, + KC_5, KC_6, KC_7, KC_8 + ), + [1] = LAYOUT( + QK_BOOT, MO(1), + KC_1, KC_2, KC_3, KC_4, + TO(0), TO(2), TO(3), RGB_TOG + ), + [2] = LAYOUT( + _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ), + [3] = LAYOUT( + _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ) + }; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, + [1] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT)}, +}; +bool oled_task_user(void) { + oled_write_P(PSTR("LAYER: "), false); + switch (get_highest_layer(layer_state)) { + case 0: + oled_write_P(PSTR("0"), false); + break; + case 1: + oled_write_P(PSTR("1"), false); + break; + case 2: + oled_write_P(PSTR("2"), false); + break; + case 3: + oled_write_P(PSTR("3"), false); + break; + } + + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 1); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 3); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} diff --git a/keyboards/dp3000/keymaps/via/keymap.c b/keyboards/dp3000/keymaps/via/keymap.c new file mode 100644 index 000000000000..52e5cee70d09 --- /dev/null +++ b/keyboards/dp3000/keymaps/via/keymap.c @@ -0,0 +1,83 @@ + /* Copyright 2023 deddia permana (@depermana12) + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌─────────┐ ┌─────────┐ + * │ mute │ │ MO(1) │ + * ├─────────┼─────────┬─────────┼─────────┤ + * │ 1 │ 2 │ 3 │ 4 │ + * ├─────────┼─────────┼─────────┼─────────┤ + * │ 5 │ 6 │ 7 │ 8 │ + * └─────────┴─────────┴─────────┴─────────┘ + */ + [0] = LAYOUT( + KC_MUTE, MO(1), + KC_1, KC_2, KC_3, KC_4, + KC_5, KC_6, KC_7, KC_8 + ), + [1] = LAYOUT( + QK_BOOT, MO(1), + KC_1, KC_2, KC_3, KC_4, + TO(0), TO(2), TO(3), RGB_TOG + ), + [2] = LAYOUT( + _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ), + [3] = LAYOUT( + _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ) + }; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, + [1] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT)}, +}; +bool oled_task_user(void) { + oled_write_P(PSTR("LAYER: "), false); + switch (get_highest_layer(layer_state)) { + case 0: + oled_write_P(PSTR("0"), false); + break; + case 1: + oled_write_P(PSTR("1"), false); + break; + case 2: + oled_write_P(PSTR("2"), false); + break; + case 3: + oled_write_P(PSTR("3"), false); + break; + } + + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 1); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 3); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} diff --git a/keyboards/dp3000/keymaps/via/rules.mk b/keyboards/dp3000/keymaps/via/rules.mk new file mode 100644 index 0000000000000000000000000000000000000000..7e5294ecc0110cf93edc4c0e175db4bc7c492080 GIT binary patch literal 97 LcmZQzpfLad0AT Date: Fri, 30 Jun 2023 08:42:36 +0700 Subject: [PATCH 02/30] add dp3000 --- keyboards/dp3000/keymaps/via/rules.mk | Bin 97 -> 80 bytes keyboards/dp3000/rules.mk | Bin 115 -> 115 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/keyboards/dp3000/keymaps/via/rules.mk b/keyboards/dp3000/keymaps/via/rules.mk index 7e5294ecc0110cf93edc4c0e175db4bc7c492080..55f117caeddd0147acc274eb99bdda8561dba6ad 100644 GIT binary patch literal 80 rcmWIZbc}cPb9C}?Rj^g4OfBYe^>g-jaSg&Q=<67OD&Z62k17BFk<%81 literal 97 LcmZQzpfLad0ATg#hYH=U0j1u S)x!jR9RpA${C!+qP(=V(sURT$ literal 115 LcmZQzpgRBn0CNBV From 7cbec3759a15863b584d831dc8722e4df3094ebf Mon Sep 17 00:00:00 2001 From: depermana12 Date: Fri, 30 Jun 2023 08:46:03 +0700 Subject: [PATCH 03/30] add dp3000 --- keyboards/dp3000/README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 keyboards/dp3000/README.md diff --git a/keyboards/dp3000/README.md b/keyboards/dp3000/README.md new file mode 100644 index 000000000000..e1196b91dfa4 --- /dev/null +++ b/keyboards/dp3000/README.md @@ -0,0 +1,27 @@ +# DP3000 + +dp3000 macropad + +dp3000 is a simple yet elegant macropad, 2x4 (8 keys), dual encoder, embedded with an Atmel 32u4 chip, powered by QMK. + +* Keyboard Maintainer: [Deddia Permana](https://github.com/depermana12) +* Hardware Supported: DP3000 PCB, ATmega32u4 +* Hardware Availability: [tokopedia.com/gundamtricks](https://www.tokopedia.com/gundamtricks) + +Make example for this keyboard (after setting up your build environment): + + make dp3000:default + +Flashing example for this keyboard: + + make dp3000:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* Bootmagic reset: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* Physical reset button: Briefly press reset button twice, located in front of the first rotary encoder (left rotary encoder) +* Keycode in layout: Press the key mapped to QK_BOOT if it is available From cdd9e915ec44080fc14184bb4988cd761f41dc3b Mon Sep 17 00:00:00 2001 From: depermana12 Date: Fri, 30 Jun 2023 10:05:18 +0700 Subject: [PATCH 04/30] Update copyright keymap.c --- keyboards/dp3000/keymaps/default/keymap.c | 31 ++++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/keyboards/dp3000/keymaps/default/keymap.c b/keyboards/dp3000/keymaps/default/keymap.c index 52e5cee70d09..417427053393 100644 --- a/keyboards/dp3000/keymaps/default/keymap.c +++ b/keyboards/dp3000/keymaps/default/keymap.c @@ -1,18 +1,19 @@ - /* Copyright 2023 deddia permana (@depermana12) - * - * 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 . - */ +/* +Copyright 2023 deddia permana (@depermana12) + +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 . +*/ #include QMK_KEYBOARD_H From fc16ca72167c437bec9060efdaa7fd8131e8edb9 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Fri, 30 Jun 2023 10:06:28 +0700 Subject: [PATCH 05/30] Updatea copyright keymap.c --- keyboards/dp3000/keymaps/via/keymap.c | 31 ++++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/keyboards/dp3000/keymaps/via/keymap.c b/keyboards/dp3000/keymaps/via/keymap.c index 52e5cee70d09..417427053393 100644 --- a/keyboards/dp3000/keymaps/via/keymap.c +++ b/keyboards/dp3000/keymaps/via/keymap.c @@ -1,18 +1,19 @@ - /* Copyright 2023 deddia permana (@depermana12) - * - * 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 . - */ +/* +Copyright 2023 deddia permana (@depermana12) + +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 . +*/ #include QMK_KEYBOARD_H From 81a2e10c5319db0e9adbcc339fefac8aacca94d3 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Fri, 30 Jun 2023 14:21:18 +0700 Subject: [PATCH 06/30] move rgb_matrix animation to info.json --- keyboards/dp3000/config.h | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/keyboards/dp3000/config.h b/keyboards/dp3000/config.h index 400fd4bc4aa5..6e9180e7b4b8 100644 --- a/keyboards/dp3000/config.h +++ b/keyboards/dp3000/config.h @@ -19,36 +19,9 @@ #define LAYER_STATE_8BIT #define DRIVER_LED_TOTAL 8 #define RGB_MATRIX_LED_COUNT 8 -#define ENABLE_RGB_MATRIX_ALPHAS_MODS -#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_BREATHING -#define ENABLE_RGB_MATRIX_BAND_SAT -#define ENABLE_RGB_MATRIX_BAND_VAL -#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -#define ENABLE_RGB_MATRIX_CYCLE_ALL -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_RAINDROPS -#define ENABLE_RGB_MATRIX_HUE_BREATHING -#define ENABLE_RGB_MATRIX_HUE_PENDULUM -#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_RGB_MATRIX_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_SPLASH #define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYRELEASES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 - From 5343b5e045841a5df02e4e2c3b6df4aec6f3a9b2 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Fri, 30 Jun 2023 14:24:11 +0700 Subject: [PATCH 07/30] Update info.json --- keyboards/dp3000/info.json | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json index 3f46d7cef1fe..fcadd5a44824 100644 --- a/keyboards/dp3000/info.json +++ b/keyboards/dp3000/info.json @@ -10,6 +10,10 @@ "command": false, "console": false, "extrakey": true, + "encoder": true, + "encoder_map": true, + "rgb_matrix": true, + "oled": true, "mousekey": false, "nkro": false }, @@ -28,7 +32,39 @@ { "pin_a": "F4", "pin_b": "F5"} ] }, - "ws2812": { "pin": "B5" + "ws2812": { + "pin": "B5" + }, + "rgb_matrix":{ + "driver":"WS2812", + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron":true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "typing_heatmap": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_multinexus": true, + "splash": true, + "solid_splash": true + } }, "matrix_pins": { "cols": ["D4", "D7", "B4", "C6"], From 9e253303fb0bcd6b1dd488b1c0c38f824c1f720c Mon Sep 17 00:00:00 2001 From: depermana12 Date: Fri, 30 Jun 2023 14:40:53 +0700 Subject: [PATCH 08/30] move to info.json --- keyboards/dp3000/rules.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/dp3000/rules.mk b/keyboards/dp3000/rules.mk index efd62a1c0448..6e7633bfe015 100644 --- a/keyboards/dp3000/rules.mk +++ b/keyboards/dp3000/rules.mk @@ -1,5 +1 @@ -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes -OLED_ENABLE = yes +# This file intentionally left blank From 1999e6f794c4ca21b9fe78386fc43b2ad04731d9 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Fri, 30 Jun 2023 14:41:17 +0700 Subject: [PATCH 09/30] Update rules.mk --- keyboards/dp3000/keymaps/via/rules.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/dp3000/keymaps/via/rules.mk b/keyboards/dp3000/keymaps/via/rules.mk index 55f117caeddd..1e5b99807cb7 100644 --- a/keyboards/dp3000/keymaps/via/rules.mk +++ b/keyboards/dp3000/keymaps/via/rules.mk @@ -1,4 +1 @@ VIA_ENABLE = yes -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes -LTO_ENABLE = yes From 59a76edfc937664832046aeceafbb2f684f3d8bb Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 11:33:04 +0700 Subject: [PATCH 10/30] Update README.md --- keyboards/dp3000/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dp3000/README.md b/keyboards/dp3000/README.md index e1196b91dfa4..c086d2e8a811 100644 --- a/keyboards/dp3000/README.md +++ b/keyboards/dp3000/README.md @@ -1,6 +1,6 @@ # DP3000 -dp3000 macropad +![dp3000 macropad](https://i.imgur.com/uBHS8EY.jpg) dp3000 is a simple yet elegant macropad, 2x4 (8 keys), dual encoder, embedded with an Atmel 32u4 chip, powered by QMK. From 3d2a4cc491d60997958bed4f5f9157994d13a1e7 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 11:35:06 +0700 Subject: [PATCH 11/30] remove driver_led_total config.h --- keyboards/dp3000/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dp3000/config.h b/keyboards/dp3000/config.h index 6e9180e7b4b8..e718ceba3d34 100644 --- a/keyboards/dp3000/config.h +++ b/keyboards/dp3000/config.h @@ -17,7 +17,6 @@ #pragma once #define LAYER_STATE_8BIT -#define DRIVER_LED_TOTAL 8 #define RGB_MATRIX_LED_COUNT 8 #define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE #define RGB_MATRIX_KEYPRESSES From fc7b86d0578971cc5c4ca7367a41ebe9e33ae111 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 11:36:36 +0700 Subject: [PATCH 12/30] Update dp3000.c --- keyboards/dp3000/dp3000.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/keyboards/dp3000/dp3000.c b/keyboards/dp3000/dp3000.c index 85b7438e7658..3c8f06f98eef 100644 --- a/keyboards/dp3000/dp3000.c +++ b/keyboards/dp3000/dp3000.c @@ -15,15 +15,30 @@ */ #include "quantum.h" -led_config_t g_led_config = {{ - { NO_LED, NO_LED, NO_LED, NO_LED}, - { 3, 2, 1, 0 }, - { 4, 5, 6, 7 } -}, { - { 0, 32 }, { 25, 32 }, { 37, 32 }, { 75, 32 }, - { 75, 16 }, { 37, 16 }, { 25, 16 }, { 0, 16 } -}, { - 4, 4, 4, 4, 4, 4, 4, 4 +bool oled_task_kb(void) { + oled_write_P(PSTR("LAYER: "), false); + switch (get_highest_layer(layer_state)) { + case 0: + oled_write_P(PSTR("0"), false); + break; + case 1: + oled_write_P(PSTR("1"), false); + break; + case 2: + oled_write_P(PSTR("2"), false); + break; + case 3: + oled_write_P(PSTR("3"), false); + break; } -}; + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 1); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 3); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} From f1abe68ca2ebc82c3e47fd91216307765fb7935d Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 11:38:04 +0700 Subject: [PATCH 13/30] Update info.json --- keyboards/dp3000/info.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json index fcadd5a44824..8f9fb5b870f7 100644 --- a/keyboards/dp3000/info.json +++ b/keyboards/dp3000/info.json @@ -3,8 +3,7 @@ "keyboard_name": "dp3000", "maintainer": "depermana12", "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", + "development_board": "promicro", "features": { "bootmagic": true, "command": false, @@ -64,7 +63,17 @@ "solid_reactive_multinexus": true, "splash": true, "solid_splash": true - } + }, + "layout":[ + { "matrix": [1, 0], "x": 0, "y": 32, "flags":4 }, + { "matrix": [1, 1], "x": 25, "y": 32, "flags":4 }, + { "matrix": [1, 2], "x": 37, "y": 32, "flags":4 }, + { "matrix": [1, 3], "x": 75, "y": 32, "flags":4 }, + { "matrix": [2, 0], "x": 75, "y": 16, "flags":4 }, + { "matrix": [2, 1], "x": 37, "y": 16, "flags":4 }, + { "matrix": [2, 2], "x": 25, "y": 16, "flags":4 }, + { "matrix": [2, 3], "x": 0, "y": 16, "flags":4 } + ] }, "matrix_pins": { "cols": ["D4", "D7", "B4", "C6"], From 6e2103a8575296bf12588c719b4c15e6ffda4d2c Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 11:39:02 +0700 Subject: [PATCH 14/30] Update keymap.c --- keyboards/dp3000/keymaps/default/keymap.c | 29 +---------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/keyboards/dp3000/keymaps/default/keymap.c b/keyboards/dp3000/keymaps/default/keymap.c index 417427053393..95a3a3634be2 100644 --- a/keyboards/dp3000/keymaps/default/keymap.c +++ b/keyboards/dp3000/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_5, KC_6, KC_7, KC_8 ), [1] = LAYOUT( - QK_BOOT, MO(1), + QK_BOOT, _______, KC_1, KC_2, KC_3, KC_4, TO(0), TO(2), TO(3), RGB_TOG ), @@ -55,30 +55,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT)}, }; -bool oled_task_user(void) { - oled_write_P(PSTR("LAYER: "), false); - switch (get_highest_layer(layer_state)) { - case 0: - oled_write_P(PSTR("0"), false); - break; - case 1: - oled_write_P(PSTR("1"), false); - break; - case 2: - oled_write_P(PSTR("2"), false); - break; - case 3: - oled_write_P(PSTR("3"), false); - break; - } - - led_t led_state = host_keyboard_led_state(); - oled_set_cursor(0, 1); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_set_cursor(0, 2); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_set_cursor(0, 3); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} From 6891648b5aed67628147676c8bead20781abb1fb Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 11:40:36 +0700 Subject: [PATCH 15/30] Update keymap.c --- keyboards/dp3000/keymaps/via/keymap.c | 29 +-------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/keyboards/dp3000/keymaps/via/keymap.c b/keyboards/dp3000/keymaps/via/keymap.c index 417427053393..95a3a3634be2 100644 --- a/keyboards/dp3000/keymaps/via/keymap.c +++ b/keyboards/dp3000/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_5, KC_6, KC_7, KC_8 ), [1] = LAYOUT( - QK_BOOT, MO(1), + QK_BOOT, _______, KC_1, KC_2, KC_3, KC_4, TO(0), TO(2), TO(3), RGB_TOG ), @@ -55,30 +55,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT)}, }; -bool oled_task_user(void) { - oled_write_P(PSTR("LAYER: "), false); - switch (get_highest_layer(layer_state)) { - case 0: - oled_write_P(PSTR("0"), false); - break; - case 1: - oled_write_P(PSTR("1"), false); - break; - case 2: - oled_write_P(PSTR("2"), false); - break; - case 3: - oled_write_P(PSTR("3"), false); - break; - } - - led_t led_state = host_keyboard_led_state(); - oled_set_cursor(0, 1); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_set_cursor(0, 2); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_set_cursor(0, 3); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} From b0e12d918920328c057e1e0b2bd76bfa51005abf Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 11:55:38 +0700 Subject: [PATCH 16/30] Update README.md --- keyboards/dp3000/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dp3000/README.md b/keyboards/dp3000/README.md index c086d2e8a811..3844a66757d0 100644 --- a/keyboards/dp3000/README.md +++ b/keyboards/dp3000/README.md @@ -1,6 +1,6 @@ # DP3000 -![dp3000 macropad](https://i.imgur.com/uBHS8EY.jpg) +![dp3000 macropad](https://i.imgur.com/uBHS8EYh.jpg) dp3000 is a simple yet elegant macropad, 2x4 (8 keys), dual encoder, embedded with an Atmel 32u4 chip, powered by QMK. From 040b566362610b9f4f6ea2b68d6eb1390c0ad13c Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 14:25:59 +0700 Subject: [PATCH 17/30] Rename README.md to readme.md --- keyboards/dp3000/{README.md => readme.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/dp3000/{README.md => readme.md} (100%) diff --git a/keyboards/dp3000/README.md b/keyboards/dp3000/readme.md similarity index 100% rename from keyboards/dp3000/README.md rename to keyboards/dp3000/readme.md From 5a7a0939f06a350573493a86fdb1a09ff2f75d59 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 14:28:07 +0700 Subject: [PATCH 18/30] Update dp3000.c --- keyboards/dp3000/dp3000.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/dp3000/dp3000.c b/keyboards/dp3000/dp3000.c index 3c8f06f98eef..3d155e96fddd 100644 --- a/keyboards/dp3000/dp3000.c +++ b/keyboards/dp3000/dp3000.c @@ -16,6 +16,9 @@ #include "quantum.h" bool oled_task_kb(void) { + if (!oled_task_user()) { + return false; + } oled_write_P(PSTR("LAYER: "), false); switch (get_highest_layer(layer_state)) { case 0: From d02b7d0ffeb6811653856822043b8a201e3b78b3 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 14:30:01 +0700 Subject: [PATCH 19/30] moved max_brightness to info.json --- keyboards/dp3000/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dp3000/config.h b/keyboards/dp3000/config.h index e718ceba3d34..8c8f8e280e26 100644 --- a/keyboards/dp3000/config.h +++ b/keyboards/dp3000/config.h @@ -23,4 +23,3 @@ #define RGB_MATRIX_KEYRELEASES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_DISABLE_WHEN_USB_SUSPENDED -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 From cd787df28d6b18d7185044ec47d6dc18955e508e Mon Sep 17 00:00:00 2001 From: depermana12 Date: Sat, 1 Jul 2023 14:31:27 +0700 Subject: [PATCH 20/30] Update rgb_matrix max_brightness info.json --- keyboards/dp3000/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json index 8f9fb5b870f7..fbe94309ccf0 100644 --- a/keyboards/dp3000/info.json +++ b/keyboards/dp3000/info.json @@ -36,6 +36,7 @@ }, "rgb_matrix":{ "driver":"WS2812", + "max_brightness": 180, "animations": { "alphas_mods": true, "gradient_up_down": true, From ca7e070cf280077a32f8734df0b33c445dbf2b94 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Mon, 3 Jul 2023 23:15:13 +0700 Subject: [PATCH 21/30] remove encoder_map --- keyboards/dp3000/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json index fbe94309ccf0..c7348c81a89f 100644 --- a/keyboards/dp3000/info.json +++ b/keyboards/dp3000/info.json @@ -10,7 +10,6 @@ "console": false, "extrakey": true, "encoder": true, - "encoder_map": true, "rgb_matrix": true, "oled": true, "mousekey": false, From 86ed2338fcc61708c5144f81d99a0d27b056fb62 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Mon, 3 Jul 2023 23:17:57 +0700 Subject: [PATCH 22/30] Update layer indicator dp3000.c --- keyboards/dp3000/dp3000.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/keyboards/dp3000/dp3000.c b/keyboards/dp3000/dp3000.c index 3d155e96fddd..3d99670fe36d 100644 --- a/keyboards/dp3000/dp3000.c +++ b/keyboards/dp3000/dp3000.c @@ -20,20 +20,7 @@ bool oled_task_kb(void) { return false; } oled_write_P(PSTR("LAYER: "), false); - switch (get_highest_layer(layer_state)) { - case 0: - oled_write_P(PSTR("0"), false); - break; - case 1: - oled_write_P(PSTR("1"), false); - break; - case 2: - oled_write_P(PSTR("2"), false); - break; - case 3: - oled_write_P(PSTR("3"), false); - break; - } + oled_write_char('0' + get_highest_layer(layer_state), false); led_t led_state = host_keyboard_led_state(); oled_set_cursor(0, 1); From a082ae4dca2f9c0a9375941a55824a01f8923cc6 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Mon, 3 Jul 2023 23:19:24 +0700 Subject: [PATCH 23/30] remove 8bit bitmask config.h --- keyboards/dp3000/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dp3000/config.h b/keyboards/dp3000/config.h index 8c8f8e280e26..509bb2761402 100644 --- a/keyboards/dp3000/config.h +++ b/keyboards/dp3000/config.h @@ -16,7 +16,6 @@ #pragma once -#define LAYER_STATE_8BIT #define RGB_MATRIX_LED_COUNT 8 #define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE #define RGB_MATRIX_KEYPRESSES From e2723ae95f3cb8292f20bb42b616e299d6d74071 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Mon, 3 Jul 2023 23:21:26 +0700 Subject: [PATCH 24/30] Update rules.mk --- keyboards/dp3000/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dp3000/rules.mk b/keyboards/dp3000/rules.mk index 6e7633bfe015..ee325681483f 100644 --- a/keyboards/dp3000/rules.mk +++ b/keyboards/dp3000/rules.mk @@ -1 +1 @@ -# This file intentionally left blank +ENCODER_MAP_ENABLE = yes From b75584435decbf497fd0c354bd50faddf80d7bf6 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Mon, 3 Jul 2023 23:23:29 +0700 Subject: [PATCH 25/30] Update encoder_map keymap.c --- keyboards/dp3000/keymaps/default/keymap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/dp3000/keymaps/default/keymap.c b/keyboards/dp3000/keymaps/default/keymap.c index 95a3a3634be2..6d3561edbc54 100644 --- a/keyboards/dp3000/keymaps/default/keymap.c +++ b/keyboards/dp3000/keymaps/default/keymap.c @@ -48,10 +48,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______ ) }; - +#if defined (ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, [1] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT)}, }; +#endif From fb952510f8b784f03dfa4bb2cd97af224b25c2ff Mon Sep 17 00:00:00 2001 From: depermana12 Date: Mon, 3 Jul 2023 23:24:35 +0700 Subject: [PATCH 26/30] Update encoder_map keymap.c --- keyboards/dp3000/keymaps/via/keymap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/dp3000/keymaps/via/keymap.c b/keyboards/dp3000/keymaps/via/keymap.c index 95a3a3634be2..6d3561edbc54 100644 --- a/keyboards/dp3000/keymaps/via/keymap.c +++ b/keyboards/dp3000/keymaps/via/keymap.c @@ -48,10 +48,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______ ) }; - +#if defined (ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, [1] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT)}, }; +#endif From 7117e26e43517d0d2447ce87b95493a4a200e366 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Mon, 3 Jul 2023 23:38:32 +0700 Subject: [PATCH 27/30] Update encoder_map rules.mk --- keyboards/dp3000/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/dp3000/keymaps/via/rules.mk b/keyboards/dp3000/keymaps/via/rules.mk index 1e5b99807cb7..f1adcab005e8 100644 --- a/keyboards/dp3000/keymaps/via/rules.mk +++ b/keyboards/dp3000/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes From 7436de49a4a2ed436d9f2ca5752575dd5508fb06 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Mon, 3 Jul 2023 23:49:22 +0700 Subject: [PATCH 28/30] Update config.h --- keyboards/dp3000/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/dp3000/config.h b/keyboards/dp3000/config.h index 509bb2761402..26e9f037f58d 100644 --- a/keyboards/dp3000/config.h +++ b/keyboards/dp3000/config.h @@ -1,4 +1,5 @@ -/* Copyright 2023 deddia permana (@depermana12) +/* + * Copyright 2023 deddia permana (@depermana12) * * 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 From dce715fdb7b26cc942f78aac375a95342408abbb Mon Sep 17 00:00:00 2001 From: depermana12 Date: Thu, 6 Jul 2023 13:29:32 +0700 Subject: [PATCH 29/30] remove encoder_map from keyboard level --- keyboards/dp3000/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dp3000/rules.mk b/keyboards/dp3000/rules.mk index ee325681483f..6e7633bfe015 100644 --- a/keyboards/dp3000/rules.mk +++ b/keyboards/dp3000/rules.mk @@ -1 +1 @@ -ENCODER_MAP_ENABLE = yes +# This file intentionally left blank From 0ae4c40aa6163e9b91539c83040ac965e29cd4c7 Mon Sep 17 00:00:00 2001 From: depermana12 Date: Thu, 6 Jul 2023 13:32:30 +0700 Subject: [PATCH 30/30] added rules.mk enabled encoder map at default keymap level --- keyboards/dp3000/keymaps/default/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/dp3000/keymaps/default/rules.mk diff --git a/keyboards/dp3000/keymaps/default/rules.mk b/keyboards/dp3000/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/dp3000/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes