Skip to content

Commit

Permalink
[Keyboard]Remove RGB light implementation of ID67, revert the file st…
Browse files Browse the repository at this point in the history
…ructure changes by qmk#15558 (qmk#15854)
  • Loading branch information
peepeetee authored and zykrah committed Jul 2, 2022
1 parent a84332b commit 5599ca2
Show file tree
Hide file tree
Showing 26 changed files with 565 additions and 332 deletions.
File renamed without changes.
67 changes: 0 additions & 67 deletions keyboards/idobao/id67/default_rgb/config.h

This file was deleted.

33 changes: 0 additions & 33 deletions keyboards/idobao/id67/default_rgb/default_rgb.h

This file was deleted.

85 changes: 0 additions & 85 deletions keyboards/idobao/id67/default_rgb/info.json

This file was deleted.

19 changes: 0 additions & 19 deletions keyboards/idobao/id67/default_rgb/readme.md

This file was deleted.

22 changes: 0 additions & 22 deletions keyboards/idobao/id67/default_rgb/rules.mk

This file was deleted.

61 changes: 61 additions & 0 deletions keyboards/idobao/id67/id67.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/* Copyright 2021 Tybera
* Copyright 2021 thewerther
*
* 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 "id67.h"

#define __ NO_LED

// Indices are reveresed on the physical board, top left is bottom right.
led_config_t g_led_config = { {
// Key Matrix to LED Index
{66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52},
{51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37},
{36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, __, 24, 23},
{22, __, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9},
{ 8, 7, __, 6, __, __, 5, __, __, __, 4, 3, 2, 1, 0},
}, {
// LED Index to Physical Position
// based on: https://gist.github.com/vinorodrigues/07fd735683856b2a06c7c52b9b3878cb
{224, 64}, {209, 64}, {194, 64}, {170, 64}, {151, 64}, {95, 64}, {39, 64}, {21, 64}, {2, 64},
{224, 48}, {209, 48}, {189, 48}, {168, 48}, {153, 48}, {138, 48}, {123, 48}, {108, 48}, {93, 48}, {78, 48}, {63, 48}, {49, 48}, {34, 48}, {9, 48},
{224, 32}, {200, 32}, {175, 32}, {161, 32}, {146, 32}, {131, 32}, {116, 32}, {101, 32}, {86, 32}, {71, 32}, {56, 32}, {41, 32}, {26, 32}, {6, 32},
{224, 16}, {205, 16}, {187, 16}, {172, 16}, {157, 16}, {142, 16}, {127, 16}, {112, 16}, {97, 16}, {82, 16}, {67, 16}, {52, 16}, {37, 16}, {22, 16}, {4, 16},
{224, 0}, {202, 0}, {179, 0}, {164, 0}, {149, 0}, {134, 0}, {119, 0}, {105, 0}, {90, 0}, {75, 0}, {60, 0}, {45, 0}, {30, 0}, {15, 0}, {0, 0}
#ifndef ID67_DISABLE_UNDERGLOW
// underglow LEDs
, {0, 0}, {56, 0}, {112, 0}, {168, 0}, {224, 0},
{224, 64}, {168, 64}, {112, 64}, {56, 64}, {0, 64}
#endif
}, {
// LED Index to Flag
4, 4, 4, 1, 1, 4, 1, 1, 1, // first row
1, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, // second row
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 9, // third row
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, // fourth row
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 // fifth row
// underglow leds
#ifndef ID67_DISABLE_UNDERGLOW
, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
#endif
} };

__attribute__ ((weak))
void rgb_matrix_indicators_user(void) {
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, 0xFF, 0xFF, 0xFF);
}
}
12 changes: 7 additions & 5 deletions keyboards/idobao/id67/rgb/rgb.h → keyboards/idobao/id67/id67.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,18 @@

#include "quantum.h"

#define ___ KC_NO

#define LAYOUT_65_ansi_blocker( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
{ K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
{ K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E }, \
}
File renamed without changes.
3 changes: 2 additions & 1 deletion keyboards/idobao/id67/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* Copyright 2021 Tybera
* Copyright 2022 thewerther
*
* 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
Expand Down Expand Up @@ -28,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, _______,
_______, RESET, BL_DEC, BL_TOGG, BL_INC, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, _______,
_______, RESET, RGB_SPI, RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),

Expand Down
26 changes: 26 additions & 0 deletions keyboards/idobao/id67/keymaps/default_nug/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* Copyright 2021 thewerther
*
* 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/>.
*/

/**
* NB! THIS VARIANT DISABLES THE UNDERGLOW LEDs
* FOR BOARDS WITH A SOLID (NON-ACRILIC) BOTTOM
*/

#pragma once

#if defined(RGB_MATRIX_ENABLE)
#define ID67_DISABLE_UNDERGLOW
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

/**
* NB! THIS VARIANT DISABLES THE UNDERGLOW LEDs
* FOR BOARDS WITH A SOLID (NON-ACRILIC) BOTTOM
*/

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* Copyright 2021 Tybera
* Copyright 2022 thewerther
*
* 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
Expand All @@ -14,4 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "default_rgb.h"
#pragma once

#if defined(RGB_MATRIX_ENABLE)
#define VIA_QMK_RGBLIGHT_ENABLE
#endif
Loading

0 comments on commit 5599ca2

Please sign in to comment.