From 260123716172d33f44bdc0e4e5422554d139215c Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Wed, 9 May 2012 00:47:30 +0100 Subject: Imported Upstream version 2.1.8.20120507 --- phidget21.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 82 insertions(+), 14 deletions(-) (limited to 'phidget21.h') diff --git a/phidget21.h b/phidget21.h index 363a29e..c9f62ea 100644 --- a/phidget21.h +++ b/phidget21.h @@ -95,7 +95,89 @@ typedef enum { PHIDID_TEXTLED_1x8 = 0x049, PHIDID_TEXTLED_4x8 = 0x048, PHIDID_WEIGHTSENSOR = 0x072, + PHIDID_FIRMWARE_UPGRADE = 0x098, } CPhidget_DeviceID; +typedef enum { + PHIDUID_NOTHING =1, + PHIDUID_ACCELEROMETER_2AXIS_2G, + PHIDUID_ACCELEROMETER_2AXIS_10G, + PHIDUID_ACCELEROMETER_2AXIS_5G, + PHIDUID_ACCELEROMETER_3AXIS_3G, + PHIDUID_ADVANCEDSERVO_1MOTOR, + PHIDUID_ADVANCEDSERVO_8MOTOR, + PHIDUID_ADVANCEDSERVO_8MOTOR_PGOOD_FLAG, + PHIDUID_ADVANCEDSERVO_8MOTOR_CURSENSE_FIX, + PHIDUID_ANALOG_4OUTPUT, + PHIDUID_BRIDGE_4INPUT, + PHIDUID_ENCODER_1ENCODER_1INPUT_OLD, + PHIDUID_ENCODER_1ENCODER_1INPUT_v1, + PHIDUID_ENCODER_1ENCODER_1INPUT_v2, + PHIDUID_ENCODER_HS_1ENCODER, + PHIDUID_ENCODER_HS_4ENCODER_4INPUT, + PHIDUID_FREQUENCYCOUNTER_2INPUT, + PHIDUID_GPS, + PHIDUID_INTERFACEKIT_0_0_4_NO_ECHO, + PHIDUID_INTERFACEKIT_0_0_4, + PHIDUID_INTERFACEKIT_0_0_8, + PHIDUID_INTERFACEKIT_0_5_7, + PHIDUID_INTERFACEKIT_0_8_8_w_LCD, + PHIDUID_INTERFACEKIT_0_16_16_NO_ECHO, + PHIDUID_INTERFACEKIT_0_16_16_BITBUG, + PHIDUID_INTERFACEKIT_0_16_16, + PHIDUID_INTERFACEKIT_2_2_2, + PHIDUID_INTERFACEKIT_2_8_8, + PHIDUID_INTERFACEKIT_4_8_8, + PHIDUID_INTERFACEKIT_8_8_8_NO_ECHO, + PHIDUID_INTERFACEKIT_8_8_8, + PHIDUID_INTERFACEKIT_8_8_8_FAST, + PHIDUID_INTERFACEKIT_8_8_8_w_LCD_NO_ECHO, + PHIDUID_INTERFACEKIT_8_8_8_w_LCD, + PHIDUID_INTERFACEKIT_8_8_8_w_LCD_FAST, + PHIDUID_INTERFACEKIT_TOUCH_SLIDER, + PHIDUID_INTERFACEKIT_TOUCH_ROTARY, + PHIDUID_IR, + PHIDUID_LED_64, + PHIDUID_LED_64_ADV, + PHIDUID_MOTORCONTROL_1MOTOR, + PHIDUID_MOTORCONTROL_HC_2MOTOR, + PHIDUID_MOTORCONTROL_LV_2MOTOR_4INPUT, + PHIDUID_PHSENSOR, + PHIDUID_RFID_OLD, + PHIDUID_RFID, + PHIDUID_RFID_2OUTPUT_NO_ECHO, + PHIDUID_RFID_2OUTPUT, + PHIDUID_RFID_2OUTPUT_ADVANCED, + PHIDUID_SERVO_1MOTOR_OLD, + PHIDUID_SERVO_4MOTOR_OLD, + PHIDUID_SERVO_1MOTOR_NO_ECHO, + PHIDUID_SERVO_1MOTOR, + PHIDUID_SERVO_4MOTOR_NO_ECHO, + PHIDUID_SERVO_4MOTOR, + PHIDUID_SPATIAL_ACCEL_3AXIS_1049, + PHIDUID_SPATIAL_ACCEL_3AXIS_1041, + PHIDUID_SPATIAL_ACCEL_3AXIS_1043, + PHIDUID_SPATIAL_ACCEL_GYRO_COMPASS_1056, + PHIDUID_SPATIAL_ACCEL_GYRO_COMPASS_1056_NEG_GAIN, + PHIDUID_SPATIAL_ACCEL_GYRO_COMPASS_1042, + PHIDUID_SPATIAL_ACCEL_GYRO_COMPASS_1044, + PHIDUID_STEPPER_BIPOLAR_1MOTOR, + PHIDUID_STEPPER_UNIPOLAR_4MOTOR, + PHIDUID_TEMPERATURESENSOR_OLD, + PHIDUID_TEMPERATURESENSOR, + PHIDUID_TEMPERATURESENSOR_AD22100, + PHIDUID_TEMPERATURESENSOR_TERMINAL_BLOCKS, + PHIDUID_TEMPERATURESENSOR_4, + PHIDUID_TEMPERATURESENSOR_IR, + PHIDUID_TEXTLCD_2x20, + PHIDUID_TEXTLCD_2x20_w_8_8_8, + PHIDUID_TEXTLCD_2x20_w_8_8_8_BRIGHTNESS, + PHIDUID_TEXTLCD_ADAPTER, + PHIDUID_TEXTLED_1x8, + PHIDUID_TEXTLED_4x8, + PHIDUID_WEIGHTSENSOR, + PHIDUID_GENERIC, + PHIDUID_FIRMWARE_UPGRADE +} CPhidget_DeviceUID; int CPhidget_open(CPhidgetHandle phid, int serialNumber); int CPhidget_openLabel(CPhidgetHandle phid, const char *label); int CPhidget_close(CPhidgetHandle phid); @@ -135,7 +217,6 @@ typedef struct _CPhidgetDictionaryListener *CPhidgetDictionaryListenerHandle; int( *fptr)(CPhidgetDictionaryHandle, void *userPtr, int errorCode, const char *errorString), void *userPtr); int CPhidgetDictionary_addKey(CPhidgetDictionaryHandle dict, const char *key, const char *value, int persistent); int CPhidgetDictionary_removeKey(CPhidgetDictionaryHandle dict, const char *pattern); - typedef int( *CPhidgetDictionary_OnKeyChange_Function)(CPhidgetDictionaryHandle dict, void *userPtr, const char *key, const char *value, CPhidgetDictionary_keyChangeReason reason); int CPhidgetDictionary_set_OnKeyChange_Handler(CPhidgetDictionaryHandle dict, CPhidgetDictionaryListenerHandle *dictlistener, const char *pattern, @@ -161,11 +242,6 @@ typedef struct _CPhidgetManager *CPhidgetManagerHandle; int CPhidgetManager_set_OnServerDisconnect_Handler(CPhidgetManagerHandle phidm, int ( *fptr)(CPhidgetManagerHandle phidm, void *userPtr), void *userPtr); int CPhidgetManager_getServerID(CPhidgetManagerHandle phidm, const char **serverID); int CPhidgetManager_getServerAddress(CPhidgetManagerHandle phidm, const char **address, int *port); - - - - - int CPhidgetManager_getServerStatus(CPhidgetManagerHandle phidm, int *serverStatus); int CPhidget_openRemote(CPhidgetHandle phid, int serial, const char *serverID, const char *password); int CPhidget_openLabelRemote(CPhidgetHandle phid, const char *label, const char *serverID, const char *password); @@ -249,15 +325,7 @@ typedef enum { int CPhidgetAdvancedServo_getEngaged(CPhidgetAdvancedServoHandle phid, int index, int *engagedState); int CPhidgetAdvancedServo_setEngaged(CPhidgetAdvancedServoHandle phid, int index, int engagedState); int CPhidgetAdvancedServo_getStopped(CPhidgetAdvancedServoHandle phid, int index, int *stoppedState); - - int CPhidgetAdvancedServo_getServoType(CPhidgetAdvancedServoHandle phid, int index, CPhidget_ServoType *servoType); - - - - - - int CPhidgetAdvancedServo_setServoType(CPhidgetAdvancedServoHandle phid, int index, CPhidget_ServoType servoType); int CPhidgetAdvancedServo_setServoParameters(CPhidgetAdvancedServoHandle phid, int index, double min_us,double max_us,double degrees,double velocity_max); typedef struct _CPhidgetAnalog *CPhidgetAnalogHandle; -- cgit v1.2.3