andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7

master
Jack Humbert 2016-11-29 00:10:06 -05:00
parent d0cefef946 84735836e3
commit efbc205efd
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keyboards/ergodox/ez/Makefile
View File

@ -1,3 +1,8 @@
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
COMMAND_ENABLE = no # Commands for debug and configuration
RGBLIGHT_ENABLE ?= yes
MIDI_ENABLE ?= yes
ifndef MAKEFILE_INCLUDED ifndef MAKEFILE_INCLUDED
include ../../../Makefile include ../../../Makefile
endif endif

11
keyboards/ergodox/ez/config.h
View File

@ -56,6 +56,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Set 0 if debouncing isn't needed */ /* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5 #define DEBOUNCE 5
/* ws2812 RGB LED */
#define RGB_DI_PIN D7
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 15 // Number of LEDs
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 255
#define RGBLIGHT_VAL_STEP 12
#define RGB_MIDI
#define RGBW_BB_TWI
/* /*
* Feature disable options * Feature disable options
* These options are also useful to firmware size reduction. * These options are also useful to firmware size reduction.

10
keyboards/ergodox/keymaps/erez_experimental/config.h
View File

@ -9,15 +9,5 @@
#undef LEADER_TIMEOUT #undef LEADER_TIMEOUT
#define LEADER_TIMEOUT 300 #define LEADER_TIMEOUT 300
/* ws2812 RGB LED */
#define RGB_DI_PIN D7
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 15 // Number of LEDs
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 255
#define RGBLIGHT_VAL_STEP 12
#define RGB_MIDI
#define RGBW_BB_TWI
#endif #endif

6
keyboards/ergodox/keymaps/erez_experimental/keymap.c
View File

@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | |NxtTab|PrvTab| | | | | | | * | | | |NxtTab|PrvTab| | | | | | |
* `----------------------------------' `----------------------------------' * `----------------------------------' `----------------------------------'
* ,-------------. ,-------------. * ,-------------. ,-------------.
* | | | | | | * | | | |TOG |
* ,------|------|------| |------+------+------. * ,------|------|------| |------+------+------.
* |VAI |VAD |HUI | |SAI |TOG |MOD | * |VAI |VAD |HUI | |SAI |TOG |MOD |
* | | |------| |------| | | * | | |------| |------| | |
@ -95,9 +95,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_AMPR, KC_UNDS, KC_MINS, CM_SCLN, KC_PLUS, KC_TRNS, KC_AMPR, KC_UNDS, KC_MINS, CM_SCLN, KC_PLUS, KC_TRNS,
KC_TRNS, KC_PIPE, KC_AT, KC_EQL, KC_PERC, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_AT, KC_EQL, KC_PERC, 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, KC_TRNS,
RGB_SAI, RGB_SAI,
RGB_SAD, RGB_TOG, RGB_MOD RGB_SAD, KC_TRNS, RGB_MOD
), ),
/* Keymap 2: Media and mouse keys /* Keymap 2: Media and mouse keys
* *