From 8a1bc534e5e80fcdf6b016d51b3dcae220a99417 Mon Sep 17 00:00:00 2001 From: Jaro Date: Sat, 28 Aug 2021 15:09:31 +0200 Subject: [PATCH] Fix --- SerialPortYmodem | 1 - build/Makefile | 40 ++++++++++++++++++------------------- build/compile_commands.json | 8 ++++---- main.cpp | 16 +++------------ 4 files changed, 27 insertions(+), 38 deletions(-) delete mode 160000 SerialPortYmodem diff --git a/SerialPortYmodem b/SerialPortYmodem deleted file mode 160000 index dd5ce17..0000000 --- a/SerialPortYmodem +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd5ce17f9fd0620c451c66ca9aaf062b48842562 diff --git a/build/Makefile b/build/Makefile index d9dfb45..d0bacf3 100644 --- a/build/Makefile +++ b/build/Makefile @@ -111,17 +111,17 @@ depend: .PHONY : depend #============================================================================= -# Target rules for targets named timeout +# Target rules for targets named usbserial-dw # Build rule for target. -timeout: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 timeout -.PHONY : timeout +usbserial-dw: cmake_check_build_system + $(MAKE) -f CMakeFiles/Makefile2 usbserial-dw +.PHONY : usbserial-dw # fast build rule for target. -timeout/fast: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/build -.PHONY : timeout/fast +usbserial-dw/fast: + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/build +.PHONY : usbserial-dw/fast TimeoutSerial.o: TimeoutSerial.cpp.o @@ -129,7 +129,7 @@ TimeoutSerial.o: TimeoutSerial.cpp.o # target to build an object file TimeoutSerial.cpp.o: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/TimeoutSerial.cpp.o + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/TimeoutSerial.cpp.o .PHONY : TimeoutSerial.cpp.o TimeoutSerial.i: TimeoutSerial.cpp.i @@ -138,7 +138,7 @@ TimeoutSerial.i: TimeoutSerial.cpp.i # target to preprocess a source file TimeoutSerial.cpp.i: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/TimeoutSerial.cpp.i + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/TimeoutSerial.cpp.i .PHONY : TimeoutSerial.cpp.i TimeoutSerial.s: TimeoutSerial.cpp.s @@ -147,7 +147,7 @@ TimeoutSerial.s: TimeoutSerial.cpp.s # target to generate assembly for a file TimeoutSerial.cpp.s: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/TimeoutSerial.cpp.s + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/TimeoutSerial.cpp.s .PHONY : TimeoutSerial.cpp.s Ymodem.o: Ymodem.cpp.o @@ -156,7 +156,7 @@ Ymodem.o: Ymodem.cpp.o # target to build an object file Ymodem.cpp.o: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/Ymodem.cpp.o + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/Ymodem.cpp.o .PHONY : Ymodem.cpp.o Ymodem.i: Ymodem.cpp.i @@ -165,7 +165,7 @@ Ymodem.i: Ymodem.cpp.i # target to preprocess a source file Ymodem.cpp.i: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/Ymodem.cpp.i + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/Ymodem.cpp.i .PHONY : Ymodem.cpp.i Ymodem.s: Ymodem.cpp.s @@ -174,7 +174,7 @@ Ymodem.s: Ymodem.cpp.s # target to generate assembly for a file Ymodem.cpp.s: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/Ymodem.cpp.s + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/Ymodem.cpp.s .PHONY : Ymodem.cpp.s YmodemFileReceive.o: YmodemFileReceive.cpp.o @@ -183,7 +183,7 @@ YmodemFileReceive.o: YmodemFileReceive.cpp.o # target to build an object file YmodemFileReceive.cpp.o: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/YmodemFileReceive.cpp.o + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/YmodemFileReceive.cpp.o .PHONY : YmodemFileReceive.cpp.o YmodemFileReceive.i: YmodemFileReceive.cpp.i @@ -192,7 +192,7 @@ YmodemFileReceive.i: YmodemFileReceive.cpp.i # target to preprocess a source file YmodemFileReceive.cpp.i: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/YmodemFileReceive.cpp.i + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/YmodemFileReceive.cpp.i .PHONY : YmodemFileReceive.cpp.i YmodemFileReceive.s: YmodemFileReceive.cpp.s @@ -201,7 +201,7 @@ YmodemFileReceive.s: YmodemFileReceive.cpp.s # target to generate assembly for a file YmodemFileReceive.cpp.s: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/YmodemFileReceive.cpp.s + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/YmodemFileReceive.cpp.s .PHONY : YmodemFileReceive.cpp.s main.o: main.cpp.o @@ -210,7 +210,7 @@ main.o: main.cpp.o # target to build an object file main.cpp.o: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/main.cpp.o + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/main.cpp.o .PHONY : main.cpp.o main.i: main.cpp.i @@ -219,7 +219,7 @@ main.i: main.cpp.i # target to preprocess a source file main.cpp.i: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/main.cpp.i + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/main.cpp.i .PHONY : main.cpp.i main.s: main.cpp.s @@ -228,7 +228,7 @@ main.s: main.cpp.s # target to generate assembly for a file main.cpp.s: - $(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/main.cpp.s + $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/main.cpp.s .PHONY : main.cpp.s # Help Target @@ -239,7 +239,7 @@ help: @echo "... depend" @echo "... rebuild_cache" @echo "... edit_cache" - @echo "... timeout" + @echo "... usbserial-dw" @echo "... TimeoutSerial.o" @echo "... TimeoutSerial.i" @echo "... TimeoutSerial.s" diff --git a/build/compile_commands.json b/build/compile_commands.json index cd3afb5..c0aa5d3 100644 --- a/build/compile_commands.json +++ b/build/compile_commands.json @@ -1,22 +1,22 @@ [ { "directory": "/home/jaro/serialport-downloader/build", - "command": "/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_LOG_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -g -std=gnu++11 -o CMakeFiles/timeout.dir/main.cpp.o -c /home/jaro/serialport-downloader/main.cpp", + "command": "/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_LOG_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -g -std=gnu++11 -o CMakeFiles/usbserial-dw.dir/main.cpp.o -c /home/jaro/serialport-downloader/main.cpp", "file": "/home/jaro/serialport-downloader/main.cpp" }, { "directory": "/home/jaro/serialport-downloader/build", - "command": "/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_LOG_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -g -std=gnu++11 -o CMakeFiles/timeout.dir/TimeoutSerial.cpp.o -c /home/jaro/serialport-downloader/TimeoutSerial.cpp", + "command": "/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_LOG_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -g -std=gnu++11 -o CMakeFiles/usbserial-dw.dir/TimeoutSerial.cpp.o -c /home/jaro/serialport-downloader/TimeoutSerial.cpp", "file": "/home/jaro/serialport-downloader/TimeoutSerial.cpp" }, { "directory": "/home/jaro/serialport-downloader/build", - "command": "/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_LOG_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -g -std=gnu++11 -o CMakeFiles/timeout.dir/Ymodem.cpp.o -c /home/jaro/serialport-downloader/Ymodem.cpp", + "command": "/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_LOG_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -g -std=gnu++11 -o CMakeFiles/usbserial-dw.dir/Ymodem.cpp.o -c /home/jaro/serialport-downloader/Ymodem.cpp", "file": "/home/jaro/serialport-downloader/Ymodem.cpp" }, { "directory": "/home/jaro/serialport-downloader/build", - "command": "/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_LOG_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -g -std=gnu++11 -o CMakeFiles/timeout.dir/YmodemFileReceive.cpp.o -c /home/jaro/serialport-downloader/YmodemFileReceive.cpp", + "command": "/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_LOG_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -g -std=gnu++11 -o CMakeFiles/usbserial-dw.dir/YmodemFileReceive.cpp.o -c /home/jaro/serialport-downloader/YmodemFileReceive.cpp", "file": "/home/jaro/serialport-downloader/YmodemFileReceive.cpp" } ] \ No newline at end of file diff --git a/main.cpp b/main.cpp index 59fa022..817d460 100755 --- a/main.cpp +++ b/main.cpp @@ -42,17 +42,6 @@ namespace po = boost::program_options; typedef vector< string > split_vector_type; -enum severity_level -{ - normal, - notification, - warning, - error, - critical -}; - -BOOST_LOG_ATTRIBUTE_KEYWORD(severity, "Severity", severity_level) - static void init_log(void) { /* init boost log @@ -220,7 +209,8 @@ int main(int argc, char* argv[]) try { for (;;) { line = serial.readStringUntil("\r\n"); - cout << line << endl; + if (line.rfind("[OK]",0) == 0) + cout << line; } } catch (...) { @@ -234,7 +224,7 @@ int main(int argc, char* argv[]) modem.setSerialPort(&serial); modem.setFilePath(path); modem.setDefaultFileName(filename); - modem.receiveProgress.connect(showProgress); + modem.receiveProgress.connect(showProgress); modem.startReceive();