Skip to content
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.

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

Dev 1.0.0 #131

Merged
merged 51 commits into from
Nov 9, 2023
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
27717c6
Abstract out the 'Enabled' Mic FX Keys, and handle them last
FrostyCoolSlug Aug 14, 2023
efffaba
Correct driver errors on installer
FrostyCoolSlug Aug 15, 2023
5a8a1c5
Fix incorrectly handling cough button mute_to_x
JulanDeAlb Aug 20, 2023
7f54fba
Merge pull request #121 from JulanDeAlb/main
FrostyCoolSlug Aug 20, 2023
e27b9d0
Correctly calculate Pitch Threshold from profile
FrostyCoolSlug Aug 22, 2023
206c97f
Correctly apply pitch threshold on Style change
FrostyCoolSlug Aug 22, 2023
e1026d9
Added 'quiet' client for use on Windows
FrostyCoolSlug Aug 22, 2023
10be04c
If loading the settings fails, load defaults
FrostyCoolSlug Aug 30, 2023
0001266
Made settings writing slightly more resilient, with extra debugging
FrostyCoolSlug Aug 30, 2023
2f63036
Have profiles save to a temporary file first.
FrostyCoolSlug Aug 30, 2023
8860a37
Have settings save to a temporary file first.
FrostyCoolSlug Aug 30, 2023
83ed748
Have Mic Profile save to a Temporary File first
FrostyCoolSlug Aug 30, 2023
0083334
Don't warn on PITCH_SHIFT_THRESHOLD
FrostyCoolSlug Aug 30, 2023
574ad8c
Fix clippy warning
FrostyCoolSlug Aug 30, 2023
11cc92c
Have errors on the opener to fetch debug information
FrostyCoolSlug Aug 30, 2023
ed5e4f2
Generate SuSE artifact during CI build
FrostyCoolSlug Aug 30, 2023
d710ba7
Shuffled the initialisation sleep position
FrostyCoolSlug Sep 4, 2023
5b4a0bb
added sync_all calls to file writes (just in case)
FrostyCoolSlug Sep 4, 2023
bb6695c
[#123] Release the USB interface *AFTER* the reset
FrostyCoolSlug Sep 4, 2023
f938c97
[#124] Respawn tray icon on Explorer restart
FrostyCoolSlug Sep 4, 2023
fd38e62
Put Deserialize_repr, Serialize_repr behind the serde feature
FrostyCoolSlug Sep 4, 2023
bbea46b
Support logging panic events
FrostyCoolSlug Sep 14, 2023
2693cb5
Lots of debug for tray spawning
FrostyCoolSlug Sep 14, 2023
94920ba
Clippy :)
FrostyCoolSlug Sep 14, 2023
107bd0a
Attempt to use local timezone for logging
FrostyCoolSlug Sep 14, 2023
ca44a84
Fetch and install the Visual C++ Runtime
FrostyCoolSlug Sep 15, 2023
25179ff
Support fetching Mic Level over IPC
FrostyCoolSlug Sep 25, 2023
8c0f05b
Pass the Mic Level back to the websocket
FrostyCoolSlug Sep 25, 2023
6a10139
Default to the App during Install
FrostyCoolSlug Sep 25, 2023
8f3afce
Updated Web Content to f47fdd65
FrostyCoolSlug Oct 3, 2023
c1b4b1d
Remove the firmware crate (deprecated)
FrostyCoolSlug Oct 3, 2023
c813d66
Bumped version to 1.0.0 :D
FrostyCoolSlug Oct 3, 2023
8bd13ea
Don't warn on driver version 5.57.0
FrostyCoolSlug Oct 3, 2023
939299e
Clippy :)
FrostyCoolSlug Oct 3, 2023
3043d21
Ensure the Mic Mute Key is handled during profile load
FrostyCoolSlug Oct 5, 2023
c96525e
Add a 'revision' flag to package.metadata.deb to solve build error
FrostyCoolSlug Oct 5, 2023
a129215
Remove firmware binaries from packages
FrostyCoolSlug Oct 5, 2023
5c43f50
Do not try to reload udev when running on an immutable OS
marvin-te Oct 13, 2023
413cf2d
Merge pull request #128 from marvin-te/main
FrostyCoolSlug Oct 13, 2023
195eb0b
Added missing documentation to CLI
FrostyCoolSlug Oct 22, 2023
a8604e1
Merge remote-tracking branch 'origin/dev-1.0.0' into dev-1.0.0
FrostyCoolSlug Oct 22, 2023
e9d48d9
Disable Mini Fader Lighting on 'Mute to All' to simulating 'Volume 0'
FrostyCoolSlug Oct 29, 2023
cfdc287
Update Cargo Lock
FrostyCoolSlug Oct 29, 2023
0274551
Added Setting to 'Lock' faders to user position
FrostyCoolSlug Oct 29, 2023
3e45d4a
Expose 'Locked Faders' to Status
FrostyCoolSlug Oct 29, 2023
a54a42d
Added IPC command to Lock the Faders in position
FrostyCoolSlug Oct 29, 2023
e180f83
Added Missing 'Device Settings' to CLI
FrostyCoolSlug Oct 29, 2023
71f0b66
Updated Web Content to cb423f9d
FrostyCoolSlug Oct 29, 2023
3512168
Fix Clippy Warnings
FrostyCoolSlug Oct 29, 2023
a7ce832
Remember to Save the Settings change to the config!
FrostyCoolSlug Oct 30, 2023
5613767
Correctly load all FX keys when changing effect bank
FrostyCoolSlug Nov 7, 2023
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
Prev Previous commit
Next Next commit
Added missing documentation to CLI
  • Loading branch information
