~ruther/qmk_firmware

c09e8bbf4207f264972eb3b2bfd3a535e58d6f81 — QMK Bot 3 years ago b28d8fc + 2d8266b
Merge remote-tracking branch 'origin/master' into develop
M keyboards/pearlboards/pandora/rules.mk => keyboards/pearlboards/pandora/rules.mk +6 -6
@@ 10,13 10,13 @@ BOOTLOADER = atmel-dfu
BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes       # Mouse keys
EXTRAKEY_ENABLE = yes       # Audio control and System control
CONSOLE_ENABLE = no        # Console for debug
COMMAND_ENABLE = no        # Commands for debug and configuration
CONSOLE_ENABLE = no         # Console for debug
COMMAND_ENABLE = no         # Commands for debug and configuration
NKRO_ENABLE = yes           # Enable N-Key Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
DIP_SWITCH_ENABLE = yes
ENCODER_ENABLE = yes
DIP_SWITCH_ENABLE = yes     # Enable dip switches
ENCODER_ENABLE = yes        # Rotary encoder

LTO_ENABLE = yes
LTO_ENABLE = yes            # Link time optimization

M keyboards/pearlboards/zeus/rules.mk => keyboards/pearlboards/zeus/rules.mk +4 -4
@@ 16,8 16,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = yes          # Audio output
ENCODER_ENABLE = yes
HAPTIC_ENABLE = yes
HAPTIC_DRIVER = DRV2605L
ENCODER_ENABLE = yes        # Rotary encoder
HAPTIC_ENABLE = yes         # Rumble feefback
HAPTIC_DRIVER = DRV2605L    # Rumble motor

LTO_ENABLE = yes
LTO_ENABLE = yes            # Link time optimization

M keyboards/pearlboards/zeuspad/keymaps/default/keymap.c => keyboards/pearlboards/zeuspad/keymaps/default/keymap.c +12 -12
@@ 19,18 19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_all(
		KC_ESC,   KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,
		KC_NLCK,  KC_PSLS,  KC_PAST,  MO(1),
		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
		LT(1, KC_ESC),  KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,
		KC_NLCK,        KC_PSLS,  KC_PAST,  KC_PMNS,
		KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
		KC_P4,          KC_P5,    KC_P6,    KC_PPLS,
		KC_P1,          KC_P2,    KC_P3,    KC_PENT,
		KC_P0,          KC_P0,    KC_PDOT,  KC_PENT),

  [1] = LAYOUT_all(
		RESET,    KC_LCTL,  KC_LALT,  KC_TRNS,
		RGB_TOG,  RGB_MOD,  RGB_HUI,  KC_PMNS,
		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT)
		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
		RESET,    RGB_TOG,  RGB_MOD,  RGB_HUI,
    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)
};

M keyboards/pearlboards/zeuspad/keymaps/via/keymap.c => keyboards/pearlboards/zeuspad/keymaps/via/keymap.c +12 -12
@@ 19,20 19,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_all(
		KC_ESC,   RGB_TOG,  RGB_MOD,  KC_MEDIA_PLAY_PAUSE,
		KC_NLCK,  KC_PSLS,  KC_PAST,  MO(1),
		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
		LT(1, KC_ESC),  RGB_TOG,  RGB_MOD,  KC_MEDIA_PLAY_PAUSE,
		KC_NLCK,        KC_PSLS,  KC_PAST,  KC_PMNS,
		KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
		KC_P4,          KC_P5,    KC_P6,    KC_PPLS,
		KC_P1,          KC_P2,    KC_P3,    KC_PENT,
		KC_P0,          KC_P0,    KC_PDOT,  KC_PENT),

  [1] = LAYOUT_all(
		RESET,    KC_LCTL,  KC_LALT,  KC_TRNS,
		RGB_TOG,  RGB_MOD,  RGB_HUI,  KC_PMNS,
		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
		RESET,    RGB_TOG,  RGB_MOD,  RGB_HUI,
    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),

  [2] = LAYOUT_all(
    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,

M keyboards/pearlboards/zeuspad/rules.mk => keyboards/pearlboards/zeuspad/rules.mk +4 -4
@@ 16,8 16,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
ENCODER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
ENCODER_ENABLE = yes        # Rotary encoder
OLED_ENABLE = yes           # Enable oled
OLED_DRIVER = SSD1306       # Oled type

LTO_ENABLE = yes
LTO_ENABLE = yes            # Link time optimization