Explorar o código

加入usb接口

lijinwen hai 4 meses
pai
achega
f8c9a574a3
Modificáronse 2 ficheiros con 17 adicións e 8 borrados
  1. 16 7
      ExportMethod.cpp
  2. 1 1
      ProtocolRS232/RS232Decode.cpp

+ 16 - 7
ExportMethod.cpp

@@ -1,29 +1,38 @@
 #include "ExportMethod.h"
+
+#include <future>
+
 #include "ProtocolDecodeBase.h"
 #include "EdgePulseData.h"
 #include "QuantizeParams.h"
 #include "ProtocolRS232/Protocol.RS232.Options.h"
 #include "ProtocolRS232/RS232DecodeResult.h"
+#include "ProtocolUSB/UsbDecodeOptions.h"
+#include "ProtocolUSB/USBDecodeResult.h"
 
 
 namespace Protocol
 {
     extern "C" {
 
-    LIBMATH_API bool decodeRS232(const ProtocolRS232Options& options,
+    LIBMATH_API bool Parse_USB(UsbDecodeOptions option, std::vector<Protocol::TwoLevelEdgePulse> edgePluses1,
+                               std::vector<Protocol::TwoLevelEdgePulse> edgePluses2, UsbDecodeResult& result);
+
+
+    LIBMATH_API bool Parse_RS232(const ProtocolRS232Options& options,
                                  const EdgePulseDataTwoLevels& edgePulseData,
                                  RS232DecodeResult& decodeResult);
 
-    LIBMATH_API bool quantizeParamsDecodeRS232(const QuantizeParams& quantizeParams,
-                                               const ProtocolRS232Options& options,
-                                               RS232DecodeResult& decodeResult);
-        
-   
+    // LIBMATH_API bool quantizeParamsDecodeRS232(const QuantizeParams& quantizeParams,
+    //                                            const ProtocolRS232Options& options,
+    //                                            RS232DecodeResult& decodeResult);
+
+
     inline LIBMATH_API void setCancellationSignal(bool value)
     {
         canceled = value;
     }
-    
+
     LIBMATH_API void getVersionExport(uint8_t* version);
 
     }

+ 1 - 1
ProtocolRS232/RS232Decode.cpp

@@ -441,7 +441,7 @@ namespace Protocol
 		return false;
 	}
 
-	bool decodeRS232(const ProtocolRS232Options& options,
+	bool Parse_RS232(const ProtocolRS232Options& options,
 		const EdgePulseDataTwoLevels& edgePulseData,
 		RS232DecodeResult& decodeResult)
 	{