Commit: 5b1379c54f22dca4e8adfc6066350b5b6a6b05cd - QtUSBRH (git)

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

Commit MetaInfo

• Revision: 5b1379c54f22dca4e8adfc6066350b5b6a6b05cd (tree)
• Time: 2013-03-24 12:35:06
• Author: alucky4416 <alucky4416@user...>
• Commiter: arakaki

Log Message

feature: add set heater on/off.

Change Summary

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

Incremental Difference

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -88,3 +88,10 @@ void MainWindow::on_checkBox_LED_1_stateChanged(int arg1)
     rc = rhdev->set_led_status(1, (unsigned char)arg1);
 
 }
+
+void MainWindow::on_checkBox_HEATER_stateChanged(int arg1)
+{
+    int rc;
+    rc = rhdev->set_heater_status((unsigned char)arg1);
+
+}

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -25,6 +25,8 @@ private slots:
 
     void on_checkBox_LED_1_stateChanged(int arg1);
 
+    void on_checkBox_HEATER_stateChanged(int arg1);
+
 private:
     Ui::MainWindow *ui;
 

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -174,7 +174,7 @@
    <widget class="QCheckBox" name="checkBox_LED_1">
     <property name="geometry">
      <rect>
-      <x>210</x>
+      <x>140</x>
       <y>120</y>
       <width>80</width>
       <height>20</height>
@@ -184,6 +184,19 @@
      <string>LED 1</string>
     </property>
    </widget>
+   <widget class="QCheckBox" name="checkBox_HEATER">
+    <property name="geometry">
+     <rect>
+      <x>270</x>
+      <y>120</y>
+      <width>80</width>
+      <height>20</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Heater</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">

--- a/usbrh.cpp
+++ b/usbrh.cpp
@@ -253,6 +253,25 @@ int usbrh::set_led_status(unsigned char led_index, unsigned char led_onoff)
     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
@@ -28,6 +28,7 @@ public:
     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();
 
 };