Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V-USB remote wakeup #7627

Merged
merged 2 commits into from
Apr 5, 2020
Merged

Conversation

drashna
Copy link
Member

@drashna drashna commented Dec 13, 2019

Backport from tmk/tmk_keyboard@391c979

I don't have any vusb boards to test this one, so it may need somebody like @mechmerlin to test it.

Types of Changes

  • Core

@drashna drashna added the core label Dec 13, 2019
@drashna drashna requested review from mechmerlin and a team December 13, 2019 08:56
@stale
Copy link

stale bot commented Jan 27, 2020

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@drashna drashna force-pushed the tmk_core/vusb_remote_wakeup branch from 1a386c4 to e951d01 Compare April 3, 2020 23:26
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and working on Plaid-Pad where previously it did not with Windows. macOS does not suspend USB devices (at least, not by default?) so it works regardless.

Only thing that is needed is to incorporate this change, if only to be compliant:

diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 00314ebe8..470d29ba3 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -521,11 +521,7 @@ const PROGMEM usbConfigurationDescriptor_t usbConfigurationDescriptor = {
 #    endif
         .bConfigurationValue = 0x01,
         .iConfiguration      = 0x00,
-#    if USB_CFG_IS_SELF_POWERED
-        .bmAttributes        = (1 << 7) | USBATTR_SELFPOWER,
-#    else
-        .bmAttributes        = (1 << 7),
-#    endif
+        .bmAttributes        = (1 << 7) | USBATTR_REMOTEWAKE,
         .bMaxPower           = USB_MAX_POWER_CONSUMPTION / 2
     },
 

Otherwise, 👍

@drashna drashna requested a review from a team April 5, 2020 05:12
@fauxpark fauxpark merged commit 845953c into qmk:master Apr 5, 2020
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Apr 10, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
mrlinuxfish pushed a commit to mrlinuxfish/qmk_firmware that referenced this pull request Apr 12, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
Quarren42 pushed a commit to Quarren42/qmk_firmware that referenced this pull request Apr 15, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
@drashna drashna deleted the tmk_core/vusb_remote_wakeup branch May 9, 2020 19:48
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
drashna added a commit to zsa/qmk_firmware that referenced this pull request May 24, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
nesth pushed a commit to nesth/qmk_firmware that referenced this pull request Jun 11, 2020
* upstream/master: (312 commits)
  updated rules.mk and default keymap of Wonderland for VIA support (qmk#8668)
  Added Caps Lock LED handler to wilba.tech PCBs (qmk#8660)
  Add keyboard TGR-910 (qmk#8683)
  V-USB remote wakeup (qmk#7627)
  Add Greek keymap (qmk#8636)
  Add Polish keymap (qmk#8637)
  Add Korean keymap (qmk#8635)
  [Keyboard] Add 60_hhkb layout to hhkb (qmk#8618)
  [Keyboard] romeo - add via layout (qmk#8667)
  [Keyboard] Add ReverseStudio-DecadePad (qmk#8553)
  [Keyboard] Add bat43 Keyboard (qmk#8648)
  minor tweaks
  Fix saving output from avrdude and dfu-programmer
  Use version_arg in ESSENTIAL_BINARIES dict
  Fixes qmk#8541 by getting version from -dumpversion then --version as fallback
  VIA Support: 1upkeyboards Sweet16 (qmk#8652)
  [Keyboard] Lattice60 (qmk#8603)
  Discipline - Add ISO compatibility, rawHID enable, via layout (qmk#8627)
  [Keyboard] Add Orbit-X Keyboard (qmk#8605)
  add 60_tsangan_hhkb layout to GH60 rev. C (qmk#8617)
  ...
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 12, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
thorstenweber83 pushed a commit to thorstenweber83/qmk_firmware that referenced this pull request Sep 2, 2020
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
* V-USB remote wakeup

Backport from tmk/tmk_keyboard@391c979

* Change vusb.c remote wake config

as per fauxpark's suggestion
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants