diff options
| author | Ole Anders <git@swoy.org> | 2017-03-07 19:39:00 +0100 |
|---|---|---|
| committer | Ole Anders <git@swoy.org> | 2017-03-07 19:39:00 +0100 |
| commit | 25a7c941746d077d246468bec6bebdb01e478090 (patch) | |
| tree | 906b491bb1465be287ec4dc02e9857437f7582a6 /keyboards/ergodox/keymaps | |
| parent | d1fb51976aeef8eeea5975c5bf75b6b1aa649826 (diff) | |
| parent | f5c8c5d4c854c5ae4dc586066c9b03557786c4c2 (diff) | |
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'keyboards/ergodox/keymaps')
| -rw-r--r-- | keyboards/ergodox/keymaps/ordinary/keymap.c | 1 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/robot_test_layout/keymap.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/keyboards/ergodox/keymaps/ordinary/keymap.c b/keyboards/ergodox/keymaps/ordinary/keymap.c index 302c41cc8d..5c01d96784 100644 --- a/keyboards/ergodox/keymaps/ordinary/keymap.c +++ b/keyboards/ergodox/keymaps/ordinary/keymap.c @@ -1,5 +1,6 @@ #include "ergodox.h" #include "led.h" +#include "mousekey.h" #include "debug.h" #include "action_layer.h" #include "action_util.h" diff --git a/keyboards/ergodox/keymaps/robot_test_layout/keymap.c b/keyboards/ergodox/keymaps/robot_test_layout/keymap.c index 480be177f0..e9e2597d7e 100644 --- a/keyboards/ergodox/keymaps/robot_test_layout/keymap.c +++ b/keyboards/ergodox/keymaps/robot_test_layout/keymap.c @@ -68,7 +68,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_FF0000: if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE - EZ_RGB(0xff0000); + EZ_RGB(0xff0000UL); register_code(KC_1); unregister_code(KC_1); #endif } @@ -77,7 +77,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_00FF00: if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE - EZ_RGB(0x00ff00); + EZ_RGB(0x00ff00UL); register_code(KC_2); unregister_code(KC_2); #endif } @@ -86,7 +86,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_0000FF: if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE - EZ_RGB(0x0000ff); + EZ_RGB(0x0000ffUL); register_code(KC_3); unregister_code(KC_3); #endif } @@ -95,7 +95,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_FFFFFF: if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE - EZ_RGB(0xffffff); + EZ_RGB(0xffffffUL); register_code(KC_4); unregister_code(KC_4); #endif } |