From 14f7f1ed3ed9717e275f77fd3eeedc388b031b9e Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 30 Dec 2022 16:33:57 -0600 Subject: [PATCH] Added videx-style bindings to apple map At the suggestion of @softwarejanitor, added the following ctrl codes to upper/lower apple map: CTRL-0: @ CTRL-1: | (vertical bar) CTRL-2: ~ (tilde) CTRL-6: ^ (caret) CTRL-7: ` (grave) CTRL-8: { (open curly brace) CTRL-9: } (close curly brace) CTRL--: _ (ctrl-dash -> underscore) CTRL-,: [ (ctrl-comma -> open bracket) CTRL-.: ] (ctrl-period -> close bracket) CTRL-/: \ (ctrl-fwd_slash -> backslash) --- firmware/asdf/src/Keymaps/asdf_keymap_apple2.h | 4 ++-- .../asdf/src/Keymaps/asdf_keymap_apple2_add_map.c | 15 +++++++-------- firmware/asdf/src/asdf_ascii.h | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_apple2.h b/firmware/asdf/src/Keymaps/asdf_keymap_apple2.h index e97245f..4f49b93 100644 --- a/firmware/asdf/src/Keymaps/asdf_keymap_apple2.h +++ b/firmware/asdf/src/Keymaps/asdf_keymap_apple2.h @@ -39,8 +39,8 @@ #if !defined(ASDF_KEYMAP_DEFS_APPLE2_H) #define ASDF_KEYMAP_DEFS_APPLE2_H -#define APPLESOFT_KEYBOARD_TEST ASDF_HOOK_USER_9 -#define APPLE2_ID_MESSAGE ASDF_HOOK_USER_10 +#define APPLESOFT_KEYBOARD_TEST ASDF_HOOK_USER_3 +#define APPLE2_ID_MESSAGE ASDF_HOOK_USER_4 #define APPLE2_PRINT_DELAY 40 // msec diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_apple2_add_map.c b/firmware/asdf/src/Keymaps/asdf_keymap_apple2_add_map.c index 0ce52df..d05e32b 100644 --- a/firmware/asdf/src/Keymaps/asdf_keymap_apple2_add_map.c +++ b/firmware/asdf/src/Keymaps/asdf_keymap_apple2_add_map.c @@ -123,25 +123,24 @@ const FLASH apple_keycode_matrix_t apple_caps_matrix = { const FLASH apple_keycode_matrix_t apple_ctrl_matrix = { [0] = { ACTION_CAPS, ACTION_SHIFT, ACTION_SHIFT, ACTION_NOTHING, ACTION_NOTHING, ASCII_ESC, ACTION_CTRL, APPLE_RIGHT_ARROW }, - [1] = { ACTION_NOTHING, ASCII_CTRL_P, ACTION_NOTHING, ACTION_NOTHING, + [1] = { ACTION_NOTHING, ASCII_CTRL_P, ACTION_NOTHING, ASCII_BACKSLASH, ASCII_SPACE, ASCII_CTRL_Z, ASCII_CTRL_A, ASCII_CTRL_Q }, - [2] = { ACTION_NOTHING, ASCII_COMMA, ASCII_CTRL_M, ASCII_CTRL_N, + [2] = { ACTION_NOTHING, ASCII_LT_SQUARE_BRACE, ASCII_CTRL_M, ASCII_CTRL_N, ASCII_CTRL_B, ASCII_CTRL_V, ASCII_CTRL_C, ASCII_CTRL_X }, [3] = { ACTION_NOTHING, ASCII_CTRL_K, ASCII_CTRL_J, ASCII_CTRL_H, ASCII_CTRL_G, ASCII_CTRL_F, ASCII_CTRL_D, ASCII_CTRL_S }, [4] = { ACTION_NOTHING, ASCII_CTRL_I, ASCII_CTRL_U, ASCII_CTRL_Y, ASCII_CTRL_T, ASCII_CTRL_R, ASCII_CTRL_E, ASCII_CTRL_W }, [5] = { ACTION_NOTHING, ACTION_NOTHING, ACTION_NOTHING, ASCII_CR, - ACTION_REPEAT, ASCII_CTRL_O, ASCII_CTRL_L, ACTION_NOTHING }, - [6] = { ACTION_NOTHING, ACTION_NOTHING, APPLE_ACTION_RESET, ACTION_NOTHING, - ACTION_NOTHING, ACTION_FN_10, ACTION_FN_9, ACTION_FN_8 }, - [7] = { APPLE_LEFT_ARROW, ACTION_FN_7, ACTION_FN_6, ACTION_FN_5, - ACTION_FN_4, ACTION_FN_3, ACTION_FN_2, ACTION_FN_1 }, + ACTION_REPEAT, ASCII_CTRL_O, ASCII_CTRL_L, ASCII_RT_SQUARE_BRACE }, + [6] = { ACTION_NOTHING, ACTION_NOTHING, APPLE_ACTION_RESET, ASCII_UNDERSCORE, + ACTION_NOTHING, ASCII_AT, ASCII_RT_CURLY_BRACE, ASCII_LT_CURLY_BRACE }, + [7] = { APPLE_LEFT_ARROW, ASCII_GRAVE_ACCENT, ASCII_CARET, ACTION_FN_5, + ACTION_FN_4, ACTION_FN_3, ASCII_TILDE, ASCII_VERT_BAR }, ASDF_APPLE2_DIP_SWITCHES }; - static const apple_keycode_matrix_t *apple_maps[] = { [APPLE_CAPS_MAP] = &apple_caps_matrix, [APPLE_PLAIN_MAP] = &apple_plain_matrix, diff --git a/firmware/asdf/src/asdf_ascii.h b/firmware/asdf/src/asdf_ascii.h index efa5046..65681e3 100644 --- a/firmware/asdf/src/asdf_ascii.h +++ b/firmware/asdf/src/asdf_ascii.h @@ -76,6 +76,7 @@ typedef enum { ASCII_RT_SQUARE_BRACE = 0x5d, ASCII_UNDERSCORE = 0x5f, ASCII_BACKSLASH = 0x5c, + ASCII_CARET = 0x5e, ASCII_GRAVE_ACCENT = 0x60, ASCII_LT_CURLY_BRACE = 0x7b, ASCII_RT_CURLY_BRACE = 0x7d,