summaryrefslogtreecommitdiff
path: root/keyboards/spaceholdings
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/spaceholdings')
-rwxr-xr-xkeyboards/spaceholdings/nebula12/config.h17
-rwxr-xr-xkeyboards/spaceholdings/nebula12/info.json18
-rwxr-xr-xkeyboards/spaceholdings/nebula12/keymaps/default/keymap.c8
-rwxr-xr-xkeyboards/spaceholdings/nebula12/keymaps/via/keymap.c8
-rwxr-xr-xkeyboards/spaceholdings/nebula12/nebula12.h10
-rwxr-xr-xkeyboards/spaceholdings/nebula12b/config.h2
-rwxr-xr-xkeyboards/spaceholdings/nebula68/config.h17
-rwxr-xr-xkeyboards/spaceholdings/nebula68/keymaps/default/keymap.c2
-rwxr-xr-xkeyboards/spaceholdings/nebula68/keymaps/via/keymap.c2
-rwxr-xr-xkeyboards/spaceholdings/nebula68b/config.h5
-rwxr-xr-xkeyboards/spaceholdings/nebula68b/hs/config.h4
-rwxr-xr-xkeyboards/spaceholdings/nebula68b/keymaps/default/keymap.c2
-rwxr-xr-xkeyboards/spaceholdings/nebula68b/keymaps/via/keymap.c2
-rwxr-xr-xkeyboards/spaceholdings/nebula68b/nebula68b.c69
14 files changed, 59 insertions, 107 deletions
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 97623f0ff0..abda9af7af 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -103,7 +103,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
- #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#endif
/* Bootmagic Lite key configuration */
@@ -144,7 +153,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
#define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_LED_COUNT 16
// These define which keys in the matrix are alphas/mods
// Used for backlight effects so colors are different for
@@ -165,7 +174,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Backlight config starts after VIA's EEPROM usage,
// dynamic keymaps start after this.
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
index aca8ea5f69..a48f88c814 100755
--- a/keyboards/spaceholdings/nebula12/info.json
+++ b/keyboards/spaceholdings/nebula12/info.json
@@ -9,9 +9,23 @@
"device_version": "0.0.1"
},
"layouts": {
- "LAYOUT_68_ansi": {
+ "LAYOUT_ortho_4x3": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+
+ {"x":0, "y":1},
+ {"x":1, "y":1},
+ {"x":2, "y":1},
+
+ {"x":0, "y":2},
+ {"x":1, "y":2},
+ {"x":2, "y":2},
+
+ {"x":0, "y":3},
+ {"x":1, "y":3},
+ {"x":2, "y":3}
]
}
}
diff --git a/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
index 670d25e732..f7ec10f881 100755
--- a/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
+++ b/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
@@ -16,25 +16,25 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT_ortho_4x3( /* Base */
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3,
MO(1), KC_P0, KC_PDOT),
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT_ortho_4x3( /* FN */
RGB_TOG, RGB_MOD, KC_TRNS,
EF_DEC, EF_INC, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_PENT),
-[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+[2] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
-[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+[3] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
index 670d25e732..f7ec10f881 100755
--- a/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
+++ b/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
@@ -16,25 +16,25 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT_ortho_4x3( /* Base */
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3,
MO(1), KC_P0, KC_PDOT),
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT_ortho_4x3( /* FN */
RGB_TOG, RGB_MOD, KC_TRNS,
EF_DEC, EF_INC, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_PENT),
-[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+[2] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
-[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+[3] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/spaceholdings/nebula12/nebula12.h b/keyboards/spaceholdings/nebula12/nebula12.h
index 1c73fbdaec..cc08bce5e6 100755
--- a/keyboards/spaceholdings/nebula12/nebula12.h
+++ b/keyboards/spaceholdings/nebula12/nebula12.h
@@ -22,14 +22,14 @@
// This a shortcut to help you visually see your layout.
-#define LAYOUT_all( \
+#define LAYOUT_ortho_4x3( \
K00, K01, K02, \
K10, K11, K12, \
K20, K21, K22, \
K30, K31, K32 \
) { \
- { K00, K01, K02, }, \
- { K10, K11, K12, }, \
- { K20, K21, K22, }, \
- { K30, K31, K32, } \
+ { K00, K01, K02 }, \
+ { K10, K11, K12 }, \
+ { K20, K21, K22 }, \
+ { K30, K31, K32 } \
}
diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h
index ac3826b253..b4e319b603 100755
--- a/keyboards/spaceholdings/nebula12b/config.h
+++ b/keyboards/spaceholdings/nebula12b/config.h
@@ -68,7 +68,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* RGB options */
#define RGB_DI_PIN D5
-#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_LED_COUNT 16
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index a8a9803d15..14a4eedb90 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -87,7 +87,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 210 /* The maximum brightness level */
- #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#endif
/* Bootmagic Lite key configuration */
@@ -128,7 +137,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
#define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 128
+#define RGB_MATRIX_LED_COUNT 128
// These define which keys in the matrix are alphas/mods
// Used for backlight effects so colors are different for
@@ -149,7 +158,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Backlight config starts after VIA's EEPROM usage,
// dynamic keymaps start after this.
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
-#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
index 3d27b48229..1a20fc1ebc 100755
--- a/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
+++ b/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_ansi( /* Base */
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_PGUP,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
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, KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
index 3d27b48229..1a20fc1ebc 100755
--- a/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
+++ b/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_ansi( /* Base */
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_PGUP,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
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, KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
index 4e22e69e10..30bf59e7dc 100755
--- a/keyboards/spaceholdings/nebula68b/config.h
+++ b/keyboards/spaceholdings/nebula68b/config.h
@@ -68,7 +68,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* RGB options */
#define RGB_DI_PIN B7
-#define DRIVER_LED_TOTAL 79
+#define RGB_MATRIX_LED_COUNT 79
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_KEYPRESSES
@@ -122,6 +122,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// // VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/spaceholdings/nebula68b/hs/config.h b/keyboards/spaceholdings/nebula68b/hs/config.h
index ac25a8ef1d..b66344facc 100755
--- a/keyboards/spaceholdings/nebula68b/hs/config.h
+++ b/keyboards/spaceholdings/nebula68b/hs/config.h
@@ -15,5 +15,5 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#undef DRIVER_LED_TOTAL
-#define DRIVER_LED_TOTAL 78
+#undef RGB_MATRIX_LED_COUNT
+#define RGB_MATRIX_LED_COUNT 78
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
index efb16d920e..08c433bdb1 100755
--- a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
+++ b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_ansi_split_bs( /* Base */
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, KC_INS, KC_PGUP,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
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, KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
index 565e11bd36..87727200f4 100755
--- a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
+++ b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_ansi_split_bs( /* Base */
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, KC_INS, KC_PGUP,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
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, KC_SLSH, KC_RSFT, KC_UP,
diff --git a/keyboards/spaceholdings/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/nebula68b.c
index 4d4f878c6b..f7b292ded9 100755
--- a/keyboards/spaceholdings/nebula68b/nebula68b.c
+++ b/keyboards/spaceholdings/nebula68b/nebula68b.c
@@ -42,72 +42,3 @@ led_config_t g_led_config = { {
// clang-format on
#endif
#endif
-
-#if defined(RGB_MATRIX_ENABLE) && defined(VIA_ENABLE)
-void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
- uint8_t *command_id = &(data[0]);
- uint8_t *command_data = &(data[1]);
- switch (*command_id) {
- case id_lighting_set_value: {
- uint8_t *value_id = &(command_data[0]);
- uint8_t *value_data = &(command_data[1]);
- switch (*value_id) {
- case id_qmk_rgblight_brightness: {
- rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), scale8(value_data[0], RGB_MATRIX_MAXIMUM_BRIGHTNESS));
- break;
- }
- case id_qmk_rgblight_effect: {
- rgb_matrix_mode_noeeprom(value_data[0]);
- if (value_data[0] == 0) {
- rgb_matrix_disable_noeeprom();
- } else {
- rgb_matrix_enable_noeeprom();
- }
- break;
- }
- case id_qmk_rgblight_effect_speed: {
- rgb_matrix_set_speed_noeeprom(value_data[0] * 85);
- break;
- }
- case id_qmk_rgblight_color: {
- rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgb_matrix_get_val());
- break;
- }
- }
- break;
- }
- case id_lighting_get_value: {
- uint8_t *value_id = &(command_data[0]);
- uint8_t *value_data = &(command_data[1]);
- switch (*value_id) {
- case id_qmk_rgblight_brightness: {
- value_data[0] = ((uint16_t)rgb_matrix_get_val() * 255) / RGB_MATRIX_MAXIMUM_BRIGHTNESS;
- break;
- }
- case id_qmk_rgblight_effect: {
- value_data[0] = rgb_matrix_get_mode();
- break;
- }
- case id_qmk_rgblight_effect_speed: {
- value_data[0] = rgb_matrix_get_speed() / 85;
- break;
- }
- case id_qmk_rgblight_color: {
- value_data[0] = rgb_matrix_get_hue();
- value_data[1] = rgb_matrix_get_sat();
- break;
- }
- }
- break;
- }
- case id_lighting_save: {
- eeconfig_update_rgb_matrix();
- break;
- }
- default: {
- *command_id = id_unhandled;
- break;
- }
- }
-}
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-05 04:44:46 +0000