summaryrefslogtreecommitdiff
path: root/keyboards/latincompass
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/latincompass')
-rw-r--r--keyboards/latincompass/latin17rgb/config.h3
-rw-r--r--keyboards/latincompass/latin17rgb/latin17rgb.c2
-rw-r--r--keyboards/latincompass/latin60rgb/config.h3
-rw-r--r--keyboards/latincompass/latin60rgb/latin60rgb.c43
-rw-r--r--keyboards/latincompass/latin64ble/config.h2
-rw-r--r--keyboards/latincompass/latin64ble/keymaps/default/keymap.c2
-rw-r--r--keyboards/latincompass/latin64ble/keymaps/via/keymap.c2
-rw-r--r--keyboards/latincompass/latin6rgb/config.h3
-rw-r--r--keyboards/latincompass/latin6rgb/latin6rgb.c2
-rw-r--r--keyboards/latincompass/latinpad/config.h2
-rw-r--r--keyboards/latincompass/latinpad/keymaps/default/keymap.c2
-rw-r--r--keyboards/latincompass/latinpad/keymaps/via/keymap.c2
-rw-r--r--keyboards/latincompass/latinpadble/config.h2
-rw-r--r--keyboards/latincompass/latinpadble/keymaps/default/keymap.c2
-rw-r--r--keyboards/latincompass/latinpadble/keymaps/via/keymap.c2
15 files changed, 37 insertions, 37 deletions
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 585f632c40..68e9debf4e 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -43,7 +43,6 @@
#define DEBOUNCE 3
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -109,7 +108,7 @@
# define DRIVER_COUNT 2
# define DRIVER_1_LED_TOTAL 25
# define DRIVER_2_LED_TOTAL 24
-# define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#endif
#define RGB_DI_PIN B7
diff --git a/keyboards/latincompass/latin17rgb/latin17rgb.c b/keyboards/latincompass/latin17rgb/latin17rgb.c
index d4ab3ea675..e165c5b76d 100644
--- a/keyboards/latincompass/latin17rgb/latin17rgb.c
+++ b/keyboards/latincompass/latin17rgb/latin17rgb.c
@@ -17,7 +17,7 @@
#ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index 0058297dda..cca0ca7ddf 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -42,7 +42,6 @@
#define DEBOUNCE 3
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -96,5 +95,5 @@
// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define DRIVER_ADDR_1 0b1010000
# define DRIVER_COUNT 1
-# define DRIVER_LED_TOTAL 60
+# define RGB_MATRIX_LED_COUNT 60
#endif
diff --git a/keyboards/latincompass/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
index b849f7ef9d..5a457246c4 100644
--- a/keyboards/latincompass/latin60rgb/latin60rgb.c
+++ b/keyboards/latincompass/latin60rgb/latin60rgb.c
@@ -1,22 +1,22 @@
/* Copyright 2021 latincompass
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
#include "latin60rgb.h"
#ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{ 0, K_13, J_13, L_13 },
{ 0, K_12, J_12, L_12 },
{ 0, K_11, J_11, L_11 },
@@ -49,9 +49,9 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, H_1, G_1, I_1 },
{ 0, E_16, D_16, F_16 },
- { 0, E_15, D_15, F_15 },
+ { 0, E_15, D_15, F_15 },
{ 0, E_14, D_14, F_14 },
- { 0, E_13, D_13, F_13 },
+ { 0, E_13, D_13, F_13 },
{ 0, E_12, D_12, F_12 },
{ 0, E_11, D_11, F_11 },
{ 0, E_10, D_10, F_10 },
@@ -91,7 +91,7 @@ led_config_t g_led_config = {
{ 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5 },
{ 4, 3, 2, 1 ,0 }
}, {
- { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 },
+ { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 },
{ 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 },
{ 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 },
{ 224, 48 }, { 198, 64 }, { 202, 48 }, { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 },
@@ -115,10 +115,13 @@ void suspend_wakeup_init_kb(void) {
suspend_wakeup_init_user();
}
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+ if (!rgb_matrix_indicators_user()) {
+ return false;
+ }
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF);
}
+ return true;
}
#endif
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index 5bb3ca4562..866bee31fa 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#define RGB_DI_PIN B7
#define RGBLED_NUM 2
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/latincompass/latin64ble/keymaps/default/keymap.c b/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
index 4c05beb7d7..8a1e9f6366 100644
--- a/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_SPI, RGB_SPD, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD, KC_MY_COMPUTER, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), KC_PGUP, KC_PGDOWN, KC_CALCULATOR,KC_DEL),
[2] = LAYOUT(
- KC_NUMLOCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MINS, KC_EQL, KC_BSPC,
+ KC_NUM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD, KC_MY_COMPUTER, MO(1),
diff --git a/keyboards/latincompass/latin64ble/keymaps/via/keymap.c b/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
index 08ce5fbf3f..f25f7db173 100644
--- a/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_SPI, RGB_SPD, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD, KC_MY_COMPUTER, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), KC_PGUP, KC_PGDOWN, KC_CALCULATOR,KC_DEL),
[2] = LAYOUT(
- KC_NUMLOCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MINS, KC_EQL, KC_BSPC,
+ KC_NUM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RGB_TOG, RGB_MOD, KC_MY_COMPUTER, MO(1),
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index 17083580a6..1b7a9b9035 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -44,7 +44,6 @@
#define DEBOUNCE 3
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -107,7 +106,7 @@
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 6
+#define RGB_MATRIX_LED_COUNT 6
#endif
//#define RGB_DI_PIN B7
//#ifdef RGB_DI_PIN
diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c
index ddab9a1519..cc10a7b334 100644
--- a/keyboards/latincompass/latin6rgb/latin6rgb.c
+++ b/keyboards/latincompass/latin6rgb/latin6rgb.c
@@ -17,7 +17,7 @@
#ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index 255ddc89db..47b79802af 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#define RGB_DI_PIN D3
#define RGBLED_NUM 18
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/latincompass/latinpad/keymaps/default/keymap.c b/keyboards/latincompass/latinpad/keymaps/default/keymap.c
index b6606e6be7..e2f263005f 100644
--- a/keyboards/latincompass/latinpad/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latinpad/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
[1] = LAYOUT(
- KC_NUMLOCK, KC_CALCULATOR,
+ KC_NUM, KC_CALCULATOR,
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,
diff --git a/keyboards/latincompass/latinpad/keymaps/via/keymap.c b/keyboards/latincompass/latinpad/keymaps/via/keymap.c
index 12d7e910e6..e2c99f38d2 100644
--- a/keyboards/latincompass/latinpad/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latinpad/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
[1] = LAYOUT(
- KC_NUMLOCK, KC_CALCULATOR,
+ KC_NUM, KC_CALCULATOR,
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,
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index 09198df612..cefcbd6469 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#define RGB_DI_PIN B7
#define RGBLED_NUM 4
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
index 3fed6c0cb4..3b7189ffa0 100644
--- a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
+++ b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
[1] = LAYOUT_pad(
- KC_NUMLOCK,
+ 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,
diff --git a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
index 2c4cc5f409..193c024cf6 100644
--- a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
+++ b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
[1] = LAYOUT_pad(
- KC_NUMLOCK,
+ 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,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 13:55:31 +0000