summaryrefslogtreecommitdiff
path: root/keyboards/westfoxtrot/cypher
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/westfoxtrot/cypher')
-rw-r--r--keyboards/westfoxtrot/cypher/rev1/config.h17
-rw-r--r--keyboards/westfoxtrot/cypher/rev1/info.json5
-rw-r--r--keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h4
-rw-r--r--keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md2
-rw-r--r--keyboards/westfoxtrot/cypher/rev5/config.h20
-rw-r--r--keyboards/westfoxtrot/cypher/rev5/info.json184
-rw-r--r--keyboards/westfoxtrot/cypher/rev5/rev5.c2
-rw-r--r--keyboards/westfoxtrot/cypher/rev5/rev5.h48
8 files changed, 104 insertions, 178 deletions
diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h
index a6e5ac891f..cd1f84bc1f 100644
--- a/keyboards/westfoxtrot/cypher/rev1/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 { B0, B1, B2, B3, B4, F6, B6, B7, C6, C7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, E6, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json
index 5089486866..217d979c41 100644
--- a/keyboards/westfoxtrot/cypher/rev1/info.json
+++ b/keyboards/westfoxtrot/cypher/rev1/info.json
@@ -6,6 +6,11 @@
"pid": "0xAA97",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "F6", "B6", "B7", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 5,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
index 947e340c32..ddfe166509 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
@@ -16,8 +16,7 @@
#pragma once
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN F7
#define RGBLED_NUM 15
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -28,6 +27,5 @@
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
- #endif
// place overrides here
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
index 065b8f5233..14cde79827 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
@@ -31,7 +31,7 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
**config.h**
```
[...]
-#define RGB_DI_PIN F7
+#define WS2812_DI_PIN F7
#define RGBLED_NUM 15 // Change this number to the amount of LEDs on the strip you soldered
[...]
```
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index 61604a74a9..85da50eba8 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -44,8 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define GRAVE_ESC_CTRL_OVERRIDE
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 25
@@ -62,4 +43,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json
index 17bc326890..c5549d35e8 100644
--- a/keyboards/westfoxtrot/cypher/rev5/info.json
+++ b/keyboards/westfoxtrot/cypher/rev5/info.json
@@ -6,115 +6,123 @@
"pid": "0xAA98",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"],
+ "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D0",
"levels": 5,
"breathing": true
},
+ "ws2812": {
+ "pin": "E6"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"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},
- {"label":"~","x":14,"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},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
- {"label":"Num Lock","x":15.5,"y":0},
- {"label":"/","x":16.5,"y":0},
- {"label":"*","x":17.5,"y":0},
- {"label":"-","x":18.5,"y":0},
+ {"matrix": [5, 5], "x": 15.5, "y": 0},
+ {"matrix": [5, 6], "x": 16.5, "y": 0},
+ {"matrix": [5, 7], "x": 17.5, "y": 0},
+ {"matrix": [5, 8], "x": 18.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},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [6, 0], "x": 10.5, "y": 1},
+ {"matrix": [6, 1], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 3], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"7","x":15.5,"y":1},
- {"label":"8","x":16.5,"y":1},
- {"label":"9","x":17.5,"y":1},
- {"label":"+","x":18.5,"y":1},
+ {"matrix": [6, 5], "x": 15.5, "y": 1},
+ {"matrix": [6, 6], "x": 16.5, "y": 1},
+ {"matrix": [6, 7], "x": 17.5, "y": 1},
+ {"matrix": [6, 8], "x": 18.5, "y": 1},
- {"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":"NUHS","x":12.75,"y":2},
- {"label":"Enter","x":13.75,"y":2,"w":1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [7, 0], "x": 10.75, "y": 2},
+ {"matrix": [7, 1], "x": 11.75, "y": 2},
+ {"matrix": [7, 2], "x": 12.75, "y": 2},
+ {"matrix": [7, 3], "x": 13.75, "y": 2, "w": 1.25},
- {"label":"4","x":15.5,"y":2},
- {"label":"5","x":16.5,"y":2},
- {"label":"6","x":17.5,"y":2},
- {"label":"=","x":18.5,"y":2},
+ {"matrix": [7, 5], "x": 15.5, "y": 2},
+ {"matrix": [7, 6], "x": 16.5, "y": 2},
+ {"matrix": [7, 7], "x": 17.5, "y": 2},
+ {"matrix": [7, 8], "x": 18.5, "y": 2},
- {"label":"Shift","x":0,"y":3,"w":1.25},
- {"label":"Shift","x":1.25,"y":3},
- {"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},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [8, 0], "x": 10.25, "y": 3},
+ {"matrix": [8, 1], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3, "w": 1.75},
- {"label":"Up","x":14.25,"y":3.25},
+ {"matrix": [8, 3], "x": 14.25, "y": 3.25},
- {"label":"1","x":15.5,"y":3},
- {"label":"2","x":16.5,"y":3},
- {"label":"3","x":17.5,"y":3},
- {"label":"Enter","x":18.5,"y":3},
+ {"matrix": [8, 5], "x": 15.5, "y": 3},
+ {"matrix": [8, 6], "x": 16.5, "y": 3},
+ {"matrix": [8, 7], "x": 17.5, "y": 3},
+ {"matrix": [8, 8], "x": 18.5, "y": 3},
- {"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},
- {"label":"Space","x":3.5,"y":4,"w":1.5},
- {"label":"Space","x":5,"y":4,"w":3},
- {"label":"Space","x":8,"y":4,"w":1.5},
- {"label":"Alt","x":9.5,"y":4,"w":1.25},
- {"label":"Win","x":10.75,"y":4},
- {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 3},
+ {"matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
+ {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 10.75, "y": 4},
+ {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
- {"label":"Left","x":13.25,"y":4.25},
- {"label":"Down","x":14.25,"y":4.25},
- {"label":"Right","x":15.25,"y":4.25},
+ {"matrix": [9, 2], "x": 13.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 14.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 15.25, "y": 4.25},
- {"label":"0","x":16.5,"y":4},
- {"label":".","x":17.5,"y":4},
- {"label":"Backspace","x":18.5,"y":4}
+ {"matrix": [9, 6], "x": 16.5, "y": 4},
+ {"matrix": [9, 7], "x": 17.5, "y": 4},
+ {"matrix": [9, 8], "x": 18.5, "y": 4}
]
}
}
diff --git a/keyboards/westfoxtrot/cypher/rev5/rev5.c b/keyboards/westfoxtrot/cypher/rev5/rev5.c
index b75fd650e0..477e1298af 100644
--- a/keyboards/westfoxtrot/cypher/rev5/rev5.c
+++ b/keyboards/westfoxtrot/cypher/rev5/rev5.c
@@ -13,7 +13,7 @@
* 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 "rev5.h"
+#include "quantum.h"
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
diff --git a/keyboards/westfoxtrot/cypher/rev5/rev5.h b/keyboards/westfoxtrot/cypher/rev5/rev5.h
deleted file mode 100644
index d005ebc975..0000000000
--- a/keyboards/westfoxtrot/cypher/rev5/rev5.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2019 westfoxtrot
- *
- * 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
-
-#define ___ KC_NO
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K51, K52, K53, K54, K55, K56, K57, K58,\
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K60, K61, K62, K63, K65, K66, K67, K68, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K70, K71, K72, K73, K75, K76, K77, K78, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K80, K81, K82, K83, K85, K86, K87, K88, \
- K40, K41, K42, K44, K46, K47, K49, K90, K91, K92, K93, K95, K96, K97, K98 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
- { K40, K41, K42, ___, K44, ___, K46, K47, ___, K49 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
- { K60, K61, K62, K63, ___, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, ___, K75, K76, K77, K78 }, \
- { K80, K81, K82, K83, ___, K85, K86, K87, K88 }, \
- { K90, K91, K92, K93, ___, K95, K96, K97, K98 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 21:13:12 +0000