minor tweak

.vscode/settings.json

@@ -19,7 +19,8 @@
         "cstdint": "c",
         "chrono": "c",
         "typeindex": "c",
-        "typeinfo": "c"
+        "typeinfo": "c",
+        "unordered_map": "c"
     },
     "C_Cpp.errorSquiggles": "disabled",
 }

Makefile

@@ -1,3 +1,5 @@
+all: voyager ergodox
+
 voyager:
 	@mkdir -p "$$(pwd)/output"
 	docker run -it --rm \
@@ -23,4 +25,4 @@ docker:
 	docker build docker -t git.betalupi.com/mark/qmk
 
 
-.PHONY: voyager ergodox ergodox_upload docker
+.PHONY: voyager ergodox ergodox_upload docker all

keyboards/betalupi_ergodox/keymaps/default/keymap.c

@@ -97,6 +97,12 @@ void matrix_scan_user(void) {
 }
 
 
+const uint16_t PROGMEM test_combo2[] = {KC_D, KC_F, COMBO_END};
+combo_t key_combos[] = {
+	COMBO(test_combo2, KC_TAB),
+};
+
+
 
 // Include all other parts of configuration
 #include "layers/layers.c"

keyboards/betalupi_ergodox/keymaps/default/layers/definitions/keyboard.h

@@ -10,9 +10,9 @@
 #ifdef BETA_LAYER_KEYS
     #define BETA_LAYER_CONTEXT_DATA LAYOUT_ergodox(\
         TO(LAYER_MAIN),     RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO,\
-        TOGGLE_LAYER_COLOR, RGB_SAD, RGB_SAI, KC_NO, KC_NO, KC_NO, RGB_HUI,\
+        TOGGLE_LAYER_COLOR, RGB_SAD, RGB_SAI, KC_NO, KC_NO, KC_NO, KC_NO,\
         KC_NO,              RGB_VAD, RGB_VAI, KC_NO, KC_NO, KC_NO,\
-        KC_NO,              RGB_SPD, RGB_SPI, KC_NO, KC_NO, KC_NO, RGB_HUD,\
+        KC_NO,              RGB_SPD, RGB_SPI, KC_NO, KC_NO, KC_NO, KC_NO,\
         KC_NO,              KC_NO,   KC_NO,   KC_NO, RGB_MOD,\
     \
               RGB_TOG, KC_NO,\

keyboards/betalupi_ergodox/keymaps/default/layers/definitions/main.h

@@ -23,7 +23,7 @@
         KC_NO,      KC_6,       KC_7,       KC_8,      KC_9,                   KC_0,            LGUI(KC_TAB),\
         KC_NO,      KC_Y,       KC_U,       KC_I,      KC_O,                   KC_NO,           KC_NO,\
                     KC_H,       KC_J,       KC_K,      MO(LAYER_SYMBOLS),      KC_L,            QK_LEAD,\
-        KC_NO,      KC_N,       KC_M,       KC_P,      KC_NO,                  KC_NO,           KC_NO,\
+        KC_NO,      KC_N,       KC_M,       KC_P,      KC_V,                     KC_NO,           KC_NO,\
                                 KC_RIGHT,   KC_NO,     KC_NO,                  KC_NO,           LGUI(KC_SPACE),\
     \
         KC_NO, KC_NO,\

keyboards/betalupi_ergodox/keymaps/default/layers/layers.c

@@ -1,5 +1,5 @@
 #include "extra_mappings.h"
