diff options
Diffstat (limited to 'keyboards/sam')
| -rw-r--r-- | keyboards/sam/s80/config.h | 20 | ||||
| -rw-r--r-- | keyboards/sam/s80/info.json | 201 | ||||
| -rw-r--r-- | keyboards/sam/s80/s80.c | 20 | ||||
| -rw-r--r-- | keyboards/sam/s80/s80.h | 43 | ||||
| -rw-r--r-- | keyboards/sam/sg81m/config.h | 18 | ||||
| -rw-r--r-- | keyboards/sam/sg81m/info.json | 8 | ||||
| -rw-r--r-- | keyboards/sam/sg81m/sg81m.c | 16 |
7 files changed, 120 insertions, 206 deletions
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h index 0a235bd36c..3792f94db7 100644 --- a/keyboards/sam/s80/config.h +++ b/keyboards/sam/s80/config.h @@ -16,30 +16,12 @@ #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 { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -#define DIODE_DIRECTION ROW2COL - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 20 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */ //# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif + // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json index ab0cde43a1..f36541a087 100644 --- a/keyboards/sam/s80/info.json +++ b/keyboards/sam/s80/info.json @@ -8,104 +8,125 @@ "pid": "0x3830", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (E6,D0)", "x":0, "y":0}, - {"label":"K02 (E6,D2)", "x":2, "y":0}, - {"label":"K03 (E6,D3)", "x":3, "y":0}, - {"label":"K04 (E6,D5)", "x":4, "y":0}, - {"label":"K05 (E6,D4)", "x":5, "y":0}, - {"label":"K06 (E6,D6)", "x":6.5, "y":0}, - {"label":"K07 (E6,D7)", "x":7.5, "y":0}, - {"label":"K08 (E6,B4)", "x":8.5, "y":0}, - {"label":"K68 (F7,B4)", "x":9.5, "y":0}, - {"label":"K67 (F7,D7)", "x":11, "y":0}, - {"label":"K65 (F7,D4)", "x":12, "y":0}, - {"label":"K64 (F7,D5)", "x":13, "y":0}, - {"label":"K63 (F7,D3)", "x":14, "y":0}, - {"label":"K66 (F7,D6)", "x":15.25, "y":0}, - {"label":"K62 (F7,D2)", "x":16.25, "y":0}, - {"label":"K61 (F7,D1)", "x":17.25, "y":0}, - {"label":"K10 (B0,D0)", "x":0, "y":1.5}, - {"label":"K11 (B0,D1)", "x":1, "y":1.5}, - {"label":"K12 (B0,D2)", "x":2, "y":1.5}, - {"label":"K13 (B0,D3)", "x":3, "y":1.5}, - {"label":"K14 (B0,D5)", "x":4, "y":1.5}, - {"label":"K15 (B0,D4)", "x":5, "y":1.5}, - {"label":"K16 (B0,D6)", "x":6, "y":1.5}, - {"label":"K17 (B0,D7)", "x":7, "y":1.5}, - {"label":"K18 (B0,B4)", "x":8, "y":1.5}, - {"label":"K78 (F6,B4)", "x":9, "y":1.5}, - {"label":"K70 (F6,D0)", "x":10, "y":1.5}, - {"label":"K77 (F6,D7)", "x":11, "y":1.5}, - {"label":"K75 (F6,D4)", "x":12, "y":1.5}, - {"label":"K74 (F6,D5)", "x":13, "y":1.5}, - {"label":"K73 (F6,D3)", "x":14, "y":1.5}, - {"label":"K76 (F6,D6)", "x":15.25, "y":1.5}, - {"label":"K72 (F6,D2)", "x":16.25, "y":1.5}, - {"label":"K71 (F6,D1)", "x":17.25, "y":1.5}, - {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B1,D1)", "x":1.5, "y":2.5}, - {"label":"K22 (B1,D2)", "x":2.5, "y":2.5}, - {"label":"K23 (B1,D3)", "x":3.5, "y":2.5}, - {"label":"K24 (B1,D5)", "x":4.5, "y":2.5}, - {"label":"K25 (B1,D4)", "x":5.5, "y":2.5}, - {"label":"K26 (B1,D6)", "x":6.5, "y":2.5}, - {"label":"K27 (B1,D7)", "x":7.5, "y":2.5}, - {"label":"K28 (B1,B4)", "x":8.5, "y":2.5}, - {"label":"K88 (F5,B4)", "x":9.5, "y":2.5}, - {"label":"K87 (F5,D7)", "x":10.5, "y":2.5}, - {"label":"K85 (F5,D4)", "x":11.5, "y":2.5}, - {"label":"K84 (F5,D5)", "x":12.5, "y":2.5}, - {"label":"K94 (F4,D5)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K86 (F5,D6)", "x":15.25, "y":2.5}, - {"label":"K82 (F5,D2)", "x":16.25, "y":2.5}, - {"label":"K81 (F5,D1)", "x":17.25, "y":2.5}, - {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B2,D1)", "x":1.75, "y":3.5}, - {"label":"K32 (B2,D2)", "x":2.75, "y":3.5}, - {"label":"K33 (B2,D3)", "x":3.75, "y":3.5}, - {"label":"K34 (B2,D5)", "x":4.75, "y":3.5}, - {"label":"K35 (B2,D4)", "x":5.75, "y":3.5}, - {"label":"K36 (B2,D6)", "x":6.75, "y":3.5}, - {"label":"K37 (B2,D7)", "x":7.75, "y":3.5}, - {"label":"K38 (B2,B4)", "x":8.75, "y":3.5}, - {"label":"K98 (F4,B4)", "x":9.75, "y":3.5}, - {"label":"K97 (F4,D7)", "x":10.75, "y":3.5}, - {"label":"K95 (F4,D4)", "x":11.75, "y":3.5}, - {"label":"K83 (F5,D3)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":1.25}, - {"label":"K41 (B3,D1)", "x":1.25, "y":4.5}, - {"label":"K42 (B3,D2)", "x":2.25, "y":4.5}, - {"label":"K43 (B3,D3)", "x":3.25, "y":4.5}, - {"label":"K44 (B3,D5)", "x":4.25, "y":4.5}, - {"label":"K45 (B3,D4)", "x":5.25, "y":4.5}, - {"label":"K46 (B3,D6)", "x":6.25, "y":4.5}, - {"label":"K47 (B3,D7)", "x":7.25, "y":4.5}, - {"label":"K48 (B3,B4)", "x":8.25, "y":4.5}, - {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5}, - {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5}, - {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5}, - {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":1.75}, - {"label":"KA3 (F1,D3)", "x":14, "y":4.5}, - {"label":"K92 (F4,D2)", "x":16.25, "y":4.5}, - {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (B7,D1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (B7,D6)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K58 (B7,B4)", "x":10, "y":5.5, "w":1.25}, - {"label":"K57 (B7,D7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K54 (B7,D5)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K53 (B7,D3)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5}, - {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5}, - {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [6, 8], "x": 9.5, "y": 0}, + + {"matrix": [6, 7], "x": 11, "y": 0}, + {"matrix": [6, 5], "x": 12, "y": 0}, + {"matrix": [6, 4], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + + {"matrix": [6, 6], "x": 15.25, "y": 0}, + {"matrix": [6, 2], "x": 16.25, "y": 0}, + {"matrix": [6, 1], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [7, 8], "x": 9, "y": 1.5}, + {"matrix": [7, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 7], "x": 11, "y": 1.5}, + {"matrix": [7, 5], "x": 12, "y": 1.5}, + {"matrix": [7, 4], "x": 13, "y": 1.5}, + {"matrix": [7, 3], "x": 14, "y": 1.5}, + + {"matrix": [7, 6], "x": 15.25, "y": 1.5}, + {"matrix": [7, 2], "x": 16.25, "y": 1.5}, + {"matrix": [7, 1], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [8, 8], "x": 9.5, "y": 2.5}, + {"matrix": [8, 7], "x": 10.5, "y": 2.5}, + {"matrix": [8, 5], "x": 11.5, "y": 2.5}, + {"matrix": [8, 4], "x": 12.5, "y": 2.5}, + {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.25, "y": 2.5}, + {"matrix": [8, 2], "x": 16.25, "y": 2.5}, + {"matrix": [8, 1], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [9, 8], "x": 9.75, "y": 3.5}, + {"matrix": [9, 7], "x": 10.75, "y": 3.5}, + {"matrix": [9, 5], "x": 11.75, "y": 3.5}, + {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [10, 8], "x": 9.25, "y": 4.5}, + {"matrix": [10, 7], "x": 10.25, "y": 4.5}, + {"matrix": [10, 5], "x": 11.25, "y": 4.5}, + {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [10, 3], "x": 14, "y": 4.5}, + + {"matrix": [9, 2], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 6], "x": 15.25, "y": 5.5}, + {"matrix": [10, 2], "x": 16.25, "y": 5.5}, + {"matrix": [10, 1], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/sam/s80/s80.c b/keyboards/sam/s80/s80.c deleted file mode 100644 index 7b56bd854e..0000000000 --- a/keyboards/sam/s80/s80.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 CMM.Studio Freather - * - * 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 "s80.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sam/s80/s80.h b/keyboards/sam/s80/s80.h deleted file mode 100644 index 482688b0a1..0000000000 --- a/keyboards/sam/s80/s80.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2020 CMM.Studio Freather - * - * 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( \ - K00, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K74, K73, K76, K72, K71, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94, K86, K82, K81, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, KA3, K92, \ - K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, KC_NO, K56, K57, K58 }, \ - { KC_NO, K61, K62, K63, K64, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \ - { KC_NO, K81, K82, K83, K84, K85, K86, K87, K88 }, \ - { KC_NO, KC_NO, K92, KC_NO, K94, K95, KC_NO, K97, K98 }, \ - { KC_NO, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8 }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h index 7cfba55dc8..0d5714a68f 100644 --- a/keyboards/sam/sg81m/config.h +++ b/keyboards/sam/sg81m/config.h @@ -16,23 +16,6 @@ #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 { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B7, B6, B5, B4, C7, C6, D0, D1, D2, D3, D4, D5, D6, D7 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E6 //reserved pin for potential underglow rgb -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -49,4 +32,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json index ebf5dda947..f4d6c5749b 100644 --- a/keyboards/sam/sg81m/info.json +++ b/keyboards/sam/sg81m/info.json @@ -8,9 +8,17 @@ "pid": "0x3831", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "C7", "C6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0" }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sam/sg81m/sg81m.c b/keyboards/sam/sg81m/sg81m.c deleted file mode 100644 index 81f829c8be..0000000000 --- a/keyboards/sam/sg81m/sg81m.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 CMM.Studio Freather - * - * 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 "sg81m.h" |