tell/X06SA
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gac-S_Changer
2019-02-12 13:44:08 +01:00
parent 911022b078
commit ae5a71bcdd
39 changed files with 106 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.properties
View File

@@ -1,4 +1,4 @@
#Tue Feb 05 08:51:03 CET 2019
#Wed Feb 06 11:13:25 CET 2019
autoSaveScanData=true
commandExecutionEvents=false
createSessionFiles=true
@@ -17,6 +17,7 @@ logLevel=Fine
logLevelConsole=Off
logPath={logs}/{date}_{time}
notificationLevel=null
saveCommandStatistics=true
scanStreamerPort=-1
serverEnabled=true
serverPort=8080

10
config/settings.properties
View File

@@ -1,12 +1,12 @@
#Tue Feb 05 15:50:04 CET 2019
#Tue Feb 12 13:16:24 CET 2019
barcode_reader_scan_pucks=false
dry_mount_counter=5
dry_timestamp=1.549363107489E9
force_dry_mount_count=20
dry_mount_counter=4
dry_timestamp=1.549971958622E9
force_dry_mount_count=15
force_dry_timeout=0
imaging_enabled=false
led_level=0.0
mounted_sample_position=E53
mounted_sample_position=B34
pin_offset=0.0
puck_types=true
room_temperature_enabled=false

4
devices/A1.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:22:35 CET 2019
detection=Both
#Wed Feb 06 20:39:47 CET 2019
detection=Mechanical
disabled=true

4
devices/A2.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:00:54 CET 2019
detection=Mechanical
disabled=false

6
devices/A3.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
disabled=false
#Thu Feb 07 09:52:13 CET 2019
detection=Mechanical
disabled=true

4
devices/A4.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 13:50:08 CET 2019
detection=Mechanical
disabled=false

4
devices/A5.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:01:09 CET 2019
detection=Mechanical
disabled=false

4
devices/B1.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:01:15 CET 2019
detection=Mechanical
disabled=false

4
devices/B2.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:30:50 CET 2019
detection=Both
#Wed Feb 06 11:01:20 CET 2019
detection=Mechanical
disabled=false

4
devices/B3.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:00:22 CET 2019
detection=Mechanical
disabled=false

4
devices/B4.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:01:46 CET 2019
detection=Mechanical
disabled=false

4
devices/B5.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:01:51 CET 2019
detection=Mechanical
disabled=false

4
devices/C1.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:01:55 CET 2019
detection=Mechanical
disabled=false

4
devices/C2.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:02 CET 2019
detection=Mechanical
disabled=false

4
devices/C3.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:06 CET 2019
detection=Mechanical
disabled=false

4
devices/C4.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:11 CET 2019
detection=Mechanical
disabled=false

4
devices/C5.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:19 CET 2019
detection=Mechanical
disabled=false

4
devices/D1.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:24 CET 2019
detection=Mechanical
disabled=false

4
devices/D2.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:29 CET 2019
detection=Mechanical
disabled=false

4
devices/D3.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:33 CET 2019
detection=Mechanical
disabled=false

4
devices/D4.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:38 CET 2019
detection=Mechanical
disabled=false

4
devices/D5.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:02:43 CET 2019
detection=Mechanical
disabled=false

4
devices/E1.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:03:08 CET 2019
detection=Mechanical
disabled=false

4
devices/E2.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:03:13 CET 2019
detection=Mechanical
disabled=false

4
devices/E3.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:03:18 CET 2019
detection=Mechanical
disabled=false

4
devices/E4.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:52:26 CET 2019
detection=Both
#Wed Feb 06 11:03:23 CET 2019
detection=Mechanical
disabled=false

4
devices/E5.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:03:27 CET 2019
detection=Mechanical
disabled=false

4
devices/F1.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:03:33 CET 2019
detection=Mechanical
disabled=false

4
devices/F2.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:03:37 CET 2019
detection=Mechanical
disabled=false

6
devices/F3.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
disabled=false
#Sat Feb 09 21:22:22 CET 2019
detection=Mechanical
disabled=true

4
devices/F4.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:03:45 CET 2019
detection=Mechanical
disabled=false

4
devices/F5.properties
View File

@@ -1,3 +1,3 @@
#Tue Feb 05 15:17:58 CET 2019
detection=Both
#Wed Feb 06 11:03:48 CET 2019
detection=Mechanical
disabled=false

6
devices/smart_magnet.properties
View File

@@ -1,8 +1,8 @@
#Tue Feb 05 11:22:07 CET 2019
holdingCurrent=50.0
#Tue Feb 12 11:31:27 CET 2019
holdingCurrent=60.0
mountCurrent=20.0
remanenceCurrent=-10.0
restingCurrent=30.0
restingCurrent=20.0
reverseCurrent=-10.0
reverseTime=0.4
unmountCurrent=20.0