-#define LAYER_INCLUDE_FILE "definitions/layers.inc"
+#define LAYER_INCLUDE_FILE "definitions/include.c"
 
 
 /*

keyboards/betalupi_ergodox/keymaps/default/rules.mk

@@ -1,3 +1,4 @@
 # rules.mk overrides
 
-TAP_DANCE_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+COMBO_ENABLE      = yes

keyboards/betalupi_voyager/keymaps/default/config.h

@@ -3,6 +3,8 @@
 // No timeout after initial leader key press
 #define LEADER_NO_TIMEOUT
 
+#define COMBO_SHOULD_TRIGGER
+
 // Timeout resets after each keypress
 #define LEADER_PER_KEY_TIMING
 #define LEADER_TIMEOUT 500
@@ -33,6 +35,6 @@
 #define USB_SUSPEND_WAKEUP_DELAY 200
 #define RAW_USAGE_PAGE 0xFF60
 #define RAW_USAGE_ID 0x61
-#define LAYER_STATE_8BIT
+#define LAYER_STATE_32BIT
 
 #define RGB_MATRIX_STARTUP_SPD 60

keyboards/betalupi_voyager/keymaps/default/keymap.c

@@ -3,7 +3,6 @@
 #include "keymap_russian.h"
 #include "keymap_us_international.h"
 
-
 // Values that should not be saved to git.
 // There should be a`secrets.h` in this directory
 // with the following contents:
@@ -14,7 +13,8 @@
 #include "secrets.h"
 
 // Macro keycodes
-enum custom_keycodes {
+enum custom_keycodes
+{
 	M_SHUTDOWN = BETA_SAFE_RANGE,
 
 	// Macros
@@ -43,28 +43,20 @@ enum custom_keycodes {
 	M_SPECIAL_BOTTOM
 };
 
-// Tapdance keycodes
-enum tap_dance_codes {
-	TD_WMLAYOUT,
-	TD_SCREENSHOT,
-	TD_OCR
-};
-
 // LED colors
-#define LC_OFF {  0,   0,   0}
-#define LC_GRN { 85, 203, 158}
-#define LC_YLW { 32, 176, 255}
+#define LC_OFF {0, 0, 0}
+#define LC_GRN {85, 203, 158}
+#define LC_YLW {32, 176, 255}
 #define LC_PNK {243, 222, 234}
 #define LC_CYN {134, 255, 213}
-#define LC_ORN { 14, 255, 255}
-#define LC_WHT {  0,   0, 150}
-#define LC_RED {  0, 255, 145}
+#define LC_ORN {14, 255, 255}
+#define LC_WHT {0, 0, 150}
+#define LC_RED {0, 255, 145}
 #define LC_BLU {153, 255, 153}
 
-#define LC_RU_B LC_HSV(  0,   0, 165)
-#define LC_RU_G LC_HSV(153, 255, 153)
-#define LC_RU_K LC_HSV(  0, 255, 145)
-
+#define LC_RUB {0, 0, 165}
+#define LC_RUG {153, 255, 153}
+#define LC_RUK {0, 255, 145}
 
 #ifdef ENABLE_HID_SPELLCHECK
 #include "features/hid_spellcheck.h"
@@ -78,7 +70,7 @@ enum tap_dance_codes {
 #include "features/leader/beta_leader.h"
 #endif
 
-//#include "features/beta_rawhid.h"
+// #include "features/beta_rawhid.h"
 
 /*
 // Send a special character.
@@ -91,93 +83,156 @@ bool send_special_character(uint16_t keycode) {
 	return true;
 }*/
 
-const uint16_t PROGMEM test_combo2[] = {KC_D, KC_F, COMBO_END};
-const uint16_t PROGMEM test_combo3[] = {KC_M, KC_P, COMBO_END};
+const uint16_t PROGMEM combo2[] = {KC_D, KC_F, COMBO_END};
+const uint16_t PROGMEM combo3[] = {KC_M, KC_P, COMBO_END};
+const uint16_t PROGMEM combo4[] = {RU_ER, RU_TE, COMBO_END};
+const uint16_t PROGMEM combo5[] = {RU_EF, RU_GHE, COMBO_END};
+const uint16_t PROGMEM combo6[] = {KC_DELETE, KC_A, COMBO_END};
 combo_t key_combos[] = {
-	COMBO(test_combo2, KC_TAB),
-	COMBO(test_combo3, KC_RIGHT),
+	COMBO(combo2, KC_TAB),
+	COMBO(combo3, KC_RIGHT),
+	COMBO(combo4, RU_YO),
+	COMBO(combo5, RU_E),
+	COMBO(combo6, LCTL(KC_DELETE)),
 };
 
