feat: 通过增量、绝对量亮度控制。#5.

This commit is contained in:
Ivan Li 2023-01-29 20:53:59 +08:00
parent 6ec61c1bcc
commit 4e3b765059
10 changed files with 539 additions and 65 deletions

317
src-tauri/Cargo.lock generated
View File

@ -14,7 +14,7 @@ version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [ dependencies = [
"memchr", "memchr 2.5.0",
] ]
[[package]] [[package]]
@ -156,7 +156,7 @@ dependencies = [
"gloo-timers", "gloo-timers",
"kv-log-macro", "kv-log-macro",
"log", "log",
"memchr", "memchr 2.5.0",
"once_cell", "once_cell",
"pin-project-lite", "pin-project-lite",
"pin-utils", "pin-utils",
@ -326,7 +326,7 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
dependencies = [ dependencies = [
"memchr", "memchr 2.5.0",
] ]
[[package]] [[package]]
@ -492,7 +492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
dependencies = [ dependencies = [
"bytes", "bytes",
"memchr", "memchr 2.5.0",
] ]
[[package]] [[package]]
@ -516,10 +516,16 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys 0.8.3",
"libc", "libc",
] ]
[[package]]
name = "core-foundation-sys"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
[[package]] [[package]]
name = "core-foundation-sys" name = "core-foundation-sys"
version = "0.8.3" version = "0.8.3"
@ -717,6 +723,72 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "ddc"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba69f2c53e320fc4abad17cb02bbbf04d1a36f18e9907f347589ec5991b3c6c5"
dependencies = [
"mccs",
]
[[package]]
name = "ddc-hi"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c6747b17c926a2aa34739b30f1a6cc726e3a7baf0e2f69a4c03a95cf5de94de"
dependencies = [
"anyhow",
"ddc",
"ddc-i2c",
"ddc-macos",
"ddc-winapi",
"edid",
"log",
"mccs",
"mccs-caps",
"mccs-db",
"nvapi",
]
[[package]]
name = "ddc-i2c"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66503057bd41fc21b532b3ebe33b2ec57e5d4971fcfc3844306ebcb499b6c8c2"
dependencies = [
"ddc",
"i2c",
"i2c-linux",
"resize-slice",
]
[[package]]
name = "ddc-macos"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cbaf316c113cfc30da8856c8104dfb4168b73fdd78562d1542e358fe8299dea"
dependencies = [
"core-foundation",
"core-foundation-sys 0.8.3",
"core-graphics",
"ddc",
"io-kit-sys",
"mach 0.3.2",
"thiserror",
]
[[package]]
name = "ddc-winapi"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3238e71b65c870e236de529546a689202fca64a2eaeec43995d28f6920d7fc9e"
dependencies = [
"ddc",
"widestring",
"winapi 0.3.9",
]
[[package]] [[package]]
name = "derive_more" name = "derive_more"
version = "0.99.17" version = "0.99.17"
@ -775,6 +847,7 @@ dependencies = [
"base64", "base64",
"bmp", "bmp",
"color_space", "color_space",
"ddc-hi",
"either", "either",
"futures", "futures",
"hex", "hex",
@ -828,6 +901,15 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
[[package]]
name = "edid"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24ce75530893d834dcfe3bb67ce0e7dec489484e7cb4423ca31618af4bab24fe"
dependencies = [
"nom",
]
[[package]] [[package]]
name = "either" name = "either"
version = "1.8.0" version = "1.8.0"
@ -1035,7 +1117,7 @@ dependencies = [
"fastrand", "fastrand",
"futures-core", "futures-core",
"futures-io", "futures-io",
"memchr", "memchr 2.5.0",
"parking", "parking",
"pin-project-lite", "pin-project-lite",
"waker-fn", "waker-fn",
@ -1076,7 +1158,7 @@ dependencies = [
"futures-macro", "futures-macro",
"futures-sink", "futures-sink",
"futures-task", "futures-task",
"memchr", "memchr 2.5.0",
"pin-project-lite", "pin-project-lite",
"pin-utils", "pin-utils",
"slab", "slab",
@ -1468,6 +1550,39 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
[[package]]
name = "i2c"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60c7b7bdd7b3a985fdcf94a0d7d98e7a47fde8b7f22fb55ce1a91cc104a2ce9a"
dependencies = [
"bitflags",
]
[[package]]
name = "i2c-linux"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0268a871aaa071221d6c2875ebedcf64710e59b0d87c68c8faf5e98b87dd2a4"
dependencies = [
"bitflags",
"i2c",
"i2c-linux-sys",
"resize-slice",
"udev",
]
[[package]]
name = "i2c-linux-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55cd060ed0016621d3da4ed3a23b0158084de90d1f3a8e59f3d391aacd3bbcf8"
dependencies = [
"bitflags",
"byteorder",
"libc",
]
[[package]] [[package]]
name = "ico" name = "ico"
version = "0.2.0" version = "0.2.0"
@ -1504,7 +1619,7 @@ dependencies = [
"globset", "globset",
"lazy_static", "lazy_static",
"log", "log",
"memchr", "memchr 2.5.0",
"regex", "regex",
"same-file", "same-file",
"thread_local", "thread_local",
@ -1559,6 +1674,16 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
] ]
[[package]]
name = "io-kit-sys"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
dependencies = [
"core-foundation-sys 0.6.2",
"mach 0.2.3",
]
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "0.4.8" version = "0.4.8"
@ -1700,6 +1825,16 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "libudev-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
dependencies = [
"libc",
"pkg-config",
]
[[package]] [[package]]
name = "libwebp-sys" name = "libwebp-sys"
version = "0.4.2" version = "0.4.2"
@ -1718,6 +1853,12 @@ dependencies = [
"safemem", "safemem",
] ]
[[package]]
name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.9" version = "0.4.9"
@ -1772,6 +1913,24 @@ dependencies = [
"time", "time",
] ]
[[package]]
name = "mach"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
dependencies = [
"libc",
]
[[package]]
name = "mach"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "macos-app-nap" name = "macos-app-nap"
version = "0.0.1" version = "0.0.1"
@ -1821,6 +1980,38 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
[[package]]
name = "mccs"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74366c6da4179141e0d4551a46799a7e667a68eda60561690d5048bd8e0f8422"
dependencies = [
"void",
]
[[package]]
name = "mccs-caps"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9766b1345aec53f3f1781797e31f7367a8c53871a0e30214d8372fe2ccbe3ce"
dependencies = [
"mccs",
"nom",
]
[[package]]
name = "mccs-db"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99726fbbe1e11e2908c461e8fab6c9106a5cb13338cc4feb68a01cced38026d0"
dependencies = [
"mccs",
"nom",
"serde",
"serde_derive",
"serde_yaml",
]
[[package]] [[package]]
name = "mdns" name = "mdns"
version = "3.0.0" version = "3.0.0"
@ -1837,6 +2028,15 @@ dependencies = [
"net2", "net2",
] ]
[[package]]
name = "memchr"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "memchr" name = "memchr"
version = "2.5.0" version = "2.5.0"
@ -1960,6 +2160,15 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "nom"
version = "3.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b"
dependencies = [
"memchr 1.0.2",
]
[[package]] [[package]]
name = "notify-rust" name = "notify-rust"
version = "4.6.0" version = "4.6.0"
@ -2042,6 +2251,28 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "nvapi"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c63de8cd8362e2c38d1a48dea6ae68e6293a8d8d22a52180d0f8dcc779b3158"
dependencies = [
"i2c",
"log",
"nvapi-sys",
"void",
]
[[package]]
name = "nvapi-sys"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b29e9a9393c69ee856bfcf5f76ed1ef32d2c0dd6f58558fd43334278fc1e7ea7"
dependencies = [
"bitflags",
"winapi 0.3.9",
]
[[package]] [[package]]
name = "objc" name = "objc"
version = "0.2.7" version = "0.2.7"
@ -2513,7 +2744,7 @@ version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea"
dependencies = [ dependencies = [
"memchr", "memchr 2.5.0",
] ]
[[package]] [[package]]
@ -2664,7 +2895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr 2.5.0",
"regex-syntax", "regex-syntax",
] ]
@ -2692,6 +2923,15 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "resize-slice"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a3cb2f74a9891e76958b9e0ccd269a25b466c3ae3bb3efd71db157248308c4a"
dependencies = [
"uninitialized",
]
[[package]] [[package]]
name = "rfd" name = "rfd"
version = "0.10.0" version = "0.10.0"
@ -2895,7 +3135,7 @@ checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"core-foundation", "core-foundation",
"core-foundation-sys", "core-foundation-sys 0.8.3",
"libc", "libc",
"security-framework-sys", "security-framework-sys",
] ]
@ -2906,7 +3146,7 @@ version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys 0.8.3",
"libc", "libc",
] ]
@ -3033,6 +3273,18 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "serde_yaml"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef8099d3df28273c99a1728190c7a9f19d444c941044f64adf986bee7ec53051"
dependencies = [
"dtoa",
"linked-hash-map",
"serde",
"yaml-rust",
]
[[package]] [[package]]
name = "serialize-to-javascript" name = "serialize-to-javascript"
version = "0.1.1" version = "0.1.1"
@ -3525,7 +3777,7 @@ dependencies = [
"infer", "infer",
"json-patch", "json-patch",
"kuchiki", "kuchiki",
"memchr", "memchr 2.5.0",
"phf 0.10.1", "phf 0.10.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3690,7 +3942,7 @@ dependencies = [
"autocfg", "autocfg",
"bytes", "bytes",
"libc", "libc",
"memchr", "memchr 2.5.0",
"mio", "mio",
"num_cpus", "num_cpus",
"parking_lot", "parking_lot",
@ -3815,6 +4067,16 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
[[package]]
name = "udev"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47504d1a49b2ea1b133e7ddd1d9f0a83cf03feb9b440c2c470d06db4589cf301"
dependencies = [
"libc",
"libudev-sys",
]
[[package]] [[package]]
name = "unicode-bidi" name = "unicode-bidi"
version = "0.3.8" version = "0.3.8"
@ -3848,6 +4110,12 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "uninitialized"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74c1aa4511c38276c548406f0b1f5f8b793f000cfb51e18f278a102abd057e81"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.7.1" version = "0.7.1"
@ -3927,6 +4195,12 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "void"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
[[package]] [[package]]
name = "waker-fn" name = "waker-fn"
version = "1.1.0" version = "1.1.0"
@ -4152,6 +4426,12 @@ dependencies = [
"cc", "cc",
] ]
[[package]]
name = "widestring"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a212922ea58fbf5044f83663aa4fc6281ff890f1fd7546c0c3f52f5290831781"
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.2.8" version = "0.2.8"
@ -4490,3 +4770,12 @@ name = "xml-rs"
version = "0.8.4" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
[[package]]
name = "yaml-rust"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
"linked-hash-map",
]

