aboutsummaryrefslogtreecommitdiffstats
path: root/cphidget.h
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-10-19 19:38:06 +0100
committerJonathan McCrohan <jmccrohan@gmail.com>2012-10-19 19:38:06 +0100
commit8f3c91e91b634adaca77dac6cf314445cceefc78 (patch)
tree8a779a28ccfbbfae413f6f7df21fb0a8650d3747 /cphidget.h
parentbd7a4f258643bf72d5e97f86f0f2272b381ed1ba (diff)
downloadlibphidget21-8f3c91e91b634adaca77dac6cf314445cceefc78.tar.gz
Imported Upstream version 2.1.8.20120912upstream/2.1.8.20120912
Diffstat (limited to 'cphidget.h')
-rw-r--r--cphidget.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/cphidget.h b/cphidget.h
index 3ad3770..4490e38 100644
--- a/cphidget.h
+++ b/cphidget.h
@@ -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"
/**