From e1e87431b9509f05d57cb4cf064e8bd43719f062 Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:45:35 -0600
Subject: [PATCH 1/9] Adding the Viktus Minne topre pcb variant
---
keyboards/viktus/minne_topre/ec.c | 182 ++++++++++++++++++
keyboards/viktus/minne_topre/ec.h | 31 +++
keyboards/viktus/minne_topre/info.json | 49 +++++
.../minne_topre/keymaps/default/keymap.c | 26 +++
.../viktus/minne_topre/keymaps/via/keymap.c | 26 +++
.../viktus/minne_topre/keymaps/via/rules.mk | 1 +
keyboards/viktus/minne_topre/minne_topre.c | 50 +++++
keyboards/viktus/minne_topre/minne_topre.h | 88 +++++++++
keyboards/viktus/minne_topre/readme.md | 27 +++
keyboards/viktus/minne_topre/rules.mk | 2 +
10 files changed, 482 insertions(+)
create mode 100644 keyboards/viktus/minne_topre/ec.c
create mode 100644 keyboards/viktus/minne_topre/ec.h
create mode 100644 keyboards/viktus/minne_topre/info.json
create mode 100644 keyboards/viktus/minne_topre/keymaps/default/keymap.c
create mode 100644 keyboards/viktus/minne_topre/keymaps/via/keymap.c
create mode 100644 keyboards/viktus/minne_topre/keymaps/via/rules.mk
create mode 100644 keyboards/viktus/minne_topre/minne_topre.c
create mode 100644 keyboards/viktus/minne_topre/minne_topre.h
create mode 100644 keyboards/viktus/minne_topre/readme.md
create mode 100644 keyboards/viktus/minne_topre/rules.mk
diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c
new file mode 100644
index 000000000000..b8aa1b9544cb
--- /dev/null
+++ b/keyboards/viktus/minne_topre/ec.c
@@ -0,0 +1,182 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include "ec.h"
+
+#include "quantum.h"
+#include "analog.h"
+#include "debug.h"
+
+// sensing channel definitions
+#define A0 0
+#define A1 1
+#define A2 2
+#define A3 3
+#define A4 4
+#define A5 5
+#define A6 6
+#define A7 7
+
+// analog connection settings
+#define DISCHARGE_PIN D5
+#define ANALOG_PORT D4
+
+#ifndef MUX_SEL_PIN
+#define MUX_SEL_PINS \
+ { D1, D2, D3 }
+#endif
+
+// pin connections
+const uint8_t row_channels[] = MATRIX_ROW_PINS;
+const uint8_t col_pins[] = MATRIX_COL_PINS;
+const uint8_t mux_sel_pins[] = MUX_SEL_PINS;
+
+_Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");
+
+static ec_config_t config;
+static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS];
+
+static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); }
+static inline void charge_capacitor(uint8_t col) {
+ setPinInput(DISCHARGE_PIN);
+ writePinHigh(col_pins[col]);
+}
+
+static inline void clear_all_col_pins(void) {
+ for (int col = 0; col < sizeof(col_pins); col++) {
+ writePinLow(col_pins[col]);
+ }
+}
+
+void init_mux_sel(void) {
+ for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) {
+ setPinOutput(mux_sel_pins[idx]);
+ }
+}
+
+void select_mux(uint8_t row) {
+ uint8_t ch = row_channels[row];
+ writePin(mux_sel_pins[0], ch & 1);
+ writePin(mux_sel_pins[1], ch & 2);
+ writePin(mux_sel_pins[2], ch & 4);
+}
+
+void init_col(void) {
+ for (int idx = 0; idx < sizeof(col_pins); idx++) {
+ setPinOutput(col_pins[idx]);
+ writePinLow(col_pins[idx]);
+ }
+}
+
+int ec_init(ec_config_t const* const ec_config) {
+ // save config
+ config = *ec_config;
+
+ // initialize discharge pin as discharge mode
+ writePinLow(DISCHARGE_PIN);
+ setPinOutput(DISCHARGE_PIN);
+
+ // set analog reference
+ analogReference(ADC_REF_POWER);
+
+ // initialize drive lines
+ init_col();
+
+ // initialize multiplexer select pin
+ init_mux_sel();
+
+ // set discharge pin to charge mode
+ setPinInput(DISCHARGE_PIN);
+
+ return 0;
+}
+
+uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
+ uint16_t sw_value = 0;
+
+ discharge_capacitor();
+
+ select_mux(row);
+
+ clear_all_col_pins();
+
+ cli();
+
+ charge_capacitor(col);
+
+ sw_value = analogReadPin(ANALOG_PORT);
+
+ sei();
+
+ return sw_value;
+}
+
+bool ec_update_key(matrix_row_t* current_row, matrix_row_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt) {
+ bool current_state = (*current_row >> col) & 1;
+
+ // press to release
+ if (current_state && sw_value < reset_pt) {
+ *current_row &= ~(MATRIX_ROW_SHIFTER << col);
+ return true;
+ }
+
+ // release to press
+ if ((!current_state) && sw_value > actuation_pt) {
+ *current_row |= (MATRIX_ROW_SHIFTER << col);
+ return true;
+ }
+
+ return false;
+}
+
+bool ec_matrix_scan(matrix_row_t current_matrix[]) {
+ bool updated = false;
+
+ for (int row = 0; row < sizeof(row_channels); row++) {
+ for (int col = 0; col < sizeof(col_pins); col++) {
+ uint16_t reset_pt = config.reset_pt;
+ uint16_t actuation_pt = config.actuation_pt;
+
+ //Modifying threshold values for overlapping pads
+ switch(row) {
+ case 3:
+ switch(col) {
+ case 1:
+ case 10: // lower threshold for bottom outside mods (40 rest, 50 act, 58 btm)
+ reset_pt = 45;
+ actuation_pt = 50;
+ break;
+ }
+ break;
+ }
+
+ ec_sw_value[col][row] = ec_readkey_raw(col, row);
+ updated |= ec_update_key(¤t_matrix[row], col, ec_sw_value[col][row], reset_pt, actuation_pt);
+ }
+ }
+
+ return updated;
+}
+
+// console debugging for pad values
+/*void ec_dprint_matrix(void) {
+ for (int row = 0; row < sizeof(row_channels); row++) {
+ for (int col = 0; col < sizeof(col_pins); col++) {
+ dprintf("%5d", ec_sw_value[col][row]);
+ }
+ dprintf("\n");
+ }
+}*/
diff --git a/keyboards/viktus/minne_topre/ec.h b/keyboards/viktus/minne_topre/ec.h
new file mode 100644
index 000000000000..283272e674e2
--- /dev/null
+++ b/keyboards/viktus/minne_topre/ec.h
@@ -0,0 +1,31 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include
+#include
+
+#include "matrix.h"
+
+typedef struct {
+ uint16_t reset_pt;
+ uint16_t actuation_pt;
+} ec_config_t;
+
+int ec_init(ec_config_t const* const ec_config);
+bool ec_matrix_scan(matrix_row_t current_matrix[]);
+void ec_dprint_matrix(void);
+uint16_t ec_readkey_raw(uint8_t col, uint8_t row);
+bool ec_update_key(matrix_row_t* current_row, matrix_row_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt);
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
new file mode 100644
index 000000000000..ab58127e7ab2
--- /dev/null
+++ b/keyboards/viktus/minne_topre/info.json
@@ -0,0 +1,49 @@
+{
+ "manufacturer": "Viktus Design LLC",
+ "keyboard_name": "Viktus Minne - Topre",
+ "maintainer": "BlindAssassin111",
+ "url": "https://viktus.design",
+ "usb": {
+ "device_version": "1.3.0",
+ "vid": "0x5644",
+ "pid": "0x4D54"
+ },
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": true
+ },
+ "bootmagic": {
+ "matrix": [0,0]
+ },
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
+ "rows": ["A0", "A1", "A3", "A4"]
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"x":1.38, "y":3}, {"x":2.38, "y":3}, {"label":"", "x":3.38, "y":3, "w":2.5}, {"x":5.88, "y":3}, {"label":"", "x":6.88, "y":3, "w":2.5}, {"x":9.38, "y":3}, {"x":10.38, "y":3}]
+ },
+ "LAYOUT_dual_3u": {
+ "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"x":1.38, "y":3}, {"x":2.38, "y":3}, {"label":"", "x":3.38, "y":3, "w":3}, {"label":"", "x":6.38, "y":3, "w":3}, {"x":9.38, "y":3}, {"x":10.38, "y":3}]
+ },
+ "LAYOUT_6u": {
+ "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"x":1.38, "y":3}, {"x":2.38, "y":3}, {"label":"", "x":3.38, "y":3, "w":6}, {"x":9.38, "y":3}, {"x":10.38, "y":3}]
+ },
+ "LAYOUT_7u": {
+ "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"x":1.38, "y":3, "w":1.5}, {"label":"", "x":2.88, "y":3, "w":7}, {"x":9.88, "y":3, "w":1.5}]
+ },
+ "LAYOUT_10u": {
+ "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"label":"", "x":1.38, "y":3, "w":10}]
+ }
+ }
+}
diff --git a/keyboards/viktus/minne_topre/keymaps/default/keymap.c b/keyboards/viktus/minne_topre/keymaps/default/keymap.c
new file mode 100644
index 000000000000..5ad476a25da0
--- /dev/null
+++ b/keyboards/viktus/minne_topre/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1),
+ KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL
+ )
+};
diff --git a/keyboards/viktus/minne_topre/keymaps/via/keymap.c b/keyboards/viktus/minne_topre/keymaps/via/keymap.c
new file mode 100644
index 000000000000..5ad476a25da0
--- /dev/null
+++ b/keyboards/viktus/minne_topre/keymaps/via/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1),
+ KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL
+ )
+};
diff --git a/keyboards/viktus/minne_topre/keymaps/via/rules.mk b/keyboards/viktus/minne_topre/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/viktus/minne_topre/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/viktus/minne_topre/minne_topre.c b/keyboards/viktus/minne_topre/minne_topre.c
new file mode 100644
index 000000000000..c51c3feec213
--- /dev/null
+++ b/keyboards/viktus/minne_topre/minne_topre.c
@@ -0,0 +1,50 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include "minne_topre.h"
+
+#include "ec.h"
+#include "matrix.h"
+#include "debug.h"
+
+#define RESET_PT 55
+#define ACTUATION_PT 65
+
+// console debugging for pad values
+/*void keyboard_post_init_kb() {
+ debug_enable = true;
+ debug_matrix = true;
+}*/
+
+void matrix_init_custom(void) {
+ ec_config_t ec_config = {.reset_pt = RESET_PT, .actuation_pt = ACTUATION_PT};
+
+ ec_init(&ec_config);
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+ bool updated = ec_matrix_scan(current_matrix);
+
+ // console debugging for pad values
+ /*static int cnt = 0;
+ if (cnt++ == 300) {
+ cnt = 0;
+ ec_dprint_matrix();
+ dprintf("\n");
+ }*/
+
+ return updated;
+}
diff --git a/keyboards/viktus/minne_topre/minne_topre.h b/keyboards/viktus/minne_topre/minne_topre.h
new file mode 100644
index 000000000000..871fa18b3331
--- /dev/null
+++ b/keyboards/viktus/minne_topre/minne_topre.h
@@ -0,0 +1,88 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+//lAYOUTS
+
+#define LAYOUT_all( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+ K31, K32, K34, K35, K37, K39, K3A \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
+ { ___, K31, K32, ___, K34, K35, ___, K37, ___, K39, K3A, ___ } \
+}
+
+#define LAYOUT_dual_3u( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+ K31, K32, K34, K37, K39, K3A \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
+ { ___, K31, K32, ___, K34, ___, ___, K37, ___, K39, K3A, ___ } \
+}
+
+#define LAYOUT_6u( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+ K31, K32, K35, K39, K3A \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
+ { ___, K31, K32, ___, ___, K35, ___, ___, ___, K39, K3A, ___ } \
+}
+
+#define LAYOUT_7u( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+ K31, K35, K3A \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
+ { ___, K31, ___, ___, ___, K35, ___, ___, ___, ___, K3A, ___ } \
+}
+
+#define LAYOUT_10u( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+ K35 \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
+ { ___, ___, ___, ___, ___, K35, ___, ___, ___, ___, ___, ___ } \
+}
diff --git a/keyboards/viktus/minne_topre/readme.md b/keyboards/viktus/minne_topre/readme.md
new file mode 100644
index 000000000000..b66f0cebe62d
--- /dev/null
+++ b/keyboards/viktus/minne_topre/readme.md
@@ -0,0 +1,27 @@
+# Viktus Minne - Topre
+
+![minne_topre](https://imgur.com/OKnryxc)
+
+Minne is a 40% keyboard with an HHKB bottom row, Now with Topre.
+
+- Keyboard Maintainer: BlindAssassin111
+- Hardware Supported: Viktus Minne Topre PCB
+- Hardware Availability: Viktus Design LLC
+
+Make example for this keyboard (after setting up your build environment):
+
+ make viktus/minne_topre:default
+
+Flashing example for this keyboard:
+
+ make viktus/minne_topre:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/viktus/minne_topre/rules.mk b/keyboards/viktus/minne_topre/rules.mk
new file mode 100644
index 000000000000..3b52e2dfecca
--- /dev/null
+++ b/keyboards/viktus/minne_topre/rules.mk
@@ -0,0 +1,2 @@
+CUSTOM_MATRIX = lite
+SRC += analog.c ec.c
From 61ff4b8470190ee8f307b1c6d1c862f7e2b2278f Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Fri, 10 Mar 2023 12:11:40 -0600
Subject: [PATCH 2/9] Update keyboards/viktus/minne_topre/readme.md
Co-authored-by: Drashna Jaelre
---
keyboards/viktus/minne_topre/readme.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keyboards/viktus/minne_topre/readme.md b/keyboards/viktus/minne_topre/readme.md
index b66f0cebe62d..0bd412f28c9d 100644
--- a/keyboards/viktus/minne_topre/readme.md
+++ b/keyboards/viktus/minne_topre/readme.md
@@ -1,6 +1,6 @@
# Viktus Minne - Topre
-![minne_topre](https://imgur.com/OKnryxc)
+![minne_topre](https://i.imgur.com/OKnryxch.png)
Minne is a 40% keyboard with an HHKB bottom row, Now with Topre.
From 4cc84dc152a2ae3db1135666de40a989b78128b3 Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Fri, 10 Mar 2023 22:33:45 -0600
Subject: [PATCH 3/9] Update rules.mk
---
keyboards/viktus/minne_topre/rules.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/keyboards/viktus/minne_topre/rules.mk b/keyboards/viktus/minne_topre/rules.mk
index 3b52e2dfecca..037e26c530c7 100644
--- a/keyboards/viktus/minne_topre/rules.mk
+++ b/keyboards/viktus/minne_topre/rules.mk
@@ -1,2 +1,3 @@
CUSTOM_MATRIX = lite
-SRC += analog.c ec.c
+QUANTUM_LIB_SRC += analog.c
+SRC += ec.c
From 16dc1b53b0dc5e90412042a8bf45ac89fb3c03a4 Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Sun, 12 Mar 2023 16:46:29 -0500
Subject: [PATCH 4/9] Moving layouts from *.h to info.json
---
keyboards/viktus/minne_topre/info.json | 217 ++++++++++++++++++++-
keyboards/viktus/minne_topre/minne_topre.h | 69 -------
2 files changed, 212 insertions(+), 74 deletions(-)
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
index ab58127e7ab2..9bb7861a1b57 100644
--- a/keyboards/viktus/minne_topre/info.json
+++ b/keyboards/viktus/minne_topre/info.json
@@ -31,19 +31,226 @@
},
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"x":1.38, "y":3}, {"x":2.38, "y":3}, {"label":"", "x":3.38, "y":3, "w":2.5}, {"x":5.88, "y":3}, {"label":"", "x":6.88, "y":3, "w":2.5}, {"x":9.38, "y":3}, {"x":10.38, "y":3}]
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+ { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+ { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+ { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+ { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+ { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
+ { "label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3 },
+ { "label": "K35", "matrix": [3, 5], "w": 1, "x": 5.875, "y": 3 },
+ { "label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3 },
+ { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
+ { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
+ ]
},
"LAYOUT_dual_3u": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"x":1.38, "y":3}, {"x":2.38, "y":3}, {"label":"", "x":3.38, "y":3, "w":3}, {"label":"", "x":6.38, "y":3, "w":3}, {"x":9.38, "y":3}, {"x":10.38, "y":3}]
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+ { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+ { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+ { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+ { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+ { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
+ { "label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3 },
+ { "label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3 },
+ { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
+ { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
+ ]
},
"LAYOUT_6u": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"x":1.38, "y":3}, {"x":2.38, "y":3}, {"label":"", "x":3.38, "y":3, "w":6}, {"x":9.38, "y":3}, {"x":10.38, "y":3}]
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+ { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+ { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+ { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+ { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+ { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
+ { "label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3 },
+ { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
+ { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
+ ]
},
"LAYOUT_7u": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"x":1.38, "y":3, "w":1.5}, {"label":"", "x":2.88, "y":3, "w":7}, {"x":9.88, "y":3, "w":1.5}]
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+ { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+ { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+ { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+ { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+ { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3 },
+ { "label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3 },
+ { "label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3 }
+ ]
},
"LAYOUT_10u": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2}, {"label":"Fn", "x":11.75, "y":2}, {"label":"", "x":1.38, "y":3, "w":10}]
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+ { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+ { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+ { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+ { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+ { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3 }
+ ]
}
}
}
diff --git a/keyboards/viktus/minne_topre/minne_topre.h b/keyboards/viktus/minne_topre/minne_topre.h
index 871fa18b3331..79594c56be58 100644
--- a/keyboards/viktus/minne_topre/minne_topre.h
+++ b/keyboards/viktus/minne_topre/minne_topre.h
@@ -17,72 +17,3 @@
#pragma once
#include "quantum.h"
-
-#define ___ KC_NO
-
-//lAYOUTS
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K31, K32, K34, K35, K37, K39, K3A \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { ___, K31, K32, ___, K34, K35, ___, K37, ___, K39, K3A, ___ } \
-}
-
-#define LAYOUT_dual_3u( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K31, K32, K34, K37, K39, K3A \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { ___, K31, K32, ___, K34, ___, ___, K37, ___, K39, K3A, ___ } \
-}
-
-#define LAYOUT_6u( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K31, K32, K35, K39, K3A \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { ___, K31, K32, ___, ___, K35, ___, ___, ___, K39, K3A, ___ } \
-}
-
-#define LAYOUT_7u( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K31, K35, K3A \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { ___, K31, ___, ___, ___, K35, ___, ___, ___, ___, K3A, ___ } \
-}
-
-#define LAYOUT_10u( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K35 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { ___, ___, ___, ___, ___, K35, ___, ___, ___, ___, ___, ___ } \
-}
From 2da0e1a68a01b09acfb74a02aa1c48df920d4cc5 Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Tue, 14 Mar 2023 00:48:13 -0500
Subject: [PATCH 5/9] Removing minne_topre.h and updating others
---
keyboards/viktus/minne_topre/ec.c | 4 ++--
keyboards/viktus/minne_topre/ec.h | 2 +-
keyboards/viktus/minne_topre/minne_topre.c | 3 ++-
keyboards/viktus/minne_topre/minne_topre.h | 19 -------------------
4 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 keyboards/viktus/minne_topre/minne_topre.h
diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c
index b8aa1b9544cb..b95935d4878e 100644
--- a/keyboards/viktus/minne_topre/ec.c
+++ b/keyboards/viktus/minne_topre/ec.c
@@ -16,9 +16,9 @@
#include "ec.h"
-#include "quantum.h"
+#include "quantum.h" //delete?
#include "analog.h"
-#include "debug.h"
+//#include "debug.h" // needed for debugging
// sensing channel definitions
#define A0 0
diff --git a/keyboards/viktus/minne_topre/ec.h b/keyboards/viktus/minne_topre/ec.h
index 283272e674e2..cb5f201b93c0 100644
--- a/keyboards/viktus/minne_topre/ec.h
+++ b/keyboards/viktus/minne_topre/ec.h
@@ -26,6 +26,6 @@ typedef struct {
int ec_init(ec_config_t const* const ec_config);
bool ec_matrix_scan(matrix_row_t current_matrix[]);
-void ec_dprint_matrix(void);
+//void ec_dprint_matrix(void); // needed for debugging
uint16_t ec_readkey_raw(uint8_t col, uint8_t row);
bool ec_update_key(matrix_row_t* current_row, matrix_row_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt);
diff --git a/keyboards/viktus/minne_topre/minne_topre.c b/keyboards/viktus/minne_topre/minne_topre.c
index c51c3feec213..cb26910911e4 100644
--- a/keyboards/viktus/minne_topre/minne_topre.c
+++ b/keyboards/viktus/minne_topre/minne_topre.c
@@ -16,9 +16,10 @@
#include "minne_topre.h"
+#include "quantum.h"
#include "ec.h"
#include "matrix.h"
-#include "debug.h"
+//#include "debug.h" // needed for debugging
#define RESET_PT 55
#define ACTUATION_PT 65
diff --git a/keyboards/viktus/minne_topre/minne_topre.h b/keyboards/viktus/minne_topre/minne_topre.h
deleted file mode 100644
index 79594c56be58..000000000000
--- a/keyboards/viktus/minne_topre/minne_topre.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2023 Viktus Design LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-#include "quantum.h"
From 231695684fa6207ab86386e9bdd4c5c3fce78cf3 Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Tue, 14 Mar 2023 12:06:43 -0500
Subject: [PATCH 6/9] fixing *.c's
---
keyboards/viktus/minne_topre/ec.c | 3 +--
keyboards/viktus/minne_topre/minne_topre.c | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c
index b95935d4878e..8811afc50ffe 100644
--- a/keyboards/viktus/minne_topre/ec.c
+++ b/keyboards/viktus/minne_topre/ec.c
@@ -14,9 +14,8 @@
* along with this program. If not, see .
*/
+#include "quantum.h"
#include "ec.h"
-
-#include "quantum.h" //delete?
#include "analog.h"
//#include "debug.h" // needed for debugging
diff --git a/keyboards/viktus/minne_topre/minne_topre.c b/keyboards/viktus/minne_topre/minne_topre.c
index cb26910911e4..96b04090cf6f 100644
--- a/keyboards/viktus/minne_topre/minne_topre.c
+++ b/keyboards/viktus/minne_topre/minne_topre.c
@@ -14,8 +14,6 @@
* along with this program. If not, see .
*/
-#include "minne_topre.h"
-
#include "quantum.h"
#include "ec.h"
#include "matrix.h"
From 5e55420241f5b2ce0eeb8f5b383c57e161e370d8 Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Tue, 21 Mar 2023 11:15:19 -0500
Subject: [PATCH 7/9] Switch from int to void for ec_init
---
keyboards/viktus/minne_topre/ec.c | 6 ++----
keyboards/viktus/minne_topre/ec.h | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c
index 8811afc50ffe..569c87858226 100644
--- a/keyboards/viktus/minne_topre/ec.c
+++ b/keyboards/viktus/minne_topre/ec.c
@@ -34,7 +34,7 @@
#define ANALOG_PORT D4
#ifndef MUX_SEL_PIN
-#define MUX_SEL_PINS \
+# define MUX_SEL_PINS \
{ D1, D2, D3 }
#endif
@@ -80,7 +80,7 @@ void init_col(void) {
}
}
-int ec_init(ec_config_t const* const ec_config) {
+void ec_init(ec_config_t const* const ec_config) {
// save config
config = *ec_config;
@@ -99,8 +99,6 @@ int ec_init(ec_config_t const* const ec_config) {
// set discharge pin to charge mode
setPinInput(DISCHARGE_PIN);
-
- return 0;
}
uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
diff --git a/keyboards/viktus/minne_topre/ec.h b/keyboards/viktus/minne_topre/ec.h
index cb5f201b93c0..8d3a4f04f80e 100644
--- a/keyboards/viktus/minne_topre/ec.h
+++ b/keyboards/viktus/minne_topre/ec.h
@@ -24,7 +24,7 @@ typedef struct {
uint16_t actuation_pt;
} ec_config_t;
-int ec_init(ec_config_t const* const ec_config);
+void ec_init(ec_config_t const* const ec_config);
bool ec_matrix_scan(matrix_row_t current_matrix[]);
//void ec_dprint_matrix(void); // needed for debugging
uint16_t ec_readkey_raw(uint8_t col, uint8_t row);
From d0b137a2324a45ba66fccf40cf3e9d65b624f610 Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Tue, 21 Mar 2023 16:46:59 -0500
Subject: [PATCH 8/9] Update info.json
---
keyboards/viktus/minne_topre/info.json | 2 --
1 file changed, 2 deletions(-)
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
index 9bb7861a1b57..a23e2a832a6e 100644
--- a/keyboards/viktus/minne_topre/info.json
+++ b/keyboards/viktus/minne_topre/info.json
@@ -14,8 +14,6 @@
"bootmagic": true,
"command": false,
"console": false,
- "extrakey": false,
- "mousekey": false,
"nkro": true
},
"bootmagic": {
From 3125ddbf646fe6beaafe479837ab37d5766c94af Mon Sep 17 00:00:00 2001
From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Date: Thu, 23 Mar 2023 11:35:41 -0500
Subject: [PATCH 9/9] Update info.json
---
keyboards/viktus/minne_topre/info.json | 2 ++
1 file changed, 2 insertions(+)
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
index a23e2a832a6e..afe00b7652b0 100644
--- a/keyboards/viktus/minne_topre/info.json
+++ b/keyboards/viktus/minne_topre/info.json
@@ -14,6 +14,8 @@
"bootmagic": true,
"command": false,
"console": false,
+ "extrakey": true,
+ "mousekey": true,
"nkro": true
},
"bootmagic": {