From 8c8e021061665543534895720d4f16bfb5106d85 Mon Sep 17 00:00:00 2001
From: Dave <dfnum2@gmail.com>
Date: Sun, 1 Jan 2023 14:36:03 -0600
Subject: [PATCH] Add character test to apple keymap

---
 firmware/asdf/src/Keymaps/asdf_keymap_apple2.c         | 10 ++++++++--
 firmware/asdf/src/Keymaps/asdf_keymap_apple2.h         |  2 +-
 firmware/asdf/src/Keymaps/asdf_keymap_defs_dipswitch.h |  1 +
 firmware/asdf/src/asdf.h                               |  1 +
 firmware/asdf/src/asdf_hook.h                          |  1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_apple2.c b/firmware/asdf/src/Keymaps/asdf_keymap_apple2.c
index 89b185f..4769f2b 100644
--- a/firmware/asdf/src/Keymaps/asdf_keymap_apple2.c
+++ b/firmware/asdf/src/Keymaps/asdf_keymap_apple2.c
@@ -48,10 +48,16 @@
 // COMPLEXITY:
 //
 
-void apple2_id_message(void) {
+void apple2_id_message(void)
+{
   asdf_print("[Keymap: Apple 2 (u/l case)]");
 }
 
+void apple2_print_characters(void)
+{
+  asdf_keymap_print_characters();
+}
+
 void setup_apple2_keymap(void)
 {
   asdf_set_print_delay(APPLE2_PRINT_DELAY);
@@ -64,7 +70,7 @@ void setup_apple2_keymap(void)
 
   asdf_hook_assign(APPLESOFT_KEYBOARD_TEST, applesoft_keyboard_test);
   asdf_hook_assign(APPLE2_ID_MESSAGE, apple2_id_message);
-  asdf_hook_assign(APPLE2_ASCII_TEST, asdf_keymap_print_characters);
+  asdf_hook_assign(APPLE2_ASCII_TEST, apple2_print_characters);
 
   // Attach the physical POWER LED as the CAPS LED. Assign no triggered
   // function, and initialize to initial state of the CAPS logic. The CAPS LED
diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_apple2.h b/firmware/asdf/src/Keymaps/asdf_keymap_apple2.h
index 7748466..dd81a06 100644
--- a/firmware/asdf/src/Keymaps/asdf_keymap_apple2.h
+++ b/firmware/asdf/src/Keymaps/asdf_keymap_apple2.h
@@ -43,7 +43,7 @@
 
 #define APPLESOFT_KEYBOARD_TEST ASDF_HOOK_USER_3
 #define APPLE2_ID_MESSAGE ASDF_HOOK_USER_4
-#define APPLE2_ASCII_TEST ASDF_HOOK_USER_5
+#define APPLE2_ASCII_TEST ASDF_HOOK_USER_11
 
 #define APPLE2_PRINT_DELAY 40 // msec
 
diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_defs_dipswitch.h b/firmware/asdf/src/Keymaps/asdf_keymap_defs_dipswitch.h
index 1d87e69..7afac2e 100644
--- a/firmware/asdf/src/Keymaps/asdf_keymap_defs_dipswitch.h
+++ b/firmware/asdf/src/Keymaps/asdf_keymap_defs_dipswitch.h
@@ -31,6 +31,7 @@
                                [1] = ACTION_MAPSEL_1,               \
                                [2] = ACTION_MAPSEL_2,               \
                                [3] = ACTION_MAPSEL_3,               \
+                               [5] = ACTION_FN_11,                   \
                                [6] = ACTION_STROBE_POLARITY_SELECT, \
                                [7] = ACTION_AUTOREPEAT_SELECT,      \
   }
diff --git a/firmware/asdf/src/asdf.h b/firmware/asdf/src/asdf.h
index d949c20..acee68e 100644
--- a/firmware/asdf/src/asdf.h
+++ b/firmware/asdf/src/asdf.h
@@ -85,6 +85,7 @@ typedef enum {
   ACTION_FN_8,
   ACTION_FN_9,
   ACTION_FN_10,
+  ACTION_FN_11,
   RESERVED_1,
   RESERVED_2,
   RESERVED_3,
diff --git a/firmware/asdf/src/asdf_hook.h b/firmware/asdf/src/asdf_hook.h
index 46dadd8..3164df0 100644
--- a/firmware/asdf/src/asdf_hook.h
+++ b/firmware/asdf/src/asdf_hook.h
@@ -42,6 +42,7 @@ typedef enum {
   ASDF_HOOK_USER_8,
   ASDF_HOOK_USER_9,
   ASDF_HOOK_USER_10,
+  ASDF_HOOK_USER_11,
   ASDF_NUM_HOOKS,
 } asdf_hook_id_t;