Skip to content

Commit

Permalink
Merge branch 'master' into promethium
Browse files Browse the repository at this point in the history
priyadi committed Dec 4, 2016

Verified

This commit was signed with the committer’s verified signature. The key has expired.
mike-burns Mike Burns
2 parents a8e5f61 + f39e1b5 commit fc80aa9
Showing 103 changed files with 3,822 additions and 589 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -25,5 +25,4 @@ ENV subproject=ez
ENV keymap=default

VOLUME /qmk
WORKDIR /qmk
CMD make clean ; make keyboard=${keyboard} subproject=${subproject} keymap=${keymap}
WORKDIR /qmk
14 changes: 14 additions & 0 deletions build_keyboard.mk
Original file line number Diff line number Diff line change
@@ -131,6 +131,14 @@ ifndef CUSTOM_MATRIX
SRC += $(QUANTUM_DIR)/matrix.c
endif

ifeq ($(strip $(API_SYSEX_ENABLE)), yes)
OPT_DEFS += -DAPI_SYSEX_ENABLE
SRC += $(QUANTUM_DIR)/api/api_sysex.c
OPT_DEFS += -DAPI_ENABLE
SRC += $(QUANTUM_DIR)/api.c
MIDI_ENABLE=yes
endif

ifeq ($(strip $(MIDI_ENABLE)), yes)
OPT_DEFS += -DMIDI_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c
@@ -174,6 +182,12 @@ ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c
endif

ifeq ($(strip $(PRINTING_ENABLE)), yes)
OPT_DEFS += -DPRINTING_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c
SRC += $(TMK_DIR)/protocol/serial_uart.c
endif

ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes)
SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC))
OPT_DEFS += $(SERIAL_DEFS)
1 change: 1 addition & 0 deletions common.mk
Original file line number Diff line number Diff line change
@@ -23,4 +23,5 @@ COMMON_VPATH += $(QUANTUM_PATH)
COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
COMMON_VPATH += $(QUANTUM_PATH)/audio
COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
COMMON_VPATH += $(QUANTUM_PATH)/api
COMMON_VPATH += $(SERIAL_PATH)
2 changes: 1 addition & 1 deletion keyboards/amj60/config.h
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#define RGB_DI_PIN E2
#define RGBLIGHT_TIMER
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 8 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
2 changes: 1 addition & 1 deletion keyboards/clueboard/rev1/config.h
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
/* Underlight configuration
*/
#define RGB_DI_PIN B2
#define RGBLIGHT_TIMER
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
2 changes: 1 addition & 1 deletion keyboards/clueboard/rev2/config.h
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
/* Underlight configuration
*/
#define RGB_DI_PIN D7
#define RGBLIGHT_TIMER
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
2 changes: 1 addition & 1 deletion keyboards/cluecard/config.h
Original file line number Diff line number Diff line change
@@ -140,7 +140,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Underlight configuration
*/
#define RGB_DI_PIN E6
//#define RGBLIGHT_TIMER
//#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 4 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
2 changes: 1 addition & 1 deletion keyboards/cluecard/keymaps/rgb_effects/config.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
#include "../../config.h"

// place overrides here
#define RGBLIGHT_TIMER
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 2
2 changes: 1 addition & 1 deletion keyboards/cluepad/config.h
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Underlight configuration
*/
#define RGB_DI_PIN F6
#define RGBLIGHT_TIMER
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 4 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
7 changes: 6 additions & 1 deletion keyboards/ergodox/ez/Makefile
Original file line number Diff line number Diff line change
@@ -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
include ../../../Makefile
endif
endif
13 changes: 13 additions & 0 deletions keyboards/ergodox/ez/config.h
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "../config.h"

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x1307
@@ -39,6 +41,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LED_BRIGHTNESS_LO 15
#define LED_BRIGHTNESS_HI 255

/* 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


/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
10 changes: 8 additions & 2 deletions keyboards/ergodox/ez/ez.c
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ void matrix_init_kb(void) {
// unused pins - C7, D4, D5, D7, E6
// set as input with internal pull-ip enabled
DDRC &= ~(1<<7);
DDRD &= ~(1<<7 | 1<<5 | 1<<4);
DDRD &= ~(1<<5 | 1<<4);
DDRE &= ~(1<<6);
PORTC |= (1<<7);
PORTD |= (1<<7 | 1<<5 | 1<<4);
PORTD |= (1<<5 | 1<<4);
PORTE |= (1<<6);

ergodox_blink_all_leds();
@@ -51,6 +51,10 @@ uint8_t init_mcp23018(void) {
mcp23018_status = 0x20;

// I2C subsystem

uint8_t sreg_prev;
sreg_prev=SREG;
cli();
if (i2c_initialized == 0) {
i2c_init(); // on pins D(1,0)
i2c_initialized++;
@@ -79,6 +83,8 @@ uint8_t init_mcp23018(void) {
out:
i2c_stop();

SREG=sreg_prev;

return mcp23018_status;
}

2 changes: 1 addition & 1 deletion keyboards/ergodox/ez/matrix.c
Original file line number Diff line number Diff line change
@@ -121,7 +121,7 @@ void matrix_init(void)
matrix_scan_count = 0;
#endif

matrix_init_kb();
matrix_init_quantum();

}

2 changes: 2 additions & 0 deletions keyboards/ergodox/ez/rules.mk
Original file line number Diff line number Diff line change
@@ -72,6 +72,8 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
#

SLEEP_LED_ENABLE = no
API_SYSEX_ENABLE ?= yes
RGBLIGHT_ENABLE ?= yes

ifndef QUANTUM_DIR
include ../../../Makefile
2 changes: 2 additions & 0 deletions keyboards/ergodox/infinity/rules.mk
Original file line number Diff line number Diff line change
@@ -63,6 +63,8 @@ VISUALIZER_ENABLE ?= no #temporarily disabled to make everything compile
LCD_ENABLE ?= yes
LED_ENABLE ?= yes
LCD_BACKLIGHT_ENABLE ?= yes
MIDI_ENABLE = no
RGBLIGHT_ENABLE = no

ifndef QUANTUM_DIR
include ../../../Makefile
9 changes: 9 additions & 0 deletions keyboards/ergodox/keymaps/bepo/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Having a file like this allows you to override Makefile definitions
# for your own particular keymap

SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
COMMAND_ENABLE = no # Commands for debug and configuration

ifndef QUANTUM_DIR
include ../../../../Makefile
endif
Binary file modified keyboards/ergodox/keymaps/bepo/bepo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit fc80aa9

Please sign in to comment.