|
@@ -67,6 +67,7 @@ class EntranceChecker(threading.Thread):
|
|
|
|
|
|
def run(self):
|
|
|
while self.is_close is False:
|
|
|
+ # print(self.error_str)
|
|
|
time.sleep(0.05)
|
|
|
#先判断连接状态
|
|
|
if self.icpu_statu.timeout():
|
|
@@ -133,13 +134,13 @@ class EntranceChecker(threading.Thread):
|
|
|
continue
|
|
|
|
|
|
#光电正常
|
|
|
- if lidar_statu==MeasureStatu["无数据"]:
|
|
|
- self.error_str='请按提示调整'
|
|
|
+ if lidar_statu==MeasureStatu["无数据"]and icpu_statu.is_occupy != 2:
|
|
|
+ self.error_str='无车!'
|
|
|
self.last_show="空闲"
|
|
|
continue
|
|
|
elif lidar_statu==MeasureStatu["噪声"]:
|
|
|
if self.last_show=="超时":
|
|
|
- self.error_str='请按提示调整'
|
|
|
+ self.error_str='雷达噪声'
|
|
|
self.last_show="空闲"
|
|
|
continue
|
|
|
elif lidar_statu==MeasureStatu["ok"]:
|
|
@@ -151,30 +152,33 @@ class EntranceChecker(threading.Thread):
|
|
|
self.last_show="轴距超差"
|
|
|
continue
|
|
|
if (border_statu>>9)&0x01==1:
|
|
|
- self.error_str='请按提示调整'
|
|
|
+ self.error_str='请按提示调整(向左旋转)'
|
|
|
self.last_show="请调整"
|
|
|
continue
|
|
|
if (border_statu>>8)&0x01==1:
|
|
|
- self.error_str='请按提示调整'
|
|
|
+ self.error_str='请按提示调整(向右旋转)'
|
|
|
self.last_show="请调整"
|
|
|
continue
|
|
|
if (border_statu>>10)&0x01==1:
|
|
|
- self.error_str='请按提示调整'
|
|
|
+ self.error_str='请按提示调整(回正方向盘)'
|
|
|
self.last_show="请调整"
|
|
|
continue
|
|
|
if (border_statu>>6)&0x01==1:
|
|
|
- self.error_str='请按提示调整'
|
|
|
+ self.error_str='超宽'
|
|
|
self.last_show="超宽"
|
|
|
continue
|
|
|
border=border_statu&0x0f
|
|
|
|
|
|
-
|
|
|
- if ArrowType[border] == "正确图片":
|
|
|
- self.error_str="OK"
|
|
|
- self.last_show="正确"
|
|
|
+ if (border in ArrowType.keys()) is False:
|
|
|
+ self.error_str='测量有误'
|
|
|
+ self.last_show = "超时"
|
|
|
else:
|
|
|
- self.error_str="请按提示调整"
|
|
|
- self.last_show="请调整"
|
|
|
+ if ArrowType[border] == "正确图片":
|
|
|
+ self.error_str="OK"
|
|
|
+ self.last_show="正确"
|
|
|
+ else:
|
|
|
+ self.error_str="请按提示调整"
|
|
|
+ self.last_show="请调整"
|
|
|
|
|
|
|
|
|
|