swaitsandClaude Opus 4.6
4e7e6d2167
Switch all ESP32-S3 boards from UsbSerialJtag to USB OTG CDC-ACM via embassy-usb. The USB device stack is now shared code — boards only provide the platform-specific embassy-usb Driver. - Custom VID:PID 1209:5741 (open-source VID, "WA" PID) - CDC-ACM class with proper device enumeration - COBS+postcard protocol over CDC-ACM packet read/write - Concurrent USB device loop + protocol loop via join() - On disconnect: sends DisplayCommand::Reset to show "Waiting for host..." - Justfile: espflash no longer uses --monitor (OTG steals PHY) - Test script updated to detect by new VID:PID Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
59 lines
1.6 KiB
Rust
59 lines
1.6 KiB
Rust
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
|
|
use embassy_sync::channel::Channel;
|
|
use embassy_sync::watch::Watch;
|
|
|
|
use crate::protocol::{Command, RadioConfig, Response};
|
|
|
|
/// Display commands routed from usb_task to display_task.
|
|
#[derive(Debug, Clone, Copy, defmt::Format)]
|
|
#[allow(dead_code)] // Constructed by usb_task once CDC-ACM is wired up
|
|
pub enum DisplayCommand {
|
|
On,
|
|
Off,
|
|
Reset,
|
|
}
|
|
|
|
/// USB-to-display command channel.
|
|
pub type DisplayCommandChannel = Channel<CriticalSectionRawMutex, DisplayCommand, 4>;
|
|
|
|
/// Host-to-radio command channel.
|
|
pub type CommandChannel = Channel<CriticalSectionRawMutex, Command, 16>;
|
|
|
|
/// Radio-to-host response channel.
|
|
pub type ResponseChannel = Channel<CriticalSectionRawMutex, Response, 32>;
|
|
|
|
/// Observable radio status for the display task.
|
|
pub type StatusWatch = Watch<CriticalSectionRawMutex, RadioStatus, 2>;
|
|
|
|
/// Current radio state exposed to observers (e.g. display).
|
|
#[derive(Debug, Clone, defmt::Format)]
|
|
pub struct RadioStatus {
|
|
pub state: RadioState,
|
|
pub config: Option<RadioConfig>,
|
|
pub rx_count: u32,
|
|
pub tx_count: u32,
|
|
pub last_rssi: Option<i16>,
|
|
pub last_snr: Option<i8>,
|
|
}
|
|
|
|
/// Radio state machine states.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, defmt::Format)]
|
|
pub enum RadioState {
|
|
Idle,
|
|
Receiving,
|
|
Transmitting,
|
|
}
|
|
|
|
impl Default for RadioStatus {
|
|
fn default() -> Self {
|
|
Self {
|
|
state: RadioState::Idle,
|
|
config: None,
|
|
rx_count: 0,
|
|
tx_count: 0,
|
|
last_rssi: None,
|
|
last_snr: None,
|
|
}
|
|
}
|
|
}
|