add command channel and reset/bootloader command
This commit is contained in:
1 parent
93a20cf8e1
commit
245c45c682
7 files changed
+197
-45
No files matched your search
+68
-23
@@ -1,10 +1,13 @@
|
||||
use std::io;
|
||||
|
||||
use async_hid::{AsyncHidRead, HidBackend, HidResult};
|
||||
use clap::{Parser, ValueEnum};
|
||||
use async_hid::{AsyncHidRead, AsyncHidWrite, Device, HidBackend, HidResult};
|
||||
use clap::{Parser, Subcommand, ValueEnum};
|
||||
use deku::DekuContainerRead;
|
||||
use futures_lite::StreamExt;
|
||||
use shared::{AudioTelemetrySnapshot, hid::AudioTelemetryReport};
|
||||
use shared::{
|
||||
AudioDeviceCommand, AudioTelemetrySnapshot,
|
||||
hid::{AudioDeviceCommandReport, AudioTelemetryReport, USAGE_COMMAND, USAGE_TELEMETRY},
|
||||
};
|
||||
|
||||
#[derive(Clone, Copy, Debug, ValueEnum)]
|
||||
enum Format {
|
||||
@@ -12,11 +15,22 @@ enum Format {
|
||||
Csv,
|
||||
}
|
||||
|
||||
#[derive(Subcommand, Clone, Copy, Debug)]
|
||||
enum Command {
|
||||
Monitor,
|
||||
Reset {
|
||||
#[arg(short, long, default_value_t = false)]
|
||||
bootloader: bool,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about)]
|
||||
struct Args {
|
||||
#[arg(short, long, default_value = "debug")]
|
||||
format: Format,
|
||||
#[command(subcommand)]
|
||||
command: Option<Command>,
|
||||
}
|
||||
|
||||
trait StateEmitter<W: io::Write> {
|
||||
@@ -35,7 +49,7 @@ impl<W: io::Write> StateEmitter<W> for DebugEmitter<W> {
|
||||
Self { writer }
|
||||
}
|
||||
fn emit(&mut self, r: &AudioTelemetrySnapshot) {
|
||||
writeln!(self.writer, "{r:?}");
|
||||
writeln!(self.writer, "{r:?}").ok();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,31 +72,62 @@ impl<W: io::Write> StateEmitter<W> for CsvEmitter<W> {
|
||||
}
|
||||
}
|
||||
|
||||
/// The device exposes one vendor HID interface per usage; pick the one we need.
|
||||
async fn find_device(usage_id: u16) -> HidResult<Device> {
|
||||
Ok(HidBackend::default()
|
||||
.enumerate()
|
||||
.await?
|
||||
.find(|d| d.product_id == 0xcc1d && d.vendor_id == 0x1209 && d.usage_id == usage_id)
|
||||
.await
|
||||
.expect("GUAC device not found or not accessible (try as root?)"))
|
||||
}
|
||||
|
||||
#[pollster::main]
|
||||
async fn main() -> HidResult<()> {
|
||||
colog::init();
|
||||
let args = Args::parse();
|
||||
let usbhid = HidBackend::default();
|
||||
let dev = usbhid
|
||||
.enumerate()
|
||||
.await?
|
||||
.find(|d| d.product_id == 0xcc1d && d.vendor_id == 0x1209)
|
||||
.await
|
||||
.expect("GUAC device not found or not accessible (try as root?)");
|
||||
let mut reader = dev.open_readable().await?;
|
||||
let mut writer: Box<dyn StateEmitter<_>> = match args.format {
|
||||
Format::Debug => Box::new(DebugEmitter::from_writer(io::stdout())),
|
||||
Format::Csv => Box::new(CsvEmitter::from_writer(io::stdout())),
|
||||
};
|
||||
|
||||
let mut buf = [0u8; core::mem::size_of::<AudioTelemetryReport>()];
|
||||
while let Ok(r) = reader.read_input_report(&mut buf).await {
|
||||
log::debug!("read {}: {:?}", r, &buf[..r]);
|
||||
let buf = &buf[..r];
|
||||
match AudioTelemetryReport::from_bytes((buf, 0)) {
|
||||
Ok((_, r)) => writer.emit(&r.into()),
|
||||
Err(e) => eprintln!("Unable to parse report: {:?}", e),
|
||||
match &args.command {
|
||||
Some(Command::Monitor) => {
|
||||
let dev = find_device(USAGE_TELEMETRY).await?;
|
||||
let mut reader = dev.open_readable().await?;
|
||||
let mut writer: Box<dyn StateEmitter<_>> = match args.format {
|
||||
Format::Debug => Box::new(DebugEmitter::from_writer(io::stdout())),
|
||||
Format::Csv => Box::new(CsvEmitter::from_writer(io::stdout())),
|
||||
};
|
||||
|
||||
let mut buf = [0u8; core::mem::size_of::<AudioTelemetryReport>()];
|
||||
while let Ok(r) = reader.read_input_report(&mut buf).await {
|
||||
log::debug!("read {}: {:?}", r, &buf[..r]);
|
||||
let buf = &buf[..r];
|
||||
match AudioTelemetryReport::from_bytes((buf, 0)) {
|
||||
Ok((_, r)) => writer.emit(&r.into()),
|
||||
Err(e) => eprintln!("Unable to parse report: {:?}", e),
|
||||
}
|
||||
}
|
||||
}
|
||||
Some(Command::Reset { bootloader }) => {
|
||||
let dev = find_device(USAGE_COMMAND).await?;
|
||||
let mut dev_writer = dev.open_writeable().await?;
|
||||
let cmd = if *bootloader {
|
||||
print!("Rebooting into bootloader...");
|
||||
AudioDeviceCommand::Bootloader
|
||||
} else {
|
||||
print!("Rebooting...");
|
||||
AudioDeviceCommand::Reset
|
||||
};
|
||||
log::debug!("writing command: {:?}", &cmd);
|
||||
let report: AudioDeviceCommandReport = cmd.into();
|
||||
log::debug!(" report: {:?}", &report);
|
||||
// Our descriptor has no report IDs, so hidraw expects a leading 0x00 that it strips
|
||||
let mut buf = [0u8; 1 + core::mem::size_of::<AudioDeviceCommandReport>()];
|
||||
buf[1..].copy_from_slice(&report.cmd);
|
||||
match dev_writer.write_output_report(&buf).await {
|
||||
Ok(_) => println!("write succeeded - reboot failed"),
|
||||
Err(_) => println!("lost device - reboot successful"),
|
||||
}
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
||||
Reference in new issue
Block a user