Skip to content

Commit

Permalink
[Keyboard] NK65 Refactor (qmk#7862)
Browse files Browse the repository at this point in the history
* Nk65  Refractor

- Changed Via keymap to via instead of default_via
- Moved Caps/Layer indicator code outside of wilba_tech rgb. This is so they can more easily be modified

* Update keyboards/nk65/nk65.c
  • Loading branch information
yiancar authored and noroadsleft committed Jan 11, 2020
1 parent 2d051d8 commit 70309be
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 19 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
42 changes: 39 additions & 3 deletions keyboards/nk65/nk65.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,42 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef RGB_BACKLIGHT_NK65
#error RGB_BACKLIGHT_NK65 not defined, recheck config.h
#endif
#ifndef RGB_BACKLIGHT_NK65
#error RGB_BACKLIGHT_NK65 not defined, recheck config.h
#endif

#include "nk65.h"
#include "drivers/issi/is31fl3733.h"

/* Indicator LEDS are part of the LED driver
* Top LED is blue only. LED driver 2 RGB 7 Green channel
* Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel
* Bottom LED is red only LED driver 2 RGB 6 Green channel.
*/
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
if (led_state.caps_lock) {
IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
} else {
IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
}
}
return res;
}

__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
uint8_t R = 0;
uint8_t G = 0;
uint8_t B = 0;
if (state & (1UL << 1)) {
R = 255;
B = 255;
}
if (state & (1UL << 2)) {
G = 255;
}

IS31FL3733_set_color( 6+64-1, R, G, B );
return state;
}
16 changes: 0 additions & 16 deletions keyboards/wilba_tech/wt_rgb_backlight.c
Original file line number Diff line number Diff line change
Expand Up @@ -1551,22 +1551,6 @@ void backlight_effect_indicators(void)
{
backlight_effect_indicators_set_colors( g_config.caps_lock_indicator.index, g_config.caps_lock_indicator.color );
}

#if defined(RGB_BACKLIGHT_NK65)
if ( IS_LED_ON(g_indicator_state, USB_LED_CAPS_LOCK) ) {
IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
} else {
IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
}
if ( IS_LAYER_ON(1) ) {
IS31FL3733_set_color( 6+64-1, 255, 0, 255 );
} else if ( IS_LAYER_ON(2) ) {
IS31FL3733_set_color( 6+64-1, 0, 255, 0 );
} else {
IS31FL3733_set_color( 6+64-1, 0, 0, 0 );
}
#endif

// This if/else if structure allows higher layers to
// override lower ones. If we set layer 3's indicator
// to none, then it will NOT show layer 2 or layer 1
Expand Down

0 comments on commit 70309be

Please sign in to comment.