Commit: 0b77ce5353acfa1cbc770e7377b420d14a5d6732 - QtUSBRH (git)

ストロベリー・リナックスUSB温度計USBRHを使った温度計 by Qt

Commit MetaInfo

• Revisão: 0b77ce5353acfa1cbc770e7377b420d14a5d6732 (tree)
• Hora: 2013-03-23 11:17:08
• Autor: arakaki <alucky4416@user...>
• Commiter: arakaki

Mensagem de Log

feature: add set led on/off.

Mudança Sumário

• modified: mainwindow.cpp
• modified: mainwindow.h
• modified: mainwindow.ui
• modified: usbrh.cpp
• modified: usbrh.h

Diff

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -76,3 +76,15 @@ void MainWindow::TimeoutDone()
 
 }
 
+void MainWindow::on_checkBox_LED_0_stateChanged(int arg1)
+{
+    int rc;
+    rc = rhdev->set_led_status(0, (unsigned char)arg1);
+}
+
+void MainWindow::on_checkBox_LED_1_stateChanged(int arg1)
+{
+    int rc;
+    rc = rhdev->set_led_status(1, (unsigned char)arg1);
+
+}

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -21,6 +21,10 @@ public:
 private slots:
     void TimeoutDone();
 
+    void on_checkBox_LED_0_stateChanged(int arg1);
+
+    void on_checkBox_LED_1_stateChanged(int arg1);
+
 private:
     Ui::MainWindow *ui;
 

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>330</width>
-    <height>165</height>
+    <width>378</width>
+    <height>219</height>
    </rect>
   </property>
   <property name="font">
@@ -158,14 +158,40 @@
      <string>QtUSBRH Thermometer</string>
     </property>
    </widget>
+   <widget class="QCheckBox" name="checkBox_LED_0">
+    <property name="geometry">
+     <rect>
+      <x>80</x>
+      <y>120</y>
+      <width>80</width>
+      <height>20</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>LED 0</string>
+    </property>
+   </widget>
+   <widget class="QCheckBox" name="checkBox_LED_1">
+    <property name="geometry">
+     <rect>
+      <x>210</x>
+      <y>120</y>
+      <width>80</width>
+      <height>20</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>LED 1</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>330</width>
-     <height>20</height>
+     <width>378</width>
+     <height>21</height>
     </rect>
    </property>
   </widget>

--- 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,25 @@ 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;
+}
+
 void usbrh::close()
 {
     int rc = 0;

--- a/usbrh.h
+++ b/usbrh.h
@@ -27,6 +27,7 @@ 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);
     void close();
 
 };