[Libphidget-cvs-commits] CVS: libphidget/src/libphidget phidget.c,1.9,1.10 phidget.h,1.5,1.6

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

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

Modified Files:
	phidget.c phidget.h 
Log Message:
Has some changes for supporting soft phidgets but that code is commented out.  Also fixed some problems in the example code.


Index: phidget.c
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/libphidget/phidget.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** phidget.c	16 Sep 2002 18:22:18 -0000	1.9
--- phidget.c	13 Dec 2002 05:01:09 -0000	1.10
***************
*** 13,16 ****
--- 13,17 ----
  #include "phidget.h"
  #include <signal.h>
+ #include "SoftPhidget.h"
  
  /**
***************
*** 20,33 ****
  
  // TODO - change this
[...2144 lines suppressed...]
! 		case LPE_CLAIM_INTERFACE_FAILED:
! 			return ("During the initialization of a phidget the interface for the USB device could not be claimed");
! 		case LPE_SET_ALT_INTERFACE_FAILED:
! 			return ("During the initialization of a phidget the alternate interface for the USB device could not be set");
! 		case LPE_NO_SERIAL_RETURNED:
! 			return ("The serial number could not be requested from the phidget");
! 		case LPE_PHIDGET_ALREADY_CLOSED:
! 			return ("Phidget is already closed");
! 		case LPE_PHIDGET_ALREADY_OPENED:
! 			return ("Phidget is already opened");
! 		case LPE_PHIDGET_NOT_OPENED:
! 			return ("Phidget is not opened");
! 		case LPE_CONTROL_MSG_ERROR:
! 			return ("Error sending a control message to a phidget");
! 		case LPE_BULK_READ_ERROR:
! 			return ("Error reading bulk data from a phidget");
! 		default:
! 			return ("not an error number");
!     	}
  };

Index: phidget.h
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/libphidget/phidget.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** phidget.h	16 Sep 2002 06:40:57 -0000	1.5
--- phidget.h	13 Dec 2002 05:01:09 -0000	1.6
***************
*** 201,205 ****
   * device is closed (either on purpose, or when the signal handler catches it)
   */
!     enum ELPError pidgetQuadServoDefault(struct phidget *device,	//<! The phidget whose default we want to set
  					 float percent1,	//!< Percentage to move servo 1
  					 float percent2,	//!< Percentage to move servo 2
--- 201,205 ----
   * device is closed (either on purpose, or when the signal handler catches it)
   */
!     enum ELPError phidgetQuadServoDefault(struct phidget *device,	//<! The phidget whose default we want to set
  					 float percent1,	//!< Percentage to move servo 1
  					 float percent2,	//!< Percentage to move servo 2
***************
*** 207,210 ****
--- 207,212 ----
  					 float percent4	//!< Percentage to move servo 4
  	);
+ 
+ enum ELPError phidget8Servo(struct phidget *phidgetDevice, int id, float percent1, float maxvelocity, float acceleration);
  
  /**