diff --git a/config/config.properties b/config/config.properties index a9f1c22..b95ee3a 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Tue Jan 15 11:47:52 CET 2019 +#Thu Jan 24 14:24:44 CET 2019 autoSaveScanData=true commandExecutionEvents=false createSessionFiles=true diff --git a/config/settings.properties b/config/settings.properties index 90cadc5..b384c6a 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,10 +1,10 @@ -#Wed Jan 23 17:07:28 CET 2019 +#Thu Jan 24 14:40:47 CET 2019 barcode_reader_scan_pucks=false dry_mount_counter=0 -dry_timestamp=1.548248191529E9 -force_dry_mount_count=0 +dry_timestamp=1.548326732257E9 +force_dry_mount_count=20 force_dry_timeout=0 imaging_enabled=false led_level=0.0 -mounted_sample_position=A17 puck_types=true +room_temperature_enabled=false diff --git a/plugins/MXSC-1.10.0.jar b/plugins/MXSC-1.10.0.jar index a66b349..065c111 100644 Binary files a/plugins/MXSC-1.10.0.jar and b/plugins/MXSC-1.10.0.jar differ diff --git a/script/local.py b/script/local.py index 6907bfe..2110c3d 100644 --- a/script/local.py +++ b/script/local.py @@ -22,6 +22,8 @@ run("setup/Layout") IMAGING_ENABLED_PREFERENCE = "imaging_enabled" PUCK_TYPES_PREFERENCE = "puck_types" BARCODE_READER_SCAN_PUCKS = "barcode_reader_scan_pucks" +ROOM_TEMPERATURE_ENABLED_PREFERENCE = "room_temperature_enabled" +BEAMLINE_STATUS_ENABLED_PREFERENCE = "beamline_status_enabled" def is_imaging_enabled(): setting = get_setting(IMAGING_ENABLED_PREFERENCE) @@ -78,6 +80,19 @@ if force_dry_timeout is None: +def is_room_temperature_enabled(): + setting = get_setting(ROOM_TEMPERATURE_ENABLED_PREFERENCE) + return str(setting).lower() == 'true' + +set_setting(ROOM_TEMPERATURE_ENABLED_PREFERENCE, is_room_temperature_enabled()) + + +def is_beamline_status_enabled(): + setting = get_setting(BEAMLINE_STATUS_ENABLED_PREFERENCE) + return str(setting).lower() == 'true' + +set_setting(ROOM_TEMPERATURE_ENABLED_PREFERENCE, is_beamline_status_enabled()) + ################################################################################################### # Scripted devices and pseudo-devices ###################################################################################################