diff options
Diffstat (limited to 'keyboards/massdrop/ctrl')
14 files changed, 20 insertions, 26 deletions
| diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h index 8b8625e700..77967e17d3 100644 --- a/keyboards/massdrop/ctrl/config.h +++ b/keyboards/massdrop/ctrl/config.h @@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "config_common.h"  /* USB Device descriptor parameter */ -#define MANUFACTURER        "Massdrop Inc." -#define PRODUCT             "CTRL Keyboard"  #define SERIAL_NUM          "Unavailable"  /* key matrix size */ diff --git a/keyboards/massdrop/ctrl/config_led.h b/keyboards/massdrop/ctrl/config_led.h index de897ce1bd..f582035e9e 100644 --- a/keyboards/massdrop/ctrl/config_led.h +++ b/keyboards/massdrop/ctrl/config_led.h @@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //Define number of ISSI3733 drivers being used (1...16)  #define ISSI3733_DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL ISSI3733_LED_COUNT +#define RGB_MATRIX_LED_COUNT ISSI3733_LED_COUNT  //Hardware address of each driver (Refer to ISSI3733 pdf "Table 1 Slave Address" and keyboard schematic)  #define ISSI3773_DRIVER_ADDRESSES { 0xA0, 0xBE } diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json index 7d0810c630..34c60ca088 100644 --- a/keyboards/massdrop/ctrl/info.json +++ b/keyboards/massdrop/ctrl/info.json @@ -1,5 +1,6 @@  { -    "keyboard_name": "CTRL", +    "keyboard_name": "CTRL Keyboard", +    "manufacturer": "Massdrop Inc.",      "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard",      "maintainer": "Massdrop",      "usb": { diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h index d0bbfd2103..4b702a1110 100644 --- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h +++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h @@ -47,9 +47,8 @@  // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue  // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation  // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness) -// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects  // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)  // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)  // #define RGBLIGHT_ANIMATIONS             // Run RGB animations  // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes. diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c index 6451dd495b..4c9c73c3fd 100644 --- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c @@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  #undef _______  #define _______ {0, 0, 0} -const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { +const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {      [_FL] = {          _______, CORAL,   CORAL,   _______, _______, CORAL,   CORAL,   _______, _______, CORAL,   _______, YELLOW,  YELLOW,           TEAL,    GOLD,   GOLD,          _______, _______, PINK,    PINK,    PINK,    PINK,    _______, _______, _______, GREEN,   GREEN,   GREEN,   GREEN,   _______, TEAL,    TEAL,   TEAL, @@ -354,7 +354,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {  void set_layer_color(int layer) {      if (layer == 0) { return; } -    for (int i = 0; i < DRIVER_LED_TOTAL; i++) { +    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {          HSV hsv = {              .h = pgm_read_byte(&ledmap[layer][i][0]),              .s = pgm_read_byte(&ledmap[layer][i][1]), diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h index 160ddf6d18..f8e0e9fc7d 100644 --- a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h +++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h @@ -32,9 +32,8 @@  // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue  // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation  // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness) -// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects  // #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended -// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)  // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)  // #define RGBLIGHT_ANIMATIONS             // Run RGB animations  // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes. diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h index ff214aaad6..96f90f5e05 100644 --- a/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h +++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h @@ -75,6 +75,6 @@ extern uint8_t raw_hid_buffer[RAW_EPSIZE];  // Defined in rgb_matrix_user.inc  // It's 119 for Massdrop CTRL, 0 - 118. -extern RGB rgb_matrix_led_state[DRIVER_LED_TOTAL]; +extern RGB rgb_matrix_led_state[RGB_MATRIX_LED_COUNT];  void raw_hid_perform_send(void); diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c b/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c index 299251e456..ad265f0ead 100644 --- a/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c @@ -199,9 +199,9 @@ void raw_hid_led(uint8_t *data) {      //rgb_matrix_set_color(data[1], data[2], data[3], data[4]);      const uint8_t led = data[1]; -    if (led >= DRIVER_LED_TOTAL) { +    if (led >= RGB_MATRIX_LED_COUNT) {          raw_hid_buffer[1] = CTRL_HID_NOK; -        raw_hid_buffer[2] = DRIVER_LED_TOTAL; +        raw_hid_buffer[2] = RGB_MATRIX_LED_COUNT;          raw_hid_buffer[3] = CTRL_HID_EOM;          return;      } @@ -219,7 +219,7 @@ void raw_hid_leds(uint8_t *data) {      const uint8_t number_leds = data[2];      uint8_t i = 0; -    while (i < number_leds && first_led + i < DRIVER_LED_TOTAL && i * 3 + 5 < RAW_EPSIZE) { +    while (i < number_leds && first_led + i < RGB_MATRIX_LED_COUNT && i * 3 + 5 < RAW_EPSIZE) {          rgb_matrix_led_state[first_led + i].r = data[3 + i * 3 + 0];          rgb_matrix_led_state[first_led + i].g = data[3 + i * 3 + 1];          rgb_matrix_led_state[first_led + i].b = data[3 + i * 3 + 2]; diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc b/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc index cca598e3b2..36d09c42e2 100644 --- a/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc +++ b/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc @@ -26,7 +26,7 @@ RGB_MATRIX_EFFECT(hid_effect)  // Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block  #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS -RGB rgb_matrix_led_state[DRIVER_LED_TOTAL]; +RGB rgb_matrix_led_state[RGB_MATRIX_LED_COUNT];  // e.g: A simple effect, self-contained within a single method  static bool hid_effect(effect_params_t* params) { @@ -38,7 +38,7 @@ static bool hid_effect(effect_params_t* params) {              rgb_matrix_led_state[i].g,              rgb_matrix_led_state[i].b);      } -    return led_max < DRIVER_LED_TOTAL; +    return led_max < RGB_MATRIX_LED_COUNT;  }  #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h index 692faa35a2..b8dddc9ec5 100644 --- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h +++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h @@ -65,9 +65,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue  // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation  // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness) -// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects  // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)  // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)  // #define RGBLIGHT_ANIMATIONS             // Run RGB animations  // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes. diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c index c89607b3f3..406263cee5 100644 --- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  #    undef _______  #    define _______ {0,0,0} -const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { +const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {      [_NL] = {          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, GOLD,    GOLD,    GOLD,    GREEN,   GREEN,   GREEN,   _______,   _______, _______, _______, @@ -217,7 +217,7 @@ void set_layer_color(int layer) {      if (layer == 0) {          return;      } -    for (int i = 0; i < DRIVER_LED_TOTAL; i++) { +    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {          HSV hsv = {              .h = pgm_read_byte(&ledmap[layer][i][0]),              .s = pgm_read_byte(&ledmap[layer][i][1]), diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c index ddcf30b68d..eee2eaf628 100644 --- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c @@ -129,8 +129,7 @@ static uint8_t COLOR_PATTERNS[][COLOR_PATTERN_RGB_COUNT][3] = {          { 66,  66,  66}, { 45,  45,  45}, { 23,  23,  23},      },  }; -static const uint8_t COLOR_PATTERNS_COUNT = ( -        sizeof(COLOR_PATTERNS) / sizeof(COLOR_PATTERNS[0])); +static const uint8_t COLOR_PATTERNS_COUNT = ARRAY_SIZE(COLOR_PATTERNS);  /**   * trimed down version of `ISSI3733_LED_MAP`: diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h index f1cbd5f3b0..59feed09a9 100644 --- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h +++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h @@ -63,9 +63,8 @@  // #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue  // #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation  // #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness) -// #define RGB_DISABLE_AFTER_TIMEOUT 0   // number of ticks to wait until disabling effects  // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)  // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)  // #define RGBLIGHT_ANIMATIONS             // Run RGB animations  // #define RGBLIGHT_ANIMATIONS             // Enable all additional animation modes. diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c index c7bc285eda..2b6515fc97 100644 --- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c @@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  #define __OFF__ {0, 0, 0} -const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { +const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {      [_FL] = {          //  These remain on base layer rgb to see adjustments ;)          //       |----------------------------------| @@ -323,7 +323,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {  void set_layer_color(int layer) {      if (layer == 0) { return; } -    for (int i = 0; i < DRIVER_LED_TOTAL; i++) { +    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {          HSV hsv = {              .h = pgm_read_byte(&ledmap[layer][i][0]),              .s = pgm_read_byte(&ledmap[layer][i][1]), | 
