Commit: 6cb7c7ba52a623d64cb1cfc136d71eba8a9d21ea - QtUSBRH_Logger (git)

Commit MetaInfo

• Revision: 6cb7c7ba52a623d64cb1cfc136d71eba8a9d21ea (tree)
• Time: 2013-03-24 13:14:14
• Author: alucky4416 <alucky4416@user...>
• Commiter: alucky4416

Log Message

replace usbrh.cpp, usbrh.h (add set led/heater on/off)

Change Summary

• modified: usbrh.cpp
• modified: usbrh.h

Incremental Difference

--- a/usbrh.cpp
+++ b/usbrh.cpp
@@ -6,6 +6,7 @@
  *
  *    Special Thanks: USBRH on *BSD http://www.nk-home.net/~aoyama/usbrh/
  *                    USBRH on Linux/libusb Mar.14 2007 http://d.hatena.ne.jp/Briareos/
+ *                    USBRH driver for Linux http://green-rabbit.sakura.ne.jp/usbrh/#id13
  *
  *  This program is FREESOFTWARE, by the GPLv2.
  */
@@ -19,6 +20,8 @@
 #define USBRH_VENDOR  0x1774
 #define USBRH_PRODUCT 0x1001
 
+#define USBRH_BUFFER_SIZE 7
+
 // parameter
 // http://www.sensirion.com/en/pdf/product_information/Data_Sheet_humidity_sensor_SHT1x_SHT7x_E.pdf
 // http://www.syscom-inc.co.jp/pdf/sht_datasheet_j.pdf
@@ -195,7 +198,7 @@ int usbrh::get_tempr_humid(double *tempr, double *humid)
 {
     int rc = 0;
     int iTemperature, iHumidity;
-    char buff[512];
+    char buff[USBRH_BUFFER_SIZE];
 
     if (gDevHandle == (usb_dev_handle *)NULL) return 1;
 
@@ -203,7 +206,7 @@ int usbrh::get_tempr_humid(double *tempr, double *humid)
     // http://www.ghz.cc/~clepple/libHID/doc/html/libusb_8c-source.html
     memset(buff, 0, sizeof(buff));
     rc = usb_control_msg(gDevHandle, USB_ENDPOINT_OUT + USB_TYPE_CLASS + USB_RECIP_INTERFACE,
-                         0x09, 0x02<<8, 0, buff, 7, 5000);
+                         0x09, 0x02<<8, 0, buff, USBRH_BUFFER_SIZE, 5000);
     if (rc < 0) {
         qDebug() << QString("usb_control_msg error : ")  << QString(usb_strerror());
     }
@@ -215,7 +218,7 @@ int usbrh::get_tempr_humid(double *tempr, double *humid)
 #ifdef __LIBUSB_WIN32__
     dev_endpoint = 0x81;
 #endif
-    rc = usb_bulk_read(gDevHandle, dev_endpoint, buff, 7, 5000);
+    rc = usb_bulk_read(gDevHandle, dev_endpoint, buff, USBRH_BUFFER_SIZE, 5000);
     if (rc < 0) {
         qDebug() << QString("usb_bulk_read error : ") << QString(usb_strerror());
         iTemperature = -99.0;
@@ -231,6 +234,44 @@ int usbrh::get_tempr_humid(double *tempr, double *humid)
     return rc;
 }
 
+int usbrh::set_led_status(unsigned char led_index, unsigned char led_onoff)
+{
+    int rc = 0;
+    char buff[USBRH_BUFFER_SIZE];
+
+    if (gDevHandle == (usb_dev_handle *)NULL) return 1;
+
+    memset(buff, 0, sizeof(buff));
+    buff[0] = 3 + led_index;
+    buff[1] = led_onoff;  // led_onoff = 1 is led on
+    rc = usb_control_msg(gDevHandle, USB_ENDPOINT_OUT + USB_TYPE_CLASS + USB_RECIP_INTERFACE,
+                         0x09, 0x03<<8, 0, buff, USBRH_BUFFER_SIZE, 5000);
+    if (rc < 0) {
+        qDebug() << QString("usb_control_msg error : ")  << QString(usb_strerror());
+    }
+
+    return rc;
+}
+
+int usbrh::set_heater_status(unsigned char heater_onoff)
+{
+    int rc = 0;
+    char buff[USBRH_BUFFER_SIZE];
+
+    if (gDevHandle == (usb_dev_handle *)NULL) return 1;
+
+    memset(buff, 0, sizeof(buff));
+    buff[0] = 1;
+    buff[1] = heater_onoff << 2;  // heater_onoff = 1 is led on
+    rc = usb_control_msg(gDevHandle, USB_ENDPOINT_OUT + USB_TYPE_CLASS + USB_RECIP_INTERFACE,
+                         0x09, 0x03<<8, 0, buff, USBRH_BUFFER_SIZE, 5000);
+    if (rc < 0) {
+        qDebug() << QString("usb_control_msg error : ")  << QString(usb_strerror());
+    }
+
+    return rc;
+}
+
 void usbrh::close()
 {
     int rc = 0;

--- a/usbrh.h
+++ b/usbrh.h
@@ -27,6 +27,8 @@ public:
     int open();
     int config();
     int get_tempr_humid(double *tempr, double *humid);
+    int set_led_status(unsigned char led_index, unsigned char led_onoff);
+    int set_heater_status(unsigned char heater_onoff);
     void close();
 
 };