Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 30dbc1fb6c added Modulo 360deg on Omega coming from Automation1 master Wayne Glettig 2025-12-18 14:50:38 +01:00
• 7c2a3ad488 shows date Wayne Glettig 2025-10-27 16:32:52 +01:00
• b06bf6875a removed MODE 12 from singlaxis.html Wayne Glettig 2025-10-27 16:15:21 +01:00
• 9d66760847 reacts to IP address in smargoparamters.yaml Wayne Glettig 2025-10-27 15:53:55 +01:00
• 5ecc818f1e added Automation IP address to smargonparameters.yaml Wayne Glettig 2025-10-27 15:46:32 +01:00
• e870ae30f6 added Automation1 API Wayne Glettig 2025-10-27 15:38:00 +01:00
• 7a2e5367f9 adds the option that the service starts serverA1.launch (Automation1 support) Wayne Glettig 2025-10-27 15:35:45 +01:00
• 7f0e1c202c Ready for Automation1 Wayne Glettig 2025-10-27 14:21:06 +01:00
• 07f0634da0 CMakeLists updated Wayne Glettig 2025-10-27 14:11:43 +01:00
• df39c9a895 added Automation1 support + headers Wayne Glettig 2025-10-27 14:10:05 +01:00
• d8ecec2c33 updated singleaxis.html Web interface Wayne Glettig 2025-10-27 14:08:04 +01:00
• f19db66b22 added code for Automation1 Wayne Glettig 2025-10-20 16:50:59 +02:00
• 8a108b7239 Added Automation1 testing script Wayne Glettig 2025-10-20 16:50:01 +02:00
• a6319b170d use Automation1 API Wayne Glettig 2025-10-20 16:03:43 +02:00
• 6d71437157 implemented Single Axis Mode Wayne Glettig 2025-10-20 15:52:54 +02:00
• da78dc5579 put back Active correction, and got title messages working again Wayne Glettig 2025-10-20 12:47:24 +02:00
• 82e0482147 moderator allows mode 11 & 12 now Wayne Glettig 2025-10-20 09:22:41 +02:00
• ae6016880d added Modes 11 & 12 single axis intialisation and run wglettig 2025-10-19 23:49:32 +02:00
• 51b2362729 layout design adaptations Wayne Glettig 2025-10-16 19:59:58 +02:00
• ad73db61d1 removed typos Wayne Glettig 2025-10-16 19:54:52 +02:00
• 0518cfcf1d cleaned up and added documentation for single axis modes Wayne Glettig 2025-10-16 19:50:03 +02:00
• 52141f55f7 added web interface for Single Axis: singleaxis.html Wayne Glettig 2025-10-16 19:43:22 +02:00
• 9c0549d7ac cleaned up config files Wayne Glettig 2025-09-22 16:55:20 +02:00
• 733311f3aa Merge branch 'master' of gitea.psi.ch:mx/smargopolo Wayne Glettig 2025-09-22 16:46:22 +02:00
• 1a930cfd12 corrected smargonparamters.yaml for X06DA Wayne Glettig 2025-09-22 16:45:41 +02:00
• 99d2cb8472 systemd startup script now has beamline descriptor in .bash script in home directory Wayne Glettig 2025-09-22 16:24:11 +02:00
• 27755d449b Merge branch 'x06da' Wayne Glettig 2025-09-22 15:09:48 +02:00
• 3e1f31c5ed RESTful Interface now handles NaN correctly origin/master origin/HEAD Wayne Glettig 2025-09-15 18:27:17 +02:00
• 4049dc02ba Updated OX OY OZ positions according to Vincent. Wayne Glettig 2025-09-15 17:33:49 +02:00
• a2a64d1637 added X06DA configuration directory Wayne Glettig 2025-09-15 17:29:53 +02:00
• c733b0a6cc Merge branch 'master' of https://git.psi.ch/mx/smargopolo Wayne Glettig 2025-08-19 14:29:47 +02:00
• 6f1241d72d Updated smargon parameters in MX Lab Wayne Glettig 2025-08-19 14:26:53 +02:00
• 3868739275 Replaced MCS2 controller at x06da MCS2-00002922 with MCS2-00007772 origin/x06da Wayne Glettig 2025-04-15 16:13:01 +02:00
• 7b1b3f9ab8 cleanup Wayne Glettig 2024-12-18 17:37:47 +01:00
• 04279c775d x06da 1st working version Wayne Glettig 2024-11-19 11:00:27 +01:00
• fe6a775142 calibration plots Wayne Glettig 2024-11-19 10:59:35 +01:00
• a6d8322ba9 minor update Wayne Glettig 2023-09-19 14:09:04 +02:00
• 4c78e1437c Calibration after broken PSI Aluminium PART Wayne Glettig 2023-04-03 15:16:48 +02:00
• e895c49caf First Calibration with PSI-Titanium Parts Wayne Glettig 2023-01-27 13:27:42 +01:00
• 7721588337 Moved History File to Beamline Folder Wayne Glettig 2022-11-16 17:11:09 +01:00
• 90d80a7dd9 Merge branch 'master' of https://git.psi.ch/mx/smargopolo Wayne Glettig 2022-11-16 16:12:10 +01:00
• e50ff1603c Run calibration for 10S Wayne Glettig 2022-11-16 16:10:58 +01:00
• 0fa39bf71b Installed Titanium Parts and Run Calibration Wayne Glettig 2022-11-16 14:41:04 +01:00
• ad1e04cb58 fixed issue with PHI Axis and calibration Wayne Glettig 2022-11-15 14:50:06 +01:00
• 228dcea83b PHI limits due to blockage in motor; sastt Wayne Glettig 2022-10-28 09:44:37 +02:00
• 0da5e8cb20 x06sa config before SAS-TT Wayne Glettig 2022-10-21 14:43:28 +02:00
• d0ee11a3d4 got rid of an obsolete link to smargon_support package Wayne Glettig 2022-08-29 16:58:43 +02:00
• 17a7459d94 added location='args' to parser.add_argument() call Wayne Glettig 2022-08-09 16:38:48 +02:00
• 915c44eaf3 x10sa CHI limit to 20 degrees Wayne Glettig 2022-08-04 14:44:09 +02:00
• da8741f2f8 gitignore update Wayne Glettig 2022-08-04 11:47:57 +02:00
• 6477722e6f remove config/calib and config smargonp Wayne Glettig 2022-08-04 11:44:42 +02:00
• e92191618d make labjack read offsets and gains from parameter yaml file Wayne Glettig 2022-08-04 11:41:35 +02:00
• a1e5dd8213 include labjack in smargonparamters.yaml for X06SA Wayne Glettig 2022-08-04 11:39:55 +02:00
• df5494cab3 updated x10sa calibration Wayne Glettig 2022-08-04 11:30:30 +02:00
• c24bef84f6 Merge branch 'master' of https://git.psi.ch/mx/smargopolo Wayne Glettig 2022-08-04 10:22:02 +02:00
• f7e2b49118 first calibration data for x10sa Dominik Buntschu 2022-08-04 10:20:34 +02:00
• a31352c47d inital upload of MXLab folder to git Dominik Buntschu 2022-07-28 12:52:23 +02:00
• f8c1167429 upload calibration scripts for X10SA Dominik Buntschu 2022-07-27 15:57:54 +02:00
• 46cc38a93c Calibration Routine 10S Dominik Buntschu 2022-07-27 14:30:47 +02:00
• 7d9eb671f7 Calibration Routine for X06SA Dominik Buntschu 2022-07-27 14:13:49 +02:00
• 26d7f18bb5 add launcher script to repo Wayne Glettig 2022-07-27 11:15:44 +02:00
• 17aa2e9ab4 initial History File to git Dominik Buntschu 2022-07-26 08:59:29 +02:00
• 1ca48fd5af updated configuration values Dominik Buntschu 2022-07-25 16:20:15 +02:00
• 0892d48f8a redis host update for x10sa Dominik Buntschu 2022-07-25 16:11:47 +02:00
• d4e31ff9e2 gitignore Wayne Glettig 2022-07-25 16:01:38 +02:00
• bb4d8f84d9 beamline specific folders for configuration and calibration Wayne Glettig 2022-07-25 16:00:23 +02:00
• 2e876931e3 solved wierd flask-restful parsing issue (location='args') Wayne Glettig 2022-07-20 19:53:04 +02:00
• a86112b72a Implemented MCS2_locator, redis_host & description in parameter file Wayne Glettig 2022-07-20 10:07:57 +02:00
• c40d1d215a Cleaned up many unused files Wayne Glettig 2022-07-19 14:45:52 +02:00
• 4d9afeeb25 Updated LabJack exodriver to 2020 version Wayne Glettig 2022-05-06 16:11:11 +02:00
• 06b2fe3a1b Added new MCS2 drivers Wayne Glettig 2022-05-06 13:21:45 +02:00
• d6e1aba566 added configuration backup folder for vespa setup Wayne Glettig 2022-04-21 12:16:07 +02:00
• 3e2e80c2e5 includes FPRX, FPRY, FPRZ orientation tweaks for both nudgeSH and nudgeO Wayne Glettig 2022-04-21 12:11:42 +02:00
• e2ac16840c added save an recall pose buttonsss Wayne Glettig 2022-04-13 13:29:08 +02:00
• 25f48f505b added buttons for chi and phi tweaking in gui html Wayne Glettig 2022-04-13 09:42:23 +02:00
• fc0658050c ok Wayne Glettig 2022-04-13 09:35:51 +02:00
• 8e8d3fd93f before adding new buttons to gui Wayne Glettig 2022-04-13 09:28:03 +02:00
• fe95afb3b5 systemd init script Wayne Glettig 2022-02-23 12:56:24 +01:00
• fa3d2d985b update message on redis failure Wayne Glettig 2022-02-23 12:55:01 +01:00
• bfac4184e6 CPU_temp updated to be simple floats Wayne Glettig 2022-01-27 22:05:47 +01:00
• 8e42ecacd9 added QAD_LOG -rw------- 1 root root 6319 Jan 27 06:02 ubuntu-advantage-timer.log# Wayne Glettig 2022-01-27 20:55:05 +01:00
• 6174b36f48 Current state which was cloned to Zac's Workstation smargopolo Wayne Glettig 2022-01-27 20:51:51 +01:00
• 74151b51b0 Added CPU_temp.py to monitor CPU temperature of the server. Wayne Glettig 2022-01-25 22:41:27 +01:00
• 1c12154d75 removed bug in BCS2SCS conversion (omega update was wrong) Wayne Glettig 2022-01-13 18:28:14 +01:00
• e270fd74c2 End of 2021 git commit from SmarGon installed at PXI. Happy New Year. Wayne Glettig 2021-12-23 11:28:24 +01:00
• bece529540 implemented BCS2SCS wglettig 2021-12-19 21:05:16 +01:00
• a3595dacfd before BCS addition Wayne Glettig 2021-12-15 23:53:32 +01:00
• ad65ab87d6 Simplified Active Correction. Bilinear Interpollation now on active_corr = 1. Also HTML control page was updated. Wayne Glettig 2021-11-10 11:11:58 +01:00
• 3c4f1b76ca added Dominik's Python Algorithms Wayne Glettig 2021-11-09 16:47:54 +01:00
• dc7267ff18 Updated smargopolo to version ready for beamline (vmax, amax, limits all in config file) Wayne Glettig 2021-11-09 16:45:31 +01:00
• ac6e03b598 ready to deploy to smargopolo pc ROS Station 2021-11-09 15:01:32 +01:00
• 6cd1de4457 new ROS Station 2021-11-09 13:33:18 +01:00
• f6317d3ad6 added bounds and simul.launch wglettig 2021-11-07 22:26:12 +01:00
• c4c94c8ed4 before adding bounding to smargopolo Wayne Glettig 2021-11-05 10:30:03 +01:00
• 446405672e Added Dominik's Python Scripts Wayne Glettig 2021-11-02 17:01:36 +01:00
• 0ba45d8c0d state before migration to git.psi.ch Wayne Glettig 2021-11-02 16:48:08 +01:00
• de72591a37 ready to deploy to smargopolo Wayne Glettig 2021-10-01 19:29:14 +02:00
• 8141442e2e after working in train on MacBook wglettig 2021-10-01 10:33:41 +02:00
• 0e3aed9726 working on active correction Wayne Glettig 2021-09-30 18:56:31 +02:00
• e3da60b469 stand vor active correction routine Wayne Glettig 2021-09-29 16:30:57 +02:00