diff options
15 files changed, 81 insertions, 186 deletions
| diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h index 28f0aa4756..6ee3311f22 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h +++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>   *   * 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 @@ -18,11 +18,11 @@  #include "config_common.h" -/* key matrix size */ +/* Key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 15 -/* key matrix pins */ +/* Key matrix pins */  #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }  #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json index f08cdf109f..59d3f70aef 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json +++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json @@ -5,7 +5,7 @@      "maintainer": "HorrorTroll",      "usb": {          "vid": "0x7516", -        "pid": "0x6003", +        "pid": "0x7000",          "device_version": "0.0.1"      },      "layouts": { diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c index 064eaaefd6..a4ba3656ef 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c +++ b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/default/keymap.c @@ -54,13 +54,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         │    │    │    │                        │   │   │   │   │   │   │         └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘  */ -    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15      */ +    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */      [_BASE] = LAYOUT_all(                  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_DEL,                  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_PGUP,                  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_PGDN,                  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(_FN), -                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT +                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT              ),  /* diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c index 66ea1efa24..49b066a369 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c +++ b/keyboards/horrortroll/chinese_pcb/black_e65/keymaps/via/keymap.c @@ -56,13 +56,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         │    │    │    │                        │   │   │   │   │   │   │         └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘  */ -    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15      */ +    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */      [_BASE] = LAYOUT_all(                  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_DEL,                  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_PGUP,                  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_PGDN,                  KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(_FN), -                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT +                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT              ),  /* diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/readme.md b/keyboards/horrortroll/chinese_pcb/black_e65/readme.md index 47abcdd928..e2f96e6da8 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/readme.md +++ b/keyboards/horrortroll/chinese_pcb/black_e65/readme.md @@ -1,9 +1,10 @@  # Black E6.5 -A chinese PCB clone of Exclusive E6.5. +A Exclusive E6.5 clone keyboard made by Chinese maker, which controlled by an ATMEGA32U4 chipset. The keyboard features per-key backlight, RGB underglow.  * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll) -* Hardware Supported: Atmega32u4 +* Hardware Supported: ATMEGA32U4 +* Hardware Availability: Unknown  Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h index 8a227f3c49..d04e480043 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>   *   * 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 @@ -18,16 +18,16 @@  #include "config_common.h" -/* key matrix size */ +/* Key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 16 -/* key matrix pins */ +/* Key matrix pins */  #define MATRIX_ROW_PINS { B7, B3, B2, F6, F7 }  #define MATRIX_COL_PINS { B1, B0, B5, B6, C6, C7, E2, D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define BOOTMAGIC_LITE_ROW 3 -#define BOOTMAGIC_LITE_COLUMN 6 +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0  /* COL2ROW or ROW2COL */  #define DIODE_DIRECTION COL2ROW @@ -43,6 +43,7 @@      #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200      #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS      #define RGB_MATRIX_KEYPRESSES +    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS      /* RGB Matrix config */      #define RGB_DI_PIN E6 @@ -75,8 +76,12 @@      #define ENABLE_RGB_MATRIX_HUE_PENDULUM      #define ENABLE_RGB_MATRIX_HUE_WAVE      #define ENABLE_RGB_MATRIX_PIXEL_RAIN +    #define ENABLE_RGB_MATRIX_PIXEL_FLOW      #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined + +    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP +    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN +      #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE      #define ENABLE_RGB_MATRIX_SOLID_REACTIVE      #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json index ff541f7ef2..36f776b62c 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json @@ -5,7 +5,7 @@      "maintainer": "HorrorTroll",      "usb": {          "vid": "0x7516", -        "pid": "0x6001", +        "pid": "0x7001",          "device_version": "0.0.1"      },      "layouts": { diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c index 3a91494536..8030dc393d 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>   *   * 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 @@ -27,26 +27,10 @@  // entirely and just use numbers.  enum layer_names { -    _BASE = 0, -    _FN = 1 +    _BASE, +    _FN,  }; -enum user_rgb_mode { -    RGB_MODE_ALL, -    RGB_MODE_KEYLIGHT, -    RGB_MODE_UNDERGLOW, -    RGB_MODE_NONE, -}; - -typedef union { -    uint32_t raw; -    struct { -        uint8_t rgb_mode :8; -    }; -} user_config_t; - -user_config_t user_config; -  // enum layer_keycodes { };  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -75,13 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         │    │    │    │                        │   │   │   │   │   │   │         └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘  */ -    /*  Row:    0        1        2        3        4     5     6       7     8     9        10       11       12       13       14       15     */ +    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */      [_BASE] = LAYOUT_65_ansi( -                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_BSPC, 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_BSLS, KC_DEL, -                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_PGUP, -                         KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, -                KC_LCTL, KC_LGUI,          KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT +                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_BSPC, 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_BSLS, KC_DEL, +                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_PGUP, +                         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, +                KC_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT              ),  /* @@ -97,38 +81,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         │    │    │    │                        │   │   │App│Spd│Vad│Spi│         └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘  */ -    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14     */ +    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */      [_FN]   = LAYOUT_65_ansi( -                _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, QK_BOOT, -                _______,          _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD, -                _______,          KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME, -                         _______, _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END, -                _______, _______,          _______,                    _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI +                _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, QK_BOOT, +                _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD, +                _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME, +                         _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END, +                _______, _______,          _______,                   _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI              ),  }; -void keyboard_post_init_user(void) { -    user_config.raw = eeconfig_read_user(); -    switch (user_config.rgb_mode) { -        case RGB_MODE_ALL: -            rgb_matrix_set_flags(LED_FLAG_ALL); -            rgb_matrix_enable_noeeprom(); -            break; -        case RGB_MODE_KEYLIGHT: -            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR); -            rgb_matrix_set_color_all(0, 0, 0); -            break; -        case RGB_MODE_UNDERGLOW: -            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); -            rgb_matrix_set_color_all(0, 0, 0); -            break; -        case RGB_MODE_NONE: -            rgb_matrix_set_flags(LED_FLAG_NONE); -            rgb_matrix_set_color_all(0, 0, 0); -            break; -    } -} -  bool process_record_user(uint16_t keycode, keyrecord_t *record) {      switch (keycode) {          case RGB_TOG: @@ -137,33 +99,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {                      case LED_FLAG_ALL: {                          rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);                          rgb_matrix_set_color_all(0, 0, 0); -                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;                      }                      break;                      case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {                          rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);                          rgb_matrix_set_color_all(0, 0, 0); -                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;                      }                      break;                      case (LED_FLAG_UNDERGLOW): {                          rgb_matrix_set_flags(LED_FLAG_NONE);                          rgb_matrix_set_color_all(0, 0, 0); -                        user_config.rgb_mode = RGB_MODE_NONE;                      }                      break;                      default: {                          rgb_matrix_set_flags(LED_FLAG_ALL);                          rgb_matrix_enable_noeeprom(); -                        user_config.rgb_mode = RGB_MODE_ALL;                      }                      break;                  } -                eeconfig_update_user(user_config.raw);              }              return false;  	} -      return true;  } diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md deleted file mode 100644 index 820d3551c3..0000000000 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout - -Keymap is default 68 qwerty, 65% layout diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h index fe6aa8c1f7..4a9ae9bdc2 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>   *   * 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 @@ -17,7 +17,3 @@  #pragma once  #define DYNAMIC_KEYMAP_LAYER_COUNT 2 - -#ifdef RGB_MATRIX_ENABLE -    #define VIA_QMK_RGBLIGHT_ENABLE -#endif diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c index 3a91494536..8030dc393d 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>   *   * 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 @@ -27,26 +27,10 @@  // entirely and just use numbers.  enum layer_names { -    _BASE = 0, -    _FN = 1 +    _BASE, +    _FN,  }; -enum user_rgb_mode { -    RGB_MODE_ALL, -    RGB_MODE_KEYLIGHT, -    RGB_MODE_UNDERGLOW, -    RGB_MODE_NONE, -}; - -typedef union { -    uint32_t raw; -    struct { -        uint8_t rgb_mode :8; -    }; -} user_config_t; - -user_config_t user_config; -  // enum layer_keycodes { };  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -75,13 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         │    │    │    │                        │   │   │   │   │   │   │         └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘  */ -    /*  Row:    0        1        2        3        4     5     6       7     8     9        10       11       12       13       14       15     */ +    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */      [_BASE] = LAYOUT_65_ansi( -                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_BSPC, 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_BSLS, KC_DEL, -                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_PGUP, -                         KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, -                KC_LCTL, KC_LGUI,          KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT +                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_BSPC, 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_BSLS, KC_DEL, +                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_PGUP, +                         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, +                KC_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT              ),  /* @@ -97,38 +81,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         │    │    │    │                        │   │   │App│Spd│Vad│Spi│         └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘  */ -    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14     */ +    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */      [_FN]   = LAYOUT_65_ansi( -                _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, QK_BOOT, -                _______,          _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD, -                _______,          KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME, -                         _______, _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END, -                _______, _______,          _______,                    _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI +                _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, QK_BOOT, +                _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD, +                _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME, +                         _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END, +                _______, _______,          _______,                   _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI              ),  }; -void keyboard_post_init_user(void) { -    user_config.raw = eeconfig_read_user(); -    switch (user_config.rgb_mode) { -        case RGB_MODE_ALL: -            rgb_matrix_set_flags(LED_FLAG_ALL); -            rgb_matrix_enable_noeeprom(); -            break; -        case RGB_MODE_KEYLIGHT: -            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR); -            rgb_matrix_set_color_all(0, 0, 0); -            break; -        case RGB_MODE_UNDERGLOW: -            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); -            rgb_matrix_set_color_all(0, 0, 0); -            break; -        case RGB_MODE_NONE: -            rgb_matrix_set_flags(LED_FLAG_NONE); -            rgb_matrix_set_color_all(0, 0, 0); -            break; -    } -} -  bool process_record_user(uint16_t keycode, keyrecord_t *record) {      switch (keycode) {          case RGB_TOG: @@ -137,33 +99,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {                      case LED_FLAG_ALL: {                          rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);                          rgb_matrix_set_color_all(0, 0, 0); -                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;                      }                      break;                      case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {                          rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);                          rgb_matrix_set_color_all(0, 0, 0); -                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;                      }                      break;                      case (LED_FLAG_UNDERGLOW): {                          rgb_matrix_set_flags(LED_FLAG_NONE);                          rgb_matrix_set_color_all(0, 0, 0); -                        user_config.rgb_mode = RGB_MODE_NONE;                      }                      break;                      default: {                          rgb_matrix_set_flags(LED_FLAG_ALL);                          rgb_matrix_enable_noeeprom(); -                        user_config.rgb_mode = RGB_MODE_ALL;                      }                      break;                  } -                eeconfig_update_user(user_config.raw);              }              return false;  	} -      return true;  } diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md deleted file mode 100644 index af924c17b7..0000000000 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout with VIA - -Keymap is default 68 qwerty, 65% layout diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md index 0d486832b3..78cc43e74f 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md @@ -1,9 +1,10 @@  # Devil68 Pro -Support Atmega32u4 keyboard. +A 65% keyboard made by Chinese maker, which controlled by an ATMEGA32U4 chipset. The keyboard features per-key RGB, RGB underglow.  * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll) -* Hardware Supported: Atmega32u4 +* Hardware Supported: ATMEGA32U4 +* Hardware Availability: Unknown  Make example for this keyboard (after setting up your build environment): @@ -19,6 +20,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to  Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the key at (3,6) in the matrix (B key) and plug in the keyboard +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard  * **Reset by wire**: Using a wire, 1 head to GND hole and other one to Reset pin on MCU  * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/horrortroll/chinese_pcb/readme.md b/keyboards/horrortroll/chinese_pcb/readme.md deleted file mode 100644 index cb73d8a43b..0000000000 --- a/keyboards/horrortroll/chinese_pcb/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# A folder for some Chinese PCB without source code - -This is a folder for collection code of Chinese PCB, where they only sold one-time limited on Taobao and no source code or contact info of Maker. Everything was re-write by using multimeter and sometimes with ISP/ICP flashing! - -## List for those keyboard in here: -<details> -  <summary>Click to expand!</summary> - -  | Keyboard name | MCU           | Layout        | Hotswap | LED                      | OLED | Other | -  | ------------- | ------------- | ------------- | ------- | ------------------------ | ---- | ----- | -  | Black E6.5    | Atmega32U4    | 68 Keys (65%) | No      | Backlight & RGB Lighting | No   | No    | -  | Devil68 Pro   | Atmega32U4    | 68 Keys (65%) | Yes     | RGB Matrix               | No   | No    | -  |               |               |               |         |                          |      |       | -</details> diff --git a/keyboards/horrortroll/readme.md b/keyboards/horrortroll/readme.md index 45e4510b6d..4da9469544 100644 --- a/keyboards/horrortroll/readme.md +++ b/keyboards/horrortroll/readme.md @@ -1,32 +1,32 @@ -# Welcome to my keyboard folder +# Welcome to my Keyboard Firmwares -In here, you can find: -- Chinese PCB that doesn't have source code (lost contact of Maker, can't found on Taobao, ... etc) -- My keyboard +## Keyboards Released by me: +  | Keyboard name    | MCU           | Layout       | Vendor ID | Product ID | Features                                     | +  | ---------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- | +  | Handwired K552   | STM32F103RCT6 | TKL          | 0x7516    | 0x5000     | Hotswap, RGB Underglow, OLED 128x32          | +  | Paws 60          | ATMEGA32U4    | 60%          | 0x7516    | 0x5001     | Hotswap                                      | -## List for my keyboard in here: -<details> -  <summary>Click to expand!</summary> +## Keyboards Completed has Collaboration with me: +  | Keyboard name    | MCU           | Layout       | Vendor ID | Product ID | Features                                     | +  | ---------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- | +  | Lemon40          | ATMEGA32U4    | 40% Alice    | 0x7516    | 0x6000     | Solder, RGB Underglow, OLED 128x32           | -  | Keyboard name  | MCU           | Layout        | Hotswap | LED          | OLED | Other | -  | -------------- | ------------- | ------------- | ------- | ------------ | ---- | ----- | -  | Handwired K552 | STM32F103RCT6 | 87 Keys (TKL) | Yes     | RGB Lighting | Yes  | No    | -  | Paws 60        | Atmega32U4    | 68 Keys (65%) | Yes     | No           | No   | No    | -  |                |               |               |         |              |      |       | -</details> +## Keyboard Rewrited by me: +  | Keyboard name                                                                               | MCU           | Layout       | Vendor ID | Product ID | Features                                     | +  | ------------------------------------------------------------------------------------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- | +  | Black E6.5                                                                                  | ATMEGA32U4    | 65%          | 0x7516    | 0x7000     | Solder, Backlight, RGB Underglow             | +  | Devil68 Pro                                                                                 | ATMEGA32U4    | 65%          | 0x7516    | 0x7001     | Hotswap, RGB Matrix & Underglow              | +  | [IK75](https://github.com/qmk/qmk_firmware/blob/master/keyboards/feker/ik75)                | ATMEGA32U4    | 75% Exploded | 0xF2E7    | 0x1226     | Hotswap, RGB Matrix & Underglow, 1 Encoder   | +  | [Gas75](https://github.com/qmk/qmk_firmware/blob/master/keyboards/ml/gas75)                 | ATMEGA32U4    | 75% Exploded | 0xC0B0    | 0x6060     | Hotswap, RGB Matrix, 1 Encoder               | +  | [GG86](https://github.com/qmk/qmk_firmware/tree/master/keyboards/gopolar/gg86)              | ATMEGA32U4    | TKL          | 0x0007    | 0x0007     | Hotswap, RGB Matrix & Underglow, OLED 128x32 | +  | [KB16-01 (Rev 1)](https://github.com/qmk/qmk_firmware/tree/master/keyboards/doio/kb16/rev1) | ATMEGA32U4    | TKL          | 0xD010    | 0x1601     | Hotswap, RGB Matrix, 3 Encoder, OLED 128x32  | +  | [KB16-01 (Rev 2)](https://github.com/qmk/qmk_firmware/tree/master/keyboards/doio/kb16/rev2) | APM32F103CBT6 | TKL          | 0xD010    | 0x1601     | Hotswap, RGB Matrix, 3 Encoder, OLED 128x32  | +  | [M63 RGB](https://github.com/qmk/qmk_firmware/blob/master/keyboards/mss_studio/m63_rgb)     | STM32F072CBU6 | 60%          | 0x4D4B    | 0x6063     | Hotswap, RGB Matrix & Underglow              | +  | [M64 RGB](https://github.com/qmk/qmk_firmware/blob/master/keyboards/mss_studio/m64_rgb)     | STM32F072CBU6 | 60%          | 0x4D4B    | 0x6064     | Hotswap, RGB Matrix & Underglow              | -## List for my collab keyboard in here: -<details> -  <summary>Click to expand!</summary> - -  | Keyboard name  | MCU           | Layout              | Hotswap | LED          | OLED | Other | -  | -------------- | ------------- | ------------------- | ------- | ------------ | ---- | ----- | -  | Lemon40        | Atmega32U4    | 47 Keys (40% Alice) | No      | RGB Lighting | Yes  | No    | -  |                |               |                     |         |              |      |       | -</details>  ## Contact me if you have any problem  **Discord:** HorrorTroll#0975    **Facebook:** https://www.facebook.com/PhamChonChe.Duc/   -**Email:** [email protected] +**Email:** [email protected]
\ No newline at end of file | 