-void matrix_scan_user(void) {
-	#ifdef ENABLE_BETA_LEADER
-		beta_qk_leader_check();
-	#endif
+void matrix_scan_user(void)
+{
+#ifdef ENABLE_BETA_LEADER
+	beta_qk_leader_check();
+#endif
 }
 
+// Must be done early, layers need this enum
+enum tap_dance_codes
+{
+	TD_WMLAYOUT,
+	TD_SCREENSHOT,
+	TD_ESCAPE,
+	TD_NOGAME
+};
 
 // Include all other parts of configuration
 #include "layers/layers.c"
 #include "parts/leader.c"
-//#include "parts/tapdance.c"
+#include "parts/tapdance.c"
+
+bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record)
+{
+	if (
+		false
+		//|| layer_state_is(LAYER_SIMPLEARROWS)
+	)
+	{
+		return false;
+	}
+
+	/* Disable combo `SOME_COMBO` on layer `_LAYER_A` */
+	if (
+		combo_index == 0 ||
+		combo_index == 1)
+	{
+		if (layer_state_is(LAYER_RUSSIAN))
+		{
+			return false;
+		}
+	}
+	else if (
+		combo_index == 2 ||
+		combo_index == 3)
+	{
+		if (!layer_state_is(LAYER_RUSSIAN))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
 
 // Process macros.
 // Return FALSE to halt key processing,
 // Return TRUE to allow QMK to handle keypress.
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+bool process_record_user(uint16_t keycode, keyrecord_t *record)
+{
 
-	#ifdef ENABLE_BETA_LEADER
-	if (!beta_process_leader(keycode, record)) { return false; }
-	#endif
+#ifdef ENABLE_BETA_LEADER
+	if (!beta_process_leader(keycode, record))
+	{
+		return false;
+	}
+#endif
 
-	#ifdef ENABLE_HID_SPELLCHECK
-	if (!process_spellcheck(keycode, record)) { return false; }
-	#endif
+#ifdef ENABLE_HID_SPELLCHECK
+	if (!process_spellcheck(keycode, record))
+	{
+		return false;
+	}
+#endif
 
-	#ifdef ENABLE_AUTOCORRECT
-	if (!process_autocorrection(keycode, record)) { return false; }
-	#endif
+#ifdef ENABLE_AUTOCORRECT
+	if (!process_autocorrection(keycode, record))
+	{
+		return false;
+	}
+#endif
 
 	// Handle special chars
-	//if (record->event.pressed) {
+	// if (record->event.pressed) {
 	//	if (!send_special_character(keycode)) { return false; }
 	//}
 
 	// Handle macros
-	switch (keycode) {
-		case M_RESETWM:
-			if (record->event.pressed) {
-				SEND_STRING(SS_LCTL(SS_LGUI(SS_LSFT(SS_TAP(X_R)))));
-			}
-			return false;
+	switch (keycode)
+	{
+	case M_RESETWM:
+		if (record->event.pressed)
+		{
+			SEND_STRING(SS_LCTL(SS_LGUI(SS_LSFT(SS_TAP(X_R)))));
+		}
+		return false;
 
-		// Workaround for one-shot LGUI key.
-		// Using just LGUI with LAYER_DESKTOP as OSL
-		// does not allow you to hold lgui. This does.
-		case M_GUI:
-			if (record->event.pressed) {
-				register_code16(KC_LGUI);
-			} else {
-				unregister_code16(KC_LGUI);
-			}
-			return false;
+	// Workaround for one-shot LGUI key.
+	// Using just LGUI with LAYER_DESKTOP as OSL
+	// does not allow you to hold lgui. This does.
+	case M_GUI:
+		if (record->event.pressed)
+		{
+			register_code16(KC_LGUI);
+		}
+		else
+		{
+			unregister_code16(KC_LGUI);
+		}
+		return false;
 
-		case M_SHUTDOWN:
-			if (record->event.pressed) {
-				SEND_STRING(SS_LGUI(SS_TAP(X_P)) SS_DELAY(100) SS_TAP(X_Y) SS_DELAY(100) SS_TAP(X_ENTER));
-			}
-			return false;
-/*
-		case M_RU_CTRL:
-			if (record->event.pressed) {
-				layer_move(LAYER_MAIN);
-				register_code16(KC_LCTL);
-			} else {
-				unregister_code16(KC_LCTL);
-				layer_move(LAYER_RUSSIAN);
-			}
-			return false;
+	case M_SHUTDOWN:
+		if (record->event.pressed)
+		{
+			SEND_STRING(SS_LGUI(SS_TAP(X_P)) SS_DELAY(100) SS_TAP(X_Y) SS_DELAY(100) SS_TAP(X_ENTER));
+		}
+		return false;
+		/*
+				case M_RU_CTRL:
+					if (record->event.pressed) {
+						layer_move(LAYER_MAIN);
+						register_code16(KC_LCTL);
+					} else {
+						unregister_code16(KC_LCTL);
+						layer_move(LAYER_RUSSIAN);
+					}
+					return false;
 
-		case M_RU_ALT:
-			if (record->event.pressed) {
-				layer_move(LAYER_MAIN);
-				register_code16(KC_LALT);
-			} else {
-				unregister_code16(KC_LALT);
-				layer_move(LAYER_RUSSIAN);
-			}
-			return false;*/
+				case M_RU_ALT:
+					if (record->event.pressed) {
+						layer_move(LAYER_MAIN);
+						register_code16(KC_LALT);
+					} else {
+						unregister_code16(KC_LALT);
+						layer_move(LAYER_RUSSIAN);
+					}
+					return false;*/
 	}
 
-
 	return true;
 }

keyboards/betalupi_voyager/keymaps/default/layers/definitions/arrows.h

@@ -1,3 +1,5 @@
+
+
 #define BETA_LAYER_MAGIC_MACRO BETA_LAYER(ARROWS)
 
 #ifdef BETA_LAYER_LAYOUTS
@@ -9,14 +11,14 @@
     #define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(\
         KC_TRNS, KC_NO,             KC_NO,          KC_NO,          KC_NO,     KC_NO, \
         KC_TRNS, KC_NO,             KC_NO,          KC_UP,          KC_NO,     KC_PGUP, \
-        KC_TRNS, LALT(KC_LCTL),     KC_LEFT,        KC_DOWN,        KC_RIGHT,  KC_PGDN, \
+        KC_TRNS, KC_LCTL,     KC_LEFT,        KC_DOWN,        KC_RIGHT,  KC_PGDN, \
         KC_LCTL, LGUI(KC_LCTL),     KC_NO,          KC_NO,          KC_NO,     KC_NO, \
         KC_NO, KC_NO, \
     \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
+        KC_NO, KC_NO,         KC_NO, KC_NO, KC_NO, KC_NO, \
+        KC_NO, KC_NO,         KC_PGUP, KC_NO, KC_NO, KC_NO, \
+        KC_NO, LCTL(KC_LEFT), KC_PGDN, LCTL(KC_RIGHT), KC_NO, KC_NO, \
+        KC_NO, KC_NO,         KC_NO, KC_NO, KC_NO, KC_NO, \
         KC_TRNS, KC_TRNS \
     )
 
@@ -31,8 +33,8 @@
         LC_OFF, LC_ORN, LC_OFF, LC_OFF, LC_RED, LC_OFF, \
         LC_OFF, LC_OFF, \
         LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+        LC_OFF, LC_OFF, LC_OFF, LC_ORN, LC_OFF, LC_OFF, \
+        LC_OFF, LC_OFF, LC_GRN, LC_ORN, LC_GRN, LC_OFF, \
         LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
         LC_OFF, LC_OFF \
     }

keyboards/betalupi_voyager/keymaps/default/layers/definitions/ctrl.h

@@ -11,8 +11,8 @@
     #define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(\
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
-        KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_V,    KC_TRNS,\
+        KC_TRNS, LGUI(KC_A), LGUI(KC_S), LGUI(KC_D), KC_TRNS, KC_TRNS,\
+        KC_NO,   LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V),    KC_TRNS,\
         KC_TRNS, KC_TRNS, \
     \
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\

