diff --git a/.gitignore b/.gitignore index 8dc4e25..6252131 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ ################################################################################ -# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +# 此 .gitignore 文件已由 Micosoft(R) Visual Studio 自动创建。 ################################################################################ /build @@ -16,3 +16,4 @@ /othersoft/calibration_console/build/ /othersoft/shuttercali/project/LocationCali/cmake-build-debug /othersoft/calibration_console/cmake-build-debug/ +/othersoft/calibration_console/cmake-build-debug/ diff --git a/root/start.sh b/root/start.sh index b9a4dae..d8d05db 100644 --- a/root/start.sh +++ b/root/start.sh @@ -4,5 +4,5 @@ chmod +x /root/frp_0.34.3_linux_arm/frpc chmod +x /root/ffwatch.sh /root/ffwatch.sh & chmod +x /root/Mywathdog.sh -/root/Mywathdog.sh & +bash /root/Mywathdog.sh & diff --git a/source/CaptureThread/Scheduler.cpp b/source/CaptureThread/Scheduler.cpp index d58b5f0..b455a8d 100644 --- a/source/CaptureThread/Scheduler.cpp +++ b/source/CaptureThread/Scheduler.cpp @@ -28,7 +28,7 @@ void Scheduler::Preheating() #ifdef _DEBUG QThread::msleep(5000); #else - //QThread::msleep(900000);//NEED TO CHANGE BEFOR HAND TO CUSTOM + QThread::msleep(900000);//NEED TO CHANGE BEFOR HAND TO CUSTOM #endif qDebug() << "Preheating Finished"; }