From ffd47ae5c824a5597d3f588368aefcb53e93833d Mon Sep 17 00:00:00 2001
From: Johannes Blume <johannes.blume@desy.de>
Date: Tue, 23 Feb 2021 12:12:31 +0000
Subject: [PATCH] Tagging the Release_1_8 of the  project.

---
 Keithley428.cpp | 37 +++++++++++++++++++++++++------------
 Makefile        |  4 ++--
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Keithley428.cpp b/Keithley428.cpp
index a7c7a2b..49e79ab 100644
--- a/Keithley428.cpp
+++ b/Keithley428.cpp
@@ -374,7 +374,8 @@ void Keithley428::read_Gain(Tango::Attribute &attr)
     }
     else
     {
-        din << "U0X";
+        Tango::DevString buffer = Tango::string_dup("U0X");
+        din << buffer;
     }
 
     dout = gpib_device->command_inout(m_write_read.c_str(), din);
@@ -474,7 +475,8 @@ void Keithley428::read_GainStr(Tango::Attribute &attr)
     }
     else
     {
-        din << "U3X";;
+        Tango::DevString buffer = Tango::string_dup("U3X");
+        din << buffer;
     }
 
     dout = gpib_device->command_inout(m_write_read.c_str(),din);  
@@ -518,7 +520,8 @@ void Keithley428::read_Overloaded(Tango::Attribute &attr)
     }
     else
     {
-        din <<  "U1X";
+        Tango::DevString buffer = Tango::string_dup("U1X");
+        din <<  buffer;
     }
 
     dout = gpib_device->command_inout(m_write_read.c_str(),din);  
@@ -564,7 +567,8 @@ void Keithley428::read_Bypass(Tango::Attribute &attr)
     }
     else
     {
-        din << "U0X";
+        Tango::DevString buffer = Tango::string_dup("U0X");
+        din << buffer;
     }
 
     dout = gpib_device->command_inout(m_write_read.c_str(),din);  
@@ -656,7 +660,8 @@ void Keithley428::read_filterState(Tango::Attribute &attr)
     }
     else
     {
-	    din << "U0X";
+        Tango::DevString buffer = Tango::string_dup("U0X");
+	    din << buffer;
     }
     dout = gpib_device->command_inout(m_write_read.c_str(),din);  
 
@@ -714,7 +719,8 @@ void Keithley428::read_autoFilterState(Tango::Attribute &attr)
     }
     else
     {
-        din << "U0X";
+        Tango::DevString buffer = Tango::string_dup("U0X");
+        din << buffer;
     }
 
     dout = gpib_device->command_inout(m_write_read.c_str(),din);  
@@ -773,7 +779,8 @@ void Keithley428::read_RiseTime(Tango::Attribute &attr)
     }
     else
     {
-        din << "U0X";
+        Tango::DevString buffer = Tango::string_dup("U0X");
+        din << buffer;
     }
     dout = gpib_device->command_inout(m_write_read.c_str(),din);  
 
@@ -920,7 +927,8 @@ void Keithley428::perform_zero_correct()
     }
     else
     {
-        din << "C2X";
+        Tango::DevString buffer = Tango::string_dup("C2X");
+        din << buffer;
     }
     gpib_device->command_inout(m_write.c_str(),din);
 
@@ -951,7 +959,8 @@ void Keithley428::filter_on()
     }
     else
     {
-        din << "P1X";
+        Tango::DevString buffer = Tango::string_dup("P1X");
+        din << buffer;
     }
 
     gpib_device->command_inout(m_write.c_str(),din);
@@ -983,7 +992,8 @@ void Keithley428::filter_off()
     }
     else
     {
-        din << "P0X";
+        Tango::DevString buffer = Tango::string_dup("P0X");
+        din << buffer;
     }
 
     gpib_device->command_inout(m_write.c_str(),din);
@@ -1007,6 +1017,7 @@ void Keithley428::auto_filter_on()
 	Tango::Attribute &filterState = dev_attr->get_attr_by_name("filterState");
 	this->read_filterState(filterState);
 
+
     string filter_state = *attr_filterState_read;
 
     if(filter_state == "ON")
@@ -1029,7 +1040,8 @@ void Keithley428::auto_filter_on()
     }
     else
     {
-        din << "Z1X";
+        Tango::DevString buffer = Tango::string_dup("Z1X");
+        din << buffer;
     }
 
     gpib_device->command_inout(m_write.c_str(),din);
@@ -1061,7 +1073,8 @@ void Keithley428::auto_filter_off()
     }
     else
     {
-        din << "Z0X";
+        Tango::DevString buffer = Tango::string_dup("Z0X");
+        din << buffer;
     }
 
     gpib_device->command_inout(m_write.c_str(),din);
diff --git a/Makefile b/Makefile
index 35490f7..2d3cae2 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ MAKE_ENV = $(TANGO_DIR)/Libraries/cppserver/common
 #
 PACKAGE_NAME = Keithley428
 MAJOR_VERS   = 1
-MINOR_VERS   = 6
+MINOR_VERS   = 8
 RELEASE      = Release_$(MAJOR_VERS)_$(MINOR_VERS)
 
 # #=============================================================================
@@ -62,7 +62,7 @@ OUTPUT_TYPE = DEVICE
 #
 # if 'make using_trunk=1' use the trunk directories
 #
-using_trunk ?= 1
+using_trunk ?= 0
 
 ifeq ($(using_trunk), 1)
   GPIB_DIR = $(TANGO_DIR)/DeviceClasses/Communication/GpibDeviceServer/trunk
-- 
GitLab