keyboards/betalupi_voyager/keymaps/default/layers/definitions/game.h

@@ -0,0 +1,47 @@
+// See symbols.h for docs
+
+#define BETA_LAYER_MAGIC_MACRO BETA_LAYER(GAME)
+
+#ifdef BETA_LAYER_LAYOUTS
+#define BETA_LAYER_CONTEXT_DATA LAYOUT_EN
+BETA_LAYER_MAGIC_MACRO
+#endif
+
+#ifdef BETA_LAYER_KEYS
+#define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(                 \
+    KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5,                    \
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,                       \
+    KC_DELETE, KC_A, KC_S, KC_D, KC_F, KC_G,                    \
+    KC_LCTL, KC_Z, KC_X, KC_C, MO(LAYER_ARROWS), TD(TD_NOGAME), \
+                                                                \
+    KC_SPACE, KC_BSPC,                                          \
+                                                                \
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                   \
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                   \
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                   \
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                   \
+    KC_NO, KC_NO)
+
+BETA_LAYER_MAGIC_MACRO
+#endif
+
+#ifdef BETA_LAYER_LEDS
+#define BETA_LAYER_CONTEXT_DATA {                   \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_RED, \
+    LC_OFF, LC_OFF,                                 \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF}
+
+// This is important.
+// The magic macro MUST be here, AFTER the RGBMatrix data.
+BETA_LAYER_MAGIC_MACRO
+#endif
+
+#undef BETA_LAYER_CONTEXT_DATA
+#undef BETA_LAYER_MAGIC_MACRO

keyboards/betalupi_voyager/keymaps/default/layers/definitions/include.c

@@ -3,26 +3,23 @@
 //
 // Learned that the hard way.
 
-
 // First layer will be "default" layer in QMK.
 // Second will have index 1, etc. See layers.h
 
-
 // These MUST be first.
 // (For example, LAYER_ARROWS overlays on top of LAYER_MAIN)
 #include "main.h"
+#include "game.h"
 #include "ctrl.h"
 
+#include "russian.h"
 
 #include "numbers.h" // Must be under symbols and arrows
 
-
 // The order of the layers below doesn't matter,
 // since they avoid transparent keys.
 #include "symbols.h"
-
 #include "arrows.h"
 #include "macros.h"
 #include "fkeys.h"
 #include "keyboard.h"
-

keyboards/betalupi_voyager/keymaps/default/layers/definitions/keyboard.h

@@ -9,9 +9,9 @@
 
 #ifdef BETA_LAYER_KEYS
     #define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(\
-        TO(LAYER_MAIN), KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO,          KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO,          KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, \
+        TO(LAYER_MAIN), RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, \
+        KC_NO,          RGB_SAD, RGB_SAI, KC_NO, KC_NO, KC_NO, \
+        KC_NO,          RGB_VAD, RGB_VAI, KC_NO, KC_NO, KC_NO, \
         RGB_MOD,        RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, \
         KC_NO, KC_NO, \
     \

keyboards/betalupi_voyager/keymaps/default/layers/definitions/macros.h

@@ -3,46 +3,42 @@
 #define BETA_LAYER_MAGIC_MACRO BETA_LAYER(MACROS)
 
 #ifdef BETA_LAYER_LAYOUTS
-    #define BETA_LAYER_CONTEXT_DATA LAYOUT_EN
-    BETA_LAYER_MAGIC_MACRO
+#define BETA_LAYER_CONTEXT_DATA LAYOUT_EN
+BETA_LAYER_MAGIC_MACRO
 #endif
 
 #ifdef BETA_LAYER_KEYS
