aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-07-05 03:30:34 -0700
committerGitHub <noreply@github.com>2021-07-05 03:30:34 -0700
commiteb7178b542058309b20e4c3411a724e937223a9c (patch)
tree0c889a949d6b95c2f01713102ca280d2a9fab471
parent5d52d018251866eba34c7aa352174a5d23900198 (diff)
downloadqmk_firmware-eb7178b542058309b20e4c3411a724e937223a9c.tar.gz
qmk_firmware-eb7178b542058309b20e4c3411a724e937223a9c.zip
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
-rw-r--r--keyboards/latinpadble/info.json8
-rw-r--r--keyboards/latinpadble/rules.mk32
2 files changed, 13 insertions, 27 deletions
diff --git a/keyboards/latinpadble/info.json b/keyboards/latinpadble/info.json
index d650dc9f6..4b84bb6c8 100644
--- a/keyboards/latinpadble/info.json
+++ b/keyboards/latinpadble/info.json
@@ -2,28 +2,28 @@
2 "keyboard_name": "latinpadble", 2 "keyboard_name": "latinpadble",
3 "url": "https://github.com/latincompass/2-RotaryEncoder-pad", 3 "url": "https://github.com/latincompass/2-RotaryEncoder-pad",
4 "maintainer": "haierwangwei2005", 4 "maintainer": "haierwangwei2005",
5
6 "width": 4, 5 "width": 4,
7 "height": 5, 6 "height": 5,
8 "layouts": { 7 "layouts": {
9 8 "LAYOUT_pad": {
10 "LAYOUT": {
11 "layout": [ 9 "layout": [
12 {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8}, 10 {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
13 {"label":"/", "x":0.8, "y":0, "w":0.8, "h":0.8},
14 11
15 {"label":"7", "x":0, "y":1}, 12 {"label":"7", "x":0, "y":1},
16 {"label":"8", "x":1, "y":1}, 13 {"label":"8", "x":1, "y":1},
17 {"label":"9", "x":2, "y":1}, 14 {"label":"9", "x":2, "y":1},
18 {"label":"+", "x":3, "y":1}, 15 {"label":"+", "x":3, "y":1},
16
19 {"label":"4", "x":0, "y":2}, 17 {"label":"4", "x":0, "y":2},
20 {"label":"5", "x":1, "y":2}, 18 {"label":"5", "x":1, "y":2},
21 {"label":"6", "x":2, "y":2}, 19 {"label":"6", "x":2, "y":2},
22 {"label":"+", "x":3, "y":2}, 20 {"label":"+", "x":3, "y":2},
21
23 {"label":"1", "x":0, "y":3}, 22 {"label":"1", "x":0, "y":3},
24 {"label":"2", "x":1, "y":3}, 23 {"label":"2", "x":1, "y":3},
25 {"label":"3", "x":2, "y":3}, 24 {"label":"3", "x":2, "y":3},
26 {"label":"Enter", "x":3, "y":3}, 25 {"label":"Enter", "x":3, "y":3},
26
27 {"label":"0", "x":0, "y":4}, 27 {"label":"0", "x":0, "y":4},
28 {"label":"0", "x":1, "y":4}, 28 {"label":"0", "x":1, "y":4},
29 {"label":".", "x":2, "y":4}, 29 {"label":".", "x":2, "y":4},
diff --git a/keyboards/latinpadble/rules.mk b/keyboards/latinpadble/rules.mk
index cb9789aca..e74c2da14 100644
--- a/keyboards/latinpadble/rules.mk
+++ b/keyboards/latinpadble/rules.mk
@@ -1,29 +1,17 @@
1
2# MCU name 1# MCU name
3MCU = atmega32u4 2MCU = atmega32u4
4 3
5# Bootloader selection 4# Processor frequency
6# Teensy halfkay
7# Pro Micro caterina
8# Atmel DFU atmel-dfu
9# LUFA DFU lufa-dfu
10# QMK DFU qmk-dfu
11# ATmega32A bootloadHID
12# ATmega328P USBasp
13BOOTLOADER = caterina
14F_CPU = 8000000 5F_CPU = 8000000
15 6
7# Bootloader selection
8BOOTLOADER = caterina
16 9
17# Feather uses the caterina bootloader
18OPT_DEFS += -DBOOTLOADER_SIZE=4096 -DCATERINA_BOOTLOADER
19 10
20# Build Options 11# Build Options
21# change yes to no to disable 12# change yes to no to disable
22# 13#
23 14BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
24# Build Options
25# change yes to no to disable
26BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
27MOUSEKEY_ENABLE = yes # Mouse keys 15MOUSEKEY_ENABLE = yes # Mouse keys
28EXTRAKEY_ENABLE = yes # Audio control and System control 16EXTRAKEY_ENABLE = yes # Audio control and System control
29CONSOLE_ENABLE = no # Console for debug 17CONSOLE_ENABLE = no # Console for debug
@@ -32,13 +20,11 @@ COMMAND_ENABLE = no # Commands for debug and configuration
32SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 20SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
33# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 21# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
34NKRO_ENABLE = no # USB Nkey Rollover 22NKRO_ENABLE = no # USB Nkey Rollover
35BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default 23BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
36MIDI_ENABLE = no # MIDI controls 24RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
37UNICODE_ENABLE = no # Unicode 25BLUETOOTH_ENABLE = no # Enable Bluetooth
38AUDIO_ENABLE = no # Audio output on port C6 26AUDIO_ENABLE = no # Audio output
27
39BLUETOOTH = AdafruitBLE 28BLUETOOTH = AdafruitBLE
40LAYOUTS = pad
41RGBLIGHT_ENABLE = yes
42OLED_DRIVER_ENABLE = yes 29OLED_DRIVER_ENABLE = yes
43ENCODER_ENABLE = yes 30ENCODER_ENABLE = yes
44