Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
fauxpark
2021-07-05 21:57:13 +10:00
10 changed files with 349 additions and 507 deletions

View File

@@ -2,28 +2,28 @@
"keyboard_name": "latinpadble",
"url": "https://github.com/latincompass/2-RotaryEncoder-pad",
"maintainer": "haierwangwei2005",
"width": 4,
"height": 5,
"layouts": {
"LAYOUT": {
"LAYOUT_pad": {
"layout": [
{"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
{"label":"/", "x":0.8, "y":0, "w":0.8, "h":0.8},
{"label":"7", "x":0, "y":1},
{"label":"8", "x":1, "y":1},
{"label":"9", "x":2, "y":1},
{"label":"+", "x":3, "y":1},
{"label":"4", "x":0, "y":2},
{"label":"5", "x":1, "y":2},
{"label":"6", "x":2, "y":2},
{"label":"+", "x":3, "y":2},
{"label":"1", "x":0, "y":3},
{"label":"2", "x":1, "y":3},
{"label":"3", "x":2, "y":3},
{"label":"Enter", "x":3, "y":3},
{"label":"0", "x":0, "y":4},
{"label":"0", "x":1, "y":4},
{"label":".", "x":2, "y":4},

View File

@@ -1,29 +1,16 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = caterina
# Processor frequency
F_CPU = 8000000
# Feather uses the caterina bootloader
OPT_DEFS += -DBOOTLOADER_SIZE=4096 -DCATERINA_BOOTLOADER
# Bootloader selection
BOOTLOADER = caterina
# Build Options
# change yes to no to disable
#
# Build Options
# change yes to no to disable
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
@@ -32,12 +19,11 @@ COMMAND_ENABLE = no # Commands for debug and configuration
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
MIDI_ENABLE = no # MIDI controls
UNICODE_ENABLE = no # Unicode
AUDIO_ENABLE = no # Audio output on port C6
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
BLUETOOTH = AdafruitBLE
RGBLIGHT_ENABLE = yes
OLED_DRIVER_ENABLE = yes
ENCODER_ENABLE = yes