libphidget-cvs-commits

[Jack S. <js...@us...>]

Update of /cvsroot/libphidget/libphidget/src/phidget++
In directory sc8-pr-cvs1:/tmp/cvs-serv12987/phidget++

Modified Files:
	CServo.cc CServo.h CServoController.cc 
Log Message:
Servo is now a SubDevice and has an ordinal number


Index: CServo.cc
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/phidget++/CServo.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CServo.cc	16 Dec 2002 22:37:12 -0000	1.8
--- CServo.cc	17 Dec 2002 21:20:24 -0000	1.9
***************
*** 29,34 ****
  
  CServo::CServo (CServoController *controller, const int id) :
! 	CUniqueDevice (controller, id),
! 	_controller(controller), _position(0),
  	_systemManaged(true)
  {
--- 29,35 ----
  
  CServo::CServo (CServoController *controller, const int id) :
! 	CSubDevice (controller, id),
! 	_controller(controller), 
! 	_position(0),
  	_systemManaged(true)
  {
***************
*** 38,42 ****
  
  CServo::CServo (const CUID &uid) :
! 	CUniqueDevice (uid), _position(0),
  	_systemManaged(false)
  {
--- 39,43 ----
  
  CServo::CServo (const CUID &uid) :
! 	CSubDevice (uid), _position(0),
  	_systemManaged(false)
  {

Index: CServo.h
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/phidget++/CServo.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CServo.h	15 Dec 2002 20:40:11 -0000	1.5
--- CServo.h	17 Dec 2002 21:20:24 -0000	1.6
***************
*** 11,15 ****
  #define __CSERVO_H__
  
! #include "CUniqueDevice.h"
  #include <stdio.h>
  
--- 11,15 ----
  #define __CSERVO_H__
  
! #include "CSubDevice.h"
  #include <stdio.h>
  
***************
*** 21,25 ****
   * A single servo
   */
! class CServo:public CUniqueDevice
  {
  	private:
--- 21,25 ----
   * A single servo
   */
! class CServo : public CSubDevice
  {
  	private:

Index: CServoController.cc
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/phidget++/CServoController.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CServoController.cc	15 Dec 2002 17:32:44 -0000	1.7
--- CServoController.cc	17 Dec 2002 21:20:24 -0000	1.8
***************
*** 99,102 ****
--- 99,103 ----
  		throw runtime_error("This servo id is already being used.");
  
+ 	servo->ordinal(id);
  	_servos[id].first = false;
  	_servos[id].second = servo;