Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated sixshooter keyboard to move LED macros into the default keymap. #4428

Merged
merged 1 commit into from
Dec 5, 2018
Merged

Updated sixshooter keyboard to move LED macros into the default keymap. #4428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions keyboards/sixshooter/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,16 @@
#define _BL 0
#define _FN 1

// Define keyboard specific keycodes for controlling on/off for all LEDs as they
// are all on different pins with this PCB, rather than a single backlight pin
enum custom_keycodes {
SS_LON = SAFE_RANGE,
SS_LOFF
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Media Keys
/* Base Layer: Media Keys
* ,-----------.
* |Mut| V-| V+|
* |FN | V-| V+|
* |---+---+---|
* |Prv|Ply|Nxt|
* `-----------'
Expand All @@ -30,13 +36,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
MO(_FN), KC_VOLD, KC_VOLU, \
KC_MPRV, KC_MPLY, KC_MNXT \
),
/* FN Layer: LED control
* ,-----------.
* |FN | V-| V+|
* |---+---+---|
* |Prv|Ply|Nxt|
* `-----------'
*/
[_FN] = LAYOUT(
KC_TRNS, SS_LON, SS_LOFF, \
KC_TRNS, KC_TRNS, KC_TRNS
KC_NO, KC_NO, KC_NO
),
};

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// Put your per-action keyboard code here.
// Runs for every action, just before processing by the firmware.
if (record->event.pressed) {

// Check for custom keycodes for turning on and off LEDs
switch(keycode) {
case SS_LON:
sixshooter_led_all_on();
return false;
case SS_LOFF:
sixshooter_led_all_off();
return false;
}
}
return true;
};

void matrix_init_user(void) {
/* Default all LEDs to on */
// Default all LEDs to on
sixshooter_led_all_on();
}
19 changes: 0 additions & 19 deletions keyboards/sixshooter/sixshooter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,6 @@ void matrix_scan_kb(void) {
matrix_scan_user();
}

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
// put your per-action keyboard code here
// runs for every action, just before processing by the firmware
if (record->event.pressed) {

/* Check for custom keycodes for turning on and off LEDs */
switch(keycode) {
case SS_LON:
sixshooter_led_all_on();
return false;
case SS_LOFF:
sixshooter_led_all_off();
return false;
}
}

return process_record_user(keycode, record);
}

void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

Expand Down
11 changes: 0 additions & 11 deletions keyboards/sixshooter/sixshooter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,6 @@
{ K00, K01, K02, K03, K04, K05 }, \
}


/*
* Define keyboard specific keycodes for controlling on/off for all LEDs as they
* are all on different pins with this PCB, rather than a single backlight pin
*/
enum keyboard_keycode {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly, this is alright, but you'd want to note in the default keymap that SAFE_RANGE_KB is the range that you need to use.

SS_LON = SAFE_RANGE,
SS_LOFF,
SAFE_RANGE_KB
};

inline void sixshooter_led_0_on(void) { DDRB |= (1<<6); PORTB |= (1<<6); }
inline void sixshooter_led_1_on(void) { DDRC |= (1<<7); PORTC |= (1<<7); }
inline void sixshooter_led_2_on(void) { DDRD |= (1<<0); PORTD |= (1<<0); }
Expand Down