This commit is contained in:
gac-S_Changer
2018-08-17 16:53:57 +02:00
parent b717e25031
commit f5277198e9
6 changed files with 14 additions and 7 deletions

View File

@@ -1,3 +1,5 @@
Commands.java=disabled
Recovery.java=disabled
MXSC-1.10.0.jar=enabled
WagoPanel.java=enabled
LaserUEPanel.java=enabled
@@ -5,11 +7,9 @@ BarcodeReaderPanel.java=enabled
PuckDetectionPanel.java=enabled
HexiposiPanel.java=enabled
MjpegSource2.java=enabled
LN2.java=enabled
LN2.java=disabled
Hexiposi.java=disabled
NewJPanel.java=disabled
Expert.java=disabled
RecoveryPanel.java=disabled
RobotPanel.java=enabled
SmartMagnetConfig.java=disabled
SmartMagnetPanel.java=enabled

Binary file not shown.

Binary file not shown.

View File

@@ -90,9 +90,11 @@ def system_check(robot_move=True):
if robot_move:
if not feedback_local_safety.read():
raise Exception("Local safety not released")
if not feedback_psys_safety.read():
raise Exception("Psys safety not released")
if not guiding_tool_park().read():
auto = not is_manual_mode()
if auto:
if not feedback_psys_safety.read():
raise Exception("Psys safety not released")
if not guiding_tool_park.read():
raise Exception("Guiding tool not parked")
def get_puck_elect_detection(segment, puck):

View File

@@ -33,7 +33,8 @@ def enable_motion():
"""
Check safety and enable arm power if in remote mode
"""
release_safety()
release_safety()
system_check(robot_move=True)
auto = not is_manual_mode()
if auto:
if not robot.state.isNormal():

4
script/test/cycle_time Normal file
View File

@@ -0,0 +1,4 @@
start =time.time()
unmount('A',2,5, force=True)
mount('A',2,5, force=True, read_dm=False)
print time.time()-start