buttplug.io
Buttplug sex toy control library
chore: Fix new config structures to load json properly
qdot.tngl.sh
+17
-2
+16
-1
crates/buttplug_server_device_config/src/device_config_file/device.rs
+16
-1
crates/buttplug_server_device_config/src/device_config_file/device.rs
···
9
9
#[derive(Debug, Clone, Getters, CopyGetters, Serialize, Deserialize)]
10
10
pub struct ConfigBaseDeviceDefinition {
11
11
#[getset(get = "pub")]
12
+
identifier: Option<Vec<String>>,
13
+
#[getset(get = "pub")]
12
14
/// Given name of the device this instance represents.
13
15
name: String,
14
16
#[getset(get_copy = "pub")]
···
18
20
#[getset(get_copy = "pub")]
19
21
message_gap_ms: Option<u32>,
20
22
#[getset(get = "pub")]
21
-
features: Vec<ConfigBaseDeviceFeature>,
23
+
features: Option<Vec<ConfigBaseDeviceFeature>>,
24
+
}
25
+
26
+
impl ConfigBaseDeviceDefinition {
27
+
pub fn update_with_configuration(&self, config: ConfigBaseDeviceDefinition) -> Self {
28
+
Self {
29
+
identifier: config.identifier().clone(),
30
+
name: config.name().clone(),
31
+
id: config.id(),
32
+
protocol_variant: config.protocol_variant.or(self.protocol_variant.clone()),
33
+
message_gap_ms: config.message_gap_ms.or(self.message_gap_ms),
34
+
features: config.features.or(self.features.clone())
35
+
}
36
+
}
22
37
}
23
38
24
39
impl Into<ServerDeviceDefinition> for ConfigBaseDeviceDefinition {
+1
-1
crates/buttplug_server_device_config/src/device_config_file/protocol.rs
+1
-1
crates/buttplug_server_device_config/src/device_config_file/protocol.rs