Merge remote-tracking branch 'origin/master'

changelog.md

@@ -1,9 +1,14 @@
-unreleased:
+0.2.68:
 - added check box to numberlineedits to switch between user input and spreadsheet
-- re-enabled MLprediciton
+- re-enabled MLprediction
 - fixed bug in gui where manual sample couldnt be created when run nubmer was negative.
 - Combined beamline view now split vertically not horizontally
-0.2.67
+- New error handling in DAQ for robot mounting errors
+- Error box pop ups in GUI when sample gripper detection error occurs
+- Automation queue pauses if sample gripper detection error occurs multiple times to allow robot dry, if continues stops and wiats for user interverntion
+- added ingest_scan to send rotation and screening result to db
+
+0.2.67:
 - added run number to sampleshortinfo
 - ingest raster result, including beam center to database
 - aerotech goes to mount postion for manual mount
@@ -11,6 +16,7 @@ unreleased:
 - smart_rotiation_panel fix - but will be mvoed to DAQ in future update
 - Fluoresence scan can be saved to CSV with right click
 - Wait for ready before sending Tell to dry
-0.2.66 
+
+0.2.66:
 - moved rastergridingestmodel and centreofmassmodel from models to raster_grid.py
 - after raster load closest image to new centre