-    #define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(\
-        TO(LAYER_MAIN),       LGUI(KC_1),          LGUI(KC_2),  LGUI(KC_3),        LGUI(KC_4),        LGUI(KC_5),\
-        KC_LGUI,              KC_NO,               KC_NO,       KC_NO,             KC_NO,             KC_NO,\
-        KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,  KC_NO,       KC_NO,             OSL(LAYER_FKEYS),  KC_NO,\
-        KC_NO,               KC_MEDIA_PREV_TRACK,  KC_NO,       LGUI(LSFT(KC_C)),  KC_NO,             KC_NO,\
-        LGUI(KC_ENTER), LGUI(KC_BSLS), \
-    \
-        M_SHUTDOWN, KC_NO, KC_NO, KC_NO, KC_NO, LCTL(LGUI(LSFT(KC_R))), \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO \
-    )
+#define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(                                      \
+    TO(LAYER_MAIN), LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5),      \
+    KC_LGUI, KC_NO, TD(TD_SCREENSHOT), KC_NO, KC_NO, LGUI(KC_T),                     \
+    KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_NO, KC_NO, OSL(LAYER_FKEYS), KC_NO, \
+    KC_NO, KC_MEDIA_PREV_TRACK, KC_NO, LGUI(KC_W), KC_NO, TO(LAYER_GAME),            \
+    LGUI(KC_ENTER), LGUI(KC_BSLS),                                                   \
+                                                                                     \
+    M_SHUTDOWN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                                   \
+    KC_NO, KC_NO, KC_NO, KC_NO, LGUI(KC_SPACE), TD(TD_WMLAYOUT),                     \
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TT(LAYER_RUSSIAN),                            \
+    LCTL(LGUI(LSFT(KC_R))), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                       \
+    KC_NO, KC_NO)
 
-    BETA_LAYER_MAGIC_MACRO
+BETA_LAYER_MAGIC_MACRO
 #endif
 
-
 #ifdef BETA_LAYER_LEDS
-    #define BETA_LAYER_CONTEXT_DATA {\
-        LC_RED, LC_PNK, LC_PNK, LC_PNK, LC_PNK, LC_PNK, \
-        LC_CYN, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_GRN, LC_GRN, LC_OFF, LC_OFF, LC_BLU, LC_OFF, \
-        LC_OFF, LC_GRN, LC_OFF, LC_ORN, LC_OFF, LC_OFF, \
-        LC_PNK, LC_PNK, \
-        LC_RED, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_ORN, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF \
-    }
+#define BETA_LAYER_CONTEXT_DATA {                   \
+    LC_RED, LC_PNK, LC_PNK, LC_PNK, LC_PNK, LC_PNK, \
+    LC_CYN, LC_OFF, LC_CYN, LC_OFF, LC_OFF, LC_OFF, \
+    LC_GRN, LC_GRN, LC_OFF, LC_OFF, LC_BLU, LC_OFF, \
+    LC_OFF, LC_GRN, LC_OFF, LC_ORN, LC_OFF, LC_RED, \
+    LC_PNK, LC_PNK,                                 \
+    LC_RED, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_RED, LC_RED, \
+    LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_BLU, \
+    LC_ORN, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+    LC_OFF, LC_OFF}
 
-    BETA_LAYER_MAGIC_MACRO
+BETA_LAYER_MAGIC_MACRO
 #endif
 
-
 #undef BETA_LAYER_CONTEXT_DATA
 #undef BETA_LAYER_MAGIC_MACRO

keyboards/betalupi_voyager/keymaps/default/layers/definitions/main.h

@@ -8,9 +8,7 @@
 #endif
 
 // TODO:
-// screenshot keys
 // russian
-// keyboard led controls
 // spellcheck
 // shared features
 
@@ -19,12 +17,12 @@
         KC_ESCAPE,                 KC_1,               KC_2,               KC_3,   KC_4,             KC_5, \
         OSL(LAYER_MACROS),         KC_Q,               KC_W,               KC_E,   KC_R,             KC_T, \
         KC_DELETE,                 MT(MOD_LALT, KC_A), KC_S,               KC_D,   KC_F,             KC_G, \
-        LM(MOD_LCTL, LAYER_CTRL),  KC_Z,               MT(MOD_LSFT, KC_X), KC_C,   MO(LAYER_ARROWS), KC_B, \
+        MO(LAYER_CTRL),  KC_Z,               MT(MOD_LSFT, KC_X), KC_C,   MO(LAYER_ARROWS), KC_B, \
     \
         KC_SPACE,   KC_BSPC, \
     \
     \
