diff --git a/.gitignore b/.gitignore index 6061a06..4ec9e78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *tmp* PROJECT/Debug/ PROJECT/Release/ -PROJECT/settings/ \ No newline at end of file +PROJECT/settings/ +*.ewp \ No newline at end of file diff --git a/APP/Service/service_statusmonitor.c b/APP/Service/service_statusmonitor.c index 8a4479c..943b0fe 100644 --- a/APP/Service/service_statusmonitor.c +++ b/APP/Service/service_statusmonitor.c @@ -471,6 +471,7 @@ static char ptz_motor_rotate_fault_detect_task() time_ms = 0; } + return 0; if(g_ptz.vert_start_stop_set == PTZ_VERT_STOP) diff --git a/PROJECT/OS2.ewp b/PROJECT/OS2.ewp index 945d9c5..336d8a7 100644 --- a/PROJECT/OS2.ewp +++ b/PROJECT/OS2.ewp @@ -716,11 +716,11 @@