mkbd65/qmk-firmware
Watch
1
0
Fork
You've already forked qmk-firmware
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2023-05-01 07:37:46 +00:00
commit 69ebc101ef
99 changed files with 90 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

3
keyboards/barleycorn_smd/config.h
View file

@ -54,9 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define USB_MAX_POWER_CONSUMPTION 400
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

3
keyboards/barleycorn_smd/info.json
View file

@ -5,7 +5,8 @@
"usb": {
"vid": "0x7033",
"pid": "0x4749",
"device_version": "0.0.1"
"device_version": "0.0.1",
"max_power": 400
},
"indicators": {
"caps_lock": "B2",

2
keyboards/basketweave/config.h
View file

@ -16,8 +16,6 @@
#pragma once
#define USB_MAX_POWER_CONSUMPTION 100
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

3
keyboards/basketweave/info.json
View file

@ -6,7 +6,8 @@
"usb": {
"vid": "0x6B62",
"pid": "0x8989",
"device_version": "0.0.1"
"device_version": "0.0.1",
"max_power": 100
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],

3
keyboards/chavdai40/rev1/config.h
View file

@ -19,6 +19,3 @@
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
/* usb power settings */
#define USB_MAX_POWER_CONSUMPTION 100

3
keyboards/chavdai40/rev1/info.json
View file

@ -1,7 +1,8 @@
{
"keyboard_name": "Chavdai40",
"usb": {
"device_version": "0.0.1"
"device_version": "0.0.1",
"max_power": 100
},
"matrix_pins": {
"cols": ["B8", "B4", "B3", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],

3
keyboards/chavdai40/rev2/config.h
View file

@ -19,6 +19,3 @@
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
/* usb power settings */
#define USB_MAX_POWER_CONSUMPTION 100

3
keyboards/chavdai40/rev2/info.json
View file

@ -1,7 +1,8 @@
{
"keyboard_name": "Chavdai40 rev2",
"usb": {
"device_version": "0.0.2"
"device_version": "0.0.2",
"max_power": 100
},
"matrix_pins": {
"cols": ["B7", "B4", "B3", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],

2
keyboards/coseyfannitutti/discipad/config.h
View file

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define USB_MAX_POWER_CONSUMPTION 100
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

3
keyboards/coseyfannitutti/discipad/info.json
View file

@ -6,7 +6,8 @@
"usb": {
"vid": "0x6B62",
"pid": "0x1769",
"device_version": "0.0.1"
"device_version": "0.0.1",
"max_power": 100
},
"matrix_pins": {
"cols": ["C0", "C1", "C2", "C3"],

2
keyboards/coseyfannitutti/discipline/config.h
View file

@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define USB_MAX_POWER_CONSUMPTION 100
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

3
keyboards/coseyfannitutti/discipline/info.json
View file

@ -6,7 +6,8 @@
"usb": {
"vid": "0x6B62",
"pid": "0x6869",
"device_version": "0.0.1"
"device_version": "0.0.1",
"max_power": 100
},
"matrix_pins": {
"cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7"],

2
keyboards/crimsonkeyboards/resume1800/config.h
View file

@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define USB_MAX_POWER_CONSUMPTION 100
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

3
keyboards/crimsonkeyboards/resume1800/info.json
View file

@ -6,7 +6,8 @@
"usb": {
"vid": "0xFEED",
"pid": "0xC18B",
"device_version": "0.0.1"
"device_version": "0.0.1",
"max_power": 100
},
"matrix_pins": {
"cols": ["A2", "B3", "A3", "B4", "A4", "D1", "D5", "D6", "A6", "A7", "C7", "C6", "C5", "C4", "D7", "C3", "C2", "C1", "C0", "D0"],

2
keyboards/dm9records/plaid/config.h
View file

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define USB_MAX_POWER_CONSUMPTION 100
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

3
keyboards/dm9records/plaid/info.json
View file

@ -6,7 +6,8 @@
"usb": {
"vid": "0x16C0",
"pid": "0x27DB",
"device_version": "0.0.2"
"device_version": "0.0.2",
"max_power": 100
},
"matrix_pins": {
"cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],

2
keyboards/ericrlau/numdiscipline/rev1/config.h
View file

@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define USB_MAX_POWER_CONSUMPTION 100
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

3
keyboards/ericrlau/numdiscipline/rev1/info.json
View file

@ -6,7 +6,8 @@
"usb": {
"vid": "0x454C",
"pid": "0x0001",
"device_version": "0.0.1"
"device_version": "0.0.1",
"max_power": 100
},
"matrix_pins": {
"cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7", "A5", "A6", "A7"],

2
keyboards/gboards/ergotaco/config.h
View file

@ -43,5 +43,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key combination for command */
#define IS_COMMAND() (get_mods() == MOD_MASK_CTRL || get_mods() == MOD_MASK_SHIFT)
#define USB_MAX_POWER_CONSUMPTION 500

2
keyboards/gboards/georgi/config.h
View file

@ -51,5 +51,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
)
#define USB_MAX_POWER_CONSUMPTION 500

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