Merge remote-tracking branch 'upstream/master' into develop
fauxpark
4 years ago
commit
4b3691e72d
@ -1,15 +1,212 @@
|
|||||||
{
|
{
|
||||||
"keyboard_name": "AL1",
|
"keyboard_name": "AL1",
|
||||||
"url": "",
|
"url": "",
|
||||||
"maintainer": "qmk",
|
"maintainer": "qmk",
|
||||||
"width": 20.5,
|
"width": 20.5,
|
||||||
"height": 5.25,
|
"height": 5.25,
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT": {
|
"LAYOUT": {
|
||||||
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Num Lock", "x":16.5, "y":0}, {"label":"/", "x":17.5, "y":0}, {"label":"*", "x":18.5, "y":0}, {"label":"-", "x":19.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"7", "x":16.5, "y":1}, {"label":"8", "x":17.5, "y":1}, {"label":"9", "x":18.5, "y":1}, {"label":"+", "x":19.5, "y":1, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":16.5, "y":2}, {"label":"5", "x":17.5, "y":2}, {"label":"6", "x":18.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"↑", "x":15.25, "y":3.25}, {"label":"1", "x":16.5, "y":3}, {"label":"2", "x":17.5, "y":3}, {"label":"3", "x":18.5, "y":3}, {"label":"Enter", "x":19.5, "y":3, "h":2}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":7}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":11.75, "y":4}, {"label":"Menu", "x":12.75, "y":4, "w":1.25}, {"label":"←", "x":14.25, "y":4.25}, {"label":"↓", "x":15.25, "y":4.25}, {"label":"→", "x":16.25, "y":4.25}, {"label":"0", "x":17.5, "y":4}, {"label":".", "x":18.5, "y":4}]
|
"layout": [
|
||||||
},
|
{"x": 0, "y": 0},
|
||||||
"LAYOUT_split_bs": {
|
{"x": 1, "y": 0},
|
||||||
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Num Lock", "x":16.5, "y":0}, {"label":"/", "x":17.5, "y":0}, {"label":"*", "x":18.5, "y":0}, {"label":"-", "x":19.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"7", "x":16.5, "y":1}, {"label":"8", "x":17.5, "y":1}, {"label":"9", "x":18.5, "y":1}, {"label":"+", "x":19.5, "y":1, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":16.5, "y":2}, {"label":"5", "x":17.5, "y":2}, {"label":"6", "x":18.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"↑", "x":15.25, "y":3.25}, {"label":"1", "x":16.5, "y":3}, {"label":"2", "x":17.5, "y":3}, {"label":"3", "x":18.5, "y":3}, {"label":"Enter", "x":19.5, "y":3, "h":2}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":7}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":11.75, "y":4}, {"label":"Menu", "x":12.75, "y":4, "w":1.25}, {"label":"←", "x":14.25, "y":4.25}, {"label":"↓", "x":15.25, "y":4.25}, {"label":"→", "x":16.25, "y":4.25}, {"label":"0", "x":17.5, "y":4}, {"label":".", "x":18.5, "y":4}]
|
{"x": 2, "y": 0},
|
||||||
|
{"x": 3, "y": 0},
|
||||||
|
{"x": 4, "y": 0},
|
||||||
|
{"x": 5, "y": 0},
|
||||||
|
{"x": 6, "y": 0},
|
||||||
|
{"x": 7, "y": 0},
|
||||||
|
{"x": 8, "y": 0},
|
||||||
|
{"x": 9, "y": 0},
|
||||||
|
{"x": 10, "y": 0},
|
||||||
|
{"x": 11, "y": 0},
|
||||||
|
{"x": 12, "y": 0},
|
||||||
|
{"x": 13, "y": 0, "w": 2},
|
||||||
|
|
||||||
|
{"x": 15.25, "y": 0},
|
||||||
|
|
||||||
|
{"x": 16.5, "y": 0},
|
||||||
|
{"x": 17.5, "y": 0},
|
||||||
|
{"x": 18.5, "y": 0},
|
||||||
|
{"x": 19.5, "y": 0},
|
||||||
|
|
||||||
|
{"x": 0, "y": 1, "w": 1.5},
|
||||||
|
{"x": 1.5, "y": 1},
|
||||||
|
{"x": 2.5, "y": 1},
|
||||||
|
{"x": 3.5, "y": 1},
|
||||||
|
{"x": 4.5, "y": 1},
|
||||||
|
{"x": 5.5, "y": 1},
|
||||||
|
{"x": 6.5, "y": 1},
|
||||||
|
{"x": 7.5, "y": 1},
|
||||||
|
{"x": 8.5, "y": 1},
|
||||||
|
{"x": 9.5, "y": 1},
|
||||||
|
{"x": 10.5, "y": 1},
|
||||||
|
{"x": 11.5, "y": 1},
|
||||||
|
{"x": 12.5, "y": 1},
|
||||||
|
{"x": 13.5, "y": 1, "w": 1.5},
|
||||||
|
|
||||||
|
{"x": 15.25, "y": 1},
|
||||||
|
|
||||||
|
{"x": 16.5, "y": 1},
|
||||||
|
{"x": 17.5, "y": 1},
|
||||||
|
{"x": 18.5, "y": 1},
|
||||||
|
{"x": 19.5, "y": 1, "h": 2},
|
||||||
|
|
||||||
|
{"x": 0, "y": 2, "w": 1.75},
|
||||||
|
{"x": 1.75, "y": 2},
|
||||||
|
{"x": 2.75, "y": 2},
|
||||||
|
{"x": 3.75, "y": 2},
|
||||||
|
{"x": 4.75, "y": 2},
|
||||||
|
{"x": 5.75, "y": 2},
|
||||||
|
{"x": 6.75, "y": 2},
|
||||||
|
{"x": 7.75, "y": 2},
|
||||||
|
{"x": 8.75, "y": 2},
|
||||||
|
{"x": 9.75, "y": 2},
|
||||||
|
{"x": 10.75, "y": 2},
|
||||||
|
{"x": 11.75, "y": 2},
|
||||||
|
{"x": 12.75, "y": 2, "w": 2.25},
|
||||||
|
|
||||||
|
{"x": 16.5, "y": 2},
|
||||||
|
{"x": 17.5, "y": 2},
|
||||||
|
{"x": 18.5, "y": 2},
|
||||||
|
|
||||||
|
{"x": 0, "y": 3, "w": 2.25},
|
||||||
|
{"x": 2.25, "y": 3},
|
||||||
|
{"x": 3.25, "y": 3},
|
||||||
|
{"x": 4.25, "y": 3},
|
||||||
|
{"x": 5.25, "y": 3},
|
||||||
|
{"x": 6.25, "y": 3},
|
||||||
|
{"x": 7.25, "y": 3},
|
||||||
|
{"x": 8.25, "y": 3},
|
||||||
|
{"x": 9.25, "y": 3},
|
||||||
|
{"x": 10.25, "y": 3},
|
||||||
|
{"x": 11.25, "y": 3},
|
||||||
|
{"x": 12.25, "y": 3, "w": 1.75},
|
||||||
|
{"x": 14, "y": 3},
|
||||||
|
|
||||||
|
{"x": 15.25, "y": 3.25},
|
||||||
|
|
||||||
|
{"x": 16.5, "y": 3},
|
||||||
|
{"x": 17.5, "y": 3},
|
||||||
|
{"x": 18.5, "y": 3},
|
||||||
|
{"x": 19.5, "y": 3, "h": 2},
|
||||||
|
|
||||||
|
{"x": 0, "y": 4, "w": 1.25},
|
||||||
|
{"x": 1.25, "y": 4},
|
||||||
|
{"x": 2.25, "y": 4, "w": 1.25},
|
||||||
|
{"x": 3.5, "y": 4, "w": 7},
|
||||||
|
{"x": 10.5, "y": 4, "w": 1.25},
|
||||||
|
{"x": 11.75, "y": 4},
|
||||||
|
{"x": 12.75, "y": 4, "w": 1.25},
|
||||||
|
|
||||||
|
{"x": 14.25, "y": 4.25},
|
||||||
|
{"x": 15.25, "y": 4.25},
|
||||||
|
{"x": 16.25, "y": 4.25},
|
||||||
|
|
||||||
|
{"x": 17.5, "y": 4},
|
||||||
|
{"x": 18.5, "y": 4}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"LAYOUT_split_bs": {
|
||||||
|
"layout": [
|
||||||
|
{"x": 0, "y": 0},
|
||||||
|
{"x": 1, "y": 0},
|
||||||
|
{"x": 2, "y": 0},
|
||||||
|
{"x": 3, "y": 0},
|
||||||
|
{"x": 4, "y": 0},
|
||||||
|
{"x": 5, "y": 0},
|
||||||
|
{"x": 6, "y": 0},
|
||||||
|
{"x": 7, "y": 0},
|
||||||
|
{"x": 8, "y": 0},
|
||||||
|
{"x": 9, "y": 0},
|
||||||
|
{"x": 10, "y": 0},
|
||||||
|
{"x": 11, "y": 0},
|
||||||
|
{"x": 12, "y": 0},
|
||||||
|
{"x": 13, "y": 0},
|
||||||
|
{"x": 14, "y": 0},
|
||||||
|
|
||||||
|
{"x": 15.25, "y": 0},
|
||||||
|
|
||||||
|
{"x": 16.5, "y": 0},
|
||||||
|
{"x": 17.5, "y": 0},
|
||||||
|
{"x": 18.5, "y": 0},
|
||||||
|
{"x": 19.5, "y": 0},
|
||||||
|
|
||||||
|
{"x": 0, "y": 1, "w": 1.5},
|
||||||
|
{"x": 1.5, "y": 1},
|
||||||
|
{"x": 2.5, "y": 1},
|
||||||
|
{"x": 3.5, "y": 1},
|
||||||
|
{"x": 4.5, "y": 1},
|
||||||
|
{"x": 5.5, "y": 1},
|
||||||
|
{"x": 6.5, "y": 1},
|
||||||
|
{"x": 7.5, "y": 1},
|
||||||
|
{"x": 8.5, "y": 1},
|
||||||
|
{"x": 9.5, "y": 1},
|
||||||
|
{"x": 10.5, "y": 1},
|
||||||
|
{"x": 11.5, "y": 1},
|
||||||
|
{"x": 12.5, "y": 1},
|
||||||
|
{"x": 13.5, "y": 1, "w": 1.5},
|
||||||
|
|
||||||
|
{"x": 15.25, "y": 1},
|
||||||
|
|
||||||
|
{"x": 16.5, "y": 1},
|
||||||
|
{"x": 17.5, "y": 1},
|
||||||
|
{"x": 18.5, "y": 1},
|
||||||
|
{"x": 19.5, "y": 1, "h": 2},
|
||||||
|
|
||||||
|
{"x": 0, "y": 2, "w": 1.75},
|
||||||
|
{"x": 1.75, "y": 2},
|
||||||
|
{"x": 2.75, "y": 2},
|
||||||
|
{"x": 3.75, "y": 2},
|
||||||
|
{"x": 4.75, "y": 2},
|
||||||
|
{"x": 5.75, "y": 2},
|
||||||
|
{"x": 6.75, "y": 2},
|
||||||
|
{"x": 7.75, "y": 2},
|
||||||
|
{"x": 8.75, "y": 2},
|
||||||
|
{"x": 9.75, "y": 2},
|
||||||
|
{"x": 10.75, "y": 2},
|
||||||
|
{"x": 11.75, "y": 2},
|
||||||
|
{"x": 12.75, "y": 2, "w": 2.25},
|
||||||
|
|
||||||
|
{"x": 16.5, "y": 2},
|
||||||
|
{"x": 17.5, "y": 2},
|
||||||
|
{"x": 18.5, "y": 2},
|
||||||
|
|
||||||
|
{"x": 0, "y": 3, "w": 2.25},
|
||||||
|
{"x": 2.25, "y": 3},
|
||||||
|
{"x": 3.25, "y": 3},
|
||||||
|
{"x": 4.25, "y": 3},
|
||||||
|
{"x": 5.25, "y": 3},
|
||||||
|
{"x": 6.25, "y": 3},
|
||||||
|
{"x": 7.25, "y": 3},
|
||||||
|
{"x": 8.25, "y": 3},
|
||||||
|
{"x": 9.25, "y": 3},
|
||||||
|
{"x": 10.25, "y": 3},
|
||||||
|
{"x": 11.25, "y": 3},
|
||||||
|
{"x": 12.25, "y": 3, "w": 1.75},
|
||||||
|
{"x": 14, "y": 3},
|
||||||
|
|
||||||
|
{"x": 15.25, "y": 3.25},
|
||||||
|
|
||||||
|
{"x": 16.5, "y": 3},
|
||||||
|
{"x": 17.5, "y": 3},
|
||||||
|
{"x": 18.5, "y": 3},
|
||||||
|
{"x": 19.5, "y": 3, "h": 2},
|
||||||
|
|
||||||
|
{"x": 0, "y": 4, "w": 1.25},
|
||||||
|
{"x": 1.25, "y": 4},
|
||||||
|
{"x": 2.25, "y": 4, "w": 1.25},
|
||||||
|
{"x": 3.5, "y": 4, "w": 7},
|
||||||
|
{"x": 10.5, "y": 4, "w": 1.25},
|
||||||
|
{"x": 11.75, "y": 4},
|
||||||
|
{"x": 12.75, "y": 4, "w": 1.25},
|
||||||
|
|
||||||
|
{"x": 14.25, "y": 4.25},
|
||||||
|
{"x": 15.25, "y": 4.25},
|
||||||
|
{"x": 16.25, "y": 4.25},
|
||||||
|
|
||||||
|
{"x": 17.5, "y": 4},
|
||||||
|
{"x": 18.5, "y": 4}
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
# The default keymap for al1
|
|
||||||
@ -1,201 +1,92 @@
|
|||||||
#include <stdint.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <avr/io.h>
|
|
||||||
#include <util/delay.h>
|
|
||||||
#include "print.h"
|
|
||||||
#include "debug.h"
|
|
||||||
#include "util.h"
|
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
|
|
||||||
#ifndef DEBOUNCE
|
#include "gpio.h"
|
||||||
# define DEBOUNCE 5
|
|
||||||
#endif
|
|
||||||
static uint8_t debouncing = DEBOUNCE;
|
|
||||||
|
|
||||||
static matrix_row_t matrix[MATRIX_ROWS];
|
|
||||||
static matrix_row_t matrix_debouncing[MATRIX_ROWS];
|
|
||||||
|
|
||||||
static uint8_t read_rows(void);
|
|
||||||
static void init_rows(void);
|
|
||||||
static void unselect_cols(void);
|
|
||||||
static void select_col(uint8_t col);
|
|
||||||
|
|
||||||
inline uint8_t matrix_rows(void) {
|
|
||||||
return MATRIX_ROWS;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline uint8_t matrix_cols(void) {
|
|
||||||
return MATRIX_COLS;
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_init_kb(void) {
|
|
||||||
matrix_init_user();
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_scan_kb(void) {
|
|
||||||
matrix_scan_user();
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_init_user(void) {
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_scan_user(void) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void matrix_init(void) {
|
|
||||||
// initialize row and col
|
|
||||||
unselect_cols();
|
|
||||||
init_rows();
|
|
||||||
|
|
||||||
// initialize matrix state: all keys off
|
|
||||||
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
|
|
||||||
matrix[i] = 0;
|
|
||||||
matrix_debouncing[i] = 0;
|
|
||||||
}
|
|
||||||
matrix_init_quantum();
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t matrix_scan(void) {
|
|
||||||
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
|
|
||||||
select_col(col);
|
|
||||||
_delay_us(3);
|
|
||||||
uint8_t rows = read_rows();
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col);
|
|
||||||
bool curr_bit = rows & (1<<row);
|
|
||||||
if (prev_bit != curr_bit) {
|
|
||||||
matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
|
|
||||||
debouncing = DEBOUNCE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unselect_cols();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (debouncing) {
|
|
||||||
if (--debouncing) {
|
|
||||||
_delay_ms(1);
|
|
||||||
} else {
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
||||||
matrix[i] = matrix_debouncing[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
matrix_scan_quantum();
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool matrix_is_modified(void) {
|
|
||||||
if (debouncing)
|
|
||||||
return false;
|
|
||||||
else
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool matrix_is_on(uint8_t row, uint8_t col) {
|
|
||||||
return (matrix[row] & ((matrix_row_t)1<<col));
|
|
||||||
}
|
|
||||||
|
|
||||||
inline matrix_row_t matrix_get_row(uint8_t row) {
|
|
||||||
return matrix[row];
|
|
||||||
}
|
|
||||||
|
|
||||||
void matrix_print(void) {
|
|
||||||
print("\nr/c 0123456789ABCDEF\n");
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t matrix_key_count(void) {
|
|
||||||
uint8_t count = 0;
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
||||||
count += bitpop32(matrix[i]);
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Row pin configuration
|
|
||||||
*
|
|
||||||
* row: 0 1 2 3 4 5
|
|
||||||
* pin: C7 B1 B2 C6 B4 B5
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
static void init_rows(void)
|
|
||||||
{
|
|
||||||
DDRC &= ~0b11000000;
|
|
||||||
DDRB &= ~0b00110110;
|
|
||||||
PORTC |= 0b11000000;
|
|
||||||
PORTB |= 0b00110110;
|
|
||||||
}
|
|
||||||
|
|
||||||
static uint8_t read_rows(void) {
|
static uint8_t read_rows(void) {
|
||||||
return (PINC&(1<<PC7) ? 0 : (1<<0)) |
|
return (readPin(C7) ? 0 : 1) |
|
||||||
(PINB&(1<<PB1) ? 0 : (1<<1)) |
|
(readPin(B1) ? 0 : 2) |
|
||||||
(PINB&(1<<PB2) ? 0 : (1<<2)) |
|
(readPin(B2) ? 0 : 4) |
|
||||||
(PINC&(1<<PC6) ? 0 : (1<<3)) |
|
(readPin(C6) ? 0 : 8) |
|
||||||
(PINB&(1<<PB4) ? 0 : (1<<4)) |
|
(readPin(B4) ? 0 : 16) |
|
||||||
(PINB&(1<<PB5) ? 0 : (1<<5));
|
(readPin(B5) ? 0 : 32);
|
||||||
}
|
|
||||||
|
|
||||||
/* Row pin configuration
|
|
||||||
* pin: D3 D7 D6 D5 D4
|
|
||||||
* row: off 0 x x x x
|
|
||||||
* 0 1 0 0 0 0
|
|
||||||
* 1 1 0 0 0 1
|
|
||||||
* 2 1 0 0 1 0
|
|
||||||
* 3 1 0 0 1 1
|
|
||||||
* 4 1 0 1 0 0
|
|
||||||
* 5 1 0 1 0 1
|
|
||||||
* 6 1 0 1 1 0
|
|
||||||
* 7 1 0 1 1 1
|
|
||||||
* 8 1 1 0 0 0
|
|
||||||
* 9 1 1 0 0 1
|
|
||||||
* 10 1 1 0 1 0
|
|
||||||
* 11 1 1 0 1 1
|
|
||||||
* 12 1 1 1 0 0
|
|
||||||
* 13 1 1 1 0 1
|
|
||||||
* 14 1 1 1 1 0
|
|
||||||
* 15 1 1 1 1 1
|
|
||||||
*/
|
|
||||||
static void unselect_cols(void)
|
|
||||||
{
|
|
||||||
// output high(DDR:1, PORT:1) to unselect
|
|
||||||
DDRB |= (1 << PD3);
|
|
||||||
PORTB |= (1 << PD3);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void select_col(uint8_t col) {
|
static void select_col(uint8_t col) {
|
||||||
DDRD |= (1<<PD3 | 1<<PD4 | 1<<PD5 | 1<<PD6 | 1<<PD7);
|
writePinLow(D3);
|
||||||
|
|
||||||
PORTD &= ~(1<<PD3);
|
writePin(D4, (col & 1));
|
||||||
|
writePin(D5, (col & 2));
|
||||||
|
writePin(D6, (col & 4));
|
||||||
|
writePin(D7, (col & 8));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void unselect_cols(void) {
|
||||||
|
writePinHigh(D3);
|
||||||
|
}
|
||||||
|
|
||||||
|
void matrix_init_custom(void) {
|
||||||
|
/* 74HC154 col pin configuration
|
||||||
|
* pin: D3 D7 D6 D5 D4
|
||||||
|
* row: off 0 x x x x
|
||||||
|
* 0 1 0 0 0 0
|
||||||
|
* 1 1 0 0 0 1
|
||||||
|
* 2 1 0 0 1 0
|
||||||
|
* 3 1 0 0 1 1
|
||||||
|
* 4 1 0 1 0 0
|
||||||
|
* 5 1 0 1 0 1
|
||||||
|
* 6 1 0 1 1 0
|
||||||
|
* 7 1 0 1 1 1
|
||||||
|
* 8 1 1 0 0 0
|
||||||
|
* 9 1 1 0 0 1
|
||||||
|
* 10 1 1 0 1 0
|
||||||
|
* 11 1 1 0 1 1
|
||||||
|
* 12 1 1 1 0 0
|
||||||
|
* 13 1 1 1 0 1
|
||||||
|
* 14 1 1 1 1 0
|
||||||
|
* 15 1 1 1 1 1
|
||||||
|
*/
|
||||||
|
setPinOutput(D3);
|
||||||
|
writePinHigh(D3);
|
||||||
|
|
||||||
|
setPinOutput(D4);
|
||||||
|
setPinOutput(D5);
|
||||||
|
setPinOutput(D6);
|
||||||
|
setPinOutput(D7);
|
||||||
|
|
||||||
|
|
||||||
|
/* Row pin configuration
|
||||||
|
*
|
||||||
|
* row: 0 1 2 3 4 5
|
||||||
|
* pin: C7 B1 B2 C6 B4 B5
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
setPinInputHigh(C7);
|
||||||
|
setPinInputHigh(B1);
|
||||||
|
setPinInputHigh(B2);
|
||||||
|
setPinInputHigh(C6);
|
||||||
|
setPinInputHigh(B4);
|
||||||
|
setPinInputHigh(B5);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
|
||||||
|
bool changed = false;
|
||||||
|
|
||||||
|
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
|
||||||
|
select_col(col);
|
||||||
|
matrix_io_delay();
|
||||||
|
uint8_t rows = read_rows();
|
||||||
|
|
||||||
|
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
||||||
|
bool prev_bit = current_matrix[row] & ((matrix_row_t)1 << col);
|
||||||
|
bool curr_bit = rows & (1 << row);
|
||||||
|
|
||||||
|
if (prev_bit != curr_bit) {
|
||||||
|
current_matrix[row] ^= ((matrix_row_t)1 << col);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
unselect_cols();
|
||||||
|
}
|
||||||
|
|
||||||
if (col & (1<<0)) {
|
return changed;
|
||||||
PORTD |= (1<<PD4);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
PORTD &= ~(1<<PD4);
|
|
||||||
}
|
|
||||||
if (col & (1<<1)) {
|
|
||||||
PORTD |= (1<<PD5);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
PORTD &= ~(1<<PD5);
|
|
||||||
}
|
|
||||||
if (col & (1<<2)) {
|
|
||||||
PORTD |= (1<<PD6);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
PORTD &= ~(1<<PD6);
|
|
||||||
}
|
|
||||||
if (col & (1<<3)) {
|
|
||||||
PORTD |= (1<<PD7);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
PORTD &= ~(1<<PD7);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue