From bbc98bbcb3dd342fc416d96d4a0e756897542651 Mon Sep 17 00:00:00 2001
From: gac-S_Changer <gac-S_Changer@PC13741.psi.ch>
Date: Thu, 10 Feb 2022 09:45:56 +0100
Subject: [PATCH] alias trash to trash_sample in trash.py

---
 config/settings.properties | 7 +++----
 devices/E1.properties      | 4 ++--
 script/local.py            | 1 +
 script/motion/trash.py     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/settings.properties b/config/settings.properties
index 11ff07f..2e2db3f 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,12 +1,11 @@
-#Fri Jan 28 12:47:58 CET 2022
-dry_mount_counter=4
-mounted_sample_position=B13
+#Thu Feb 10 09:43:08 CET 2022
+dry_mount_counter=0
 room_temperature_enabled=false
 pin_offset=-0.0
 cryopos_in=5.0
 puck_types=true
 imaging_enabled=false
-dry_timestamp=1.643370086772E9
+dry_timestamp=1.644482454943E9
 roi_h=1000
 led_level=0.0
 beamline_status_enabled=false
diff --git a/devices/E1.properties b/devices/E1.properties
index 1898ba8..826b858 100644
--- a/devices/E1.properties
+++ b/devices/E1.properties
@@ -1,3 +1,3 @@
-#Tue Aug 18 13:57:40 CEST 2020
+#Fri Feb 04 14:52:58 CET 2022
 detection=Mechanical
-disabled=false
+disabled=true
diff --git a/script/local.py b/script/local.py
index 7b076ca..eef81a4 100644
--- a/script/local.py
+++ b/script/local.py
@@ -28,6 +28,7 @@ ROOM_TEMPERATURE_ENABLED_PREFERENCE = "room_temperature_enabled"
 BEAMLINE_STATUS_ENABLED_PREFERENCE = "beamline_status_enabled"
 VALVE_CONTROL_ENABLED_PREFERENCE = "valve_control"
 
+
 def is_imaging_enabled():
     setting = get_setting(IMAGING_ENABLED_PREFERENCE)
     return not (str(setting).lower() == 'false')
diff --git a/script/motion/trash.py b/script/motion/trash.py
index 1e91df5..261077b 100644
--- a/script/motion/trash.py
+++ b/script/motion/trash.py
@@ -40,4 +40,4 @@ def trash():
     else:
         robot.move_home()
 
-    
\ No newline at end of file
+trash_sample = trash
\ No newline at end of file