BIN
plugins/MXSC-1.10.0.jar
View File

Binary file not shown.

2
plugins/SmartMagnetPanel.java
View File

@@ -290,7 +290,7 @@ public class SmartMagnetPanel extends DevicePanel {
}//GEN-LAST:event_buttonSupressOffActionPerformed
private void buttonConfigurationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonConfigurationActionPerformed
try {
try {
this.showConfigEditor(true, false);
} catch (Exception ex) {
Logger.getLogger(SmartMagnetPanel.class.getName()).log(Level.SEVERE, null, ex);

29
script/data/samples.py
View File

@@ -134,18 +134,32 @@ def update_puck_table():
#Sample mount/unmount
def same_address(puck_add_1, sample_pos_1, puck_add_2, sample_pos_2):
if str(puck_add_1) != str(puck_add_2):
return False
try:
sample_pos_1 = int(sample_pos_1)
except:
return False
try:
sample_pos_2 = int(sample_pos_2)
except:
return False
return sample_pos_1 == sample_pos_2
def update_samples_info_sample_mount(puck_address, sample_position, sample_detected, sample_id):
try:
if (samples_info is not None) and (puck_address is not None):
if (samples_info is not None) and (puck_address is not None):
for si in samples_info:
if str(si["puckAddress"]) == str(puck_address) and str(si["samplePosition"]) == str(sample_position):
if same_address( si["puckAddress"], si["samplePosition"], puck_address, sample_position):
if sample_detected:
if si["sampleStatus"] != "Mounted":
si["sampleStatus"] = "Mounted"
si["sampleStatus"] = "Mounted"
try:
mount_count = int(si["sampleMountCount"])
except:
mount_count = 0
mount_count = 0
si["sampleMountCount"] = mount_count + 1
else:
si["sampleStatus"] = "Unknown"
@@ -157,12 +171,13 @@ def update_samples_info_sample_mount(puck_address, sample_position, sample_detec
return
except:
pass
def update_samples_info_sample_unmount(puck_address, sample_position):
try:
if (samples_info is not None) and (puck_address is not None):
for si in samples_info:
if str(si["puckAddress"]) == str(puck_address) and str(si["samplePosition"]) == str(sample_position):
if same_address( si["puckAddress"], si["samplePosition"], puck_address, sample_position):
si["sampleStatus"] = "HasBeenMounted"
save_samples_info()
return
@@ -173,7 +188,7 @@ def update_samples_info_sample_scan(puck_address, sample_position, sample_detect
try:
if (samples_info is not None) and (puck_address is not None):
for si in samples_info:
if str(si["puckAddress"]) == str(puck_address) and str(si["samplePosition"]) == str(sample_position):
if same_address( si["puckAddress"], si["samplePosition"], puck_address, sample_position):
if sample_detected:
if si["sampleStatus"] == "Unknown":
si["sampleStatus"] = "Present"
@@ -185,7 +200,7 @@ def update_samples_info_sample_scan(puck_address, sample_position, sample_detect
save_samples_info()
return
except:
pass
pass

3
script/devices/SmartMagnet.py
View File

@@ -104,7 +104,8 @@ class SmartMagnet(DeviceBase):
self.set_resting_current()
def is_resting_current(self):
return self.get_current() == self.config.getFieldValue("restingCurrent")
is_resting = 2.0 > abs( float(self.get_current()) - float(self.config.getFieldValue("restingCurrent")) )
return is_resting
def apply_reverse(self):

3
script/motion/mount.py
View File

@@ -55,7 +55,8 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
smart_magnet.set_supress(False)
time.sleep(0.2)
#To better dectect sample
smart_magnet.apply_resting()
smart_magnet.apply_resting()
time.sleep(0.5)
if smart_magnet.check_mounted(idle_time=0.25, timeout = 1.0) == True:
if auto_unmount and (get_setting("mounted_sample_position") is not None):
#auto_unmount set to true so detection remains enabled

9
script/motion/recover.py
View File

@@ -118,7 +118,7 @@ def move_to_safest_point(segment, vicinity_tolerance = 100):
#print "Recovered to point " + str(robot.get_curjoint_or_pointrent_point())
def recover():
def recover(move_park = True):
#Initial checks
robot.assert_no_task()
robot.reset_motion()
@@ -144,7 +144,12 @@ def recover():
location = robot.get_current_point()
if location is None:
raise Exception("Robot didn't reach known point")
return "Success recovering to point: " + str(location)
print "Success recovered to point: " + str(location)
if move_park:
robot.move_park()
return "Success recovered to park position"
else:
return "Success recovered to point: " + str(location)
#finally:
# robot.set_default_speed()
if not is_on_known_segment: