Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions cli/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use clap::{Arg, App};
use gvm_lights::{GvmClient, ControlMessage, LightCmd};
use gvm_lights::{GvmClient, ControlMessage};
use gvm_lights::codec::LightCmd;
use std::str::FromStr;

#[async_std::main]
Expand Down Expand Up @@ -59,6 +60,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let client = GvmClient::new("192.168.4.2").await?;

let sent_bytes = client.send_to(&"192.168.4.1", &cmd).await?;
println!("{}", sent_bytes);
println!("{:?}", sent_bytes);
Ok(())
}
22 changes: 11 additions & 11 deletions gvm_lights/src/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub enum ControlMessage {

pub fn encode(msg: &ControlMessage) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
let dev_id = b"00";
let dev_type = b"30";
let dev_type = b"20";

let (cmd, param) = match msg {
ControlMessage::Light(param) => {
Expand All @@ -24,27 +24,27 @@ pub fn encode(msg: &ControlMessage) -> Result<Vec<u8>, Box<dyn std::error::Error
LightCmd::Off => (b"00", b"00".to_vec()),
}
},
ControlMessage::SetBrightness(*br) => {
let br = if br > 100 { 100 }
else { br };
ControlMessage::SetBrightness(br) => {
let br = if *br > 100 { 100 }
else { *br };
(b"02", hex::encode_upper([br]).into_bytes())
},
ControlMessage::SetTemperature(t) => {
let t = if t < 3200 { 3200 }
let t = if *t < 3200 { 3200 }
else {
if t > 5600 { 5600 }
else { t }
if *t > 5600 { 5600 }
else { *t }
};
(b"03", hex::encode_upper([(t / 100) as u8]).into_bytes())
},
ControlMessage::SetHue(hue) => {
let hue = if hue > 360 { 360 }
else { hue };
let hue = if *hue > 360 { 360 }
else { *hue };
(b"04", hex::encode_upper([(hue / 5) as u8]).into_bytes())
},
ControlMessage::SetSaturation(sat) => {
let sat = if sat > 100 { 100 }
else { sat };
let sat = if *sat > 100 { 100 }
else { *sat };
(b"05", hex::encode_upper([sat]).into_bytes())
},
};
Expand Down
135 changes: 79 additions & 56 deletions proxy/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ edition = "2018"
[dependencies]
tokio = { version = "0.2.23", features = ["full", "tracing"] }
futures = "0.3"
bluster = { git = "https://github.com/dfrankland/bluster" }
bluster = { git = "https://github.com/dfrankland/bluster", rev = "ffba9e258561d5d2e70a81f805c694456ca11dd1" }
uuid = "0.8.1"
pretty_env_logger = "0.2"