xavier :

- MCCE2 (Novelec part) : methods to change the active channel to communicate with.

include/AbstractElectrometerClass.h

@@ -9,9 +9,14 @@
 //
 // $Author: xavela $
 //
-// $Revision: 1.13 $
+// $Revision: 1.14 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.13  2008/06/20 14:36:24  xavela
+// xavier :
+// - DDC status show only errors if any
+// - added command to get DDC model configuration
+//
 // Revision 1.12  2008/05/14 09:42:37  xavela
 // xavier :
 // - attributes management :
@@ -191,9 +196,11 @@ public:
 	virtual std::string get_ElectroMeterPolarity  (void);
 	virtual std::string get_ElectroMeterFrequency (void);
 	virtual std::string get_ElectroMeterGain      (void);
+	virtual unsigned short get_ElectroChannel	  (void);
 	virtual void set_ElectroMeterPolarity		  (std::string pola);
 	virtual void set_ElectroMeterFrequency		  (std::string freq);
 	virtual void set_ElectroMeterGain			  (std::string gain);
+	virtual void set_ElectroChannel				  (unsigned short address);
 
 	/**
 	*  \brief Electrometer Status and State.

include/ElectrometerProtocol.h

@@ -12,9 +12,14 @@
 //
 // $Author: xavela $
 //
-// $Revision: 1.10 $
+// $Revision: 1.11 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.10  2008/06/20 14:36:24  xavela
+// xavier :
+// - DDC status show only errors if any
+// - added command to get DDC model configuration
+//
 // Revision 1.9  2008/04/15 12:52:00  xavela
 // xavier :
 // - SRQ management changed :
@@ -204,6 +209,8 @@ public:
 	virtual void set_polarity		(std::string pola);
 	virtual void set_frequency		(std::string freq);
 	virtual void set_gain			(std::string gain);
+	virtual unsigned short get_electrometer_active_channel(void);
+	virtual void set_electrometer_active_channel		  (unsigned short address);
 
 
 

include/NovelecProtocol.h

@@ -86,6 +86,8 @@ public:
 	void set_polarity	(std::string pola);
 	void set_frequency	(std::string freq);
 	void set_gain		(std::string gain);
+	void set_electrometer_active_channel(unsigned short channel_add) { this->_devAdd = channel_add;};
+	unsigned short get_electrometer_active_channel(void) { return this->_devAdd;};
 
 	/**
 	*   \brief init the MCCE-2 device :

src/AbstractElectrometerClass.cpp

@@ -11,9 +11,14 @@
 //
 // $Author: xavela $
 //
-// $Revision: 1.14 $
+// $Revision: 1.15 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.14  2008/06/20 14:36:23  xavela
+// xavier :
+// - DDC status show only errors if any
+// - added command to get DDC model configuration
+//
 // Revision 1.13  2008/05/14 09:42:37  xavela
 // xavier :
 // - attributes management :
@@ -714,3 +719,19 @@ void AbstractElectrometerClass::mcce_init (void)
 	_electrometerProtocol->init_MCCE2_for_communication( );
 }
 
+// ============================================================================
+// AbstractElectrometerClass::set_ElectroChannel
+// ============================================================================
+void AbstractElectrometerClass::set_ElectroChannel (unsigned short address) 
+{
+	_electrometerProtocol->set_electrometer_active_channel(address);
+}
+
+// ============================================================================
+// AbstractElectrometerClass::get_ElectroChannel
+// ============================================================================
+unsigned short AbstractElectrometerClass::get_ElectroChannel (void) 
+{
+	return _electrometerProtocol->get_electrometer_active_channel();
+}
+

src/ElectrometerProtocol.cpp

@@ -719,3 +719,24 @@ std::string ElectrometerProtocol::get_DDC_configuration (void)
 											"This Electrometer does not support this command.",
 											"ElectrometerProtocol::get_configuration( ).");
 }
+
+// ============================================================================
+// ElectrometerProtocol::set_electrometer_active_channel
+// ============================================================================
+void ElectrometerProtocol::set_electrometer_active_channel (unsigned short ) 
+{
+	throw electrometer::ElectrometerException("COMMAND_NOT_SUPPORTED", 
+											"This Electrometer does not support this command.",
+											"ElectrometerProtocol::set_electrometer_active_channel( ).");
+}
+
+// ============================================================================
+// ElectrometerProtocol::get_electrometer_active_channel
+// ============================================================================
+unsigned short ElectrometerProtocol::get_electrometer_active_channel (void) 
+{
+	throw electrometer::ElectrometerException("COMMAND_NOT_SUPPORTED", 
+											"This Electrometer does not support this command.",
+											"ElectrometerProtocol::get_electrometer_active_channel( ).");
+}
+

src/NovelecProtocol.cpp

@@ -568,14 +568,13 @@ std::string data;
 	//			-> "address ACK " : if command well understood
 	//- An invalid response is: "address NAK ..."
 
-	if(response.find("NAK") != std::string::npos)
-	{
 	if(_is_measure_mode_on)
 		throw electrometer::ElectrometerException("COMMAND_NOT_ALLOWED", 
 											"Cannot change parameter(s) when MEASURE mode enabled.",
 											"NovelecProtocol::check_command( ).");
 
-		else
+	if(response.find("NAK") != std::string::npos)
+	{
 		throw electrometer::ElectrometerException("COMMAND_NOT_UNDERSTOOD", 
 											"Bad formatted string command sent -> NAK received !",
 											"NovelecProtocol::check_command( ).");