Improve Support for KAxxx (#5)

* update serial driver
* prepare 1.0.5

Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "pza-plugin-korad"
 edition = "2021"
-version = "1.0.4"
+version = "1.0.5"
 
 [lib]
 path = "src/lib.rs"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
 # The panduza core library
-panduza-platform-core = { git = "https://github.com/Panduza/panduza-platform-core", tag = "0.1.5", features = [
+panduza-platform-core = { git = "https://github.com/Panduza/panduza-platform-core", tag = "0.1.6", features = [
     "serial",
 ] }
 # The panduza connectors library
@@ -24,7 +24,7 @@ futures = "0.3.17"
 
 [package.metadata.cargo-post.dependencies]
 # Only for env paths
-panduza-platform-core = { git = "https://github.com/Panduza/panduza-platform-core", tag = "0.1.5" }
+panduza-platform-core = { git = "https://github.com/Panduza/panduza-platform-core", tag = "0.1.6" }
 
 [build-dependencies]
 # 

src/common.rs

@@ -1,3 +1,5 @@
+pub mod control;
 pub mod driver;
 pub mod fake;
-pub mod real;
+pub mod identity;
+pub mod measure;

src/common/real/control/options/ocp.rs → src/common/control/options/ocp.rs

@@ -2,21 +2,25 @@ use crate::common::driver::KoradDriver;
 use panduza_platform_core::protocol::AsciiCmdRespProtocol;
 use panduza_platform_core::Error;
 use panduza_platform_core::{
-    spawn_on_command, BooleanAttServer, Class, InstanceLogger, Instance,
+    log_debug, spawn_on_command, BooleanAttServer, Class, Instance, InstanceLogger,
 };
 use std::sync::Arc;
 use tokio::sync::Mutex;
 
-///
-///
+/// Mount OCP Attribute
 ///
 pub async fn mount<SD: AsciiCmdRespProtocol + 'static>(
     mut instance: Instance,
     mut class: Class,
     driver: Arc<Mutex<KoradDriver<SD>>>,
 ) -> Result<(), Error> {
     //
+    // Start logging
+    let logger = instance.logger.clone();
+    log_debug!(logger, "Mounting 'control/options/ocp' class...");
+
     //
+    // Mount the attribute
     let att_voltage = class
         .create_attribute("ocp")
         .with_wo()
@@ -37,6 +41,10 @@ pub async fn mount<SD: AsciiCmdRespProtocol + 'static>(
         on_command(logger_2.clone(), att_voltage_2.clone(), driver.clone())
     );
 
+    //
+    //
+    log_debug!(logger, "Mounting 'control/options/ocp' class -> OK");
+
     //
     // Function ok
     Ok(())
@@ -53,7 +61,9 @@ async fn on_command<SD: AsciiCmdRespProtocol + 'static>(
     while let Some(command) = value_value_attr.pop_cmd().await {
         //
         // Log
-        logger.debug(format!("OCP command received '{:?}'", command));
+        log_debug!(logger, "OCP command received '{:?}'", command);
+        //
+        //
         driver.lock().await.set_ocp(command).await?;
     }
     Ok(())

src/common/driver.rs

@@ -220,16 +220,17 @@ impl<SD: AsciiCmdRespProtocol> KoradDriver<SD> {
     ///
     ///
     pub async fn set_ocp(&mut self, value: bool) -> Result<(), Error> {
-        match value {
-            true => {
-                let cmd = "OCP1".to_string();
-                self.driver.send(&cmd).await
-            }
-            false => {
-                let cmd = "OCP0".to_string();
-                self.driver.send(&cmd).await
-            }
+        //
+        // Prepare command
+        let mut cmd = "OCP0".to_string();
+        if value {
+            cmd = "OCP1".to_string();
         }
+
+        //
+        // Send
+        log_trace!(self.logger, "SEND => {:?}", cmd);
+        self.driver.send(&cmd).await
     }
 
     ///

src/common/real/identity.rs → src/common/identity.rs

@@ -11,6 +11,10 @@ pub async fn mount<SD: AsciiCmdRespProtocol>(
     mut instance: Instance,
     driver: Arc<Mutex<KoradDriver<SD>>>,
 ) -> Result<(), Error> {
+    //
+    //
+    instance.logger.debug("Mounting 'identity'...");
+
     //
     // Create attribute
     let att_identity = instance
@@ -25,5 +29,9 @@ pub async fn mount<SD: AsciiCmdRespProtocol>(
     let idn = driver.lock().await.get_idn().await?;
     att_identity.set(idn).await?;
 
+    //
+    //
+    instance.logger.debug("Mounting 'identity' => OK");
+
     Ok(())
 }

src/ka3005p/device.rs

@@ -63,8 +63,7 @@ impl KA3005PDevice {
             SerialSettings::new()
                 .set_port_name_from_json_or_usb_settings(&json_settings, &usb_settings)
                 .map_err(|e| Error::Generic(e.to_string()))?
-                .set_baudrate(DEVICE_SERIAL_BAUDRATE)
-                .set_time_lock_duration(Duration::from_millis(300)), // require delay between 2 commands
+                .set_baudrate(DEVICE_SERIAL_BAUDRATE),
         );
 
         Ok(())
@@ -83,7 +82,7 @@ impl KA3005PDevice {
             "Serial Settings not provided".to_string(),
         ))?;
 
-        let driver = SerialTimeLockDriver::open(settings)?;
+        let driver = SerialTimeLockDriver::open(settings, Duration::from_millis(300))?;
 
         let kdriver = KoradDriver::new(driver, instance.logger.clone());
 
@@ -107,9 +106,9 @@ impl DriverOperations for KA3005PDevice {
 
         let driver = self.mount_driver(instance.clone())?;
 
-        crate::common::real::identity::mount(instance.clone(), driver.clone()).await?;
-        crate::common::real::control::mount(instance.clone(), driver.clone()).await?;
-        crate::common::real::measure::mount(instance.clone(), driver.clone()).await?;
+        crate::common::identity::mount(instance.clone(), driver.clone()).await?;
+        crate::common::control::mount(instance.clone(), driver.clone()).await?;
+        crate::common::measure::mount(instance.clone(), driver.clone()).await?;
 
         Ok(())
     }

src/kd3005p/device.rs

@@ -5,6 +5,7 @@ use async_trait::async_trait;
 
 use crate::common::driver::KoradDriver;
 use panduza_platform_core::drivers::serial::eol::Driver as SerialEolDriver;
+// use panduza_platform_core::drivers::serial::time_lock::Driver as SerialTimeLockDriver;
 use panduza_platform_core::drivers::serial::Settings as SerialSettings;
 use panduza_platform_core::drivers::usb::Settings as UsbSettings;
 use panduza_platform_core::{DriverOperations, Error};
@@ -94,6 +95,7 @@ impl KD3005PDevice {
         ))?;
 
         let driver = SerialEolDriver::open(settings, vec![b'\n'])?;
+        // let driver = SerialTimeLockDriver::open(settings, Duration::from_millis(300))?;
 
         let kdriver = KoradDriver::new(driver, instance.logger.clone());
 
@@ -121,9 +123,9 @@ impl DriverOperations for KD3005PDevice {
 
         let driver = self.mount_driver(instance.clone())?;
 
-        crate::common::real::identity::mount(instance.clone(), driver.clone()).await?;
-        crate::common::real::control::mount(instance.clone(), driver.clone()).await?;
-        crate::common::real::measure::mount(instance.clone(), driver.clone()).await?;
+        crate::common::identity::mount(instance.clone(), driver.clone()).await?;
+        crate::common::control::mount(instance.clone(), driver.clone()).await?;
+        crate::common::measure::mount(instance.clone(), driver.clone()).await?;
 
         //
         //

src/kd3005p_fake/device.rs

@@ -40,9 +40,9 @@ impl DriverOperations for KD3005PFakeDevice {
     async fn mount(&mut self, instance: Instance) -> Result<(), Error> {
         let driver = self.mount_driver(instance.clone())?;
 
-        crate::common::real::identity::mount(instance.clone(), driver.clone()).await?;
-        crate::common::real::control::mount(instance.clone(), driver.clone()).await?;
-        crate::common::real::measure::mount(instance.clone(), driver.clone()).await?;
+        crate::common::identity::mount(instance.clone(), driver.clone()).await?;
+        crate::common::control::mount(instance.clone(), driver.clone()).await?;
+        crate::common::measure::mount(instance.clone(), driver.clone()).await?;
 
         Ok(())
     }