[Libphidget-cvs-commits] CVS: libphidget/src/libphidget phidget.h,1.16,1.17

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

Update of /cvsroot/libphidget/libphidget/src/libphidget
In directory sc8-pr-cvs1:/tmp/cvs-serv29511/libphidget

Modified Files:
	phidget.h 
Log Message:
Refactored, now UniqueDevices can have parents, and the different sub devices use the parent instead of their own instance of their controller.  Started to work a bit on the query sub-system.


Index: phidget.h
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/libphidget/phidget.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** phidget.h	15 Dec 2002 22:55:25 -0000	1.16
--- phidget.h	17 Dec 2002 23:39:15 -0000	1.17
***************
*** 63,68 ****
      // Actual phidget types
      LP_PHIDGET = 100,		 /**< Generic phidget, not used in this library */
      LP_SERVO_CONTROLLER = 200,	 /**< Identifies all servo controller phidgets */
!     //LP_INTERFACE_KIT = 300,	 /**< Identifies all interface kit phidgets, support being added now */
      LP_INTERFACE_KIT_880 = 301,	 /**< 880 interface kit */
      LP_INTERFACE_KIT_488 = 302,	 /**< 488 interface kit */
--- 63,69 ----
      // Actual phidget types
      LP_PHIDGET = 100,		 /**< Generic phidget, not used in this library */
+ 
      LP_SERVO_CONTROLLER = 200,	 /**< Identifies all servo controller phidgets */
!     LP_INTERFACE_KIT = 300,	 /**< Identifies all interface kit phidgets, support being added now */
      LP_INTERFACE_KIT_880 = 301,	 /**< 880 interface kit */
      LP_INTERFACE_KIT_488 = 302,	 /**< 488 interface kit */
***************
*** 71,84 ****
      LP_RFID = 600,		 /**< Currently unsupported */
      LP_LED = 700,		 /**< Currently unsupported */
!     LP_TEXT_LCD = 800,		 /**< Currently unsupported */
  
!     // Phidget devices, a phidget device is something a phidget controls
      LP_SERVO = 201,		 /**< Any servo that a servo controller controls */
      LP_DIGITAL_IN = 301,	 /**< Any digital input that an interface kit controls */
      LP_DIGITAL_OUT = 302,	 /**< Any digital output that an interface kit controls */
      LP_ANALOG_IN = 303,		 /**< Any analog input that an interface kit controls */
  
      LP_OTHER = 0,		 /**< Identifies all unknown phidgets, this shouldn't exists */
      LP_INVALID = -2,		 /**< Invalid device class */
  };
  
--- 72,90 ----
      LP_RFID = 600,		 /**< Currently unsupported */
      LP_LED = 700,		 /**< Currently unsupported */
!     LP_TEXT_LCD = 800,		 /**< Text LCD */
  
!     // Phidget subdevices, a phidget subdevice is something a phidget controls
!     LP_SUB_DEVICE = 101,         /**< A SubDevice of a phidget, not used in this library */
      LP_SERVO = 201,		 /**< Any servo that a servo controller controls */
      LP_DIGITAL_IN = 301,	 /**< Any digital input that an interface kit controls */
      LP_DIGITAL_OUT = 302,	 /**< Any digital output that an interface kit controls */
      LP_ANALOG_IN = 303,		 /**< Any analog input that an interface kit controls */
+     LP_ANALOG_OUT = 304,         /**< Any analog input that an interface kit controls */
+     LP_IN = 305,                 /**< Any input that an interface kit controls */
+     LP_OUT = 306,                /**< Any output that an interface kit controls */
  
      LP_OTHER = 0,		 /**< Identifies all unknown phidgets, this shouldn't exists */
      LP_INVALID = -2,		 /**< Invalid device class */
+ 
  };