hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

support more leds (#15840)

Browse Source
fix_template_bootmagic
yulei 3 years ago committed by GitHub
parent 0be7345640
commit 82dd84e257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 114 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 19
      keyboards/neson_design/n6/config.h
  2. 8
      keyboards/neson_design/n6/keymaps/via/keymap.c
  3. 130
      keyboards/neson_design/n6/n6.c

19
keyboards/neson_design/n6/config.h
Unescape View File

@ -50,17 +50,20 @@
//#define NO_PRINT
#define DRIVER_1_LED_TOTAL 32
#define DRIVER_2_LED_TOTAL 32
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_ADDR_2 0b1110111
#define DRIVER_COUNT 2
#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
#define LED_CAPS_LOCK_PIN F5
//rgb light setting
//#define RGBLIGHT_LIMIT_VAL 128
#define RGBLED_NUM 33
#define RGBLED_NUM 65
#define RGB_DI_PIN B3
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_COUNT 1
#define DRIVER_LED_TOTAL 32
#define CAPS_PIN F5
#define RGBLIGHT_LIMIT_VAL 192

8
keyboards/neson_design/n6/keymaps/via/keymap.c
Unescape View File

@ -19,16 +19,16 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_ansi_blocker_split_bs(
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_DEL, KC_BSPC, KC_PSCR,
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_DEL, 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_HOME,
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_END,
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(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_LEFT,KC_DOWN, KC_RIGHT),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN, KC_RIGHT),
[1] = LAYOUT_65_ansi_blocker_split_bs(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,_______,
RESET, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______,
_______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______, _______,
RESET, RGB_TOG,RGB_MOD,RGB_RMOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,KC_MUTE,KC_VOLU,KC_VOLD,_______, _______,
_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,
_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
_______,_______,_______, _______, _______,_______, _______,_______,_______),

130
keyboards/neson_design/n6/n6.c
Unescape View File

@ -34,7 +34,7 @@ enum {
};
// alert state update interval
#define ALERT_INTERVAL 600
#define ALERT_INTERVAL 500
// self testing state update interval
#define ST_INTERVAL 100
// self testing start index
@ -46,6 +46,26 @@ enum {
// self testing stage end duration
#define ST_END_DURATION 10
// led index
#define ST_LEFT_BEGIN 0
#ifdef DRIVER_ADDR_2
#define ST_LEFT_SIZE 4
#else
#define ST_LEFT_SIZE 2
#endif
#define ST_LEFT_END (ST_LEFT_BEGIN+ST_LEFT_SIZE-1)
#ifdef DRIVER_ADDR_2
#define ST_RIGHT_BEGIN 60
#else
#define ST_RIGHT_BEGIN 30
#endif
#ifdef DRIVER_ADDR_2
#define ST_RIGHT_SIZE 4
#else
#define ST_RIGHT_SIZE 2
#endif
#define ST_RIGHT_END (ST_RIGHT_BEGIN+ST_RIGHT_SIZE-1)
#ifdef RGBLIGHT_ENABLE
extern rgblight_config_t rgblight_config;
@ -94,21 +114,21 @@ static void self_testing(void)
IS31FL3731_set_color_all(0, 0, 0);
}
if (rgb_state.index >= 1) {
for (int i = rgb_state.index-1; i < 32-rgb_state.index+1; i++) {
if (rgb_state.index >= ST_LEFT_END) {
for (int i = rgb_state.index - 1; i < DRIVER_LED_TOTAL - rgb_state.index + 1; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
}
if (rgb_state.index==1) {
rgb_state.index=0;
if (rgb_state.index == ST_LEFT_END) {
rgb_state.index = ST_LEFT_BEGIN;
} else {
rgb_state.index -= 2;
rgb_state.index -= ST_LEFT_SIZE;
}
} else{
if (rgb_state.delay > 0) {
rgb_state.delay--;
} else {
// move to stage 2
rgb_state.index = 2;
rgb_state.index = ST_LEFT_BEGIN+ST_LEFT_SIZE;
rgb_state.testing = ST_STAGE_2;
}
}
@ -116,28 +136,32 @@ static void self_testing(void)
case ST_STAGE_2: {
// clear all
IS31FL3731_set_color_all(0, 0, 0);
int i = 0;
// light left and right
IS31FL3731_set_color(0, led.r, led.g, led.b);
IS31FL3731_set_color(1, led.r, led.g, led.b);
IS31FL3731_set_color(30, led.r, led.g, led.b);
IS31FL3731_set_color(31, led.r, led.g, led.b);
for (i = 0; i < ST_LEFT_SIZE; i++) {
IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
}
for (i = 0; i < ST_RIGHT_SIZE; i++) {
IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
}
if (rgb_state.dir) {
// left to right
for (int i = rgb_state.index; i < rgb_state.index+4; i++) {
for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index += 4;
if (rgb_state.index == 30) {
rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE;
if (rgb_state.index == ST_RIGHT_BEGIN) {
rgb_state.dir = !rgb_state.dir;
rgb_state.count--;
}
} else {
// right to left
for (int i = rgb_state.index-4; i < rgb_state.index; i++) {
for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index -= 4;
if (rgb_state.index == 2) {
rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE;
if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) {
rgb_state.dir = !rgb_state.dir;
rgb_state.count--;
}
@ -153,13 +177,13 @@ static void self_testing(void)
}
break;
case ST_STAGE_3:
if (rgb_state.index != 16) {
if (rgb_state.index != DRIVER_LED_TOTAL/2) {
IS31FL3731_set_color_all(0, 0, 0);
}
// light left and right
if (rgb_state.index == 16) {
if (rgb_state.index == DRIVER_LED_TOTAL/2) {
if (rgb_state.duration) {
rgb_state.duration--;
} else {
@ -176,7 +200,7 @@ static void self_testing(void)
IS31FL3731_set_color(i, led.r, led.g, led.b);
}
// right
for (int i = 31; i > 31-rgb_state.index-1; i--) {
for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) {
IS31FL3731_set_color(i, led.r, led.g, led.b);
}
rgb_state.index ++;
@ -230,27 +254,66 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C9_14, C8_14, C7_14},
{0, C9_15, C8_15, C6_14},
{0, C9_16, C7_15, C6_15},
// right CA
{1, C1_1, C3_2, C4_2},
{1, C1_2, C2_2, C4_3},
{1, C1_3, C2_3, C3_3},
{1, C1_4, C2_4, C3_4},
{1, C1_5, C2_5, C3_5},
{1, C1_6, C2_6, C3_6},
{1, C1_7, C2_7, C3_7},
{1, C1_8, C2_8, C3_8},
{1, C9_1, C8_1, C7_1},
{1, C9_2, C8_2, C7_2},
{1, C9_3, C8_3, C7_3},
{1, C9_4, C8_4, C7_4},
{1, C9_5, C8_5, C7_5},
{1, C9_6, C8_6, C7_6},
{1, C9_7, C8_7, C6_6},
{1, C9_8, C7_7, C6_7},
// right CB
{1, C1_9, C3_10, C4_10},
{1, C1_10, C2_10, C4_11},
{1, C1_11, C2_11, C3_11},
{1, C1_12, C2_12, C3_12},
{1, C1_13, C2_13, C3_13},
{1, C1_14, C2_14, C3_14},
{1, C1_15, C2_15, C3_15},
{1, C1_16, C2_16, C3_16},
{1, C9_9, C8_9, C7_9},
{1, C9_10, C8_10, C7_10},
{1, C9_11, C8_11, C7_11},
{1, C9_12, C8_12, C7_12},
{1, C9_13, C8_13, C7_13},
{1, C9_14, C8_14, C7_14},
{1, C9_15, C8_15, C6_14},
{1, C9_16, C7_15, C6_15},
};
#endif
void matrix_init_kb(void)
{
// clear caps led
setPinOutput(CAPS_PIN);
writePinLow(CAPS_PIN);
#ifdef RGBLIGHT_ENABLE
setPinOutput(LED_CAPS_LOCK_PIN);
writePinLow(LED_CAPS_LOCK_PIN);
i2c_init();
IS31FL3731_init(DRIVER_ADDR_1);
#ifdef DRIVER_ADDR_2
IS31FL3731_init(DRIVER_ADDR_2);
#endif
for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
IS31FL3731_set_led_control_register(index, true, true, true);
}
IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
update_ticks();
#ifdef DRIVER_ADDR_2
IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
#endif
update_ticks();
matrix_init_user();
}
#ifdef RGBLIGHT_ENABLE
void housekeeping_task_kb(void)
{
if (rgb_state.state == SELF_TESTING) {
@ -259,7 +322,8 @@ void housekeeping_task_kb(void)
//gold 0xFF, 0xD9, 0x00
LED_TYPE led = {
.r = 0xFF,
.g = 0xD9,
//.g = 0xD9,
.g = 0xA5,
.b = 0x00,
};
if (rgb_state.alert) {
@ -280,6 +344,9 @@ void housekeeping_task_kb(void)
}
IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
#ifdef DRIVER_ADDR_2
IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
#endif
housekeeping_task_user();
}
@ -293,15 +360,13 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
}
ws2812_setleds(start_led+DRIVER_LED_TOTAL, 1);
}
#endif
bool led_update_kb(led_t led_state)
{
bool res = led_update_user(led_state);
if (res) {
writePin(CAPS_PIN, led_state.caps_lock);
writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
#ifdef RGBLIGHT_ENABLE
if (rgb_state.state != SELF_TESTING) {
if (led_state.caps_lock) {
rgb_state.state = CAPS_ALERT;
@ -311,7 +376,8 @@ bool led_update_kb(led_t led_state)
rgblight_set();
}
}
#endif
}
return res;
}
#endif
Write Preview
Loading…
Cancel
Save