diff --git a/Hyt2/APP/Service/service_statusmonitor.c b/Hyt2/APP/Service/service_statusmonitor.c index 1fdc1bc..4450bf9 100644 --- a/Hyt2/APP/Service/service_statusmonitor.c +++ b/Hyt2/APP/Service/service_statusmonitor.c @@ -24,7 +24,7 @@ static char ptz_temp_volt_current_fault_detect_task() if ( g_ptz.fault_detect.Phase_curr_H != FAULT ) { hori_fault++; - if ( hori_fault >= 10 ) + if ( hori_fault >= 30 ) { g_ptz.fault_detect.Phase_curr_H = FAULT;//水平电机相电流过大,报警 ptz_hori_stop(PTZ_HORI_STOP_TIME); @@ -41,7 +41,7 @@ static char ptz_temp_volt_current_fault_detect_task() if ( g_ptz.fault_detect.Phase_curr_V != FAULT ) { vert_fault++; - if ( vert_fault >= 10 ) + if ( vert_fault >= 30 ) { g_ptz.fault_detect.Phase_curr_V = FAULT;//垂直电机相电流过大,报警 ptz_vert_stop(PTZ_VERT_STOP_TIME); @@ -85,7 +85,7 @@ static char ptz_temp_volt_current_fault_detect_task() g_ptz.fault_detect.temperature_fault = NO_FAULT; } //极限温度故障,用于限制云台功能控制,超过温度阈值10℃有效,此时云台不能正常工作 - if(g_ptz.temperature > (PTZ_TEMP_DETECT_MAX + 10.0) || g_ptz.temperature < (PTZ_TEMP_DETECT_MIN - 5.0) ) + if(g_ptz.temperature > (PTZ_TEMP_DETECT_MAX + 10.0) || g_ptz.temperature < (PTZ_TEMP_DETECT_MIN - 9.0) ) { max_temperature_fault = FAULT; ptz_hori_stop(PTZ_HORI_STOP_TIME); diff --git a/Hyt2/APP/Service/service_statusmonitor.h b/Hyt2/APP/Service/service_statusmonitor.h index 8b8932d..339dd42 100644 --- a/Hyt2/APP/Service/service_statusmonitor.h +++ b/Hyt2/APP/Service/service_statusmonitor.h @@ -114,7 +114,7 @@ //相电流运行最大值 // #define PHASE_CURRENT 5.0 - #define PHASE_CURRENT 15 + #define PHASE_CURRENT 20.0 #endif //L6235D涡轮蜗杆重型云台 diff --git a/Hyt2/PROJECT/.vscode/iar-vsc.json b/Hyt2/PROJECT/.vscode/iar-vsc.json new file mode 100644 index 0000000..90c2a8a --- /dev/null +++ b/Hyt2/PROJECT/.vscode/iar-vsc.json @@ -0,0 +1,18 @@ +{ + "workspace": { + "path": "${workspaceFolder}\\OS2.eww" + }, + "workspaces": { + "${workspaceFolder}\\OS2.eww": { + "configs": { + "${workspaceFolder}\\OS2.ewp": "Debug" + }, + "selected": { + "path": "${workspaceFolder}\\OS2.ewp" + } + } + }, + "workbench": { + "path": "D:\\IAR" + } +} \ No newline at end of file