FrostyCoolSlug committed Oct 22, 2023
commit 195eb0b8d22377e7a10f7f0692fe3cbd04aaff29
71 changes: 67 additions & 4 deletions client/src/cli.rs
Original file line number Diff line number Diff line change
@@ -86,6 +86,7 @@ pub enum SubCommands {
volume_percent: u8,
},

/// Adjust Submix Settings
Submix {
#[command(subcommand)]
command: SubmixCommands,
@@ -173,17 +174,20 @@ fn percent_value_float(s: &str) -> Result<f32, String> {
#[derive(Subcommand, Debug)]
#[command(arg_required_else_help = true)]
pub enum CoughButtonBehaviours {
/// Sets whether the button is only active when held (so not toggled)
ButtonIsHold {
#[arg(value_parser, action = ArgAction::Set)]
is_hold: bool,
},

/// Change the Mute Target on Press
MuteBehaviour {
/// Where a single press will mute (Hold will always Mute to All)
#[arg(value_enum)]
mute_behaviour: MuteFunction,
},

/// Change the current button Mute State
MuteState {
/// The new State
#[arg(value_enum)]
@@ -268,6 +272,7 @@ pub enum MicrophoneCommands {
level: u8,
},

/// Enable Microphone Monitor whenever FX are enabled
MonitorMicWithFx {
#[arg(value_parser, action = ArgAction::Set)]
enabled: bool,
@@ -277,12 +282,15 @@ pub enum MicrophoneCommands {
#[derive(Subcommand, Debug)]
#[command(arg_required_else_help = true)]
pub enum SubmixCommands {
/// Enable / Disable SubMixes
Enabled {
#[arg(value_parser, action = ArgAction::Set)]
enabled: bool,
},

/// Change Submix Volumes
Volume {
/// The Channel to Change
#[arg(value_enum)]
channel: ChannelName,

@@ -291,23 +299,31 @@ pub enum SubmixCommands {
volume_percent: u8,
},

/// Link / Unlink a volume -> submix volume
Linked {
/// The Channel to Change
#[arg(value_enum)]
channel: ChannelName,

/// Whether the channels volumes are linked
#[arg(value_parser, action = ArgAction::Set)]
linked: bool,
},

/// Set the output mix for a channel
OutputMix {
/// The Output Device to Change
#[arg(value_enum)]
device: OutputDevice,

/// The Mix to Assign
#[arg(value_enum)]
mix: Mix,
},

/// Activate Mix Monitoring
MonitorMix {
/// The Channel to Monitor
#[arg(value_enum)]
device: OutputDevice,
},
@@ -456,35 +472,51 @@ pub enum FaderCommands {
state: MuteState,
},

/// Configure the Scribble Screen on a Fader
Scribbles {
#[command(subcommand)]
command: Scribbles,
},
}
#[derive(Subcommand, Debug)]
pub enum Scribbles {
/// Change a Scribble Icon
Icon {
/// The Fader to Change
#[arg(value_enum)]
fader: FaderName,

/// The name of the Icon file
name: Option<String>,
},

/// Change the Text on a Scribble
Text {
/// The Fader to Change
#[arg(value_enum)]
fader: FaderName,

/// The text to display
text: String,
},

/// Change the Number field (Top Left)
Number {
/// The Fader to Change
#[arg(value_enum)]
fader: FaderName,

/// The Text to display
text: String,
},

/// Inverts a scribble display
Invert {
/// The Fader to Change
#[arg(value_enum)]
fader: FaderName,

/// Whether the screen is inverted
#[arg(value_parser, action = ArgAction::Set)]
inverted: bool,
},
@@ -504,6 +536,7 @@ pub enum CoughCommands {
#[derive(Subcommand, Debug)]
#[command(arg_required_else_help = true)]
pub enum LightingCommands {
/// Change Global Animation States
Animation {
#[command(subcommand)]
command: AnimationCommands,
@@ -536,12 +569,17 @@ pub enum LightingCommands {
command: ButtonGroupLightingCommands,
},

/// Change a 'Simple' (one colour) target
SimpleColour {
/// The Lighting to Change
#[arg(value_enum)]
target: SimpleColourTargets,

/// The New Colour
colour: String,
},

/// Change an Encoder Colour
EncoderColour {
/// The Encoder to Change
#[arg(value_enum)]
@@ -561,15 +599,35 @@ pub enum LightingCommands {
#[derive(Subcommand, Debug)]
#[command(arg_required_else_help = true)]
pub enum AnimationCommands {
Mode { mode: AnimationMode },
Mod1 { mod1: u8 },
Mod2 { mod2: u8 },
WaterFall { waterfall: WaterfallDirection },
/// Change the Animation Mod
Mode {
/// The new Mode
mode: AnimationMode,
},

/// Change the Mod1 Value
Mod1 {
/// The New Value
mod1: u8,
},

/// Change the Mod2 Value
Mod2 {
/// The new Value
mod2: u8,
},

/// Change the Waterfall Direction
WaterFall {
/// The Waterfall Direction
waterfall: WaterfallDirection,
},
}

#[derive(Subcommand, Debug)]
#[command(arg_required_else_help = true)]
pub enum FaderLightingCommands {
/// Change the Faders Lighting Mode
Display {
/// The Fader to Change
#[arg(value_enum)]
@@ -597,6 +655,7 @@ pub enum FaderLightingCommands {
#[derive(Subcommand, Debug)]
#[command(arg_required_else_help = true)]
pub enum FadersAllLightingCommands {
/// Change the Faders Lighting Mode
Display {
/// The new display method
#[arg(value_enum)]
@@ -616,6 +675,7 @@ pub enum FadersAllLightingCommands {
#[derive(Subcommand, Debug)]
#[command(arg_required_else_help = true)]
pub enum ButtonLightingCommands {
/// Change a Buttons Colours
Colour {
/// The Button to change
#[arg(value_enum)]
@@ -628,6 +688,7 @@ pub enum ButtonLightingCommands {
colour_two: Option<String>,
},

/// Set a Button's "Off" style
OffStyle {
/// The Button to change
#[arg(value_enum)]
@@ -642,6 +703,7 @@ pub enum ButtonLightingCommands {
#[derive(Subcommand, Debug)]
#[command(arg_required_else_help = true)]
pub enum ButtonGroupLightingCommands {
/// Change a Buttons Groups Colours
Colour {
/// The group to change
#[arg(value_enum)]
@@ -654,6 +716,7 @@ pub enum ButtonGroupLightingCommands {
colour_two: Option<String>,
},

/// Change a Button Group's "Off" style
OffStyle {
/// The group to change
#[arg(value_enum)]