jie/serial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化Until函数

Browse Source
This commit is contained in:
JIe 2024-10-09 17:04:41 +08:00
parent 45a14b5d19
commit 1417770918
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/serial.h
View File

@ -1,8 +1,10 @@
#ifndef SERIAL_H #ifndef SERIAL_H
#define SERIAL_H #define SERIAL_H
#include <algorithm>
#include <chrono> #include <chrono>
#include <cstring> #include <cstring>
#include <expected>
#include <format> #include <format>
#include <functional> #include <functional>
#include <iostream> #include <iostream>
@ -12,7 +14,6 @@
#include <thread> #include <thread>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <expected>
#include "serialib.h" #include "serialib.h"
@ -48,7 +49,7 @@ concept SupportString = requires {
std::is_same_v<T, std::string>; std::is_same_v<T, std::string>;
}; };
enum class [[maybe_unused]] SerialErrorCode{ enum class [[maybe_unused]] SerialErrorCode {
SUCCESS, SUCCESS,
TIMEOUT, TIMEOUT,
SETTIMEOUTERROR, SETTIMEOUTERROR,
@ -83,17 +84,18 @@ class Serial {
bool IsOpen() { return ser.isDeviceOpen(); } bool IsOpen() { return ser.isDeviceOpen(); }
template<SupportString T> template <SupportString T>
bool OpenDeviceDelay(T portName, unsigned int baudRate, int delay){ bool OpenDeviceDelay(T portName, unsigned int baudRate, int delay) {
std::this_thread::sleep_for(std::chrono::seconds(delay)); std::this_thread::sleep_for(std::chrono::seconds(delay));
return OpenDevice(portName, baudRate); return OpenDevice(portName, baudRate);
} }
template <SupportString T> template <SupportString T>
bool OpenDevice(T portName, unsigned int bauds = 115200) { bool OpenDevice(T portName, unsigned int bauds = 115200, int delayTime = 0) {
std::string reallyPortName; std::string reallyPortName;
std::format_to(std::back_inserter(reallyPortName), "\\\\.\\{}", std::format_to(std::back_inserter(reallyPortName), "\\\\.\\{}",
portName); portName);
std::this_thread::sleep_for(std::chrono::milliseconds(delayTime));
if (ser.isDeviceOpen()) if (ser.isDeviceOpen())
return true; return true;
int code = ser.openDevice(reallyPortName.c_str(), bauds); int code = ser.openDevice(reallyPortName.c_str(), bauds);
@ -122,14 +124,15 @@ class Serial {
} }
template <SupportString T> template <SupportString T>
std::expected<std::string, SerialErrorCode> DelayGetResponse(int delayTime, T command, std::expected<std::string, SerialErrorCode>
int timeout = 50) { DelayGetResponse(int delayTime, T command, int timeout = 50) {
std::this_thread::sleep_for(std::chrono::milliseconds(delayTime)); std::this_thread::sleep_for(std::chrono::milliseconds(delayTime));
return GetAtResponse(command, timeout); return GetAtResponse(command, timeout);
} }
template <SupportString T> template <SupportString T>
std::expected<std::string, SerialErrorCode> GetAtResponse(T command, int timeout = 50) { std::expected<std::string, SerialErrorCode>
GetAtResponse(T command, int timeout = 50) {
ser.flushReceiver(); ser.flushReceiver();
std::string reallyCommand; std::string reallyCommand;
if constexpr (std::is_same_v<T, std::string>) { if constexpr (std::is_same_v<T, std::string>) {
@ -166,8 +169,8 @@ class Serial {
} }
} }
template <SupportString T> template <int timeout = 200, SupportString T, SupportString... Args>
bool GetAtUntil(T command, T expect = "OK", int timeout = 200) { bool GetAtUntil(T command, Args... expect) {
auto endTime = std::chrono::system_clock::now() + auto endTime = std::chrono::system_clock::now() +
std::chrono::milliseconds(timeout); std::chrono::milliseconds(timeout);
ser.flushReceiver(); ser.flushReceiver();
@ -189,7 +192,7 @@ class Serial {
delete[] buffer; delete[] buffer;
if (size > 0) if (size > 0)
Log("Receive: " + str); Log("Receive: " + str);
if (str.find(expect) != std::string::npos) { if (((str.find(expect) != std::string::npos) && ...)) {
return true; return true;
} }
} }