Pull out constants.

EVerest · Dec 11, 2023 · 0b802d3 · 0b802d3
1 parent d91da2d
commit 0b802d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/zvt/src/feig/mod.rs b/zvt/src/feig/mod.rs
@@ -1,2 +1,3 @@
+pub mod constants;
 pub mod packets;
 pub mod sequences;
diff --git a/zvt/src/feig/packets/mod.rs b/zvt/src/feig/packets/mod.rs
@@ -74,9 +74,6 @@ pub struct CVendFunctions {
     pub instr: u16,
 }
 
-pub const CVEND_FUNCTIONS_ENHANCED_SYSTEMS_INFO: u16 = 1;
-pub const CVEND_FUNCTIONS_ENHANCED_FACTORY_RESET: u16 = 0x0255;
-
 #[derive(Debug, PartialEq, Zvt)]
 #[zvt_control_field(class = 0x80, instr = 0x00)]
 pub struct WriteData {

diff --git a/zvt_cli/src/main.rs b/zvt_cli/src/main.rs
@@ -221,7 +221,7 @@ async fn status(socket: &mut PacketTransport) -> Result<()> {
     // Check the current version of the software
     let request = feig::packets::CVendFunctions {
         password: None,
-        instr: feig::packets::CVEND_FUNCTIONS_ENHANCED_SYSTEMS_INFO,
+        instr: feig::constants::CVendFunctions::SystemsInfo as u16,
     };
     let mut stream = feig::sequences::GetSystemInfo::into_stream(&request, socket);
     while let Some(response) = stream.next().await {
@@ -237,7 +237,7 @@ async fn status(socket: &mut PacketTransport) -> Result<()> {
 async fn factory_reset(socket: &mut PacketTransport, password: usize) -> Result<()> {
     let request = feig::packets::CVendFunctions {
         password: Some(password),
-        instr: feig::packets::CVEND_FUNCTIONS_ENHANCED_FACTORY_RESET,
+        instr: feig::constants::CVendFunctions::FactoryReset as u16,
     };
     let mut stream = feig::sequences::FactoryReset::into_stream(&request, socket);
     while let Some(response) = stream.next().await {