diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-12-05 23:35:47 +0000 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-12-05 23:35:47 +0000 |
| commit | d793256d203fde3090d3729f70e0595674fa48d6 (patch) | |
| tree | 3ef1aefbe45529a2063630b05a7be6dcd2c13fbc /cphidget.h | |
| parent | 3d9394c18ca528ac78197007d1a2dfff6f401920 (diff) | |
| parent | 8f3c91e91b634adaca77dac6cf314445cceefc78 (diff) | |
| download | libphidget21-d793256d203fde3090d3729f70e0595674fa48d6.tar.gz | |
Merge tag 'upstream/2.1.8.20120912'
Diffstat (limited to 'cphidget.h')
| -rw-r--r-- | cphidget.h | 22 |
1 files changed, 13 insertions, 9 deletions
@@ -2,7 +2,7 @@ #define __CPHIDGET /** \defgroup phidcommon Phidget Common - * Calls common to all Phidgets. See the programming manual for more specific API details, supported functionality, units, etc. + * These calls are common to all Phidgets objects. See the <a class="el" href="http://www.phidgets.com/docs/General_Phidget_Programming" target="_blank">General Phidget Programming</a> page for more in-depth usage instructions and examples. * @{ */ @@ -238,14 +238,6 @@ PHIDGET21_API int CCONV CPhidget_calibrate_gainoffset(CPhidgetHandle phid, int i //Some constants and function for new M3 Phidgets (General Packet Protocol) -PHIDGET21_API int CCONV CPhidgetGPP_reboot_firmwareUpgrade(CPhidgetHandle phid); -PHIDGET21_API int CCONV CPhidgetGPP_reboot_ISP(CPhidgetHandle phid); -PHIDGET21_API int CCONV CPhidgetGPP_setLabel(CPhidgetHandle phid, const char *buffer); -int CCONV CPhidgetGPP_setDeviceSpecificConfigTable(CPhidgetHandle phid, unsigned char *data, int length, int index); -int CCONV CPhidgetGPP_setDeviceWideConfigTable(CPhidgetHandle phid, unsigned char *data, int length, int index); -PHIDGET21_API int CCONV CPhidgetGPP_upgradeFirmware(CPhidgetHandle phid, unsigned char *data, int length); -PHIDGET21_API int CCONV CPhidgetGPP_eraseFirmware(CPhidgetHandle phid); - //Bit 7 (MSB) #define PHID_USB_GENERAL_PACKET_FLAG 0x80 @@ -265,9 +257,21 @@ PHIDGET21_API int CCONV CPhidgetGPP_eraseFirmware(CPhidgetHandle phid); #define PHID_USB_GENERAL_PACKET_SET_DS_TABLE 0x07 #define PHID_USB_GENERAL_PACKET_SET_DW_TABLE 0x08 #define PHID_USB_GENERAL_PACKET_FIRMWARE_UPGRADE_ERASE 0x09 +#define PHID_USB_GENERAL_PACKET_ERASE_CONFIG 0x0A +#endif +#if !defined(EXTERNALPROTO) || defined(DEBUG) +PHIDGET21_API int CCONV CPhidgetGPP_reboot_firmwareUpgrade(CPhidgetHandle phid); +PHIDGET21_API int CCONV CPhidgetGPP_reboot_ISP(CPhidgetHandle phid); +PHIDGET21_API int CCONV CPhidgetGPP_setLabel(CPhidgetHandle phid, const char *buffer); +PHIDGET21_API int CCONV CPhidgetGPP_setDeviceSpecificConfigTable(CPhidgetHandle phid, unsigned char *data, int length, int index); +PHIDGET21_API int CCONV CPhidgetGPP_setDeviceWideConfigTable(CPhidgetHandle phid, unsigned char *data, int length, int index); +PHIDGET21_API int CCONV CPhidgetGPP_upgradeFirmware(CPhidgetHandle phid, unsigned char *data, int length); +PHIDGET21_API int CCONV CPhidgetGPP_eraseFirmware(CPhidgetHandle phid); +PHIDGET21_API int CCONV CPhidgetGPP_eraseConfig(CPhidgetHandle phid); #endif + #include "cphidgetmacros.h" /** |