Fixup latinpadble (qmk#20924)

freznel10 · May 14, 2023 · 13a989d · 13a989d
1 parent d52e7d4
commit 13a989d
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 388 deletions.
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json
@@ -8,6 +8,21 @@
  "pid": "0x7C98",
  "device_version": "0.0.1"
  },
+ "features": {
+ "bluetooth": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
  "matrix_pins": {
  "cols": ["D6", "D7", "B5", "B6"],
  "rows": ["F0", "F6", "F5", "F4", "F1"]
@@ -21,10 +36,26 @@
  "ws2812": {
  "pin": "B7"
  },
+ "rgblight": {
+ "brightness_steps": 25,
+ "led_count": 4,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "static_gradient": true
+ }
+ },
+ "bluetooth": {
+ "driver": "BluefruitLE"
+ },
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
- "LAYOUT_pad": {
+ "LAYOUT": {
  "layout": [
  {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
 

diff --git a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
@@ -16,28 +16,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_pad(
+ [0] = LAYOUT(
  KC_PGUP,
  KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
  KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
  KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
- KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
- [1] = LAYOUT_pad(
+ KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER
+ ),
+ [1] = LAYOUT(
  KC_NUM,
  RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
  RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
  RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
- RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS),
+ RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS
+ )
 };
-
-static void render_logo(void) {
- static const char PROGMEM qmk_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0};
- oled_write_P(qmk_logo, false);
-}
-
-#ifdef OLED_ENABLE
-bool oled_task_user(void) {
- render_logo();
- return false;
-}
-#endif
diff --git a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
@@ -16,44 +16,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_pad(
+ [0] = LAYOUT(
  KC_PGUP,
  KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
  KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
  KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
  KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER
  ),
- [1] = LAYOUT_pad(
+ [1] = LAYOUT(
  KC_NUM,
  RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
  RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
  RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
  RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS
- ),
- [2] = LAYOUT_pad(
- _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______
- ),
- [3] = LAYOUT_pad(
- _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______
  )
 };
-
-static void render_logo(void) {
- static const char PROGMEM qmk_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0};
- oled_write_P(qmk_logo, false);
-}
-
-#ifdef OLED_ENABLE
-bool oled_task_user(void) {
- render_logo();
- return false;
-}
-#endif
diff --git a/keyboards/latincompass/latinpadble/latinpadble.c b/keyboards/latincompass/latinpadble/latinpadble.c
@@ -0,0 +1,18 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+ if (!oled_task_user()) {
+ return false;
+ }
+ static const char PROGMEM qmk_logo[] = {
+ 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+ 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+ 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
+ };
+ oled_write_P(qmk_logo, false);
+ return false;
+}
+#endif