Update of /cvsroot/libphidget/libphidget/src/libphidget
In directory sc8-pr-cvs1:/tmp/cvs-serv9445/libphidget
Modified Files:
phidget.c phidget.h
Log Message:
fixed some spelling mistakes
Index: phidget.c
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/libphidget/phidget.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** phidget.c 13 Dec 2002 22:05:16 -0000 1.15
--- phidget.c 13 Dec 2002 22:10:26 -0000 1.16
***************
*** 46,51 ****
* - UniServo .1 Degree Supported libusb
* - 8-AdvancedServo Waiting for firmware patch libusb
! * - Interface Kit 884 Digital Input only HID
! * - Interface Kit 088 Digital Input only HID
* - Interface Kit 32-32-0 Not supported yet
* - Interface Kit 0-256-0 Not supported yet
--- 46,51 ----
* - UniServo .1 Degree Supported libusb
* - 8-AdvancedServo Waiting for firmware patch libusb
! * - Interface Kit 488 Digital Input only HID
! * - Interface Kit 880 Digital Input only HID
* - Interface Kit 32-32-0 Not supported yet
* - Interface Kit 0-256-0 Not supported yet
***************
*** 901,907 ****
_registerDeviceType("QuadServo .1 Degree", 0x06C2, 0x0038, LP_SERVO_CONTROLLER);
_registerDeviceType("UniServo .1 Degree", 0x06C2, 0x0039, LP_SERVO_CONTROLLER);
! _registerDeviceType("Interface Kit 884", 0x0925, 0x8201, LP_INTERFACE_KIT_884);
! _registerDeviceType("Interface Kit 884", 0x06C2, 0x0040, LP_INTERFACE_KIT_884);
! _registerDeviceType("Interface Kit 088", 0x06C2, 0x0041, LP_INTERFACE_KIT_088);
//_registerDeviceType("RFID VID/PID", 0x06C2, 0x0030, LP_OTHER);
//_registerDeviceType("8-AdvancedServo", 0x06C2, 0x003B, LP_SERVO_CONTROLLER);
--- 901,907 ----
_registerDeviceType("QuadServo .1 Degree", 0x06C2, 0x0038, LP_SERVO_CONTROLLER);
_registerDeviceType("UniServo .1 Degree", 0x06C2, 0x0039, LP_SERVO_CONTROLLER);
! _registerDeviceType("Interface Kit 4/8/8", 0x0925, 0x8201, LP_INTERFACE_KIT_488);
! _registerDeviceType("Interface Kit 4/8/8", 0x06C2, 0x0040, LP_INTERFACE_KIT_488);
! _registerDeviceType("Interface Kit 8/8/0", 0x06C2, 0x0041, LP_INTERFACE_KIT_880);
//_registerDeviceType("RFID VID/PID", 0x06C2, 0x0030, LP_OTHER);
//_registerDeviceType("8-AdvancedServo", 0x06C2, 0x003B, LP_SERVO_CONTROLLER);
***************
*** 1376,1385 ****
* Helper function to read from an interface kit.
*/
! enum ELPError phidgetInterfaceKit884Read(struct phidget *phidgetDevice, float analog[4], int digital[8])
{
char buffer[7];
// Not correct type of interface kit
! if (phidgetDevice->type->deviceClass != LP_INTERFACE_KIT_884)
return (_error(LPE_WRONG_PHIDGET_CLASS_TYPE));
--- 1376,1385 ----
* Helper function to read from an interface kit.
*/
! enum ELPError phidgetInterfaceKit488Read(struct phidget *phidgetDevice, float analog[4], int digital[8])
{
char buffer[7];
// Not correct type of interface kit
! if (phidgetDevice->type->deviceClass != LP_INTERFACE_KIT_488)
return (_error(LPE_WRONG_PHIDGET_CLASS_TYPE));
***************
*** 1408,1412 ****
* Helper function to read from an interface kit.
*/
! enum ELPError phidgetInterfaceKit088Read(struct phidget *phidgetDevice, float analog[8], int digital[8])
{
int t=0;
--- 1408,1412 ----
* Helper function to read from an interface kit.
*/
! enum ELPError phidgetInterfaceKit880Read(struct phidget *phidgetDevice, float analog[8], int digital[8])
{
int t=0;
***************
*** 1414,1418 ****
// Not correct type of interface kit
! if (phidgetDevice->type->deviceClass != LP_INTERFACE_KIT_088)
return (_error(LPE_WRONG_PHIDGET_CLASS_TYPE));
--- 1414,1418 ----
// Not correct type of interface kit
! if (phidgetDevice->type->deviceClass != LP_INTERFACE_KIT_880)
return (_error(LPE_WRONG_PHIDGET_CLASS_TYPE));
Index: phidget.h
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/libphidget/phidget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** phidget.h 13 Dec 2002 22:05:16 -0000 1.10
--- phidget.h 13 Dec 2002 22:10:26 -0000 1.11
***************
*** 65,70 ****
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_088 = 301, /**< 088 interface kit */
! LP_INTERFACE_KIT_884 = 302, /**< 884 interface kit */
LP_ENCODER = 400, /**< Currently unsupported */
LP_POWER = 500, /**< Currently unsupported */
--- 65,70 ----
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 */
LP_ENCODER = 400, /**< Currently unsupported */
LP_POWER = 500, /**< Currently unsupported */
***************
*** 212,216 ****
enum ELPError phidget8Servo(struct phidget *phidgetDevice, int id, float percent1, float maxvelocity, float acceleration);
! enum ELPError phidgetInterfaceKit448(struct phidget *phidgetDevice, float analog[4], int digital[8]);
enum ELPError phidgetInterfaceKit880(struct phidget *phidgetDevice, float analog[8], int digital[8]);
--- 212,216 ----
enum ELPError phidget8Servo(struct phidget *phidgetDevice, int id, float percent1, float maxvelocity, float acceleration);
! enum ELPError phidgetInterfaceKit488(struct phidget *phidgetDevice, float analog[4], int digital[8]);
enum ELPError phidgetInterfaceKit880(struct phidget *phidgetDevice, float analog[8], int digital[8]);
|
