From a72343e16b07fa291e4c0b14dd289ec6357d3039 Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Tue, 10 Mar 2009 10:55:00 +0000
Subject: [PATCH] xavier : K_485 no config cmd supported.
---
src/KeithleyDDCProtocol.cpp | 6 ++++++
src/Keithley_485.cpp | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/KeithleyDDCProtocol.cpp b/src/KeithleyDDCProtocol.cpp
index 5f47c99..2091849 100644
--- a/src/KeithleyDDCProtocol.cpp
+++ b/src/KeithleyDDCProtocol.cpp
@@ -398,12 +398,15 @@ std::stringstream cmd_to_send;
std::string argout("no data");
//- send command : G0X -> show prefix ( = keithley type )
+ this->enable_readingWithPrefix();
+
cmd_to_send.str("");
//- get status word
cmd_to_send << "U1X" << std::endl;
argout = _communication_link->write_read(cmd_to_send.str());
// std::cout << "\n\nKeithleyDDCProtocol::get_raw_status returns *" << argout << "*" << std::ends;
+ this->disable_readingWithPrefix();
return argout;
}
@@ -417,12 +420,15 @@ std::stringstream cmd_to_send;
std::string argout("no data");
//- send command : G0X -> show prefix ( = keithley type )
+ this->enable_readingWithPrefix();
+
cmd_to_send.str("");
//- get status word
cmd_to_send << "U0X" << std::endl;
argout = _communication_link->write_read(cmd_to_send.str());
// std::cout << "\n\nKeithleyDDCProtocol::get_DDC_configuration returns *" << argout << "*" << std::ends;
+ this->disable_readingWithPrefix();
return argout;
}
diff --git a/src/Keithley_485.cpp b/src/Keithley_485.cpp
index b3c0cb1..bb34279 100644
--- a/src/Keithley_485.cpp
+++ b/src/Keithley_485.cpp
@@ -149,7 +149,7 @@ std::string Keithley_485::electrometer_status (void)
std::string tmp("");
//- read keithley status from HW
- _kstatus = _electrometerProtocol->get_raw_status();
+ _kstatus = _electrometerProtocol->get_DDC_configuration();
//- build status
try
--
GitLab