Skip to content

Commit 594e9a0

Browse files
committed
RM unused modules, cargo clippy, cargo fmt
1 parent c282712 commit 594e9a0

File tree

7 files changed

+17
-45
lines changed

7 files changed

+17
-45
lines changed

dbus-monitor/src/dbus_monitor.rs

+12-10
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@ use dbus::message::MatchRule;
99
use dbus::Message;
1010
use dbus::MessageType;
1111

12-
use std::process::Command;
1312
use std::time::Duration;
1413

15-
use crate::utils;
16-
17-
use inputmodule_control::inputmodule::find_serialdevs;
14+
use clap::Parser;
1815
use inputmodule_control::commands::ClapCli;
19-
use inputmodule_control::inputmodule::{serial_commands};
20-
use clap::{Parser, Subcommand};
16+
use inputmodule_control::inputmodule::serial_commands;
2117

2218
use log::debug;
2319

@@ -30,8 +26,14 @@ fn handle_message(msg: &Message) {
3026
let string_value: String = string_ref.to_string();
3127
debug!("String value: {}", string_value);
3228

33-
if string_value.contains("calendar.google.com"){
34-
run_inputmodule_command(vec!["led-matrix", "--pattern", "all-on", "--blink-n-times", "3"]);
29+
if string_value.contains("calendar.google.com") {
30+
run_inputmodule_command(vec![
31+
"led-matrix",
32+
"--pattern",
33+
"all-on",
34+
"--blink-n-times",
35+
"3",
36+
]);
3537
run_inputmodule_command(vec!["led-matrix", "--brightness", "0"]);
3638
}
3739
}
@@ -41,11 +43,11 @@ fn handle_message(msg: &Message) {
4143
debug!("DBus Message handled");
4244
}
4345

44-
pub fn run_inputmodule_command(args: Vec<&str>){
46+
pub fn run_inputmodule_command(args: Vec<&str>) {
4547
let bin_placeholder = vec!["bin-placeholder"];
4648
let full_args = [&bin_placeholder[..], &args[..]].concat();
4749
let args = ClapCli::parse_from(full_args);
48-
50+
4951
serial_commands(&args);
5052
}
5153

dbus-monitor/src/main.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
mod dbus_monitor;
2-
mod utils;
32

43
extern crate log;
5-
use log::{debug};
64
use env_logger;
75

86
fn main() {

dbus-monitor/src/utils.rs

-27
This file was deleted.

inputmodule-control/src/commands.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#![allow(clippy::needless_range_loop)]
22
#![allow(clippy::single_match)]
33

4-
use crate::inputmodule::{B1_LCD_PID, LED_MATRIX_PID};
54
use crate::b1display::B1DisplaySubcommand;
65
use crate::c1minimal::C1MinimalSubcommand;
6+
use crate::inputmodule::{B1_LCD_PID, LED_MATRIX_PID};
77
use crate::ledmatrix::LedMatrixSubcommand;
88

99
use clap::{Parser, Subcommand};

inputmodule-control/src/inputmodule.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ use serialport::{SerialPort, SerialPortInfo, SerialPortType};
1010

1111
use crate::b1display::{B1Pattern, Fps, PowerMode};
1212
use crate::c1minimal::Color;
13+
use crate::commands::ClapCli;
1314
use crate::font::{convert_font, convert_symbol};
1415
use crate::ledmatrix::{Game, GameOfLifeStartParam, Pattern};
15-
use crate::commands::ClapCli;
1616

1717
const FWK_MAGIC: &[u8] = &[0x32, 0xAC];
1818
pub const FRAMEWORK_VID: u16 = 0x32AC;

inputmodule-control/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
mod b1display;
44
mod c1minimal;
5+
pub mod commands;
56
mod font;
67
pub mod inputmodule;
78
mod ledmatrix;
8-
pub mod commands;
9-

inputmodule-control/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
#![allow(clippy::single_match)]
33
mod b1display;
44
mod c1minimal;
5+
mod commands;
56
mod font;
67
mod inputmodule;
78
mod ledmatrix;
8-
mod commands;
99

10-
use clap::{Parser};
10+
use clap::Parser;
1111
use inputmodule::find_serialdevs;
1212

1313
use crate::inputmodule::serial_commands;

0 commit comments

Comments
 (0)