From 953b9f7496b2d20f7cd574767465c842e5ead5e4 Mon Sep 17 00:00:00 2001
From: Dave <dfnum2@gmail.com>
Date: Mon, 27 Nov 2023 12:29:35 -0600
Subject: [PATCH] Add dipswitches back to Ace keymap

---
 firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c | 8 ++++----
 firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.h | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c
index 74c0a3b..f1e67e5 100644
--- a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c
+++ b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c
@@ -49,8 +49,8 @@ const FLASH ace1000_keycode_matrix_t ace1000_plain_matrix = {
     [5] = { ACE_KEY_9, ACE_KEY_O, ACE_KEY_L, ACE_KEY_PERIOD, ACE_KEY_RIGHT, ACE_KEY_UNDERSCORE, ACE_KEY_PLUS, ACE_KEY_SPLAT,  },
     [6] = { ACE_KEY_0, ACE_KEY_P, ACE_KEY_SEMI, ACE_KEY_SLASH, ACE_KEY_7, ACE_KEY_4, ACE_KEY_1, ACE_KEY_GT,  },
     [7] = { ACE_KEY_MINUS, ACE_KEY_CURLY, ACE_KEY_QUOTE, ACTION_SHIFT, ACE_KEY_8, ACE_KEY_5, ACE_KEY_2, ACE_KEY_0,  },
-    [8] = { ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING },
     [9] = { ACE_KEY_SLASH, ACE_KEY_SQUARE, ACE_KEY_RETURN, ACE_KEY_LEFT, ACE_KEY_9, ACE_KEY_6, ACE_KEY_3, ACE_KEY_PERIOD,  },
+    ASDF_ACE_DIP_SWITCHES,
 };
 
 const FLASH ace1000_keycode_matrix_t ace1000_shift_matrix = {
@@ -62,8 +62,8 @@ const FLASH ace1000_keycode_matrix_t ace1000_shift_matrix = {
     [5] = { ACE_KEY_SHIFT_9, ACE_KEY_SHIFT_O, ACE_KEY_SHIFT_L, ACE_KEY_SHIFT_PERIOD, ACE_KEY_SHIFT_RIGHT, ACE_KEY_SHIFT_UNDERSCORE, ACE_KEY_SHIFT_PLUS, ACE_KEY_SHIFT_SPLAT,  },
     [6] = { ACE_KEY_SHIFT_0, ACE_KEY_SHIFT_P, ACE_KEY_SHIFT_SEMI, ACE_KEY_SHIFT_SLASH, ACE_KEY_SHIFT_7, ACE_KEY_SHIFT_4, ACE_KEY_SHIFT_1, ACE_KEY_SHIFT_GT,  },
     [7] = { ACE_KEY_SHIFT_MINUS, ACE_KEY_SHIFT_CURLY, ACE_KEY_SHIFT_QUOTE, ACTION_SHIFT, ACE_KEY_SHIFT_8, ACE_KEY_SHIFT_5, ACE_KEY_SHIFT_2, ACE_KEY_SHIFT_0,  },
-    [8] = { ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING },
     [9] = { ACE_KEY_SHIFT_SLASH, ACE_KEY_SHIFT_SQUARE, ACE_KEY_RETURN, ACE_KEY_SHIFT_LEFT, ACE_KEY_SHIFT_9, ACE_KEY_SHIFT_6, ACE_KEY_SHIFT_3, ACE_KEY_SHIFT_PERIOD,  },
+    ASDF_ACE_DIP_SWITCHES,
 };
 
 const FLASH ace1000_keycode_matrix_t ace1000_caps_matrix = {
@@ -75,8 +75,8 @@ const FLASH ace1000_keycode_matrix_t ace1000_caps_matrix = {
     [5] = { ACE_KEY_9, ACE_KEY_SHIFT_O, ACE_KEY_SHIFT_L, ACE_KEY_PERIOD, ACE_KEY_RIGHT, ACE_KEY_UNDERSCORE, ACE_KEY_PLUS, ACE_KEY_SPLAT,  },
     [6] = { ACE_KEY_0, ACE_KEY_SHIFT_P, ACE_KEY_SEMI, ACE_KEY_SLASH, ACE_KEY_7, ACE_KEY_4, ACE_KEY_1, ACE_KEY_GT,  },
     [7] = { ACE_KEY_MINUS, ACE_KEY_CURLY, ACE_KEY_QUOTE, ACTION_SHIFT, ACE_KEY_8, ACE_KEY_5, ACE_KEY_2, ACE_KEY_0,  },
-    [8] = { ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING },
     [9] = { ACE_KEY_SLASH, ACE_KEY_SQUARE, ACE_KEY_RETURN, ACE_KEY_LEFT, ACE_KEY_9, ACE_KEY_6, ACE_KEY_3, ACE_KEY_PERIOD,  },
+    ASDF_ACE_DIP_SWITCHES,
 };
 
 const FLASH ace1000_keycode_matrix_t ace1000_ctrl_matrix = {
@@ -88,8 +88,8 @@ const FLASH ace1000_keycode_matrix_t ace1000_ctrl_matrix = {
     [5] = { ACE_KEY_CTRL_9, ACE_KEY_CTRL_O, ACE_KEY_CTRL_L, ACE_KEY_CTRL_PERIOD, ACE_KEY_CTRL_RIGHT, ACE_KEY_CTRL_UNDERSCORE, ACE_KEY_CTRL_PLUS, ACE_KEY_CTRL_SPLAT,  },
     [6] = { ACE_KEY_CTRL_0, ACE_KEY_CTRL_P, ACE_KEY_CTRL_SEMI, ACE_KEY_CTRL_SLASH, ACE_KEY_CTRL_7, ACE_KEY_CTRL_4, ACE_KEY_CTRL_1, ACE_KEY_CTRL_GT,  },
     [7] = { ACE_KEY_CTRL_MINUS, ACE_KEY_CTRL_CURLY, ACE_KEY_CTRL_QUOTE, ACTION_SHIFT, ACE_KEY_CTRL_8, ACE_KEY_CTRL_5, ACE_KEY_CTRL_2, ACE_KEY_CTRL_0,  },
-    [8] = { ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING },
     [9] = { ACE_KEY_CTRL_SLASH, ACE_KEY_CTRL_SQUARE, ACE_KEY_RETURN, ACE_KEY_CTRL_LEFT, ACE_KEY_CTRL_9, ACE_KEY_CTRL_6, ACE_KEY_CTRL_3, ACE_KEY_CTRL_PERIOD,  },
+    ASDF_ACE_DIP_SWITCHES,
 };
 
 static const ace1000_keycode_matrix_t *ace1000_maps[] = {
diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.h b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.h
index 446edfe..0320fda 100644
--- a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.h
+++ b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.h
@@ -27,6 +27,7 @@
 #if !defined(ASDF_KEYMAP_ACE1000_ADD_MAP_H)
 #define ASDF_KEYMAP_ACE1000_ADD_MAP_H
 
+#include "asdf_keymap_defs_dipswitch.h"
 #include "asdf_modifiers.h"
 
 typedef enum {
@@ -41,6 +42,8 @@ typedef enum {
 void ace1000_add_map(const ace1000_map_index_t map_index, modifier_index_t modifier_index);
 void ace1000_keyboard_test(void);
 
+#define ASDF_ACE_DIP_SWITCHES ASDF_KEYMAP_DIP_SWITCHES
+
 // Key value definitions
 #define ACE_KEY_0	0x30
 #define ACE_KEY_1	0x31