LatinPadBLE: correct info.json data (#13452)

* correct info.json data

Removes an extra key object, and corrects the layout macro reference.

* refactor rules.mk file

- remove invalid `LAYOUTS` rule
- edits the rules.mk file to more closely resemble the file from QMK's AVR template.

* additional rules.mk cleanup per fauxpark

Apply suggestions from code review
master
James Young 2021-07-05 03:30:34 -07:00 committed by GitHub
parent 5d52d01825
commit eb7178b542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 27 deletions

View File

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

View File

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