.

LFB-MRI · Dec 12, 2023 · 1274435 · 1274435
1 parent 9370ff8
commit 1274435
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 11 deletions.
diff --git a/src/MagneticReadoutProcessing/MRP/MRPReadingSourceFullsphere.py b/src/MagneticReadoutProcessing/MRP/MRPReadingSourceFullsphere.py
@@ -34,7 +34,7 @@ class MRPReadingSourceFullsphere(MRPReadingSource.MRPReadingSource):
         # HOME MECHANIC
         "G28 Y",
         "G28 X",
-        "SET_IDLE_TIMEOUT TIMEOUT=36000",
+        "SET_IDLE_TIMEOUT TIMEOUT=60",
         "M220 S8000"
     ]
 
@@ -51,7 +51,7 @@ class MRPReadingSourceFullsphere(MRPReadingSource.MRPReadingSource):
     MEASUREMENT_CONFIG: dict = {
         # AXIS LIMITS
         # 0-180 DEGREE
-        "MAX_THETA_MECHANIC": 21.0,
+        "MAX_THETA_MECHANIC": 20.0,
         "MIN_THETA_MECHANIC": 0.0,
         # 0- 360 DEGREE
         "MIN_PHI_MECHANIC": 0.0,

diff --git a/src/MagneticReadoutProcessing/MRPcli/configs/remotecfg_config.json b/src/MagneticReadoutProcessing/MRPcli/configs/remotecfg_config.json
@@ -1 +1 @@
-{"_default": {"1": {"key": "SENSOR_SERIAL_DEVICE_PATH", "value": "http://127.0.0.1:5556/proxy/", "cfg_name": "remotecfg_config.json"}, "2": {"key": "SENSOR_SERIAL_NAME", "value": "Unified Sensor", "cfg_name": "remotecfg_config.json"}, "3": {"key": "CONFIG_NAME", "value": "", "cfg_name": "remotecfg_config.json"}, "4": {"key": "READING_PREFIX", "value": "remotecfg", "cfg_name": "remotecfg_config.json"}, "5": {"key": "READING_OUTPUT_FOLDER", "value": "../readings", "cfg_name": "remotecfg_config.json"}, "6": {"key": "READING_DATAPOINT_COUNT", "value": "18", "cfg_name": "remotecfg_config.json"}, "7": {"key": "READING_AVERAGE_COUNT", "value": "2", "cfg_name": "remotecfg_config.json"}, "8": {"key": "READING_MAGNET_TYPE", "value": "2", "cfg_name": "remotecfg_config.json"}, "9": {"key": "SENSOR_SERIAL_BAUDRATE", "value": "0", "cfg_name": "remotecfg_config.json"}}}
+{"_default": {"1": {"key": "SENSOR_SERIAL_DEVICE_PATH", "value": "http://192.168.178.123:5556/proxy/", "cfg_name": "remotecfg_config.json"}, "2": {"key": "SENSOR_SERIAL_NAME", "value": "Unified Sensor", "cfg_name": "remotecfg_config.json"}, "3": {"key": "CONFIG_NAME", "value": "", "cfg_name": "remotecfg_config.json"}, "4": {"key": "READING_PREFIX", "value": "remotecfg", "cfg_name": "remotecfg_config.json"}, "5": {"key": "READING_OUTPUT_FOLDER", "value": "../readings", "cfg_name": "remotecfg_config.json"}, "6": {"key": "READING_DATAPOINT_COUNT", "value": "18", "cfg_name": "remotecfg_config.json"}, "7": {"key": "READING_AVERAGE_COUNT", "value": "2", "cfg_name": "remotecfg_config.json"}, "8": {"key": "READING_MAGNET_TYPE", "value": "2", "cfg_name": "remotecfg_config.json"}, "9": {"key": "SENSOR_SERIAL_BAUDRATE", "value": "0", "cfg_name": "remotecfg_config.json"}}}
diff --git a/src/readings/360_dregee_magnet_0.mag.json b/src/readings/360_dregee_magnet_0.mag.json
diff --git a/src/readings/360_dregee_magnet_10.mag.json b/src/readings/360_dregee_magnet_10.mag.json
diff --git a/src/readings/360_dregree_empty_-1.mag.json b/src/readings/360_dregree_empty_-1.mag.json
diff --git a/...emotecfg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID0_MAGN45_CUBIC_12x12x12_cIDX0.mag.json b/...emotecfg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID0_MAGN45_CUBIC_12x12x12_cIDX0.mag.json
diff --git a/...fg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID0_MAGN45_CUBIC_12x12x12_cIDX0.mag.json_cIDX1 b/...fg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID0_MAGN45_CUBIC_12x12x12_cIDX0.mag.json_cIDX1
diff --git a/...emotecfg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID1_MAGN45_CUBIC_12x12x12_cIDX0.mag.json b/...emotecfg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID1_MAGN45_CUBIC_12x12x12_cIDX0.mag.json
diff --git a/...fg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID1_MAGN45_CUBIC_12x12x12_cIDX0.mag.json_cIDX1 b/...fg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID1_MAGN45_CUBIC_12x12x12_cIDX0.mag.json_cIDX1
diff --git a/src/readings/remotecfg_remotecfg.png b/src/readings/remotecfg_remotecfg.png
diff --git a/...cfg_remotecfg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID0_MAGNOT_SPECIFIED_cIDX0.mag.json b/...cfg_remotecfg_ID2BE820F6-2C41-5D59-8858-23E3CB22FBC6_SID0_MAGNOT_SPECIFIED_cIDX0.mag.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"_default": {"1": {"key": "SENSOR_SERIAL_DEVICE_PATH", "value": "http://127.0.0.1:5556/proxy/", "cfg_name": "remotecfg_config.json"}, "2": {"key": "SENSOR_SERIAL_NAME", "value": "Unified Sensor", "cfg_name": "remotecfg_config.json"}, "3": {"key": "CONFIG_NAME", "value": "", "cfg_name": "remotecfg_config.json"}, "4": {"key": "READING_PREFIX", "value": "remotecfg", "cfg_name": "remotecfg_config.json"}, "5": {"key": "READING_OUTPUT_FOLDER", "value": "../readings", "cfg_name": "remotecfg_config.json"}, "6": {"key": "READING_DATAPOINT_COUNT", "value": "18", "cfg_name": "remotecfg_config.json"}, "7": {"key": "READING_AVERAGE_COUNT", "value": "2", "cfg_name": "remotecfg_config.json"}, "8": {"key": "READING_MAGNET_TYPE", "value": "2", "cfg_name": "remotecfg_config.json"}, "9": {"key": "SENSOR_SERIAL_BAUDRATE", "value": "0", "cfg_name": "remotecfg_config.json"}}}
		{"_default": {"1": {"key": "SENSOR_SERIAL_DEVICE_PATH", "value": "http://192.168.178.123:5556/proxy/", "cfg_name": "remotecfg_config.json"}, "2": {"key": "SENSOR_SERIAL_NAME", "value": "Unified Sensor", "cfg_name": "remotecfg_config.json"}, "3": {"key": "CONFIG_NAME", "value": "", "cfg_name": "remotecfg_config.json"}, "4": {"key": "READING_PREFIX", "value": "remotecfg", "cfg_name": "remotecfg_config.json"}, "5": {"key": "READING_OUTPUT_FOLDER", "value": "../readings", "cfg_name": "remotecfg_config.json"}, "6": {"key": "READING_DATAPOINT_COUNT", "value": "18", "cfg_name": "remotecfg_config.json"}, "7": {"key": "READING_AVERAGE_COUNT", "value": "2", "cfg_name": "remotecfg_config.json"}, "8": {"key": "READING_MAGNET_TYPE", "value": "2", "cfg_name": "remotecfg_config.json"}, "9": {"key": "SENSOR_SERIAL_BAUDRATE", "value": "0", "cfg_name": "remotecfg_config.json"}}}