Skip to content

Commit

Permalink
Merge remote-tracking branch 'qmk/develop' into develop
Browse files Browse the repository at this point in the history 
* qmk/develop: (141 commits)
  Implement GPIO abstraction for atsam (qmk#13567)
  [Keyboard][Bug] Add timer_avr to includes for broken builds (qmk#13641)
  [Keyboard] adds new revision: dztech/dz60rgb/v2_1 (qmk#13636)
  [Keyboard] Fixing info.json for h0oni/hotduck (qmk#13640)
  [Keyboard] Ymd40v2new layouts and fixed per-switch backlight (qmk#13622)
  [Bug] Develop - DC01 left (qmk#13597)
  [Keyboard] Fix clawsome/hatchback and reviung5 compile issues (qmk#13607)
  [Keyboard] add ogurec (qmk#13242)
  [Keyboard] Add Durgod Taurus K310 keyboard (qmk#12314)
  [Keyboard] Updated keyboard & keymaps (qmk#12667)
  [Keyboard] add SPRH keyboard (qmk#12999)
  Retain brightness with lighting layers (qmk#13025)
  [Keyboard] Add keypad Satxri6key (qmk#13423)
  [Keyboard] Initial Tron Guy Labs keyboard implementation. (qmk#13438)
  [Keyboard] Add Ristretto Keyboard (qmk#13479)
  [Keyboard] New Keyboard - OBE (qmk#13545)
  [Keyboard] Add personal planck keymap (qmk#13635)
  [Keymap] narze/xd004 (qmk#13634)
  [Keyboard] Add h0oni hotduck keyboard (qmk#13609)
  Fix API generation failure caused by GRS-70EC (qmk#13631)
  ...
  • Loading branch information
Carlos Cardoso committed Jul 22, 2021
2 parents dd5a778 + 490fa5a commit 412e2ae
Show file tree
Hide file tree
Showing 1,117 changed files with 41,331 additions and 5,975 deletions.
1 change: 1 addition & 0 deletions .github/workflows/api.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
paths:
- 'keyboards/**'
- 'layouts/community/**'
workflow_dispatch:

jobs:
api_data:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/develop_api.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
paths:
- 'keyboards/**'
- 'layouts/community/**'
workflow_dispatch:

jobs:
api_data:
Expand Down
14 changes: 6 additions & 8 deletions common_features.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,6 @@ endif
COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix
COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations
COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners
# Get rid of this!
COMMON_VPATH += $(QUANTUM_DIR)/rgblight

SRC += $(QUANTUM_DIR)/color.c
SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix.c
SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix_drivers.c
Expand Down Expand Up @@ -335,6 +332,11 @@ ifeq ($(strip $(PRINTING_ENABLE)), yes)
SRC += $(TMK_DIR)/protocol/serial_uart.c
endif

ifeq ($(strip $(KEY_OVERRIDE_ENABLE)), yes)
OPT_DEFS += -DKEY_OVERRIDE_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_key_override.c
endif

ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes)
SERIAL_SRC := $(wildcard $(SERIAL_PATH)/protocol/*.c)
SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c)
Expand Down Expand Up @@ -511,11 +513,7 @@ ifneq ($(strip $(CUSTOM_MATRIX)), yes)
# if 'lite' then skip the actual matrix implementation
ifneq ($(strip $(CUSTOM_MATRIX)), lite)
# Include the standard or split matrix code if needed
ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
QUANTUM_SRC += $(QUANTUM_DIR)/split_common/matrix.c
else
QUANTUM_SRC += $(QUANTUM_DIR)/matrix.c
endif
QUANTUM_SRC += $(QUANTUM_DIR)/matrix.c
endif
endif

Expand Down
1 change: 1 addition & 0 deletions docs/_summary.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
* [Combos](feature_combo.md)
* [Debounce API](feature_debounce_type.md)
* [Key Lock](feature_key_lock.md)
* [Key Overrides](feature_key_overrides.md)
* [Layers](feature_layers.md)
* [One Shot Keys](one_shot_keys.md)
* [Pointing Device](feature_pointing_device.md)
Expand Down
4 changes: 4 additions & 0 deletions docs/config_options.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ If you define these options you will enable the associated feature, which may in
* Sets the delay between `register_code` and `unregister_code`, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
* `#define TAP_HOLD_CAPS_DELAY 80`
* Sets the delay for Tap Hold keys (`LT`, `MT`) when using `KC_CAPSLOCK` keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
* `#define KEY_OVERRIDE_REPEAT_DELAY 500`
* Sets the key repeat interval for [key overrides](feature_key_overrides.md).

## RGB Light Configuration

Expand Down Expand Up @@ -400,6 +402,8 @@ Use these to enable or disable building certain features. The more you have enab
* USB N-Key Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
* `AUDIO_ENABLE`
* Enable the audio subsystem.
* `KEY_OVERRIDE_ENABLE`
* Enable the key override feature
* `RGBLIGHT_ENABLE`
* Enable keyboard underlight functionality
* `LEADER_ENABLE`
Expand Down
28 changes: 24 additions & 4 deletions docs/driver_installation_zadig.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,38 @@ If you find that you can no longer type with the keyboard, you may have accident

![A healthy keyboard as seen by Zadig](https://i.imgur.com/Hx0E5kC.png)

Open the Device Manager and look for a device that looks like your keyboard.
Open the Device Manager, select **View → Devices by container**, and look for an entry with your keyboard's name.

![The board with the wrong driver installed, in Device Manager](https://i.imgur.com/L3wvX8f.png)
![The board with the wrong driver installed, in Device Manager](https://i.imgur.com/o7WLvBl.png)

Right-click it and hit **Uninstall device**. Make sure to tick **Delete the driver software for this device** first.
Right-click each entry and hit **Uninstall device**. Make sure to tick **Delete the driver software for this device** first if it appears.

![The Device Uninstall dialog, with the "delete driver" checkbox ticked](https://i.imgur.com/aEs2RuA.png)

Click **Action → Scan for hardware changes**. At this point, you should be able to type again. Double check in Zadig that the keyboard device(s) are using the `HidUsb` driver. If so, you're all done, and your board should be functional again! Otherwise, repeat the process until Zadig reports the correct driver.
Click **Action → Scan for hardware changes**. At this point, you should be able to type again. Double check in Zadig that the keyboard device(s) are using the `HidUsb` driver. If so, you're all done, and your board should be functional again! Otherwise, repeat this process until Zadig reports the correct driver.

?> A full reboot of your computer may sometimes be necessary at this point, to get Windows to pick up the new driver.

## Uninstallation

Uninstallation of bootloader devices is a little more involved than installation.

Open the Device Manager, select **View → Devices by container**, and look for the bootloader device. Match up the USB VID and PID in Zadig with one from [the table below](#list-of-known-bootloaders).

Find the `Inf name` value in the Details tab of the device properties. This should generally be something like `oemXX.inf`:

![Device properties showing the Inf name value](https://i.imgur.com/Bu4mk9m.png)

Then, open a new Command Prompt window as an Administrator (type in `cmd` into the Start menu and press Ctrl+Shift+Enter). Run `pnputil /enum-drivers` to verify the `Inf name` matches the `Published Name` field of one of the entries:

![pnputil output with matching driver highlighted](https://i.imgur.com/3RrSjzW.png)

Run `pnputil /delete-driver oemXX.inf /uninstall`. This will delete the driver and remove it from any devices using it. Note that this will not uninstall the device itself.

As with the previous section, this process may need to be repeated multiple times, as multiple drivers can be applicable to the same device.

!> **WARNING:** Be *extremely careful* when doing this! You could potentially uninstall the driver for some other critical device. If you are unsure, double check the output of `/enum-drivers`, and omit the `/uninstall` flag when running `/delete-driver`.

## List of Known Bootloaders

This is a list of known bootloader devices and their USB vendor and product IDs, as well as the correct driver to assign for flashing with QMK. Note that the usbser and HidUsb drivers are built in to Windows, and cannot be assigned with Zadig - if your device has an incorrect driver, you must use the Device Manager to uninstall it as described in the previous section.
Expand Down
Loading

0 comments on commit 412e2ae

Please sign in to comment.