diff options
Diffstat (limited to 'keyboards/dichotomy')
-rw-r--r-- | keyboards/dichotomy/config.h | 7 | ||||
-rw-r--r-- | keyboards/dichotomy/info.json | 2 | ||||
-rwxr-xr-x | keyboards/dichotomy/matrix.c | 14 | ||||
-rwxr-xr-x | keyboards/dichotomy/rules.mk | 6 |
4 files changed, 4 insertions, 25 deletions
diff --git a/keyboards/dichotomy/config.h b/keyboards/dichotomy/config.h index 581f133571..5ffc669203 100644 --- a/keyboards/dichotomy/config.h +++ b/keyboards/dichotomy/config.h @@ -17,18 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -//#define BACKLIGHT_LEVELS 3 - #define ONESHOT_TIMEOUT 500 /* diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/info.json index 094ccd67b3..bd37a0a2c7 100644 --- a/keyboards/dichotomy/info.json +++ b/keyboards/dichotomy/info.json @@ -8,6 +8,8 @@ "pid": "0xACC7", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0.5}, {"label":"k01", "x":1, "y":0.5}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.5}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":7, "y":0.5}, {"label":"k07", "x":8, "y":0.5}, {"label":"k08", "x":9, "y":0}, {"label":"k09", "x":10, "y":0.25}, {"label":"k0A", "x":11, "y":0.5}, {"label":"k0B", "x":12, "y":0.5}, {"label":"k10", "x":0, "y":1.5}, {"label":"k11", "x":1, "y":1.5}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1}, {"label":"k14", "x":4, "y":1.5}, {"label":"k15", "x":5, "y":1.5}, {"label":"k16", "x":7, "y":1.5}, {"label":"k17", "x":8, "y":1.5}, {"label":"k18", "x":9, "y":1}, {"label":"k19", "x":10, "y":1.25}, {"label":"k1A", "x":11, "y":1.5}, {"label":"k1B", "x":12, "y":1.5}, {"label":"k20", "x":0, "y":2.5}, {"label":"k21", "x":1, "y":2.5}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2}, {"label":"k24", "x":4, "y":2.5}, {"label":"k25", "x":5, "y":2.5}, {"label":"k26", "x":7, "y":2.5}, {"label":"k27", "x":8, "y":2.5}, {"label":"k28", "x":9, "y":2}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2A", "x":11, "y":2.5}, {"label":"k2B", "x":12, "y":2.5}, {"label":"k33", "x":3, "y":4}, {"label":"k34", "x":4, "y":4}, {"label":"k35", "x":5, "y":4}, {"label":"k36", "x":7, "y":4}, {"label":"k37", "x":8, "y":4}, {"label":"k38", "x":9, "y":4}, {"label":"k42", "x":2, "y":5}, {"label":"k43", "x":3, "y":5}, {"label":"k44", "x":4, "y":5}, {"label":"k45", "x":5, "y":5}, {"label":"k46", "x":7, "y":5}, {"label":"k47", "x":8, "y":5}, {"label":"k48", "x":9, "y":5}, {"label":"k49", "x":10, "y":5}] diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c index 0799554f0a..a3c94275eb 100755 --- a/keyboards/dichotomy/matrix.c +++ b/keyboards/dichotomy/matrix.c @@ -54,16 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. static matrix_row_t matrix[MATRIX_ROWS]; __attribute__ ((weak)) -void matrix_init_quantum(void) { - matrix_init_kb(); -} - -__attribute__ ((weak)) -void matrix_scan_quantum(void) { - matrix_scan_kb(); -} - -__attribute__ ((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -92,7 +82,7 @@ uint8_t matrix_cols(void) { } void matrix_init(void) { - matrix_init_quantum(); + matrix_init_kb(); uart_init(1000000); } @@ -190,7 +180,7 @@ uint8_t matrix_scan(void) } //matrix_print(); - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk index 420e409e43..040710a460 100755 --- a/keyboards/dichotomy/rules.mk +++ b/keyboards/dichotomy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |