jaro/usbserial-dw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Jaro
2021-08-28 15:09:31 +02:00
parent e20021dd2d
commit 8a1bc534e5
4 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SerialPortYmodem

Submodule SerialPortYmodem deleted from dd5ce17f9f

40
build/Makefile
View File

@@ -111,17 +111,17 @@ depend:
.PHONY : depend .PHONY : depend
#============================================================================= #=============================================================================
# Target rules for targets named timeout # Target rules for targets named usbserial-dw
# Build rule for target. # Build rule for target.
timeout: cmake_check_build_system usbserial-dw: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 timeout $(MAKE) -f CMakeFiles/Makefile2 usbserial-dw
.PHONY : timeout .PHONY : usbserial-dw
# fast build rule for target. # fast build rule for target.
timeout/fast: usbserial-dw/fast:
$(MAKE) -f CMakeFiles/timeout.dir/build.make CMakeFiles/timeout.dir/build $(MAKE) -f CMakeFiles/usbserial-dw.dir/build.make CMakeFiles/usbserial-dw.dir/build
.PHONY : timeout/fast .PHONY : usbserial-dw/fast
TimeoutSerial.o: TimeoutSerial.cpp.o TimeoutSerial.o: TimeoutSerial.cpp.o
@@ -129,7 +129,7 @@ TimeoutSerial.o: TimeoutSerial.cpp.o
# target to build an object file # target to build an object file
TimeoutSerial.cpp.o: 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 .PHONY : TimeoutSerial.cpp.o
TimeoutSerial.i: TimeoutSerial.cpp.i TimeoutSerial.i: TimeoutSerial.cpp.i
@@ -138,7 +138,7 @@ TimeoutSerial.i: TimeoutSerial.cpp.i
# target to preprocess a source file # target to preprocess a source file
TimeoutSerial.cpp.i: 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 .PHONY : TimeoutSerial.cpp.i
TimeoutSerial.s: TimeoutSerial.cpp.s TimeoutSerial.s: TimeoutSerial.cpp.s
@@ -147,7 +147,7 @@ TimeoutSerial.s: TimeoutSerial.cpp.s
# target to generate assembly for a file # target to generate assembly for a file
TimeoutSerial.cpp.s: 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 .PHONY : TimeoutSerial.cpp.s
Ymodem.o: Ymodem.cpp.o Ymodem.o: Ymodem.cpp.o
@@ -156,7 +156,7 @@ Ymodem.o: Ymodem.cpp.o
# target to build an object file # target to build an object file
Ymodem.cpp.o: 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 .PHONY : Ymodem.cpp.o
Ymodem.i: Ymodem.cpp.i Ymodem.i: Ymodem.cpp.i
@@ -165,7 +165,7 @@ Ymodem.i: Ymodem.cpp.i
# target to preprocess a source file # target to preprocess a source file
Ymodem.cpp.i: 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 .PHONY : Ymodem.cpp.i
Ymodem.s: Ymodem.cpp.s Ymodem.s: Ymodem.cpp.s
@@ -174,7 +174,7 @@ Ymodem.s: Ymodem.cpp.s
# target to generate assembly for a file # target to generate assembly for a file
Ymodem.cpp.s: 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 .PHONY : Ymodem.cpp.s
YmodemFileReceive.o: YmodemFileReceive.cpp.o YmodemFileReceive.o: YmodemFileReceive.cpp.o
@@ -183,7 +183,7 @@ YmodemFileReceive.o: YmodemFileReceive.cpp.o
# target to build an object file # target to build an object file
YmodemFileReceive.cpp.o: 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 .PHONY : YmodemFileReceive.cpp.o
YmodemFileReceive.i: YmodemFileReceive.cpp.i YmodemFileReceive.i: YmodemFileReceive.cpp.i
@@ -192,7 +192,7 @@ YmodemFileReceive.i: YmodemFileReceive.cpp.i
# target to preprocess a source file # target to preprocess a source file
YmodemFileReceive.cpp.i: 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 .PHONY : YmodemFileReceive.cpp.i
YmodemFileReceive.s: YmodemFileReceive.cpp.s YmodemFileReceive.s: YmodemFileReceive.cpp.s
@@ -201,7 +201,7 @@ YmodemFileReceive.s: YmodemFileReceive.cpp.s
# target to generate assembly for a file # target to generate assembly for a file
YmodemFileReceive.cpp.s: 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 .PHONY : YmodemFileReceive.cpp.s
main.o: main.cpp.o main.o: main.cpp.o
@@ -210,7 +210,7 @@ main.o: main.cpp.o
# target to build an object file # target to build an object file
main.cpp.o: 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 .PHONY : main.cpp.o
main.i: main.cpp.i main.i: main.cpp.i
@@ -219,7 +219,7 @@ main.i: main.cpp.i
# target to preprocess a source file # target to preprocess a source file
main.cpp.i: 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 .PHONY : main.cpp.i
main.s: main.cpp.s main.s: main.cpp.s
@@ -228,7 +228,7 @@ main.s: main.cpp.s
# target to generate assembly for a file # target to generate assembly for a file
main.cpp.s: 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 .PHONY : main.cpp.s
# Help Target # Help Target
@@ -239,7 +239,7 @@ help:
@echo "... depend" @echo "... depend"
@echo "... rebuild_cache" @echo "... rebuild_cache"
@echo "... edit_cache" @echo "... edit_cache"
@echo "... timeout" @echo "... usbserial-dw"
@echo "... TimeoutSerial.o" @echo "... TimeoutSerial.o"
@echo "... TimeoutSerial.i" @echo "... TimeoutSerial.i"
@echo "... TimeoutSerial.s" @echo "... TimeoutSerial.s"

8
build/compile_commands.json
View File

@@ -1,22 +1,22 @@
[ [
{ {
"directory": "/home/jaro/serialport-downloader/build", "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" "file": "/home/jaro/serialport-downloader/main.cpp"
}, },
{ {
"directory": "/home/jaro/serialport-downloader/build", "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" "file": "/home/jaro/serialport-downloader/TimeoutSerial.cpp"
}, },
{ {
"directory": "/home/jaro/serialport-downloader/build", "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" "file": "/home/jaro/serialport-downloader/Ymodem.cpp"
}, },
{ {
"directory": "/home/jaro/serialport-downloader/build", "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" "file": "/home/jaro/serialport-downloader/YmodemFileReceive.cpp"
} }
] ]

16
main.cpp
View File

@@ -42,17 +42,6 @@ namespace po = boost::program_options;
typedef vector< string > split_vector_type; 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) static void init_log(void)
{ {
/* init boost log /* init boost log
@@ -220,7 +209,8 @@ int main(int argc, char* argv[])
try { try {
for (;;) { for (;;) {
line = serial.readStringUntil("\r\n"); line = serial.readStringUntil("\r\n");
cout << line << endl; if (line.rfind("[OK]",0) == 0)
cout << line;
} }
} catch (...) { } catch (...) {
@@ -234,7 +224,7 @@ int main(int argc, char* argv[])
modem.setSerialPort(&serial); modem.setSerialPort(&serial);
modem.setFilePath(path); modem.setFilePath(path);
modem.setDefaultFileName(filename); modem.setDefaultFileName(filename);
modem.receiveProgress.connect(showProgress); modem.receiveProgress.connect(showProgress);
modem.startReceive(); modem.startReceive();