@ -67,11 +67,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
*/
[ _RS ] = KEYMAP (
[ _RS ] = KEYMAP (
# ifdef RGBLIGHT_ENABLE
# ifdef RGBLIGHT_ENABLE
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , F ( 1 ) , F ( 7 ) , \
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , RGB_TOG , RGB_VAI , \
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , RESET , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , F ( 8 ) , \
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , RESET , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , RGB_VAD , \
KC_TRNS , KC_TRNS , MO ( _RS ) , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , \
KC_TRNS , KC_TRNS , MO ( _RS ) , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , \
MO ( _FL ) , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , MO ( _FL ) , F ( 5 ) , \
MO ( _FL ) , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , MO ( _FL ) , RGB_SAI , \
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , F ( 2 ) , F ( 2 ) , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , F ( 4 ) , F ( 6 ) , F ( 3 ) ) ,
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , RGB_MOD , RGB_MOD , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , RGB_HUD , RGB_SAD , RGB_HUI ) ,
# else
# else
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , \
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , \
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , RESET , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , \
KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , RESET , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , \
@ -83,30 +83,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
enum function_id {
enum function_id {
SHIFT_ESC ,
SHIFT_ESC ,
# ifdef RGBLIGHT_ENABLE
RGBLED_TOGGLE ,
RGBLED_STEP_MODE ,
RGBLED_INCREASE_HUE ,
RGBLED_DECREASE_HUE ,
RGBLED_INCREASE_SAT ,
RGBLED_DECREASE_SAT ,
RGBLED_INCREASE_VAL ,
RGBLED_DECREASE_VAL
# endif
} ;
} ;
const uint16_t PROGMEM fn_actions [ ] = {
const uint16_t PROGMEM fn_actions [ ] = {
[ 0 ] = ACTION_FUNCTION ( SHIFT_ESC ) ,
[ 0 ] = ACTION_FUNCTION ( SHIFT_ESC ) ,
# ifdef RGBLIGHT_ENABLE
[ 1 ] = ACTION_FUNCTION ( RGBLED_TOGGLE ) ,
[ 2 ] = ACTION_FUNCTION ( RGBLED_STEP_MODE ) ,
[ 3 ] = ACTION_FUNCTION ( RGBLED_INCREASE_HUE ) ,
[ 4 ] = ACTION_FUNCTION ( RGBLED_DECREASE_HUE ) ,
[ 5 ] = ACTION_FUNCTION ( RGBLED_INCREASE_SAT ) ,
[ 6 ] = ACTION_FUNCTION ( RGBLED_DECREASE_SAT ) ,
[ 7 ] = ACTION_FUNCTION ( RGBLED_INCREASE_VAL ) ,
[ 8 ] = ACTION_FUNCTION ( RGBLED_DECREASE_VAL ) ,
# endif
} ;
} ;
void action_function ( keyrecord_t * record , uint8_t id , uint8_t opt ) {
void action_function ( keyrecord_t * record , uint8_t id , uint8_t opt ) {
@ -132,49 +112,5 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
}
}
}
}
break ;
break ;
//led operations
# ifdef RGBLIGHT_ENABLE
case RGBLED_TOGGLE :
if ( record - > event . pressed ) {
rgblight_toggle ( ) ;
}
break ;
case RGBLED_INCREASE_HUE :
if ( record - > event . pressed ) {
rgblight_increase_hue ( ) ;
}
break ;
case RGBLED_DECREASE_HUE :
if ( record - > event . pressed ) {
rgblight_decrease_hue ( ) ;
}
break ;
case RGBLED_INCREASE_SAT :
if ( record - > event . pressed ) {
rgblight_increase_sat ( ) ;
}
break ;
case RGBLED_DECREASE_SAT :
if ( record - > event . pressed ) {
rgblight_decrease_sat ( ) ;
}
break ;
case RGBLED_INCREASE_VAL :
if ( record - > event . pressed ) {
rgblight_increase_val ( ) ;
}
break ;
case RGBLED_DECREASE_VAL :
if ( record - > event . pressed ) {
rgblight_decrease_val ( ) ;
}
break ;
case RGBLED_STEP_MODE :
if ( record - > event . pressed ) {
rgblight_step ( ) ;
}
break ;
# endif
}
}
}
}