Commit: 9e971ec08553fed308e37a8ad0fc8c2e564e8e7f - QtUSBRH (git)

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

Commit MetaInfo

• Revision: 9e971ec08553fed308e37a8ad0fc8c2e564e8e7f (tree)
• Zeit: 2013-03-19 00:22:01
• Autor: alucky4416 <alucky4416@user...>
• Commiter: alucky4416

Log Message

BUG: usbrh.h #define const move to usbrh.cpp

Ändern Zusammenfassung

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

Diff

--- a/usbrh.cpp
+++ b/usbrh.cpp
@@ -16,6 +16,20 @@
 //#include <string.h>
 #include "usbrh.h"
 
+#define USBRH_VENDOR  0x1774
+#define USBRH_PRODUCT 0x1001
+
+// 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
+#define d1 -40.00
+#define d2 0.01
+#define c1 -4
+#define c2 0.0405
+#define c3 -0.0000028
+#define t1 0.01
+#define t2 0.00008
+
 // ---------------------------------------------------------------------------------------
 
 double usbrh::convert_temp(int in)

--- a/usbrh.h
+++ b/usbrh.h
@@ -8,20 +8,6 @@
 #include <usb.h>
 #endif
 
-#define USBRH_VENDOR  0x1774
-#define USBRH_PRODUCT 0x1001
-
-// 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
-#define d1 -40.00
-#define d2 0.01
-#define c1 -4
-#define c2 0.0405
-#define c3 -0.0000028
-#define t1 0.01
-#define t2 0.00008
-
 class usbrh
 {