From 77cd6e5739bce72784f8bf362995e4eee63c67c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wo=C5=BAniak?= Date: Mon, 13 Jun 2022 12:54:50 +0200 Subject: [PATCH] Swap axes, fix drag & drop, upgrade deps --- Cargo.lock | 244 ++++++++++----------- amdfand/Cargo.toml | 2 +- amdgpu-config/Cargo.toml | 2 +- amdgpu-config/src/fan.rs | 2 +- amdgpu/Cargo.toml | 2 +- amdgpu/src/card.rs | 2 +- amdgpu/src/temp_input.rs | 2 +- amdgui-helper/Cargo.toml | 2 +- amdguid/Cargo.toml | 34 +-- amdguid/src/widgets/change_fan_settings.rs | 12 +- amdguid/src/widgets/config_file.rs | 28 +-- amdguid/src/widgets/drag_plot.rs | 14 +- amdguid/src/widgets/legend.rs | 2 +- amdmond-lib/Cargo.toml | 2 +- amdvold/Cargo.toml | 2 +- amdvold/src/clock_state.rs | 10 +- 16 files changed, 182 insertions(+), 180 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 66a7aaf..e2b2131 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "amdfand" -version = "1.0.11" +version = "1.0.12" dependencies = [ "amdgpu", "amdgpu-config", @@ -71,7 +71,7 @@ dependencies = [ [[package]] name = "amdgpu" -version = "1.0.9" +version = "1.0.11" dependencies = [ "gumdrop", "log", @@ -86,7 +86,7 @@ dependencies = [ [[package]] name = "amdgpu-config" -version = "1.0.9" +version = "1.0.10" dependencies = [ "amdgpu", "csv", @@ -100,7 +100,7 @@ dependencies = [ [[package]] name = "amdgui-helper" -version = "1.0.9" +version = "1.0.10" dependencies = [ "amdgpu", "amdgpu-config", @@ -118,7 +118,7 @@ dependencies = [ [[package]] name = "amdguid" -version = "1.0.9" +version = "1.0.10" dependencies = [ "amdgpu", "amdgpu-config", @@ -167,7 +167,7 @@ dependencies = [ [[package]] name = "amdmond-lib" -version = "1.0.9" +version = "1.0.10" dependencies = [ "amdgpu", "amdgpu-config", @@ -183,7 +183,7 @@ dependencies = [ [[package]] name = "amdvold" -version = "1.0.9" +version = "1.0.10" dependencies = [ "amdgpu", "amdgpu-config", @@ -248,9 +248,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", @@ -293,9 +293,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "bytes" @@ -856,9 +856,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "getrandom" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1049,9 +1049,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg", "hashbrown", @@ -1080,9 +1080,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" dependencies = [ "wasm-bindgen", ] @@ -1107,9 +1107,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -1133,18 +1133,19 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] @@ -1160,9 +1161,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" @@ -1214,12 +1215,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ "adler", - "autocfg", ] [[package]] @@ -1237,16 +1237,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" dependencies = [ "libc", "log", - "miow", - "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", + "windows-sys", ] [[package]] @@ -1392,9 +1390,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -1402,9 +1400,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -1481,18 +1479,18 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "osmesa-sys" @@ -1518,7 +1516,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb1e509cfe7a12db2a90bfa057dfcdbc55a347f5da677c506b53dd099cfec9d" dependencies = [ - "ttf-parser 0.15.0", + "ttf-parser 0.15.1", ] [[package]] @@ -1534,12 +1532,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.1", + "parking_lot_core 0.9.3", ] [[package]] @@ -1558,9 +1556,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1587,15 +1585,15 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "pretty_env_logger" @@ -1628,11 +1626,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1652,9 +1650,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -1666,32 +1664,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" dependencies = [ "libc", - "raw-window-handle 0.4.2", + "raw-window-handle 0.4.3", ] [[package]] name = "raw-window-handle" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" dependencies = [ "cty", ] [[package]] name = "redox_syscall" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7776223e2696f1aa4c6b0170e83212f47296a00424305117d013dfe86fb0fe55" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", "redox_syscall", @@ -1700,9 +1698,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" dependencies = [ "aho-corasick", "memchr", @@ -1717,9 +1715,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" [[package]] name = "ron" @@ -1759,9 +1757,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "same-file" @@ -1786,18 +1784,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.136" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", @@ -1879,9 +1877,9 @@ dependencies = [ [[package]] name = "smithay-client-toolkit" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1325f292209cee78d5035530932422a30aa4c8fda1a16593ac083c1de211e68a" +checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" dependencies = [ "bitflags", "dlib 0.5.0", @@ -1901,7 +1899,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "610b551bd25378bfd2b8e7a0fcbd83d427e8f2f6a40c47ae0f70688e9949dd55" dependencies = [ - "smithay-client-toolkit 0.15.3", + "smithay-client-toolkit 0.15.4", "wayland-client 0.29.4", ] @@ -1943,13 +1941,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.89" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1969,18 +1967,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -2000,17 +1998,17 @@ dependencies = [ [[package]] name = "tokio" -version = "1.17.0" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ "bytes", "libc", "memchr", - "mio 0.8.2", + "mio 0.8.3", "num_cpus", "once_cell", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2", @@ -2020,9 +2018,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", @@ -2031,9 +2029,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] @@ -2046,9 +2044,15 @@ checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" [[package]] name = "ttf-parser" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3" +checksum = "42d4b50cba812f0f04f0707bb6a0eaa5fae4ae05d90fc2a377998d2f21e77a1c" + +[[package]] +name = "unicode-ident" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" [[package]] name = "unicode-segmentation" @@ -2056,12 +2060,6 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - [[package]] name = "version_check" version = "0.9.4" @@ -2150,9 +2148,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2160,9 +2158,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" dependencies = [ "bumpalo", "lazy_static", @@ -2175,9 +2173,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2185,9 +2183,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", @@ -2198,9 +2196,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" +checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" [[package]] name = "wayland-client" @@ -2360,9 +2358,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" dependencies = [ "js-sys", "wasm-bindgen", @@ -2418,9 +2416,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.32.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ "windows_aarch64_msvc", "windows_i686_gnu", @@ -2431,33 +2429,33 @@ dependencies = [ [[package]] name = "windows_aarch64_msvc" -version = "0.32.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_i686_gnu" -version = "0.32.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_msvc" -version = "0.32.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_x86_64_gnu" -version = "0.32.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_msvc" -version = "0.32.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winit" diff --git a/amdfand/Cargo.toml b/amdfand/Cargo.toml index c5a9903..517283f 100644 --- a/amdfand/Cargo.toml +++ b/amdfand/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amdfand" -version = "1.0.11" +version = "1.0.12" edition = "2018" description = "AMDGPU fan control service" license = "MIT OR Apache-2.0" diff --git a/amdgpu-config/Cargo.toml b/amdgpu-config/Cargo.toml index cbe2316..4fcbbda 100644 --- a/amdgpu-config/Cargo.toml +++ b/amdgpu-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amdgpu-config" -version = "1.0.9" +version = "1.0.10" edition = "2021" description = "Subcomponent of AMDGPU tools" license = "MIT OR Apache-2.0" diff --git a/amdgpu-config/src/fan.rs b/amdgpu-config/src/fan.rs index 25dcacf..3578ab0 100644 --- a/amdgpu-config/src/fan.rs +++ b/amdgpu-config/src/fan.rs @@ -246,7 +246,7 @@ mod parse_config { use amdgpu::{AmdGpuError, Card, TempInput}; - #[derive(Deserialize, PartialEq, Debug)] + #[derive(Deserialize, PartialEq, Eq, Debug)] pub struct Foo { card: Card, } diff --git a/amdgpu/Cargo.toml b/amdgpu/Cargo.toml index b7bba3f..6b6c0ff 100644 --- a/amdgpu/Cargo.toml +++ b/amdgpu/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amdgpu" -version = "1.0.10" +version = "1.0.11" edition = "2018" description = "Subcomponent of AMDGPU fan control service" license = "MIT OR Apache-2.0" diff --git a/amdgpu/src/card.rs b/amdgpu/src/card.rs index 205d3c0..b7f981e 100644 --- a/amdgpu/src/card.rs +++ b/amdgpu/src/card.rs @@ -2,7 +2,7 @@ use serde::Deserialize; use crate::AmdGpuError; -#[derive(Debug, Copy, Clone, PartialEq)] +#[derive(Debug, Copy, Clone, PartialEq, Eq)] pub struct Card(pub u32); impl std::fmt::Display for Card { diff --git a/amdgpu/src/temp_input.rs b/amdgpu/src/temp_input.rs index ad13e1e..7656b25 100644 --- a/amdgpu/src/temp_input.rs +++ b/amdgpu/src/temp_input.rs @@ -1,7 +1,7 @@ use crate::AmdGpuError; use serde::Serializer; -#[derive(PartialEq, Debug, Copy, Clone)] +#[derive(PartialEq, Eq, Debug, Copy, Clone)] pub struct TempInput(pub u16); impl TempInput { diff --git a/amdgui-helper/Cargo.toml b/amdgui-helper/Cargo.toml index 4b35307..699acd6 100644 --- a/amdgui-helper/Cargo.toml +++ b/amdgui-helper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amdgui-helper" -version = "1.0.9" +version = "1.0.10" edition = "2018" description = "AMDGPU fan control service" license = "MIT OR Apache-2.0" diff --git a/amdguid/Cargo.toml b/amdguid/Cargo.toml index 1bc49aa..4e51d45 100644 --- a/amdguid/Cargo.toml +++ b/amdguid/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amdguid" -version = "1.0.9" +version = "1.0.10" edition = "2018" description = "AMDGPU fan control service" license = "MIT OR Apache-2.0" @@ -40,28 +40,28 @@ gumdrop = { version = "0.8.0" } log = { version = "0.4.14" } pretty_env_logger = { version = "0.4.0" } -egui = { version = "0.15.0", optional = true } -epaint = { version = "0.15.0", features = ["serialize"], optional = true } -epi = { version = "0.15.0", optional = true } -winit = { version = "0.25.0", optional = true } -egui-winit = { version = "0.15.0", optional = true } +egui = { version = "0.15", optional = true } +epaint = { version = "0.15", features = ["serialize"], optional = true } +epi = { version = "0.15", optional = true } +winit = { version = "0.25", optional = true } +egui-winit = { version = "0.15", optional = true } # vulkan -egui_vulkano = { version = "0.4.0", optional = true } -vulkano-win = { version = "0.25.0", optional = true } -vulkano = { version = "0.25.0", optional = true } -vulkano-shaders = { version = "0.25.0", optional = true } +egui_vulkano = { version = "0.4", optional = true } +vulkano-win = { version = "0.25", optional = true } +vulkano = { version = "0.25", optional = true } +vulkano-shaders = { version = "0.25", optional = true } # xorg glium glium = { version = "0.30", optional = true } -egui_glium = { version = "0.15.0", optional = true } +egui_glium = { version = "0.15", optional = true } # xorg glow -glutin = { version = "0.27.0", optional = true } -glow = { version = "0.11.2", optional = true } -egui_glow = { version = "0.15.0", optional = true } +glutin = { version = "0.27", optional = true } +glow = { version = "0.11", optional = true } +egui_glow = { version = "0.15", optional = true } -tokio = { version = "1.15.0", features = ["full"] } -parking_lot = { version = "0.11.2" } +tokio = { version = "1.15", features = ["full"] } +parking_lot = { version = "0.11" } -nix = { version = "0.23.1" } +nix = { version = "0.23" } [dev-dependencies] amdgpu = { path = "../amdgpu", version = "1.0", features = ["gui-helper"] } diff --git a/amdguid/src/widgets/change_fan_settings.rs b/amdguid/src/widgets/change_fan_settings.rs index 1db44dd..932eb5d 100644 --- a/amdguid/src/widgets/change_fan_settings.rs +++ b/amdguid/src/widgets/change_fan_settings.rs @@ -50,7 +50,7 @@ impl ChangeFanSettings { let iter = config .speed_matrix() .iter() - .map(|v| crate::items::Value::new(v.speed, v.temp)); + .map(|v| crate::items::Value::new(v.temp, v.speed)); crate::items::Line::new(crate::items::Values::from_values_iter( iter, )) @@ -63,8 +63,8 @@ impl ChangeFanSettings { .allow_drag(true) .allow_zoom(false) .line(curve) - .y_axis_name(String::from("Temperature")) - .x_axis_name(String::from("Speed")) + .y_axis_name(String::from("Speed")) + .x_axis_name(String::from("Temperature")) .hline(crate::items::HLine::new(100.0).color(Color32::TRANSPARENT)) .vline(crate::items::VLine::new(100.0).color(Color32::TRANSPARENT)) .on_event(|msg| match msg { @@ -85,17 +85,17 @@ impl ChangeFanSettings { let current = config.speed_matrix_mut().get_mut(idx); if let Some(point) = current { - point.speed = (point.speed + delta.x as f64) + point.speed = (point.speed + delta.y as f64) .max(min.speed) .min(max.speed); - point.temp = (point.temp + delta.y as f64) + point.temp = (point.temp + delta.x as f64) .max(min.temp) .min(max.temp); } } } }) - .legend(crate::widgets::legend::Legend::default()) + .legend(widgets::legend::Legend::default()) }); ui.separator(); Self::save_button(self.config.clone(), state, ui); diff --git a/amdguid/src/widgets/config_file.rs b/amdguid/src/widgets/config_file.rs index bdc809a..e33a296 100644 --- a/amdguid/src/widgets/config_file.rs +++ b/amdguid/src/widgets/config_file.rs @@ -41,21 +41,10 @@ impl Widget for ConfigFile { MatrixPoint::MAX }; - { - ui.label("Temperature"); - if ui - .add(egui::Slider::new(&mut current.temp, min.temp..=max.temp)) - .changed() - { - if let Some(entry) = self.config.lock().speed_matrix_mut().get_mut(idx) { - entry.temp = current.temp; - } - } - } { ui.label("Speed"); if ui - .add(egui::Slider::new(&mut current.speed, min.speed..=max.speed)) + .add(egui::Slider::new(&mut current.temp, min.temp..=max.temp)) .changed() { if let Some(entry) = self.config.lock().speed_matrix_mut().get_mut(idx) { @@ -63,18 +52,29 @@ impl Widget for ConfigFile { } } } + { + ui.label("Temperature"); + if ui + .add(egui::Slider::new(&mut current.speed, min.speed..=max.speed)) + .changed() + { + if let Some(entry) = self.config.lock().speed_matrix_mut().get_mut(idx) { + entry.temp = current.temp; + } + } + } ui.horizontal(|ui| { if next.is_some() { if ui - .add(egui::Button::new("Add in middle")) + .add(egui::Button::new("Add in the middle")) .clicked_by(PointerButton::Primary) { self.config.lock().speed_matrix_vec_mut().insert( idx + 1, MatrixPoint::new( - min.temp + ((max.temp - min.temp) / 2.0), min.speed + ((max.speed - min.speed) / 2.0), + min.temp + ((max.temp - min.temp) / 2.0), ), ) } diff --git a/amdguid/src/widgets/drag_plot.rs b/amdguid/src/widgets/drag_plot.rs index aa9147f..9914019 100644 --- a/amdguid/src/widgets/drag_plot.rs +++ b/amdguid/src/widgets/drag_plot.rs @@ -369,16 +369,18 @@ where .iter_mut() .for_each(|line| line.initialize(transform.bounds().range_x())); - let bounds = *transform.bounds(); + let t_bounds = *transform.bounds(); + let prepared = DragPlotPrepared { items, lines, show_x: true, show_y: true, show_axes: [true, true], - transform, + transform: transform.clone(), axis_names, }; + if let Some(mut f) = on_event { if let Some(pointer) = response.hover_pos() { if response.mouse_down(PointerButton::Primary) { @@ -387,8 +389,10 @@ where } } } - if allow_drag && response.dragged_by(PointerButton::Primary) { - let delta = response.drag_delta() * Vec2::new(0.18, -0.18); + if allow_drag && response.dragged_by(PointerButton::Primary) && response.hover_pos().is_some() { + let mut delta = response.drag_delta(); + delta.x *= transform.dvalue_dpos()[0] as f32; + delta.y *= transform.dvalue_dpos()[1] as f32; f(PlotMsg::Drag(delta)); } } @@ -404,7 +408,7 @@ where ui.memory().id_data.insert( plot_id, PlotMemory { - bounds, + bounds: t_bounds, auto_bounds, hovered_entry, hidden_items, diff --git a/amdguid/src/widgets/legend.rs b/amdguid/src/widgets/legend.rs index 8692801..c661721 100644 --- a/amdguid/src/widgets/legend.rs +++ b/amdguid/src/widgets/legend.rs @@ -4,7 +4,7 @@ use egui::{pos2, vec2, Align, PointerButton, Rect, Response, Sense, WidgetInfo, use epaint::{Color32, TextStyle}; /// Where to place the plot legend. -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum Corner { LeftTop, RightTop, diff --git a/amdmond-lib/Cargo.toml b/amdmond-lib/Cargo.toml index abd4679..63574a2 100644 --- a/amdmond-lib/Cargo.toml +++ b/amdmond-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amdmond-lib" -version = "1.0.9" +version = "1.0.10" edition = "2021" description = "AMD GPU monitoring tool for Linux" license = "MIT OR Apache-2.0" diff --git a/amdvold/Cargo.toml b/amdvold/Cargo.toml index 6fd16df..0e7dd90 100644 --- a/amdvold/Cargo.toml +++ b/amdvold/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amdvold" -version = "1.0.9" +version = "1.0.10" edition = "2018" description = "AMDGPU fan control service" license = "MIT OR Apache-2.0" diff --git a/amdvold/src/clock_state.rs b/amdvold/src/clock_state.rs index e6aa335..0536f16 100644 --- a/amdvold/src/clock_state.rs +++ b/amdvold/src/clock_state.rs @@ -5,7 +5,7 @@ const ENGINE_CLOCK_LABEL: &str = "OD_SCLK:"; const MEMORY_CLOCK_LABEL: &str = "OD_MCLK:"; const CURVE_POINTS_LABEL: &str = "OD_VDDC_CURVE:"; -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] pub struct Frequency { pub value: u32, pub unit: String, @@ -50,7 +50,7 @@ impl std::str::FromStr for Frequency { } } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] pub struct Voltage { pub value: u32, pub unit: String, @@ -95,13 +95,13 @@ impl std::str::FromStr for Voltage { } } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] pub struct CurvePoint { pub freq: Frequency, pub voltage: Voltage, } -#[derive(Debug, thiserror::Error, PartialEq)] +#[derive(Debug, thiserror::Error, PartialEq, Eq)] pub enum ClockStateError { #[error("Can't parse value. {0:?}")] ParseValue(#[from] std::num::ParseIntError), @@ -113,7 +113,7 @@ pub enum ClockStateError { InvalidEngineClockSection(String), } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] pub struct ClockState { pub curve_labels: Vec, pub engine_label_lowest: Option,