-        KC_6,      KC_7,        KC_8,      KC_9,                 KC_0,        LGUI(KC_TAB), \
+        KC_6,      KC_7,        KC_8,      KC_9,                 KC_0,        LGUI(KC_SPACE), \
         KC_Y,       KC_U,       KC_I,      KC_O,                 KC_NO,       KC_NO, \
         KC_H,       KC_J,       KC_K,      MO(LAYER_SYMBOLS),    KC_L,        QK_LEAD, \
         KC_N,       KC_M,       KC_P,      KC_V,    KC_NO,       KC_NO, \

keyboards/betalupi_voyager/keymaps/default/layers/definitions/russian.h

@@ -0,0 +1,47 @@
+// See symbols.h for docs
+
+#define BETA_LAYER_MAGIC_MACRO BETA_LAYER(RUSSIAN)
+
+#ifdef BETA_LAYER_LAYOUTS
+    #define BETA_LAYER_CONTEXT_DATA LAYOUT_EN
+    BETA_LAYER_MAGIC_MACRO
+#endif
+
+#ifdef BETA_LAYER_KEYS
+    #define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(\
+        KC_ESCAPE,                 RU_1,                RU_2,                RU_3,    RU_4,              RU_5, \
+        OSL(LAYER_MACROS),         RU_CHE,              RU_SHA,              RU_IE,   RU_ER,             RU_TE, \
+        KC_DELETE,                 MT(MOD_LALT, RU_A),  RU_ES,               RU_DE,   RU_EF,             RU_GHE, \
+        LM(MOD_LCTL, LAYER_CTRL),  RU_ZE,               MT(MOD_LSFT, RU_YA), RU_TSE,  MO(LAYER_ARROWS),  RU_BE, \
+        KC_SPACE,   KC_BSPC, \
+    \
+        RU_6,     RU_7,      RU_8,      RU_9,                 RU_0,        LGUI(KC_TAB), \
+        RU_U,     RU_YU,     RU_I,      RU_O,                 RU_SHCH,     RU_HARD, \
+        RU_HA,    RU_ZHE,    RU_KA,     MO(LAYER_SYMBOLS),    RU_EL,       RU_SOFT, \
+        RU_EN,    RU_EM,     RU_PE,     RU_VE,                RU_YERU,     RU_SHTI, \
+        KC_RSFT, KC_ENTER \
+    )
+
+    BETA_LAYER_MAGIC_MACRO
+#endif
+
+#ifdef BETA_LAYER_LEDS
+    #define BETA_LAYER_CONTEXT_DATA {\
+        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+        LC_RUB, LC_RUB, LC_RUB, LC_RUB, LC_RUB, LC_RUB, \
+        LC_RUG, LC_RUG, LC_RUG, LC_RUG, LC_RUG, LC_RUG, \
+        LC_RUK, LC_RUK, LC_RUK, LC_RUK, LC_RUK, LC_RUK, \
+        LC_OFF, LC_OFF, \
+        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
+        LC_RUB, LC_RUB, LC_RUB, LC_RUB, LC_RUB, LC_RUB, \
+        LC_RUG, LC_RUG, LC_RUG, LC_RUG, LC_RUG, LC_RUG, \
+        LC_RUK, LC_RUK, LC_RUK, LC_RUK, LC_RUK, LC_RUK, \
+        LC_OFF, LC_OFF \
+    }
+
+    BETA_LAYER_MAGIC_MACRO
+#endif
+
+
+#undef BETA_LAYER_CONTEXT_DATA
+#undef BETA_LAYER_MAGIC_MACRO

keyboards/betalupi_voyager/keymaps/default/layers/layers.c

@@ -1,5 +1,5 @@
 //#include "extra_mappings.h"
