summaryrefslogtreecommitdiff
path: root/keyboards/idobao/montex
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/idobao/montex')
-rw-r--r--keyboards/idobao/montex/v1/config.h10
-rw-r--r--keyboards/idobao/montex/v1/info.json59
-rw-r--r--keyboards/idobao/montex/v1/v1.c17
-rw-r--r--keyboards/idobao/montex/v1/v1.h35
-rwxr-xr-xkeyboards/idobao/montex/v1rgb/config.h17
-rwxr-xr-xkeyboards/idobao/montex/v1rgb/info.json64
-rwxr-xr-xkeyboards/idobao/montex/v1rgb/v1rgb.c2
-rwxr-xr-xkeyboards/idobao/montex/v1rgb/v1rgb.h24
-rwxr-xr-xkeyboards/idobao/montex/v2/config.h2
9 files changed, 72 insertions, 158 deletions
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index 5c612855fb..85cbcfcc14 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
@@ -31,7 +23,6 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -47,4 +38,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json
index 725ddc0c4d..7d437655bb 100644
--- a/keyboards/idobao/montex/v1/info.json
+++ b/keyboards/idobao/montex/v1/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D3", "D2", "D1", "D0"],
+ "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6"
},
@@ -16,38 +21,38 @@
"layouts": {
"LAYOUT_numpad_6x5": {
"layout": [
- { "label": "0,0", "x": 0, "y": 0},
- { "label": "0,1", "x": 1, "y": 0},
- { "label": "0,2", "x": 2, "y": 0},
- { "label": "0,3", "x": 3, "y": 0},
- { "label": "0,4", "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
- { "label": "1,0", "x": 0, "y": 1.25},
- { "label": "1,1", "x": 1, "y": 1.25},
- { "label": "1,2", "x": 2, "y": 1.25},
- { "label": "1,3", "x": 3, "y": 1.25},
- { "label": "1,4", "x": 4, "y": 1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
- { "label": "2,0", "x": 0, "y": 2.25},
- { "label": "2,1", "x": 1, "y": 2.25},
- { "label": "2,2", "x": 2, "y": 2.25},
- { "label": "2,3", "x": 3, "y": 2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
- { "label": "3,0", "x": 0, "y": 3.25},
- { "label": "3,1", "x": 1, "y": 3.25},
- { "label": "3,2", "x": 2, "y": 3.25},
- { "label": "3,3", "x": 3, "y": 3.25},
- { "label": "3,4", "x": 4, "y": 2.25, "h": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+ {"matrix": [2, 4], "x": 4, "y": 2.25, "h": 2},
- { "label": "4,0", "x": 0, "y": 4.25},
- { "label": "4,1", "x": 1, "y": 4.25},
- { "label": "4,2", "x": 2, "y": 4.25},
- { "label": "4,3", "x": 3, "y": 4.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4.25},
- { "label": "5,0", "x": 0, "y": 5.25},
- { "label": "5,1", "x": 1, "y": 5.25, "w": 2},
- { "label": "5,2", "x": 3, "y": 5.25},
- { "label": "5,3", "x": 4, "y": 4.25, "h": 2}
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25, "w": 2},
+ {"matrix": [5, 2], "x": 3, "y": 5.25},
+ {"matrix": [5, 3], "x": 4, "y": 4.25, "h": 2}
]
}
}
diff --git a/keyboards/idobao/montex/v1/v1.c b/keyboards/idobao/montex/v1/v1.c
deleted file mode 100644
index e927383097..0000000000
--- a/keyboards/idobao/montex/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 NachoxMacho
-*
-* 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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "v1.h"
diff --git a/keyboards/idobao/montex/v1/v1.h b/keyboards/idobao/montex/v1/v1.h
deleted file mode 100644
index d57097fa88..0000000000
--- a/keyboards/idobao/montex/v1/v1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 NachoxMacho
-*
-* 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 <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_6x5( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, K34, \
- K40, K41, K42, K43, \
- K50, K51, K52, K53 \
-) { \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 }, \
- { K20, K21, K22, K23, K34 }, \
- { K30, K31, K32, K33, KC_NO }, \
- { K40, K41, K42, K43, KC_NO }, \
- { K50, K51, K52, K53, KC_NO } \
-}
diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
index a3b2a5ef92..e405e2059f 100755
--- a/keyboards/idobao/montex/v1rgb/config.h
+++ b/keyboards/idobao/montex/v1rgb/config.h
@@ -3,24 +3,9 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- */
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 }
-
-#define DIODE_DIRECTION ROW2COL
-
#define RGB_DI_PIN B1
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 31
diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json
index 75add6a896..08f427d967 100755
--- a/keyboards/idobao/montex/v1rgb/info.json
+++ b/keyboards/idobao/montex/v1rgb/info.json
@@ -6,39 +6,49 @@
"pid": "0x0127",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D3", "D2", "D1", "D0"],
+ "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["numpad_6x5"],
"layouts": {
"LAYOUT_numpad_6x5": {
"layout": [
- { "label": "K00 (D4,D5)", "x": 0, "y": 0 },
- { "label": "K01 (D4,D3)", "x": 1, "y": 0 },
- { "label": "K02 (D4,D2)", "x": 2, "y": 0 },
- { "label": "K03 (D4,D1)", "x": 3, "y": 0 },
- { "label": "K04 (D4,D0)", "x": 4, "y": 0 },
- { "label": "K10 (D6,D5)", "x": 0, "y": 1 },
- { "label": "K11 (D6,D3)", "x": 1, "y": 1 },
- { "label": "K12 (D6,D2)", "x": 2, "y": 1 },
- { "label": "K13 (D6,D1)", "x": 3, "y": 1 },
- { "label": "K14 (D6,D0)", "x": 4, "y": 1 },
- { "label": "K20 (D7,D5)", "x": 0, "y": 2 },
- { "label": "K21 (D7,D3)", "x": 1, "y": 2 },
- { "label": "K22 (D7,D2)", "x": 2, "y": 2 },
- { "label": "K23 (D7,D1)", "x": 3, "y": 2 },
- { "label": "K24 (D7,D0)", "x": 4, "y": 2, "h": 2 },
- { "label": "K30 (B4,D5)", "x": 0, "y": 3 },
- { "label": "K31 (B4,D3)", "x": 1, "y": 3 },
- { "label": "K32 (B4,D2)", "x": 2, "y": 3 },
- { "label": "K33 (B4,D1)", "x": 3, "y": 3 },
- { "label": "K40 (B5,D5)", "x": 0, "y": 4 },
- { "label": "K41 (B5,D3)", "x": 1, "y": 4 },
- { "label": "K42 (B5,D2)", "x": 2, "y": 4 },
- { "label": "K43 (B5,D1)", "x": 3, "y": 4 },
- { "label": "K53 (C6,D1)", "x": 4, "y": 4, "h": 2 },
- { "label": "K50 (C6,D5)", "x": 0, "y": 5 },
- { "label": "K51 (C6,D3)", "x": 1, "y": 5, "w": 2 },
- { "label": "K52 (C6,D2)", "x": 3, "y": 5 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [5, 3], "x": 4, "y": 4, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5, "w": 2},
+ {"matrix": [5, 2], "x": 3, "y": 5}
]
}
}
diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.c b/keyboards/idobao/montex/v1rgb/v1rgb.c
index 3d2a847c00..b70067cfcf 100755
--- a/keyboards/idobao/montex/v1rgb/v1rgb.c
+++ b/keyboards/idobao/montex/v1rgb/v1rgb.c
@@ -1,7 +1,7 @@
// Copyright 2022 peepeetee (@peepeetee)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "v1rgb.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.h b/keyboards/idobao/montex/v1rgb/v1rgb.h
deleted file mode 100755
index e069771c6f..0000000000
--- a/keyboards/idobao/montex/v1rgb/v1rgb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_numpad_6x5( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14, \
- K20, K21, K22, K23, K24, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43, K53, \
- K50, K51, K52 \
-) { \
- { K00, K01, K02, K03, K04 }, \
- { K10, K11, K12, K13, K14 }, \
- { K20, K21, K22, K23, K24 }, \
- { K30, K31, K32, K33, ___ }, \
- { K40, K41, K42, K43, ___ }, \
- { K50, K51, K52, K53, ___ }, \
-}
diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h
index 47e51e9268..a7527d4bb7 100755
--- a/keyboards/idobao/montex/v2/config.h
+++ b/keyboards/idobao/montex/v2/config.h
@@ -7,7 +7,7 @@
/* LED Matrix & Animations */
#define RGB_DI_PIN B1
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
#ifndef ID27_DISABLE_UNDERGLOW
#define RGB_MATRIX_LED_COUNT 31 // The number of LEDs connected
#else
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 00:44:02 +0000