diff --git a/COM_Reader/COM_Reader.vcxproj b/COM_Reader/COM_Reader.vcxproj index 203f384..d18fae5 100644 --- a/COM_Reader/COM_Reader.vcxproj +++ b/COM_Reader/COM_Reader.vcxproj @@ -133,6 +133,9 @@ + + + diff --git a/COM_Reader/COM_Reader.vcxproj.filters b/COM_Reader/COM_Reader.vcxproj.filters index 2c2e927..d5750d5 100644 --- a/COM_Reader/COM_Reader.vcxproj.filters +++ b/COM_Reader/COM_Reader.vcxproj.filters @@ -27,4 +27,9 @@ Файлы заголовков + + + Файлы ресурсов + + \ No newline at end of file diff --git a/COM_Reader/FlowData.txt b/COM_Reader/FlowData.txt new file mode 100644 index 0000000..f1b0b51 --- /dev/null +++ b/COM_Reader/FlowData.txt @@ -0,0 +1,11 @@ +ideal speed is 12 sensor measure is 12 + +ideal speed is 11 sensor measure is 12 + +ideal speed is 99 sensor measure is 12 + + + + + + diff --git a/COM_Reader/com_reader.cpp b/COM_Reader/com_reader.cpp index db2ff86..113e6de 100644 --- a/COM_Reader/com_reader.cpp +++ b/COM_Reader/com_reader.cpp @@ -56,10 +56,23 @@ void ComReader::PrintComData() { ReadFile(hSerial, &received_char, 1, &recived_size, 0); if (recived_size > 0) - std::cout << received_char; + std::cout << received_char; } } +void ComReader::PrintComDataOnce() +{ + DWORD recived_size = '0'; + char received_char = '0'; + while (true) + { + ReadFile(hSerial, &received_char, 1, &recived_size, 0); + if (recived_size > 0) + std::cout << received_char; + if (received_char == '\n') + break; + } +} std::vector ComReader::getVectorData() { diff --git a/COM_Reader/com_reader.h b/COM_Reader/com_reader.h index 675fbf5..2c350fd 100644 --- a/COM_Reader/com_reader.h +++ b/COM_Reader/com_reader.h @@ -26,6 +26,8 @@ class ComReader /// void PrintComData(); + void PrintComDataOnce(); + /// /// Returns a vector-string received from the COM port /// diff --git a/COM_Reader/main.cpp b/COM_Reader/main.cpp index 6338f1f..75207ba 100644 --- a/COM_Reader/main.cpp +++ b/COM_Reader/main.cpp @@ -1,25 +1,35 @@ #include "com_reader.h" +#include int main() { - //example - ComReader Ard(L"COM3", 9600, 8); - + ComReader Ard(L"COM7", 9600, 8); + std::fstream write; + write.open("C:/Users/MAN-MADE/Desktop/Projects/UAV/Skripts/COM_Reader/COM_Reader/FlowData.txt"); + char* str; std::vector vct; + std::string ideal_flow_speed; while (1) { - str = Ard.getCharData(); + std::cout << "Enter current speed or \"Exit\" to exit "; + std::cin >> ideal_flow_speed; + if (ideal_flow_speed == "exit" || ideal_flow_speed == "Exit") + break; + vct = Ard.getVectorData(); - - for (int i = 0; i < Ard.getSizeData(); i++) - std::cout << str[i]; - - for (int i = 0; i < Ard.getSizeData(); i++) + std::cout << "ideal speed is " << ideal_flow_speed << " sensor measured "; + write << "ideal speed is " << ideal_flow_speed << " sensor measured "; + for (size_t i = 0; i < vct.size(); i++) + { std::cout << vct[i]; - } - //example + write << vct[i]; + } + std::cout << "\n"; + } + + write.close(); return 0; } \ No newline at end of file