-#define LAYER_INCLUDE_FILE "definitions/layers.inc"
+#define LAYER_INCLUDE_FILE "definitions/include.c"
 
 
 /*
@@ -55,6 +55,7 @@ const uint8_t PROGMEM ledmaps[][RGB_MATRIX_LED_COUNT][3] = {
 #undef BETA_LAYER
 #undef BETA_LAYER_LEDS
 
+
 /*
 // Create os layout array
 #define BETA_LAYER_LAYOUTS
@@ -117,9 +118,16 @@ bool rgb_matrix_indicators_user(void) {
 	}
 
 	if (biton32(layer_state) == LAYER_KEYBOARD) {
-		rgb_matrix_set_color(0, 0xFF, 0x00, 0x00);
-		rgb_matrix_set_color(18, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(19, 0x00, 0xFF, 0x00);
+		rgb_matrix_set_color(0,  0xFF, 0x00, 0x00);
+		rgb_matrix_set_color(18, 0x95, 0xFF, 0x00);
+		rgb_matrix_set_color(19, 0x95, 0xFF, 0x00);
+
+		rgb_matrix_set_color(14, 0x00, 0xFF, 0x8C);
+		rgb_matrix_set_color(13, 0x00, 0xFF, 0x8C);
+		rgb_matrix_set_color(8,  0x00, 0xFF, 0x8C);
+		rgb_matrix_set_color(7,  0x00, 0xFF, 0x8C);
+		rgb_matrix_set_color(2,  0x00, 0xFF, 0x8C);
+		rgb_matrix_set_color(1,  0x00, 0xFF, 0x8C);
 	}
 
 	return true;

keyboards/betalupi_voyager/keymaps/default/parts/tapdance.c

@@ -1,31 +1,51 @@
-void td_screenshot(tap_dance_state_t *state, void *user_data) {
-	if (state->count == 1) {
+void td_screenshot(tap_dance_state_t *state, void *user_data)
+{
+	if (state->count == 1)
+	{
 		tap_code16(KC_PSCR);
-	} else if (state->count == 2) {
+	}
+	else if (state->count == 2)
+	{
 		tap_code16(LSFT(KC_PSCR));
-	} else if (state->count == 3) {
+	}
+	else if (state->count == 3)
+	{
 		tap_code16(LALT(KC_PSCR));
-	} else {
+	}
+	else
+	{
 		reset_tap_dance(state);
 	}
 }
 
-void td_ocr(tap_dance_state_t *state, void *user_data) {
-	if (state->count == 1) {
-		tap_code16(LCTL(KC_PSCR));
-	} else if (state->count == 2) {
-		tap_code16(LCTL(LSFT(KC_PSCR)));
-	} else {
-		reset_tap_dance(state);
-	}
-}
-
-void td_wmlayout(tap_dance_state_t *state, void *user_data) {
-	if (state->count == 1) {
+void td_wmlayout(tap_dance_state_t *state, void *user_data)
+{
+	if (state->count == 1)
+	{
 		tap_code16(LGUI(KC_COMMA));
-	} else if (state->count == 2) {
+	}
+	else if (state->count == 2)
+	{
 		tap_code16(LGUI(KC_DOT));
-	} else {
+	}
+	else
+	{
+		reset_tap_dance(state);
+	}
+}
+
+void td_nogame(tap_dance_state_t *state, void *user_data)
+{
+	if (state->count == 1)
+	{
+		tap_code16(KC_B);
+	}
+	else if (state->count == 2)
+	{
+		layer_move(LAYER_MAIN);
+	}
+	else
+	{
 		reset_tap_dance(state);
 	}
 }
@@ -33,5 +53,5 @@ void td_wmlayout(tap_dance_state_t *state, void *user_data) {
 tap_dance_action_t tap_dance_actions[] = {
 	[TD_WMLAYOUT] = ACTION_TAP_DANCE_FN(td_wmlayout),
 	[TD_SCREENSHOT] = ACTION_TAP_DANCE_FN(td_screenshot),
-	[TD_OCR] = ACTION_TAP_DANCE_FN(td_ocr),
-};
+	[TD_NOGAME] = ACTION_TAP_DANCE_FN(td_nogame),
+};

keyboards/betalupi_voyager/keymaps/default/rules.mk

@@ -1,3 +1,3 @@
 # rules.mk overrides
 
-TAP_DANCE_ENABLE = no
+TAP_DANCE_ENABLE = yes