From 565ac07c8da0c568fc1e9e67ca67638ed5f4032c Mon Sep 17 00:00:00 2001
From: Evan Travers <evantravers@gmail.com>
Date: Thu, 2 May 2024 10:48:44 -0500
Subject: [PATCH] Add combos to Atreus
---
.envrc | 1 +
keyboards/keyboardio/atreus/keymaps/evantravers/keymap.c | 9 +++++++++
lib/chibios-contrib | 2 +-
users/evantravers/rules.mk | 1 +
4 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 .envrc
diff --git a/.envrc b/.envrc
new file mode 100644
index 000000000000..1d953f4bd735
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/keyboards/keyboardio/atreus/keymaps/evantravers/keymap.c b/keyboards/keyboardio/atreus/keymaps/evantravers/keymap.c
index e2259b65dd5b..1ba5390d1cab 100644
--- a/keyboards/keyboardio/atreus/keymaps/evantravers/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/evantravers/keymap.c
@@ -5,6 +5,15 @@
#include "evantravers.h"
+const uint16_t PROGMEM apos_combo[] = {RALT_T(KC_L), RGUI_T(KC_SCLN), COMBO_END};
+const uint16_t PROGMEM hyper_combo[] = {LGUI_T(KC_A), RGUI_T(KC_SCLN), COMBO_END};
+const uint16_t PROGMEM esc_combo[] = {KC_Q, KC_W, COMBO_END};
+combo_t key_combos[] = {
+ COMBO(apos_combo, KC_QUOT),
+ COMBO(hyper_combo, KC_F19),
+ COMBO(esc_combo, KC_ESC),
+};
+
#define LAYOUT_atreus_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 9d7a7f904ed1..da78eb3759b8 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 9d7a7f904ed135e3459cf6d602db56a26872df6b
+Subproject commit da78eb3759b8d1779b237657c7667baa4aa95ca1
diff --git a/users/evantravers/rules.mk b/users/evantravers/rules.mk
index 38dd7bde1150..43eed852a681 100644
--- a/users/evantravers/rules.mk
+++ b/users/evantravers/rules.mk
@@ -15,3 +15,4 @@ CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
MACROS_ENABLED = no
CAPS_WORD_ENABLE = yes
+COMBO_ENABLE = yes