Fix: [Awake] The mouse and keyboard set awake error.#544
Merged
deepin-bot[bot] merged 1 commit intolinuxdeepin:develop/eaglefrom Oct 17, 2025
Merged
Conversation
-- Logic code error. Not find the id of mouse or keyboard to set awake. Log: fix issue Bug: https://pms.uniontech.com/bug-view-336943.html
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: GongHeng2017 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Reviewer's GuideThis PR enhances the DBus wakeup interface to correctly identify PS/2 mice versus keyboards by introducing a hardware class parameter, refines the wakeup key logic accordingly, and propagates these changes through all relevant call sites while cleaning up obsolete checks. Sequence diagram for setting wakeup state with hardware classsequenceDiagram
participant DeviceInput
participant DBusWakeupInterface
DeviceInput->>DBusWakeupInterface: setWakeupMachine(wakeupID, sysPath, wakeup, name, m_HardwareClass)
DBusWakeupInterface->>DBusWakeupInterface: Determine key ("PS2M" for mouse, "PS2K" for keyboard)
DBusWakeupInterface->>DBusWakeupInterface: Call SetWakeupDevices with correct path and state
Sequence diagram for checking input wakeup state with hardware class and interface typesequenceDiagram
participant DeviceInput
participant DBusWakeupInterface
DeviceInput->>DBusWakeupInterface: isInputWakeupMachine(m_SysPath, m_Name, m_HardwareClass, m_Interface)
DBusWakeupInterface->>DBusWakeupInterface: Determine key ("PS2M" for mouse, "PS2K" for keyboard)
DBusWakeupInterface->>DBusWakeupInterface: Check wakeup state for correct device
Class diagram for updated DBusWakeupInterface and DeviceInputclassDiagram
class DBusWakeupInterface {
+bool setWakeupMachine(QString unique_id, QString path, bool wakeup, QString name, QString hardwareclass)
+bool isInputWakeupMachine(QString path, QString name, QString hardwareClass, QString interfaceType)
}
class DeviceInput {
+EnableDeviceStatus setEnable(bool e)
+bool canWakeupMachine()
+bool isWakeupMachine()
-QString m_HardwareClass
-QString m_Interface
}
DeviceInput --> DBusWakeupInterface : uses
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
max-lvs
approved these changes
Oct 17, 2025
Contributor
Author
|
/forcemerge |
Contributor
|
This pr force merged! (status: unstable) |
98b67c8
into
linuxdeepin:develop/eagle
16 of 18 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
-- Logic code error. Not find the id of mouse or keyboard to set awake.
Log: fix issue
Bug: https://pms.uniontech.com/bug-view-336943.html
Summary by Sourcery
Fix wakeup enable/disable logic by adding hardware class and interface context to DBusWakeupInterface and updating all callers to pass these parameters for correct PS/2 mouse vs keyboard handling
Bug Fixes:
Enhancements: