From 06f0774d6003b3b8984a7821092b8874be5b50fa Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 23 Jun 2021 16:22:45 -0700 Subject: [PATCH 1/3] correct info.json data Removes an extra key object, and corrects the layout macro reference. --- keyboards/latinpadble/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/latinpadble/info.json b/keyboards/latinpadble/info.json index d650dc9f6493..4b84bb6c87a3 100644 --- a/keyboards/latinpadble/info.json +++ b/keyboards/latinpadble/info.json @@ -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}, From 7a63ef1413d42b9af694379fa7071816bf65f48a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 4 Jul 2021 18:52:55 -0700 Subject: [PATCH 2/3] refactor rules.mk file - remove invalid `LAYOUTS` rule - edits the rules.mk file to more closely resemble the file from QMK's AVR template. --- keyboards/latinpadble/rules.mk | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/keyboards/latinpadble/rules.mk b/keyboards/latinpadble/rules.mk index cb9789acaa35..9df0c6db94b5 100644 --- a/keyboards/latinpadble/rules.mk +++ b/keyboards/latinpadble/rules.mk @@ -1,29 +1,17 @@ - # 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 F_CPU = 8000000 - # Feather uses the caterina bootloader OPT_DEFS += -DBOOTLOADER_SIZE=4096 -DCATERINA_BOOTLOADER # 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,13 +20,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 -LAYOUTS = pad -RGBLIGHT_ENABLE = yes OLED_DRIVER_ENABLE = yes ENCODER_ENABLE = yes - From 0f35b40ce61b027b3dc15e86f7ccb79ab6e25d50 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 4 Jul 2021 21:59:55 -0700 Subject: [PATCH 3/3] additional rules.mk cleanup per fauxpark Apply suggestions from code review Co-authored-by: Ryan --- keyboards/latinpadble/rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/latinpadble/rules.mk b/keyboards/latinpadble/rules.mk index 9df0c6db94b5..e74c2da14a40 100644 --- a/keyboards/latinpadble/rules.mk +++ b/keyboards/latinpadble/rules.mk @@ -1,12 +1,12 @@ # MCU name MCU = atmega32u4 +# Processor frequency +F_CPU = 8000000 + # Bootloader selection BOOTLOADER = caterina -F_CPU = 8000000 -# Feather uses the caterina bootloader -OPT_DEFS += -DBOOTLOADER_SIZE=4096 -DCATERINA_BOOTLOADER # Build Options # change yes to no to disable