View File

@ -36,6 +36,7 @@ either = "1.8.0"
image = "0.24.5" image = "0.24.5"
mdns = "3.0.0" mdns = "3.0.0"
macos-app-nap = "0.0.1" macos-app-nap = "0.0.1"
ddc-hi = "0.4.1"
[features] [features]
# by default Tauri runs in production mode # by default Tauri runs in production mode

View File

@ -75,7 +75,8 @@ impl CoreManager {
colors.push(color); colors.push(color);
} }
hue = (hue + 1.0) % 360.0; hue = (hue + 1.0) % 360.0;
match rpc::manager::Manager::global() match rpc::Manager::global()
.await
.publish_led_colors(&colors) .publish_led_colors(&colors)
.await .await
{ {
@ -187,7 +188,8 @@ impl CoreManager {
} }
// info!("{:?}", colors); // info!("{:?}", colors);
global_sub_pixels = HashMap::new(); global_sub_pixels = HashMap::new();
match rpc::manager::Manager::global() match rpc::Manager::global()
.await
.publish_led_sub_pixels(colors) .publish_led_sub_pixels(colors)
.await .await
{ {

View File

@ -0,0 +1,13 @@
use serde::{Deserialize, Serialize};
#[derive(Clone, Copy, Serialize, Deserialize, Debug)]
pub enum Brightness {
Relative(u16),
Absolute(u16),
}
#[derive(Clone, Copy, Serialize, Deserialize, Debug)]
pub struct DisplayBrightness {
pub brightness: Brightness,
pub display_index: usize,
}

View File

@ -0,0 +1,78 @@
use ddc_hi::Display;
use paris::{info, error};
use tokio::sync::{broadcast, OnceCell};
use crate::{display::Brightness, rpc};
use super::DisplayBrightness;
use ddc_hi::Ddc;
pub struct Manager {}
impl Manager {
pub async fn global() -> &'static Self {
static DISPLAY_MANAGER: OnceCell<Manager> = OnceCell::const_new();
DISPLAY_MANAGER.get_or_init(|| Self::create()).await
}
pub async fn create() -> Self {
let rpc = rpc::Manager::global().await;
let rx = rpc.client().subscribe_change_display_brightness_rx();
tokio::spawn(Self::subscribe_display_brightness(rx));
Self {}
}
pub async fn subscribe_display_brightness(mut rx: broadcast::Receiver<DisplayBrightness>) {
while let Ok(display_brightness) = rx.recv().await {
if let Err(err) = Self::set_display_brightness(display_brightness) {
error!("set_display_brightness failed. {:?}", err);
}
}
}
pub fn set_display_brightness(display_brightness: DisplayBrightness) -> anyhow::Result<()> {
match Display::enumerate().get_mut(display_brightness.display_index) {
Some(display) => match display.handle.get_vcp_feature(0x10) {
Ok(curr_brightness) => {
let curr = curr_brightness.value();
info!("curr_brightness: {:?}", curr);
let mut target = match display_brightness.brightness {
Brightness::Relative(v) => v + curr,
Brightness::Absolute(v) => v,
};
if target.gt(&curr_brightness.maximum()) {
target = curr_brightness.maximum();
} else if target.lt(&0) {
target = 0;
}
display
.handle
.set_vcp_feature(0x10, target)
.map_err(|err| anyhow::anyhow!("can not set brightness. {:?}", err))?;
}
Err(err) => {
info!(
"can not get display#{} brightness. {:?}",
display_brightness.display_index, err
);
if let Brightness::Absolute(v) = display_brightness.brightness {
display
.handle
.set_vcp_feature(0x10, v)
.map_err(|err| anyhow::anyhow!("can not set brightness. {:?}", err))?;
};
}
},
None => {
anyhow::bail!(
"display#{} was not found.",
display_brightness.display_index
);
}
}
Ok(())
}
}

View File

@ -0,0 +1,8 @@
mod brightness;
mod manager;
pub use brightness::*;
pub use manager::*;

View File

@ -5,24 +5,28 @@
#![feature(bool_to_option)] #![feature(bool_to_option)]
mod core; mod core;
mod display;
mod picker; mod picker;
mod rpc; mod rpc;
use crate::core::AmbientLightMode; use crate::core::AmbientLightMode;
use crate::core::CoreManager; use crate::core::CoreManager;
use once_cell::sync::OnceCell;
use paris::*; use paris::*;
use picker::config::DisplayConfig; use picker::config::DisplayConfig;
use picker::manager::Picker; use picker::manager::Picker;
use picker::screenshot::ScreenshotDto; use picker::screenshot::ScreenshotDto;
use tauri::async_runtime::Mutex; use tauri::async_runtime::Mutex;
use once_cell::sync::OnceCell;
static GET_SCREENSHOT_LOCK: OnceCell<Mutex<bool>> = OnceCell::new(); static GET_SCREENSHOT_LOCK: OnceCell<Mutex<bool>> = OnceCell::new();
#[tauri::command] #[tauri::command]
async fn take_snapshot() -> Vec<ScreenshotDto> { async fn take_snapshot() -> Vec<ScreenshotDto> {
info!("Hi?"); info!("Hi?");
let _lock = GET_SCREENSHOT_LOCK.get_or_init(|| Mutex::new(false)).lock().await; let _lock = GET_SCREENSHOT_LOCK
.get_or_init(|| Mutex::new(false))
.lock()
.await;
info!("Hi!"); info!("Hi!");
let manager = Picker::global().await; let manager = Picker::global().await;
@ -88,8 +92,7 @@ async fn play_mode(target_mode: AmbientLightMode) {
} }
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {display::Manager::global().await;
rpc::manager::Manager::global();
tauri::Builder::default() tauri::Builder::default()
.invoke_handler(tauri::generate_handler![ .invoke_handler(tauri::generate_handler![
take_snapshot, take_snapshot,

View File

@ -1,23 +1,35 @@
use crate::picker::led_color::LedColor; use paris::error;
use tokio::sync::{broadcast, OnceCell};
use super::mqtt::MqttConnection; use crate::{display, picker::led_color::LedColor};
use once_cell::sync::OnceCell;
use super::mqtt::MqttRpc;
pub struct Manager { pub struct Manager {
mqtt: MqttConnection, client: MqttRpc,
initialized: bool,
} }
impl Manager { impl Manager {
pub fn global() -> &'static Self { pub async fn global() -> &'static Self {
static RPC_MANAGER: OnceCell<Manager> = OnceCell::new(); static RPC_MANAGER: OnceCell<Manager> = OnceCell::const_new();
RPC_MANAGER.get_or_init(|| Manager::new()) RPC_MANAGER.get_or_init(|| Manager::new()).await
} }
pub fn new() -> Self { pub async fn new() -> Self {
let mut mqtt = MqttConnection::new(); let mut mqtt = MqttRpc::new();
mqtt.initialize(); let initialized = match mqtt.initialize().await {
Self { mqtt } Ok(_) => true,
Err(err) => {
error!("initialize for mqtt was failed. {:?}", err);
false
}
};
Self {
client: mqtt,
initialized,
}
} }
pub async fn publish_led_colors(&self, colors: &Vec<LedColor>) -> anyhow::Result<()> { pub async fn publish_led_colors(&self, colors: &Vec<LedColor>) -> anyhow::Result<()> {
@ -27,29 +39,14 @@ impl Manager {
.flatten() .flatten()
.collect::<Vec<u8>>(); .collect::<Vec<u8>>();
self.mqtt self.publish_led_sub_pixels(payload).await
.client
.publish(
"display-ambient-light/desktop/colors",
rumqttc::QoS::AtLeastOnce,
false,
payload,
)
.await
.map_err(|error| anyhow::anyhow!("mqtt publish failed. {}", error))
} }
pub async fn publish_led_sub_pixels(&self, payload: Vec<u8>) -> anyhow::Result<()> { pub async fn publish_led_sub_pixels(&self, payload: Vec<u8>) -> anyhow::Result<()> {
self.client.publish_led_sub_pixels(payload).await
}
self.mqtt pub fn client(&self) -> &MqttRpc {
.client &self.client
.publish(
"display-ambient-light/desktop/colors",
rumqttc::QoS::AtLeastOnce,
false,
payload,
)
.await
.map_err(|error| anyhow::anyhow!("mqtt publish failed. {}", error))
} }
} }

View File

@ -1,2 +1,4 @@
pub mod manager; mod manager;
pub mod mqtt; pub mod mqtt;
pub use manager::*;

View File

@ -1,41 +1,106 @@
use rumqttc::{AsyncClient, MqttOptions, QoS}; use crate::display;
use image::EncodableLayout;
use paris::warn;
use rumqttc::{AsyncClient, Event, Incoming, MqttOptions, QoS};
use serde::Deserialize;
use std::time::Duration; use std::time::Duration;
use time::{format_description, OffsetDateTime}; use time::{format_description, OffsetDateTime};
use tokio::task; use tokio::{sync::broadcast, task};
use tracing::warn;
pub struct MqttConnection { const DISPLAY_TOPIC: &'static str = "display-ambient-light/display";
pub client: AsyncClient, const DISPLAY_BRIGHTNESS_TOPIC: &'static str = "display-ambient-light/display/brightness";
pub struct MqttRpc {
client: AsyncClient,
change_display_brightness_tx: broadcast::Sender<display::DisplayBrightness>,
} }
impl MqttConnection { impl MqttRpc {
pub fn new() -> Self { pub fn new() -> Self {
let mut options = MqttOptions::new("rumqtt-async", "192.168.31.11", 1883); let mut options = MqttOptions::new("rumqtt-async", "192.168.31.11", 1883);
options.set_keep_alive(Duration::from_secs(5)); options.set_keep_alive(Duration::from_secs(5));
let (client, mut eventloop) = AsyncClient::new(options, 10); let (client, mut eventloop) = AsyncClient::new(options, 10);
let (change_display_brightness_tx, _) =
broadcast::channel::<display::DisplayBrightness>(16);
let change_display_brightness_tx2 = change_display_brightness_tx.clone();
task::spawn(async move { task::spawn(async move {
loop { loop {
match eventloop.poll().await { match eventloop.poll().await {
Ok(_) => {} Ok(notification) => {
let handled = || -> anyhow::Result<()> {
println!("MQTT notification = {:?}", notification);
if let Event::Incoming(notification) = notification {
if let Incoming::Publish(notification) = notification {
match notification.topic.as_str() {
DISPLAY_BRIGHTNESS_TOPIC => {
let payload_text = String::from_utf8(
notification.payload.as_bytes().to_owned(),
)
.map_err(|err| {
anyhow::anyhow!("can not parse json. {:?}", err)
})?;
let display_brightness: display::DisplayBrightness =
serde_json::from_str(payload_text.as_str())
.map_err(|err| {
anyhow::anyhow!(
"can not deserialize display brightness. {:?}",
err
)
})?;
change_display_brightness_tx2
.send(display_brightness)
.map_err(|err| {
anyhow::anyhow!(
"can not broadcast display brightness. {:?}",
err
)
})?;
}
&_ => {}
};
}
}
Ok(())
};
if let Err(err) = handled() {
warn!("handle notification was failed. Error: {:?}", err);
}
}
Err(err) => { Err(err) => {
println!("MQTT Error Event = {:?}", err); println!("MQTT Error Event = {:?}", err);
} }
} }
} }
}); });
Self { client }
Self {
client,
change_display_brightness_tx,
}
} }
pub fn initialize(&mut self) { pub async fn initialize(&mut self) -> anyhow::Result<()> {
self.subscribe_board(); self.subscribe_board().await?;
self.subscribe_display().await?;
self.broadcast_desktop_online(); self.broadcast_desktop_online();
anyhow::Ok(())
} }
async fn subscribe_board(&self) { async fn subscribe_board(&self) -> anyhow::Result<()> {
self.client self.client
.subscribe("display-ambient-light/board/#", QoS::AtMostOnce) .subscribe("display-ambient-light/board/#", QoS::AtMostOnce)
.await; .await
.map_err(|err| anyhow::anyhow!("subscribe board failed. {:?}", err))
}
async fn subscribe_display(&self) -> anyhow::Result<()> {
self.client
.subscribe(format!("{}/#", DISPLAY_TOPIC), QoS::AtMostOnce)
.await
.map_err(|err| anyhow::anyhow!("subscribe board failed. {:?}", err))
} }
fn broadcast_desktop_online(&mut self) { fn broadcast_desktop_online(&mut self) {
@ -69,4 +134,20 @@ impl MqttConnection {
} }
}); });
} }
pub async fn publish_led_sub_pixels(&self, payload: Vec<u8>) -> anyhow::Result<()> {
self.client
.publish(
"display-ambient-light/desktop/colors",
rumqttc::QoS::AtLeastOnce,
false,
payload,
)
.await
.map_err(|error| anyhow::anyhow!("mqtt publish failed. {}", error))
}
pub fn subscribe_change_display_brightness_rx(&self) -> broadcast::Receiver<display::DisplayBrightness> {
self.change_display_brightness_tx.subscribe()
}
} }