Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2023-03-10 11:18:33 +00:00
commit 06b697bde6
494 changed files with 1235 additions and 3287 deletions

View file

@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 16
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
#define DIODE_DIRECTION COL2ROW
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View file

@ -8,6 +8,11 @@
"pid": "0x422D",
"device_version": "2.0.0"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "D4"
},

View file

@ -15,16 +15,6 @@
*/
#pragma once
/* key matrix pins
*/
#define MATRIX_ROW_PINS { B1, B2, B3, C6, C7 }
#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5, D3 }
/* COL2ROW or ROW2COL
*/
#define DIODE_DIRECTION COL2ROW
/* IS31FL3731 driver address (for status LEDs)
* Using the default defines here, but using a custom implementation
*/

View file

@ -7,6 +7,11 @@
"pid": "0xBFFA",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
"rows": ["B1", "B2", "B3", "C6", "C7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["alice", "alice_split_bs"],

View file

@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 8
#define MATRIX_COLS 16
// #define MATRIX_ROW_PINS { B0, B2, B4, B5, B6 }
// #define MATRIX_COL_PINS { F5, B1, F0, F1, F4, B3, D7, D6, D4, D5, D3, D2, D1, D0 }
//#define DIODE_DIRECTION
/*
* Feature disable options
* These options are also useful to firmware size reduction.

View file

@ -1,23 +0,0 @@
/* Copyright 2021 Swiftrax <swiftrax@gmail.com>
*
* 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
/* default pinout */
#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0 }
#define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3 }
#define DIODE_DIRECTION COL2ROW

View file

@ -8,6 +8,11 @@
"pid": "0xE965",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3"],
"rows": ["D5", "D3", "D2", "D1", "D0"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],

View file

@ -17,14 +17,6 @@
#pragma once
/* key matrix pins */
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, E2 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200

View file

@ -8,6 +8,11 @@
"pid": "0x1226",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "E2"],
"rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
},
"diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "C6", "pin_b": "C7", "resolution": 2}

View file

@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// 0 , 1 , 2 , 3 , 4 , 5
#define MATRIX_ROW_PINS { B4, E6, D7, B5, C6, F6}
#define MATRIX_COL_PINS { F7, B1, B3, B2, B6}
#define DIODE_DIRECTION COL2ROW
#ifdef RGBLIGHT_ENABLE
#define RGB_DI_PIN D4

View file

@ -8,6 +8,11 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F7", "B1", "B3", "B2", "B6"],
"rows": ["B4", "E6", "D7", "B5", "C6", "F6"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5"}

View file

@ -1,27 +0,0 @@
/*
Copyright 2021 Swiftrax <swiftrax@gmail.com>
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
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
#define MATRIX_COL_PINS { D2, D1, D0, B7, B3, B2, F0, F1, F4, F5, F6, F7 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

View file

@ -8,6 +8,11 @@
"pid": "0xE96C",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D2", "D1", "D0", "B7", "B3", "B2", "F0", "F1", "F4", "F5", "F6", "F7"],
"rows": ["B5", "B4", "D7", "D6", "D4"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D5"},

View file

@ -17,25 +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)
*å
*/
// Checked with Eagle Schematic
#define MATRIX_ROW_PINS { B0, F4, F1, F7, F6, F5 }
#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
/* COL2ROW or 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 */

View file

@ -8,6 +8,11 @@
"pid": "0x0014",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
"rows": ["B0", "F4", "F1", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -17,25 +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)
*å
*/
// Checked with Eagle Schematic
#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
/* COL2ROW or 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 */

View file

@ -8,6 +8,11 @@
"pid": "0x0010",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
"rows": ["F4", "F1", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "C7"
},

View file

@ -17,25 +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)
*å
*/
// Checked with Eagle Schematic
#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
#define MATRIX_COL_PINS { B0, F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
/* COL2ROW or 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 */

View file

@ -8,6 +8,11 @@
"pid": "0x0015",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B0", "F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
"rows": ["F4", "F1", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "C7"
},

View file

@ -17,25 +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)
*
*/
// Checked with Eagle Schematic
#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
/* COL2ROW or 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 */

Some files were not shown because too many files have changed in this diff Show more