Skip to content

Fix an issue that charging via usb port will close ble #681

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.

Sign up for GitHub

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

Open
L1cardo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix an issue that charging via usb port will close ble #681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions rmk/src/usb/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ use embassy_usb::{Builder, Handler};
use ssmarshal::serialize;
use static_cell::StaticCell;

use crate::RawMutex;
use crate::channel::KEYBOARD_REPORT_CHANNEL;
use crate::config::DeviceConfig;
use crate::descriptor::CompositeReportType;
use crate::hid::{HidError, HidWriterTrait, Report, RunnableHidWriter};
use crate::state::ConnectionState;
use crate::{CONNECTION_STATE, RawMutex};
use crate::state::{CONNECTION_STATE, CONNECTION_TYPE, ConnectionState, ConnectionType};

pub(crate) static USB_REMOTE_WAKEUP: Signal<RawMutex, ()> = Signal::new();

Expand Down Expand Up @@ -242,10 +242,10 @@ impl Handler for UsbDeviceHandler {
fn enabled(&mut self, enabled: bool) {
if enabled {
info!("Device enabled");
USB_ENABLED.signal(());
} else {
info!("Device disabled");
if USB_ENABLED.signaled() {
CONNECTION_TYPE.store(ConnectionType::Ble.into(), Ordering::Release);
USB_ENABLED.reset();
USB_SUSPENDED.signal(());
}
Expand All @@ -262,11 +262,17 @@ impl Handler for UsbDeviceHandler {

fn configured(&mut self, configured: bool) {
if configured {
CONNECTION_TYPE.store(ConnectionType::Usb.into(), Ordering::Release);
CONNECTION_STATE.store(ConnectionState::Connected.into(), Ordering::Release);
USB_ENABLED.signal(());
info!("Device configured, it may now draw up to the configured current from Vbus.")
} else {
info!("Device is no longer configured, the Vbus current limit is 100mA.");
if USB_ENABLED.signaled() {
CONNECTION_TYPE.store(ConnectionType::Ble.into(), Ordering::Release);
USB_ENABLED.reset();
USB_SUSPENDED.signal(());
}
}
}

Expand Down