summaryrefslogtreecommitdiff
path: root/layouts/community
diff options
context:
space:
mode:
Diffstat (limited to 'layouts/community')
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c25
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk1
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c23
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h27
4 files changed, 66 insertions, 10 deletions
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
index b5dc544927..cfad9da8a3 100644
--- a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
@@ -1,7 +1,7 @@
#ifdef KEYBOARD_zeal60
#include "config.h"
#include "zeal60.h"
-#include "zeal_backlight.h"
+#include "rgb_backlight.h"
#include "action_layer.h"
#include "solarized.h"
#include "talljoe.h"
@@ -9,7 +9,7 @@
// from zeal_backlight.c
// we want to be able to set indicators for the spacebar stabs
// but they are not represented by a row/index.
-extern zeal_backlight_config g_config;
+extern backlight_config g_config;
void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led );
void set_backlight_defaults(void) {
@@ -17,7 +17,7 @@ void set_backlight_defaults(void) {
uint8_t caps_lock;
map_row_column_to_led(3, 12, &caps_lock);
map_row_column_to_led(4, 7, &space);
- zeal_backlight_config default_values = {
+ backlight_config default_values = {
.use_split_backspace = USE_SPLIT_BACKSPACE,
.use_split_left_shift = USE_SPLIT_LEFT_SHIFT,
.use_split_right_shift = USE_SPLIT_RIGHT_SHIFT,
@@ -34,15 +34,17 @@ void set_backlight_defaults(void) {
.layer_2_indicator = { .index = space, .color = solarized.yellow },
.layer_3_indicator = { .index = 254, .color = solarized.red },
.alphas_mods = {
- BACKLIGHT_ALPHAS_MODS_ROW_0,
- BACKLIGHT_ALPHAS_MODS_ROW_1,
- BACKLIGHT_ALPHAS_MODS_ROW_2,
- BACKLIGHT_ALPHAS_MODS_ROW_3,
- BACKLIGHT_ALPHAS_MODS_ROW_4 }
+ RGB_BACKLIGHT_ALPHAS_MODS_ROW_0,
+ RGB_BACKLIGHT_ALPHAS_MODS_ROW_1,
+ RGB_BACKLIGHT_ALPHAS_MODS_ROW_2,
+ RGB_BACKLIGHT_ALPHAS_MODS_ROW_3,
+ RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 }
};
- memcpy(&g_config, &default_values, sizeof(zeal_backlight_config));
+ memcpy(&g_config, &default_values, sizeof(backlight_config));
backlight_config_save();
+#undef CUSTOM_RGB_LAYOUTS
+#ifdef CUSTOM_RGB_LAYOUTS
solarized_t* S = &solarized;
HSV alphas = S->base2;
HSV custom_color_map[MATRIX_ROWS][MATRIX_COLS] = CM(
@@ -54,9 +56,12 @@ void set_backlight_defaults(void) {
);
for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
- backlight_set_key_color(row, col, custom_color_map[row][col]);
+ uint8_t index;
+ map_row_column_to_led( row, col, &index );
+ set_key_color(index, custom_color_map[row][col]);
}
}
+#endif // CUSTOM_RGB_LAYOUTS
}
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk b/layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk
new file mode 100644
index 0000000000..239f03091a
--- /dev/null
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk
@@ -0,0 +1 @@
+SRC += $(KEYMAP_PATH)/solarized.c
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
new file mode 100644
index 0000000000..3e9e726b95
--- /dev/null
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
@@ -0,0 +1,23 @@
+#include "solarized.h"
+
+#define MAKE_COLOR(_H, _S, _V) \
+ { .h = (((uint32_t)_H) * 255) / 360, .s = (((uint16_t)_S) * 255) / 100, .v = (((uint16_t)_V) * 255) / 100 }
+
+solarized_t solarized = {
+ .base03 = MAKE_COLOR(193, 100, 21),
+ .base02 = MAKE_COLOR(192, 90, 26),
+ .base01 = MAKE_COLOR(194, 25, 46),
+ .base00 = MAKE_COLOR(195, 23, 51),
+ .base0 = MAKE_COLOR(186, 13, 59),
+ .base1 = MAKE_COLOR(180, 9, 63),
+ .base2 = MAKE_COLOR( 44, 11, 93),
+ .base3 = MAKE_COLOR( 44, 10, 99),
+ .yellow = MAKE_COLOR( 45, 100, 71),
+ .orange = MAKE_COLOR( 18, 89, 80),
+ .red = MAKE_COLOR( 1, 79, 86),
+ .magenta = MAKE_COLOR(331, 74, 83),
+ .violet = MAKE_COLOR(237, 45, 77),
+ .blue = MAKE_COLOR(205, 82, 82),
+ .cyan = MAKE_COLOR(175, 74, 63),
+ .green = MAKE_COLOR( 68, 100, 60),
+};
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
new file mode 100644
index 0000000000..3b00caea70
--- /dev/null
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
@@ -0,0 +1,27 @@
+#ifndef SOLARIZED_H
+#define SOLARIZED_H
+
+#include "quantum/color.h"
+
+typedef struct {
+ HSV base03;
+ HSV base02;
+ HSV base01;
+ HSV base00;
+ HSV base0;
+ HSV base1;
+ HSV base2;
+ HSV base3;
+ HSV yellow;
+ HSV orange;
+ HSV red;
+ HSV magenta;
+ HSV violet;
+ HSV blue;
+ HSV cyan;
+ HSV green;
+} solarized_t;
+
+extern solarized_t solarized;
+
+#endif