summaryrefslogtreecommitdiffstats
path: root/macway
diff options
context:
space:
mode:
Diffstat (limited to 'macway')
-rw-r--r--macway/controller.h6
-rw-r--r--macway/keymap.c85
-rw-r--r--macway/keymap.h7
-rw-r--r--macway/matrix.c7
-rw-r--r--macway/matrix.h15
5 files changed, 25 insertions, 95 deletions
diff --git a/macway/controller.h b/macway/controller.h
index aa862cdc1..22fd694ff 100644
--- a/macway/controller.h
+++ b/macway/controller.h
@@ -3,4 +3,10 @@
#include "controller_teensy.h"
+
+/* matrix row size */
+#define MATRIX_ROWS 9
+/* matrix column size */
+#define MATRIX_COLS 8
+
#endif
diff --git a/macway/keymap.c b/macway/keymap.c
index 652a53066..00927a665 100644
--- a/macway/keymap.c
+++ b/macway/keymap.c
@@ -4,18 +4,16 @@
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
#include "usb_keyboard.h"
#include "usb_keycodes.h"
-#include "matrix.h"
#include "print.h"
#include "debug.h"
#include "util.h"
-#include "keymap.h"
+#include "controller.h"
+#include "keymap_skel.h"
-#define FN_KEYCODE(fn) (pgm_read_byte(&fn_keycode[(fn)]))
-#define FN_LAYER(fn) (pgm_read_byte(&fn_layer[(fn)]))
-#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
#define KEYMAP( \
R1C1, R1C0, R2C0, R3C0, R4C0, R4C1, R5C1, R5C0, R6C0, R7C0, R8C0, R8C1, R6C1, R0C2, \
R1C2, R1C3, R2C3, R3C3, R4C3, R4C2, R5C2, R5C3, R6C3, R7C3, R8C3, R8C2, R6C2, \
@@ -34,14 +32,11 @@
{ R8C0, R8C1, R8C2, R8C3, R8C4, R8C5, KB_NO, R8C7 } \
}
+#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
-static int current_layer = 0;
-static bool layer_used = false;
-/* layer to change into while Fn key pressed */
-static const int PROGMEM fn_layer[] = { 0, 1, 2, 3, 4, 0, 2, 3 };
+static const uint8_t PROGMEM fn_layer[] = { 0, 1, 2, 3, 4, 0, 2, 3 };
-/* keycode to sent when Fn key released without using layer keys. */
static const uint8_t PROGMEM fn_keycode[] = {
KB_NO, // FN_0 [NOT USED]
KB_NO, // FN_1 layer 1
@@ -73,6 +68,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KB_LSFT,KB_Z, KB_X, KB_C, KB_V, KB_B, KB_N, KB_M, KB_COMM,KB_DOT, KB_SLSH,KB_RSFT,FN_1, \
FN_7, KB_LGUI,KB_LALT,KB_SPC, FN_6, KB_BSLS,KB_GRV, KB_NO, KB_NO),
+
/* Layer 1: HHKB mode (HHKB Fn)
* ,-----------------------------------------------------------.
* |Pow| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
@@ -92,6 +88,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KB_LSFT,KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KP_PLUS,KP_MINS,KB_END, KB_PGDN,KB_DOWN,KB_RSFT,FN_1, \
KB_NO, KB_LGUI,KB_LALT,KB_SPC, KB_RALT,KB_NO, KB_NO, KB_NO, KB_NO),
+
/* Layer 2: Vi mode (Quote/Rmeta)
* ,-----------------------------------------------------------.
* | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| ` |
@@ -111,6 +108,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KB_LSFT,KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO, KB_RSFT,KB_NO, \
KB_NO, KB_LGUI,KB_LALT,KB_SPC, FN_6, KB_NO, KB_NO, KB_NO, KB_NO),
+
/* Layer 3: Mouse mode (Semicolon)
* ,-------------------------------------------------------- --.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
@@ -131,6 +129,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KB_LSFT,KB_NO, MS_DOWN,KB_NO, KB_NO, KB_NO, MS_BTN2,MS_BTN1,MS_BTN2,MS_BTN3,KB_NO, KB_RSFT,KB_NO, \
FN_7, KB_LGUI,KB_LALT,MS_BTN1,KB_RALT,KB_NO, KB_NO, KB_NO, KB_NO),
+
/* Layer 4: Matias half keyboard style (Space)
* ,-----------------------------------------------------------.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
@@ -152,76 +151,22 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-uint8_t keymap_get_keycode(int row, int col)
+uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
{
- return keymap_get_keycodel(current_layer, row, col);
+ return KEYCODE(layer, row, col);
}
-uint8_t keymap_get_keycodel(int layer, int row, int col)
+int keymap_fn_layer(uint8_t fn_bits)
{
- uint8_t code = KEYCODE(layer, row, col);
- // normal key or mouse key
- if (IS_KEY(code) || IS_MOUSE(code))
- layer_used = true;
- return code;
+ return pgm_read_byte(&fn_layer[biton(fn_bits)]);
}
-inline
-int keymap_get_layer(void)
+uint8_t keymap_fn_keycode(uint8_t fn_bits)
{
- return current_layer;
+ return pgm_read_byte(&fn_keycode[(biton(fn_bits))]);
}
-inline
-int keymap_set_layer(int layer)
-{
- current_layer = layer;
- return current_layer;
-}
-
-inline
bool keymap_is_special_mode(uint8_t fn_bits)
{
return (keyboard_modifier_keys == (BIT_LCTRL | BIT_LSHIFT | BIT_LALT | BIT_LGUI));
}
-
-void keymap_fn_proc(uint8_t fn_bits)
-{
- // layer switching
- static int last_bits = 0;
- static uint8_t last_mod = 0;
-
- if (usb_keyboard_has_key() || fn_bits == last_bits) {
- // do nothing during press other than Fn key
- return;
- } else if (fn_bits == 0) {
- // send key when Fn key is released without using the layer
- if (!layer_used) {
- uint8_t code = FN_KEYCODE(biton(last_bits));
- if (code != KB_NO) {
- if (IS_MOD(code)) {
- keyboard_modifier_keys = last_mod | 1<<(code & 0x07);
- } else {
- keyboard_keys[0] = code;
- keyboard_modifier_keys = last_mod;
- }
- usb_keyboard_send();
- usb_keyboard_print();
- usb_keyboard_clear();
- }
- }
- last_bits = 0;
- last_mod = 0;
- layer_used = false;
- keymap_set_layer(0); // default layer
- } else if ((fn_bits & (fn_bits - 1)) == 0) {
- // switch layer when just one Fn Key is pressed
- last_bits = fn_bits;
- last_mod = keyboard_modifier_keys;
- layer_used = false;
- keymap_set_layer(FN_LAYER(biton(fn_bits)));
- debug("layer: "); phex(current_layer); debug("(");
- debug_bin(last_bits); debug(")\n");
- debug("last_mod: "); debug_hex(last_mod); debug("\n");
- }
-}
diff --git a/macway/keymap.h b/macway/keymap.h
deleted file mode 100644
index c65c2e19b..000000000
--- a/macway/keymap.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef KEYMAP_H
-#define KEYMAP_H 1
-
-#include "usb_keycodes.h"
-#include "keymap_skel.h"
-
-#endif
diff --git a/macway/matrix.c b/macway/matrix.c
index 30da657ea..c2b3fb8b2 100644
--- a/macway/matrix.c
+++ b/macway/matrix.c
@@ -5,9 +5,10 @@
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
-#include "matrix.h"
#include "print.h"
#include "util.h"
+#include "controller.h"
+#include "matrix_skel.h"
// matrix is active low. (key on: 0/key off: 1)
// row: Hi-Z(unselected)/low output(selected)
@@ -16,8 +17,8 @@
// PB0-PB7
// matrix state buffer
-uint8_t *matrix;
-uint8_t *matrix_prev;
+static uint8_t *matrix;
+static uint8_t *matrix_prev;
static uint8_t _matrix0[MATRIX_ROWS];
static uint8_t _matrix1[MATRIX_ROWS];
diff --git a/macway/matrix.h b/macway/matrix.h
deleted file mode 100644
index c11f1f3e2..000000000
--- a/macway/matrix.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef MATRIX_H
-#define MATRIX_H 1
-
-#include <stdint.h>
-#include "matrix_skel.h"
-
-
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 8
-
-
-extern uint8_t *matrix;
-extern uint8_t *matrix_prev;
-
-#endif
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-12-02 09:01:21 +0100