From e589056abd4cab5de48850593ea1f6db94f8809d Mon Sep 17 00:00:00 2001 From: fly Date: Sun, 14 Apr 2024 23:38:32 +0200 Subject: [PATCH] Have 2 output reports for testing stuff Signed-off-by: fly --- firmware/descriptor.wara | 10 +++++++++- firmware/src/device.rs | 14 +++++++++----- firmware/src/main.rs | 4 ++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/firmware/descriptor.wara b/firmware/descriptor.wara index c9386cf..1f08e83 100644 --- a/firmware/descriptor.wara +++ b/firmware/descriptor.wara @@ -10,8 +10,16 @@ usage = ['Generic Desktop', 'Pointer'] usage = ['Generic Desktop', 'X'] logicalValueRange = [0, 65535] +[[applicationCollection.inputReport.physicalCollection.variableItem]] +usage = ['Generic Desktop', 'Z'] +logicalValueRange = [0, 65535] + [[applicationCollection.outputReport]] [[applicationCollection.outputReport.variableItem]] usage = ['Haptics', 'Manual Trigger'] -logicalValueRange = [0, 255] +logicalValueRange = [0, 48000] + +[[applicationCollection.outputReport.variableItem]] +usage = ['Haptics', 'Manual Trigger'] +logicalValueRange = [0, 65535] diff --git a/firmware/src/device.rs b/firmware/src/device.rs index cb1e7b5..990fac7 100644 --- a/firmware/src/device.rs +++ b/firmware/src/device.rs @@ -36,12 +36,15 @@ pub const CUSTOM_DESCRIPTOR: &[u8] = &[ 0x95, 0x10, // ReportCount(16) 0x75, 0x01, // ReportSize(1) 0x81, 0x02, // Input(Data, Variable, Absolute, NoWrap, Linear, PreferredState, NoNullPosition, BitField) - 0x05, 0x0E, // UsagePage(Haptics[0x000E]) - 0x09, 0x21, // UsageId(Manual Trigger[0x0021]) + 0x06, 0x00, 0xFF, // Usage Page (Vendor Defined 0xFF00) + 0x09, 0x01, // Usage (0x01) 0x27, 0x80, 0xBB, 0x00, 0x00, // LogicalMaximum(48,000) 0x95, 0x01, // ReportCount(1) 0x75, 0x10, // ReportSize(16) 0x91, 0x02, // Output(Data, Variable, Absolute, NoWrap, Linear, PreferredState, NoNullPosition, NonVolatile, BitField) + 0x09, 0x21, // UsageId(Manual Trigger[0x0021]) + 0x27, 0xFF, 0xFF, 0x00, 0x00, // LogicalMaximum(65,535) + 0x91, 0x02, // Output(Data, Variable, Absolute, NoWrap, Linear, PreferredState, NoNullPosition, NonVolatile, BitField) 0xC0, // EndCollection() ]; @@ -57,10 +60,11 @@ pub struct CustomInputReport { } #[derive(Clone, Copy, Debug, Eq, PartialEq, Default, PackedStruct)] -#[packed_struct(endian = "lsb", size_bytes = "2")] +#[packed_struct(endian = "lsb", size_bytes = "4")] pub struct CustomOutputReport { #[packed_field] - pub int: u16, + pub integ_lt: u16, + pub test: u16, } pub struct CustomDevice<'a, B: UsbBus> { @@ -77,7 +81,7 @@ impl<'a, B: UsbBus> CustomDevice<'a, B> { } pub fn read_report(&mut self) -> Result { - let mut data = [0, 0]; + let mut data = [0, 0, 0, 0]; self.interface .read_report(&mut data[..]) .map(|_| CustomOutputReport::unpack(&data).unwrap()) diff --git a/firmware/src/main.rs b/firmware/src/main.rs index 07948d7..6512ce3 100644 --- a/firmware/src/main.rs +++ b/firmware/src/main.rs @@ -111,11 +111,11 @@ fn main() -> ! { Err(UsbHidError::WouldBlock) => {} Ok(output) => { let pwm_val: u16; - if output.int > pwm_max { + if output.integ_lt > pwm_max { pwm_val = pwm_max; } else { - pwm_val = output.int; + pwm_val = output.integ_lt; } pwm.set_duty(Channel::C1, pwm_val); }