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

V2

Browse Source
This commit is contained in:
alexgobbo
2025-09-12 16:16:15 +02:00
parent 68c510e707
commit ba17725e75
22 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/settings.properties
+3 -3
View File
@@ -1,9 +1,9 @@
#Wed Aug 13 10:52:38 CEST 2025
#Fri Sep 12 15:42:10 CEST 2025
barcode_reader_scan_pucks=false
beamline_status_enabled=false
cold_position_timeout=3600
dry_mount_counter=0
dry_timestamp=1.753545811032E9
dry_mount_counter=10
dry_timestamp=1.757680125206E9
force_dry_mount_count=10
force_dry_timeout=27000
imaging_enabled=true
devices/cover_detection.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Wed Aug 13 10:52:40 CEST 2025
#Wed Sep 10 12:06:02 CEST 2025
border_dewar=0.56
center_x=1020.0
center_y=1047.0
devices/led_ctrl_1.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Wed Aug 06 10:57:31 CEST 2025
#Tue Aug 26 09:15:05 CEST 2025
description=null
maxValue=1.0
minValue=0.0
devices/led_ctrl_2.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Wed Aug 06 10:57:31 CEST 2025
#Tue Aug 26 09:15:05 CEST 2025
description=null
maxValue=1.0
minValue=0.0
devices/led_ctrl_3.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Wed Aug 06 10:57:31 CEST 2025
#Tue Aug 26 09:15:05 CEST 2025
description=null
maxValue=1.0
minValue=0.0
plugins/BarcodeReaderPanel.java
+2 -2
View File
@@ -32,7 +32,7 @@ public class BarcodeReaderPanel extends DevicePanel {
public void onTimer(){
if ((getDevice()!=null) && enabled){
if ((future==null) || (future.isDone())){
future = Context.getInterpreter().evalLineBackgroundAsync(getDevice().getName() + ".get()");
future = Context.getSequencer().evalLineBackgroundAsync(getDevice().getName() + ".get()");
}
}
}
@@ -40,7 +40,7 @@ public class BarcodeReaderPanel extends DevicePanel {
void execute(String statement, boolean showReturn){
try {
Context.getInterpreter().evalLineBackgroundAsync(statement).handle((ret, ex) -> {
Context.getSequencer().evalLineBackgroundAsync(statement).handle((ret, ex) -> {
if (BarcodeReaderPanel.this.isShowing()){
if (ex != null){
showException((Exception)ex);
plugins/Commands.java
+2 -2
View File
@@ -30,8 +30,8 @@ public class Commands extends Panel {
try{
spinnerDryTime.setValue(Context.getInterpreter().getScriptManager().getVar("DEFAULT_DRY_HEAT_TIME"));
spinnerDrySpeed.setValue(Context.getInterpreter().getScriptManager().getVar("DEFAULT_DRY_SPEED"));
spinnerDryTime.setValue(Context.getInterpreter().getVar("DEFAULT_DRY_HEAT_TIME"));
spinnerDrySpeed.setValue(Context.getInterpreter().getVar("DEFAULT_DRY_SPEED"));
} catch(Exception ex){
this.showException(ex);
}
plugins/HexiposiPanel.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class HexiposiPanel extends DevicePanel {
private void buttonHomingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonHomingActionPerformed
try {
//Context.getInstance().evalLineAsync("hexiposi.move_home()").handle((ret, ex) -> {
Context.getInterpreter().evalLineAsync("homing_hexiposi()").handle((ret, ex) -> {
Context.getSequencer().evalLineAsync("homing_hexiposi()").handle((ret, ex) -> {
if (ex != null){
showException((Exception)ex);
}
plugins/LaserUEPanel.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class LaserUEPanel extends DevicePanel {
void execute(String statement, boolean showReturn){
try {
Context.getInterpreter().evalLineBackgroundAsync(statement).handle((ret, ex) -> {
Context.getSequencer().evalLineBackgroundAsync(statement).handle((ret, ex) -> {
if (LaserUEPanel.this.isShowing()){
if (ex != null){
showException((Exception)ex);
plugins/MXSC-2.0.0.jar
BIN
View File
Binary file not shown.
plugins/PuckDetectionPanel.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class PuckDetectionPanel extends DevicePanel {
void execute(String statement, boolean showReturn){
try {
Context.getInterpreter().evalLineBackgroundAsync(statement).handle((ret, ex) -> {
Context.getSequencer().evalLineBackgroundAsync(statement).handle((ret, ex) -> {
if (ex != null){
showException((Exception)ex);
} else if (showReturn){
plugins/RobotPanel.java
+9 -9
View File
@@ -569,7 +569,7 @@ public class RobotPanel extends DevicePanel {
private void buttonEnableActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonEnableActionPerformed
try{
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".enable()");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".enable()");
} catch (Exception ex){
this.showException(ex);
}
@@ -577,7 +577,7 @@ public class RobotPanel extends DevicePanel {
private void buttonDisableActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDisableActionPerformed
try{
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".disable()");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".disable()");
} catch (Exception ex){
this.showException(ex);
}
@@ -586,7 +586,7 @@ public class RobotPanel extends DevicePanel {
private void spinnerSpeedStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerSpeedStateChanged
try{
if (!updating){
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".set_monitor_speed(" + spinnerSpeed.getValue() + ")");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".set_monitor_speed(" + spinnerSpeed.getValue() + ")");
}
} catch (Exception ex){
this.showException(ex);
@@ -595,7 +595,7 @@ public class RobotPanel extends DevicePanel {
private void butonStopActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_butonStopActionPerformed
try{
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".reset_motion()");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".reset_motion()");
} catch (Exception ex){
this.showException(ex);
}
@@ -603,7 +603,7 @@ public class RobotPanel extends DevicePanel {
private void buttonPauseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPauseActionPerformed
try{
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".stop()");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".stop()");
} catch (Exception ex){
this.showException(ex);
}
@@ -611,7 +611,7 @@ public class RobotPanel extends DevicePanel {
private void buttonResumeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonResumeActionPerformed
try{
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".resume()");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".resume()");
} catch (Exception ex){
this.showException(ex);
}
@@ -619,7 +619,7 @@ public class RobotPanel extends DevicePanel {
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
try{
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".stop_task()");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".stop_task()");
//Context.getInstance().evalLineBackground(getDevice().getName() + ".task_kill('" + textTask.getText() + "')");
} catch (Exception ex){
this.showException(ex);
@@ -628,7 +628,7 @@ public class RobotPanel extends DevicePanel {
private void buttonCloseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonCloseActionPerformed
try{
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".close_tool()");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".close_tool()");
} catch (Exception ex){
this.showException(ex);
}
@@ -636,7 +636,7 @@ public class RobotPanel extends DevicePanel {
private void buttonOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonOpenActionPerformed
try{
Context.getInterpreter().evalLineBackground(getDevice().getName() + ".open_tool()");
Context.getSequencer().evalLineBackground(getDevice().getName() + ".open_tool()");
} catch (Exception ex){
this.showException(ex);
}
plugins/SmartMagnetPanel.java
+2 -2
View File
@@ -275,7 +275,7 @@ public class SmartMagnetPanel extends DevicePanel {
private void buttonSupressOnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSupressOnActionPerformed
try {
Context.getInterpreter().evalLineBackground("smart_magnet.set_supress(True)");
Context.getSequencer().evalLineBackground("smart_magnet.set_supress(True)");
} catch (Exception ex) {
Logger.getLogger(SmartMagnetPanel.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -283,7 +283,7 @@ public class SmartMagnetPanel extends DevicePanel {
private void buttonSupressOffActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSupressOffActionPerformed
try {
Context.getInterpreter().evalLineBackground("smart_magnet.set_supress(False)");
Context.getSequencer().evalLineBackground("smart_magnet.set_supress(False)");
} catch (Exception ex) {
Logger.getLogger(SmartMagnetPanel.class.getName()).log(Level.SEVERE, null, ex);
}
plugins/WagoPanel.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class WagoPanel extends DevicePanel {
void execute(String statement){
try {
Context.getInterpreter().evalLineBackgroundAsync(statement).handle((ret, ex) -> {
Context.getSequencer().evalLineBackgroundAsync(statement).handle((ret, ex) -> {
if (WagoPanel.this.isShowing()){
if (ex != null){
showException((Exception)ex);
script/data/samples.py
+1 -1
View File
@@ -41,7 +41,7 @@ def save_samples_info():
output_file = open( Setup.expandPath("{context}/samples_info.json") , "w")
output_file.write(data)
output_file.close()
get_interpreter().sendEvent("samples_updated", True)
get_sequencer().sendEvent("samples_updated", True)
save_puck_info()
def restore_samples_info():
script/motion/mount.py
+12 -7
View File
@@ -61,6 +61,9 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
try:
#ZACH
if needs_chilling and not delayed_chill:
#added bt domi 26.8.2025
set_setting("dry_timestamp",time.time())
set_setting("dry_mount_counter", 0)
robot.move_dewar(*cover_info)
robot.move_cold()
time.sleep(30.0)
@@ -155,11 +158,6 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
# if cleaner_timer > 0:
# start_pin_cleaner(cleaner_timer)
try:
dry_mount_count = int(get_setting("dry_mount_counter"))
except:
dry_mount_count = 0
set_setting("dry_mount_counter", dry_mount_count+1)
if is_aux:
robot.move_park_async()
@@ -194,9 +192,16 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
set_exec_pars(then = "dry(wait_cold = -1)")
else:
set_exec_pars(then = "dry()")
else:
try:
dry_mount_count = int(get_setting("dry_mount_counter"))
except:
dry_mount_count = 0
set_setting("dry_mount_counter", dry_mount_count+1)
print "setting mounted sample to %s%d-%d" % (segment, puck, sample)
set_setting("mounted_sample_position", get_sample_name(segment, puck, sample))
print "setting mounted sample to %s%d-%d" % (segment, puck, sample)
set_setting("mounted_sample_position", get_sample_name(segment, puck, sample))
return [mount_sample_detected, mount_sample_id]
finally:
smart_magnet.set_default_current()
script/motion/move_cold.py
+1
View File
@@ -1,6 +1,7 @@
def move_cold(reset_timestamp=False):
"""
"""
#useless code below
if reset_timestamp:
set_setting("dry_timestamp",time.time())
print "move_cold and resetting dry_timestamp"
script/motion/move_park.py
+1 -1
View File
@@ -15,6 +15,6 @@ def move_park():
if not robot.is_park():
robot.move_park()
robot.move_park()
return True
script/motion/unmount.py
+3
View File
@@ -80,6 +80,9 @@ def unmount(segment = None, puck = None, sample = None, force=False, auto_unmoun
if not is_aux:
if needs_chilling:
#added bt domi 26.8.2025
set_setting("dry_timestamp",time.time())
set_setting("dry_mount_counter", 0)
robot.move_dewar(*cover_info)
robot.move_cold()
time.sleep(30.)
script/tasks/ColdPositionTimeout.py
+3 -3
View File
@@ -4,17 +4,17 @@ if cold_position_timeout > 0:
if (time.time() - robot.last_command_timestamp) > cold_position_timeout:
if robot.is_cold():
log("Detected cold position timeout", False)
if get_interpreter().state == State.Ready:
if get_sequencer().state == State.Ready:
if robot.state == State.Ready:
if feedback_psys_safety.take() == True:
#TODO: Chan
get_interpreter().evalLine("dry(wait_cold = -1)") #Dry and park : use get_interpreter().evalLine to change application state
get_sequencer().evalLine("dry(wait_cold = -1)") #Dry and park : use get_sequencer().evalLine to change application state
else:
raise Exception("Cannot clear cold position: feedback_psys_safety = False ")
else:
raise Exception("Cannot clear cold position: robot state: " + str(robot.state))
else:
raise Exception("Cannot clear cold position: system state: " + str(get_interpreter().state))
raise Exception("Cannot clear cold position: system state: " + str(get_sequencer().state))
script/test/mount_profile.py
+3
View File
@@ -50,6 +50,9 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
try:
#ZACH
if needs_chilling:
#added bt domi 26.8.2025
set_setting("dry_timestamp",time.time())
set_setting("dry_mount_counter", 0)
robot.move_cold()
time.sleep(30.0)
script/test/unmount_profile.py
+3
View File
@@ -64,6 +64,9 @@ def unmount(segment = None, puck = None, sample = None, force=False, auto_unmoun
if not force:
visual_check_hexiposi(segment)
if needs_chilling:
#added bt domi 26.8.2025
set_setting("dry_timestamp",time.time())
set_setting("dry_mount_counter", 0)
robot.move_cold()
time.sleep(30.)
else: