summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhou_xin <zhou_xin@dl.cn.nexty-ele.com>2019-03-02 13:55:46 +0800
committerzhou_xin <zhou_xin@dl.cn.nexty-ele.com>2019-03-02 13:55:46 +0800
commite6fa527e2f7a5a23580fcb2e81f6555deab6d640 (patch)
treed96443adec3cc4e60231e1c38e90f8092ebce7fe
parentc8788c356e6b0f9d50f639fe39e926eab2586b1c (diff)
Fix interface name of can devicesandbox/wanglu/settings-with-touch-recorder
-rw-r--r--app/logfile/logplay.cpp2
-rw-r--r--app/logfile/logsave.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/logfile/logplay.cpp b/app/logfile/logplay.cpp
index 53febea..ee1db7e 100644
--- a/app/logfile/logplay.cpp
+++ b/app/logfile/logplay.cpp
@@ -242,7 +242,7 @@ void LogPlayImpl::setCANProperty(int index, QString port, QString stime, QString
{
if(index > 0 && index < datas.size())
{
- playUtilsArg["-p"] = "vcan0="+port;
+ playUtilsArg["-p"] = "slcan0="+port;
playUtilsArg["-I"] = datas[index][pathRole].toString();
}
}
diff --git a/app/logfile/logsave.cpp b/app/logfile/logsave.cpp
index 3482cba..b395fdf 100644
--- a/app/logfile/logsave.cpp
+++ b/app/logfile/logsave.cpp
@@ -144,7 +144,7 @@ bool LogSaveImpl::saveStart(bool can, bool touch, bool video, bool audio)
fd = open(dumpUtilsArg["-L"].toStdString().c_str(), O_CREAT | O_WRONLY, 0666);
dup2(fd, 1);
close(fd); /* fd は以後不要なので close() */
- execl(DumpUtilsExec.c_str(), basename(DumpUtilsExec.c_str()), "vcan0", "-L", (char *)NULL);
+ execl(DumpUtilsExec.c_str(), basename(DumpUtilsExec.c_str()), "slcan0", "-L", (char *)NULL);
break;
default:
break;