commit 1d570637c2ce45046280fa47bd93a340464526b2 Author: TaineEriksen Date: Wed Jul 21 12:41:13 2021 -0700 Inclued a copy of MR firmware commit 9592b119aa2370d139ffb1ea084aff2b42e8125d Author: TaineEriksen Date: Wed Jul 21 12:40:42 2021 -0700 New LCLS2 style boot file for FACET gap diode commit 36e996d8255177576d9eb40e0b29ef27cd14ae08 Author: TaineEriksen Date: Wed Jul 21 12:40:02 2021 -0700 Tried removing the header from MR firmware commit 291a9f415aa50f0531242e19a5f8b42a922d588b Author: TaineEriksen Date: Wed Jul 21 12:38:33 2021 -0700 Changed to use a LCLS style BLEN on FACET commit 7a0a679b44b574050c228f97c11638f47c92e343 Author: TaineEriksen Date: Thu Jul 15 17:03:10 2021 -0700 Added raw waveform processing to make file and uncommented it in the startup file commit 5b30d80acb6b09447189c5d56dc4d8def5ed700d Author: TaineEriksen Date: Wed Jul 14 13:19:34 2021 -0700 Added a copy of the LCLS2 style firmware image commit 5fc2fbb5c53376b701b54dc3cc86e31b54533e75 Author: TaineEriksen Date: Wed Jul 14 09:11:29 2021 -0700 Coppied blen main screens from gadc to restor changes then reupdated to use the timing screens in event commit ce6a70d5c915cbdab2b6d9e4a9ee688eff2b94a5 Author: TaineEriksen Date: Tue Jul 13 15:26:30 2021 -0700 Changed to use timing screens from evnt commit 77f32191e9b53e681194b9bb42a7db679b427342 Author: TaineEriksen Date: Tue Jul 13 15:24:57 2021 -0700 Corrected li11-bl01 POS commit f032073c9a1997af5b6df476baa3bdd6d8b0736c Author: Daron Chabot Date: Wed Jul 7 16:52:59 2021 -0700 ENH: cfg prod pyro blen iocs commit 490d634af96bfb841f4292b253537ed8acee0876 Author: Daron Chabot Date: Wed Jul 7 16:44:32 2021 -0700 ENH: cfg prod gapdiode blen commit 9c762671a1b37ef859d6617a8a3980dc36e1ee09 Author: Daron Chabot Date: Tue Mar 23 13:20:27 2021 -0700 ENH: flesh out S11, S14 startup scripts commit f1a8629e5aab9a9f22a404f45ac37986ad4a4fb9 Author: Daron Chabot Date: Wed Jun 16 09:34:38 2021 -0700 MNT: path consistency with BCM commit b4c851fd7611d6f3cf8326172edc46a0960d894e Author: Daron Chabot Date: Wed Jun 16 09:25:04 2021 -0700 MNT: reorder BSA channels commit cf0b56b22b77f69c03e6e6d633f511527b9da26f Author: Daron Chabot Date: Thu Jun 3 11:35:17 2021 -0700 MNT: Stream control commit 4a6cb43cb812e619928dcab20b6d5a67a64fed9b Author: Daron Chabot Date: Tue May 25 16:48:51 2021 -0700 ENH: add BSA support commit 335889fd3b4ae3ae3e3cd674c4343e1709e25f37 Author: Daron Chabot Date: Wed May 19 16:11:40 2021 -0700 ENH: update slider text to match Help svg commit c64e9d180e60d3b6a4c0ab80da8c647556318df4 Author: Daron Chabot Date: Wed May 19 16:11:12 2021 -0700 MNT: fixup Deadband region on svg commit bb02925649bcb29c4a452779c892ca6095e329e8 Author: Daron Chabot Date: Fri May 14 15:03:04 2021 -0700 ENH: Use pyro filter desc fields in ui commit 28d9746f9931804bf6eadd0a4e90e9033013bb47 Author: Daron Chabot Date: Fri May 14 13:50:48 2021 -0700 MNT: bpm select widget type commit 8305d8758e504de59c46b3a98be518c3b116637c Author: Daron Chabot Date: Fri May 14 09:42:57 2021 -0700 ENH: temperature alarms commit 47e4c4e5fead2cb9984d29ba43202989c6068d61 Author: Daron Chabot Date: Thu May 13 17:27:32 2021 -0700 ENH: additional blen freq range descriptions commit 93000a12faa75eff8f145787cbe4b64339a97b58 Author: Daron Chabot Date: Thu May 13 17:17:09 2021 -0700 MNT: rotate gapdiode channels pi/2 cw commit 8db3fcae7e4a8d82583c66a3158004c1af84d47f Author: Daron Chabot Date: Thu May 13 17:15:33 2021 -0700 ENH: blen labels on imax commit 15b1fd30b91ba7f76f635eb5927ea5df14bbccf0 Author: Daron Chabot Date: Thu May 13 16:16:25 2021 -0700 FIX: equation math commit a906dcac9eab87e51b15cb4c16d69a5a59a0e82e Author: Daron Chabot Date: Thu May 13 16:10:34 2021 -0700 ENH: autosave var additions commit 3ec909822dd4adde0637f5b248b5a6958e4e7113 Author: Daron Chabot Date: Thu May 13 15:10:00 2021 -0700 MNT: units display in ui commit c4a86a70f2e7db961e6d131aece682f9b404a759 Author: Daron Chabot Date: Thu May 13 09:03:56 2021 -0700 MNT: description phrasing commit 56b96e2abdcfcd39a6bda5ee23cf02ed2abdce8e Author: Daron Chabot Date: Thu May 13 08:58:47 2021 -0700 MNT: re-order imax, sum on main pyro panel commit 59a6aae2951f5acd306b2bf997e715d0beed178b Author: Daron Chabot Date: Wed May 12 18:54:40 2021 -0700 ENH: Help image commit bdcb3229685670f08d72a6a5e6f74fcee191625a Author: Daron Chabot Date: Wed May 12 17:32:28 2021 -0700 MNT: suggestion from AF commit b3a5e14353c5cae76356b43bbdd7c4754f59ec89 Author: Daron Chabot Date: Wed May 12 17:01:40 2021 -0700 MNT: coalesce use of blen_daq from engineering ui panels commit a5af4e3f10afb445c687185d3192f7f7f8a4a1a8 Author: Daron Chabot Date: Wed May 12 16:42:43 2021 -0700 FIX: qt throwing a TypeError commit a25f86c0f0795b29a0444a956ac51518b604da4c Author: Daron Chabot Date: Wed May 12 16:34:16 2021 -0700 MNT: rm Coefficients... button commit dac319a3749c50e22b4ddbb143f9b2a2508a9b55 Author: Daron Chabot Date: Mon May 10 17:47:09 2021 -0700 FIX: bpm sync signal, ui commit b33dbabff40415deb279fdc059199f9bbdc78876 Author: Daron Chabot Date: Mon May 10 12:55:31 2021 -0700 MNT: resize, layout pyro ui commit 8bb9b38652e062655f6c816379b1ee502be07fde Author: Daron Chabot Date: Mon May 10 10:49:14 2021 -0700 MNT: temperature pv templates commit 69eed93920bc669020fd0012486242f1a4340f6d Author: Daron Chabot Date: Fri May 7 19:34:33 2021 -0700 ENH: bpm server ip addr parsing commit 32ae2d3498f41185791b64b9b1a81b7607079bb0 Author: Daron Chabot Date: Fri May 7 19:09:25 2021 -0700 ENH: bpm, imax, etc from gap ui commit 709c4cb0372ab82221de7e026deb531db75f5871 Author: Daron Chabot Date: Fri May 7 17:05:05 2021 -0700 ENH: add temperature monitoring to pyro ui commit d05b271915ff2327876a93c0402a4f02f0db928f Author: Daron Chabot Date: Fri May 7 16:42:46 2021 -0700 ENH: temperature sensor monitors commit 9fe99c2d2f3b30845382c8d7a66c6245c845f55c Author: Daron Chabot Date: Wed May 5 18:41:50 2021 -0700 ENH: passive temperature sensor integration commit fab26c0c30bf675bd93de32f200c1af855a05816 Author: Daron Chabot Date: Fri Apr 23 15:57:13 2021 -0700 ENH: bpm info, layout commit 5922719ae6119ff13991d476812fdabab0b7eb7f Author: Daron Chabot Date: Fri Apr 23 13:57:03 2021 -0700 FIX: typos commit 78d0f4b8d312c63c74a1263110ee911864adfc5c Author: Daron Chabot Date: Thu Apr 22 17:40:50 2021 -0700 WIP: bpm ip,port,select support commit 7438ba603a4c00a99c0a6a747dbd229d758d0f28 Author: Daron Chabot Date: Thu Apr 22 14:23:36 2021 -0700 ENH: expose BPM server ip, port in Records commit 57be9427b188008b744bcfd06df581fa84137e37 Author: Daron Chabot Date: Sat Apr 17 17:16:10 2021 -0700 ENH: fix autosave-restore machinery commit cae098f33d29e5c56bec1cd6d5c690d8b2ecf163 Author: Daron Chabot Date: Sat Apr 17 16:48:07 2021 -0700 MNT: resize, clean up layout commit 706f2065f7cc8b9959ebd719ea0678f1d5df4398 Author: Daron Chabot Date: Sat Apr 17 15:52:16 2021 -0700 WIP: integration-window calibration edits commit 3e56bb4d1ba427e096844e39b6a8fb0e934cb1a8 Author: Daron Chabot Date: Sat Apr 17 15:08:01 2021 -0700 MNT: omit extraneous eqn header commit c33808f7b1cd9a445afd15a7f0f873cfac2eded7 Author: Daron Chabot Date: Sat Apr 17 14:54:26 2021 -0700 MNT: swap A0/A1/A3/A4 positions commit 00a7b6c6c0190783ac4d9fda732dfade03375dc8 Author: Daron Chabot Date: Tue Mar 30 16:38:42 2021 -0700 MNT: terminology chg commit 6fe1112bdde7074f2e7b2ddf9ff73e1228bb0261 Author: Daron Chabot Date: Sat Mar 27 15:41:36 2021 -0700 WIP: launch gapdiode coeff panel commit e694fc1cd2d8731683682661a2a860be49254075 Author: Daron Chabot Date: Sat Mar 27 15:38:26 2021 -0700 FIX: coeff I2 owned per AMC commit e615473649746b36c1bea3a83bfb8a2133e57019 Author: Daron Chabot Date: Sat Mar 27 15:18:53 2021 -0700 WIP: coeff entry panel commit 7018405474b34b8b23b27391c42850f243edaae6 Author: Daron Chabot Date: Sat Mar 27 13:53:40 2021 -0700 WIP: gapdiode coefficient UI panels commit bed64b1dcade988b666244b8cd98bb1f49695fb9 Author: Daron Chabot Date: Tue Mar 23 13:27:05 2021 -0700 ENH: temp fix for CP yaml issue commit 2b756e9c9bf5fa42860f00d0706bb259707e4e69 Author: Daron Chabot Date: Mon Mar 22 11:04:08 2021 -0700 ENH: new yaml cpsw backdoor tarball from LS commit 246cc0b1a4fad0958573292d83f234e649af6b6a Author: Daron Chabot Date: Fri Mar 19 15:36:43 2021 -0700 FIX: +/-X designation commit 580971f5db31e8fe2fa0b88a7dfc175223fee420 Author: Daron Chabot Date: Fri Mar 19 14:37:12 2021 -0700 DOC: startup file database descriptions commit 7c6ff61f258fba1d14dca11b6dd677d9a38caa05 Author: Daron Chabot Date: Fri Mar 19 14:29:56 2021 -0700 WIP: add raw data offset coefI2 commit c6d01aaf8b9072fd40e920cf15c5a1d3be157ad6 Author: Daron Chabot Date: Fri Mar 19 11:23:41 2021 -0700 WIP: expand range of allowed channels commit 5562cdea5a792d37c5f4c156c88b22aaf9016a22 Author: Daron Chabot Date: Fri Mar 19 11:22:51 2021 -0700 WIP: hack to add AMC clk selection commit c8ce30f7f82f9dc67e972d170041ad40b45c54e1 Author: Daron Chabot Date: Thu Mar 18 18:14:04 2021 -0700 MNT: make DspPreprocConfig vars easier on the eyes commit c534a1c49caf283def65ce76b35a32fe326a1eb2 Author: Daron Chabot Date: Wed Mar 17 16:30:29 2021 -0700 WIP: wire channels C,D into UI panels commit 44b16d968248ba285abcfbd3cd341bcc660066f7 Author: Daron Chabot Date: Tue Mar 16 17:08:35 2021 -0700 WIP: re-add attentuators to dict commit 70ab29a76087b640ada7759eb453420a87d2c512 Author: Daron Chabot Date: Mon Mar 8 21:46:30 2021 -0800 WIP: refactor for gapdiode stream support commit 1674642bb7daaf816e730037e57b61eeb5265675 Author: Daron Chabot Date: Tue Mar 2 16:51:01 2021 -0800 WIP: ui refactoring for gapdiode support commit 4455bfc2900cc69d50cb75013d4cf9fb17b86310 Author: Daron Chabot Date: Tue Mar 2 16:50:07 2021 -0800 ENH: gapdiode teststand config commit ffdc0adc285cee324f519e56f725ca28f533a906 Author: rreno Date: Thu Jan 28 15:05:21 2021 -0800 [BUG]: Fixed bug with monitorFPGAReboot the FPGARebootMon record was detecting reboots due to faulty logic. Changed the calcout "When Zero" to "When Non-zero" to fix the issue. commit aedbb774358a02aae3c93ff1b9379bcc10662187 Author: rreno Date: Mon Jan 11 09:25:34 2021 -0800 Addded AppType + Location to FPGA Config display. commit 8e1daa96ce8ca2e42f16397d827dccb2e228acf4 Author: rreno Date: Fri Jan 8 17:07:10 2021 -0800 Added AppType and Location records to autosave commit e8a832a3cfb078c1ef9c6069cd0bc863a21d5f06 Author: rreno Date: Fri Jan 8 12:57:09 2021 -0800 Put the integration window curve back on the plots commit f3132d58e7d8f650b7ac592784e6153e2f11650f Author: rreno Date: Wed Jan 6 10:54:02 2021 -0800 Fixed issue with autosave by moving autosave module init until after all databases are loaded. commit e4f38050d5427e39bca64bf4b37e0b859b14651d Author: rreno Date: Wed Jan 6 10:53:26 2021 -0800 Added Sum, IMAX, and TMIT indicators to the coefficients screen commit f47ef448f1fa3a4883399c42e7054a5cf54fd2e4 Author: rreno Date: Tue Jan 5 13:58:06 2021 -0800 Updated LCLS2 startup scripts to match development from FACET-II. Specifically, using a macro for the YCPSWAsyn port name commit 96c1528331844a941b82567d192f7cee5ad5be73 Merge: 92a64d5 223d391 Author: rreno Date: Tue Jan 5 13:51:58 2021 -0800 Merge branch 'facet2' commit 223d391ef99be72a7a0590524edce13af1afad73 Author: rreno Date: Tue Jan 5 13:51:51 2021 -0800 Updated FACET-II ioc startup scripts commit 46f050855d578a3b5394ee02e39a0b6fb025fcb4 Author: rreno Date: Tue Jan 5 13:51:05 2021 -0800 Added FACET-II specific screens commit fc8381995dea55c7ce4555521bd3a70f241a55d6 Author: rreno Date: Tue Jan 5 13:50:29 2021 -0800 Bumpped Event module version commit f34339405a2fbd81b20441cab6c3aadb92a59e51 Author: rreno Date: Tue Jan 5 13:43:16 2021 -0800 UI Cleanup commit 20aff2a445e7d00db23490724efc4893603ef366 Author: rreno Date: Fri Dec 18 14:56:52 2020 -0800 Added some \'meta\' registers to the MR dict commit cb659dd000084a1bd486df1227b112216c84b64b Author: rreno Date: Fri Dec 18 14:56:17 2020 -0800 Updated MR FPGA database files commit 92a64d5443d49ee1b279b0a6af7a181b1a876589 Author: rreno Date: Fri Dec 18 14:45:06 2020 -0800 Bumped event module version to R4.5.3 commit 5f27a4967d8b6ef1e5e0e9b8fbcafc8ecc796dea Author: rreno Date: Tue Dec 15 12:30:09 2020 -0800 Refactored MR BSA * Fixed race condition when dumping packets to the console * Factored out functionality from the main stream task into private member functions * Prefer to pass by (const) ref instead of pointer where possible. * Changed BlenBSA class from a singleton into a data member of CpswStreamBSA Left TODO once testing commences: Determine whether or not the firmware searching for LCLS1 BEAMFULL will cause errors in FACET-II commit 541a350f8fb54d0ab9b6f7dd0fcb8e06dc45a343 Author: rreno Date: Mon Dec 14 13:03:24 2020 -0800 FACET-II: made changes to FCOM to support both LCLS1 and FACET FCOM needs commit 3c6c695902f9929d29ce1496474e986192ce2488 Author: rreno Date: Thu Dec 10 14:08:16 2020 -0800 Changed FCOM network IP for FACET IOCs commit fa8cabe86535a9ff67bc9c6c62d7cf5238f61dc5 Author: rreno Date: Tue Dec 8 14:21:26 2020 -0800 Renamed blenCommonX.cmd files to blenX.cmd commit 79f24e7f7c2865f600b5e82e052dfa9cc6491e3a Author: rreno Date: Tue Dec 8 14:03:10 2020 -0800 Added BLEN_ASYN_PORT macro for cpsw asyn commit 6931b82cd6f46258ab7eb76764a6ed98a31915af Author: rreno Date: Tue Dec 8 14:02:21 2020 -0800 Updated blenCommon and blenCommonFACET startup scripts commit 1d88dfdc4ec8b9cb17a522ad779f6a870a0b04a1 Author: rreno Date: Tue Dec 8 13:06:11 2020 -0800 Started making FACET specific startup scripts commit 9e1ccf03064c20429ddd141375eeafc99b0b542e Author: rreno Date: Fri Nov 13 15:28:47 2020 -0800 Update the Attenuation RBV PVs at 2Hz commit 637d20d692e564f7af02fe4850945b204b2fbbfe Author: rreno Date: Fri Nov 13 15:28:21 2020 -0800 Added CoefA0 to manual.req commit a287340251de7026f2b50a46e436dd82769b17e1 Author: rreno Date: Fri Nov 13 15:24:53 2020 -0800 Another rework of the Attenuation widgets. I got inspiration from the line edit widgets in cpswTreeGui. The line edit fires off a monitor thread that watches the RBV for the Attenuation register. If the widget is not being edited and the value in the register is different from the value in the widget the text gets updated to match the register. I had to go totally outside of the PyDMLineEdit this time and subclass QLineEdit directly since the PyDMLineEdit does not support this kind of behavior. I also used pyepics PVs to connect to the CA endpoints. commit 047bb283284e2576c0b756cd1884be47732886c0 Author: rreno Date: Wed Nov 11 15:53:08 2020 -0800 Refactored implementation of filter atten select. Changed the implementation of the filter attenuation select feature. There were numerous problems with the old implementation. If you tried to click filter buttons quickly, it would totally confuse the UI. To fix this, I did the following: * Upped scan rate of MoverOnOff record to 2Hz. * On UI start up, connect to all 16 Attenuation records and create a widget for each. Hide them all. * Set up a callback with pyepics on MoverOnOff change and hide/show widgets as appropriate. The UI is now much more responsive and it seems to work correctly. I also made some changes to the blen_waveforms UI (made it smaller by default) and the blen_lcls2_filters UI. Added Attenuation records to the manual.req autosave file. commit 10e757a05113a33de2ce0b4be80df08c50d0c76b Author: rreno Date: Wed Nov 11 10:20:49 2020 -0800 Added a LCLS2 filter attenuation control commit f94f18f602c60803d45c28c6bdc0a83ebb0595db Author: rreno Date: Wed Nov 11 10:19:56 2020 -0800 Added proper DESC to BPMS_SYNC record commit 5b23e0d7aad13b0e6d7d3a79e8d9165bd2d60c20 Author: rreno Date: Wed Nov 11 10:18:39 2020 -0800 Reverted new aSub record - it's actually not worth it. I can just right shift the MoverOnOffRBV by 2 to get the Attenuation Index. commit 4eb6a69b0bfc894a4f70b695032336c9dab6a4d8 Author: rreno Date: Mon Nov 9 21:24:06 2020 -0800 Added Attenuation Index lookup records to get the proper attenuation register index from the current filter configuration. commit ddfef334b41985c734c0dcc1ddccec981e1f3795 Author: rreno Date: Wed Oct 21 17:47:36 2020 -0700 Updated databases * LCLS2: Load msgStatus.db for BPM sync * All: Created custom YCPSWAsyn records for floating point values to set precision in the substitutions files. commit 162259f04755ecdec6510b003c3925bee6f0d203 Author: rreno Date: Wed Oct 21 12:58:04 2020 -0700 Add error handling to FPGA config screen commit ca7a01dd0bde07428a971bd805cc331c91341e94 Author: rreno Date: Tue Oct 20 17:20:51 2020 -0700 Removed shell=True implementation from Popen commit 2666aad51991e2f737d1902ac5b5260c2638d82f Author: rreno Date: Fri Oct 16 15:13:56 2020 -0700 Changed to subprocess.Popen to launch TreeGUI subprocess.Popen is non-blocking. In the old implementation the main Engineering screens GUI would lock up when the TreeGUI was open. commit ce321acad008c927d59f29f42803c5e4d40e2b30 Author: rreno Date: Thu Oct 15 16:34:12 2020 -0700 Added a window title to the coefficients embedded display since I am now loading it directly from the calibration window. commit 7cbaeee3a9fd604c5da72d365fa05be87c4bb890 Author: rreno Date: Thu Oct 15 16:33:34 2020 -0700 Refactored the BLEN Engineering screens. Made the calibration tabs their own embedded displays since they are now slightly more complex in layout commit 92f65bb9c613b05bb94775e2228992e3fd1af9dc Author: rreno Date: Thu Oct 15 15:15:29 2020 -0700 Refactored the Current Aquisition part of the blen_waveforms display into a PyDMEmbeddedDisplay for row reuse commit 7d6d207f56b1e42944ce4b2388536274b4aa2bdc Author: rreno Date: Thu Oct 15 12:33:42 2020 -0700 Calibration screens: * Refactored the separation between INST A and INST B Now each instrument has a totally separate tab it is operated on. The slider source changing logic still exists but isn't executed. I'll need to get that stuff taken out in a future commit. commit 9d77fb2105ff38f0ad22d63a004c281055aeca88 Author: rreno Date: Wed Oct 14 16:17:19 2020 -0700 blen IOC functions organization commit 3e27434153e814f796eacb79f7684b651fbf4d17 Author: rreno Date: Wed Oct 14 16:10:11 2020 -0700 Created new coefficients screen commit 8e208873bd7b0facdd82d6984dd7f1acd7017b47 Author: rreno Date: Wed Oct 14 16:08:32 2020 -0700 BLEN Summary Screen (blen_waveforms): * Removed the weight function overlay on the inst A and B raw waveform displays * Pointed to a new coefficients screen with the Calculation Parameters button commit 2ee004aa2c1adc864763df65fdcbdd1e66e02668 Author: rreno Date: Wed Oct 14 16:06:29 2020 -0700 BLEN Calibration screen: * Added radio buttons to select inst A or inst B * Added a help button and a WIP vector graphic to describe the weight fn params commit afaae991152f4fffdeb9856d0db47b2a715ed78d Author: rreno Date: Wed Oct 14 16:05:40 2020 -0700 Made further improvements to FPGA configuration loading display and added saveConfig* PVs to autosave commit 14b2a96d1ddb7342c6ab07a60628a7690f1a41e3 Author: rreno Date: Wed Oct 14 16:04:36 2020 -0700 Removed rhel6 specific config file commit 0b651d3c43a83204b53e2a16c2781a6b1d381a79 Author: rreno Date: Mon Oct 12 12:39:19 2020 -0700 Lowered blen autosave scan time from 60s to 5s commit 9c378844d5bcad347daf2e85f4fb71463f1dacb9 Author: rreno Date: Mon Oct 12 12:38:42 2020 -0700 Fixed bug in BPM sync database - it was looking at the wrong bit of of the status message commit cc7a7eb19d47db54bc3333603a035bd07d757c6e Author: rreno Date: Mon Oct 12 12:38:08 2020 -0700 Added FPGA save config params to autosave commit 1d21e90652eb91a520370a5b829b7b92d25c36b8 Author: rreno Date: Fri Sep 18 13:33:08 2020 -0700 Implemented BPMS_SYNC functionality similar to what is in BCM commit ef5ea14b1ae09fea82b227563fb8d5402c2b25bd Author: rreno Date: Tue Sep 8 16:49:03 2020 -0700 Cleaned up Engineering screens. Added title to the main window, changed the layout of the FPGA config tab commit 99c636fe62d8aedb9df27b721057d0893cabef90 Author: rreno Date: Thu Sep 3 10:03:52 2020 -0700 Updated the PyDM Screens: Moved "expert" level buttons into an overall engineering screen. Uses tabs with PyDM Embedded displays to give engineers access to calibration-related displays and FPGA and timing related displays. commit caadbe4e227fa0f873b9edbbc760f473152894f3 Author: rreno Date: Tue Sep 1 16:16:13 2020 -0700 Fixed macros for loadConfig* PVs commit b4a19fcf00ca397bb5c290cc2efd9fef08b88ff6 Author: rreno Date: Fri Aug 28 09:39:09 2020 -0700 Updated autosave files to include the load config path to better support FPGA reboot monitoring commit 23aa9d6b91421fe6a06bdb57017c149e020a6af3 Author: rreno Date: Fri Aug 28 09:37:03 2020 -0700 Re-enabled monitor FPGA reboots commit b5e895cae1362d026dab01b7124737ffc5a21a5f Author: rreno Date: Wed Aug 19 15:41:25 2020 -0700 Fixed issue with FPGA config loading in an infinite loop The monitorFPGAReboot database was detecting a non-existant FPGA reboot and was trying to reload the configuration. This change removed all the workaround code from the FPGA Config UI, the monitorFPGAReboot database, and removed it from st.cmd for the test stand and the Makefile commit 6119a087f5b955fc085f7275cc55c864280afd3b Author: rreno Date: Tue Aug 18 23:31:25 2020 -0700 cpswStreamBSA: marked void * param in C_streamTask with unused attribute, removed local variable and directly call streamTask commit 6c3c9910f7f050a7baefb2391503ead030dc4899 Author: rreno Date: Tue Aug 18 23:30:07 2020 -0700 blenIOCFunctions: Marked args parameter in report func with unused attribute commit 8c3b10c6aff7eead6758e72717bc3e266fc225c3 Author: rreno Date: Tue Aug 18 23:29:12 2020 -0700 asubRWF: Fixed -Wsign-compare warning and a typo in a comment commit 98bf464bfe270bdcfe111d5822d9a146b544da91 Author: rreno Date: Tue Aug 18 16:16:37 2020 -0700 labeled the void* parameter in C_fcomTask using [[gnu::unused]] attribute commit 3acfb8b8ef9b30711f8eebc02795c34732064e4d Author: rreno Date: Tue Aug 18 16:15:57 2020 -0700 Fixed zero sized array error in blen IOC functions commit 1507665e6bebd022cdeb85988a5f2376ce8e942f Author: rreno Date: Tue Aug 18 16:14:04 2020 -0700 Moved BlenFcom::getStats into the header and removed local variable from C_fcomTask commit d3fe482aac0ca6af1f2b0cecc9c108c83122ed15 Author: rreno Date: Tue Aug 18 16:04:20 2020 -0700 Added CPP flags to src Makefile. Added warnings, debug info, and now compiling for C++17 commit 9d34597ae4f47a2201687cbd6e5c1254b6cdfdd7 Author: rreno Date: Tue Aug 18 15:46:09 2020 -0700 Closed out R4.0.0b0 release. Updated release notes commit 5b8cc3b604e126d45b1e657e3f7c57a4c0a34637 Author: rreno Date: Tue Aug 18 15:45:12 2020 -0700 Refactored the blenFcom declaration. Used C++11 delete on move and copy operations. Cleaned up formatting commit e48ab631d9e6a679256462c7eb3a98e4e961292c Author: rreno Date: Tue Aug 18 15:44:21 2020 -0700 Refactored IOC shell functions. Made them explicitly MR in the name so future me doesn't try to call them from LCLS2 configurations commit 6d60df934a4ae203b3bd0e2558105ae60589f294 Merge: e32f90d 56a1a75 Author: rreno Date: Tue Aug 18 15:06:09 2020 -0700 Merge branch 'R4.0.0b0' commit 56a1a757f49139bc289130c15ebc9d18d8fe1365 Author: rreno Date: Tue Aug 18 15:04:47 2020 -0700 Commented out autoscaling the integration window to support new firmware. commit e32f90d7be490eca6df3476707367c4258831631 Merge: e507baa b5d707b Author: rreno Date: Tue Aug 18 15:03:21 2020 -0700 Merge branch 'R4.0.0b0' commit e507baae8bd9c15000b700ab49df140289f7cfb4 Author: rreno Date: Tue Aug 18 15:02:48 2020 -0700 Small change to LI24 st.cmd to support upcoming merger of R4.0.0b0 LCLS2 branch commit 5343c64bcbde39b80df584356cc9e8a8f760fd52 Author: rreno Date: Thu Aug 13 12:03:31 2020 -0700 Build only for linuxRT target commit fedac25888b7279805390b8706b82c5c849f7c1a Author: rreno Date: Tue Aug 4 12:33:25 2020 -0700 Fixed prefix for TPR Device Name PV database loads commit 3b64df6a3d36a5fb9721bda4824ad39b69e54fb3 Author: rreno Date: Tue Aug 4 12:28:47 2020 -0700 Added TPR Device Name PVs database loading to startup scripts commit edee061007c5c8da59364e55a6e026dd0412fad7 Author: rreno Date: Sun Jul 12 13:58:15 2020 -0700 Added ATCA_SLOT macro for tpr trigger init commit fb3640af04072ddecf1144402fa96394014edc96 Author: rreno Date: Wed Jul 8 12:57:12 2020 -0700 removed attr and ipdb imports commit ac5e69c9402d8bc5ad9abfafacb9ab8bf339b1ca Author: rreno Date: Wed Jul 8 10:57:17 2020 -0700 Named save config fields in Qt Designer file for fpga config commit 57ed786ae9dece4143bbe7dcaf77febd0a9530ac Author: rreno Date: Wed Jul 8 10:48:41 2020 -0700 Added macro for TPR INST to be equal to ATCA_SLOT. commit 3a73ac1a07e571a15135caa1118d86c8e38fb280 Author: rreno Date: Wed Jul 8 10:46:33 2020 -0700 Forgot one hard coded IOC_UNIT macro for tpr trigger enginering screens commit 81bcf1c0bab8705e2cd20141c220327448bdb9b2 Author: rreno Date: Wed Jul 8 10:27:58 2020 -0700 Fixed hard coded IOC_UNIT being sent to tprTrigger engineering screens commit e85f27ae40bc6d3498dd74ff8f21abec219181e9 Author: rreno Date: Wed Jul 8 10:27:31 2020 -0700 Fixed filter 4 reading filter 3 status commit c373121b251b33a50b254154718d90840a9c7a8e Author: rreno Date: Wed Jul 8 10:27:15 2020 -0700 Added ATCA_SLOT env variable to startup to set tpr trigger INST=ATCA_SLOT commit a9356c159cfec87c1f87f1fa2655f3eabbf375cf Author: rreno Date: Tue Jul 7 13:03:27 2020 -0700 Changed yaml dir to /data//yaml for BC2B SIOC commit 0d5a5c1a22f6a2b062231210b6d3c11a297b3eb3 Author: rreno Date: Tue Jul 7 12:56:54 2020 -0700 Disabled upload portion of fpga_config. need to report bug to ycpswasyn maintainers commit 904ef86d2337de66473dd91ed03dcf5b0ba5f150 Author: rreno Date: Tue Jul 7 12:40:24 2020 -0700 Trying to troubleshoot config upload. Looks like writing a 1 to the loadConfig PV puts it into an infinite loop of uploading a config to the FPGA. Will need to listen for a successful or unsuccessful upload to write a 0 to the PV to prevent looping commit dba33cf42b69aad31aedad3ff28a61ad26333c26 Author: rreno Date: Tue Jul 7 12:38:57 2020 -0700 Added gmon.out to gitignore commit 87ee12910cf4952118c0642bc6a0a75c28d1117a Author: rreno Date: Tue Jul 7 12:38:23 2020 -0700 Renamed blen_loadSaveConfigFiles to fpga_config commit bfa3f5ce78cbc142ac97385f5cf434e413662953 Author: rreno Date: Tue Jul 7 09:35:45 2020 -0700 Removed excess fpga_config.py entries from related display button commit 6c2bd47402feee2d7c1b26912f39169962f17c8e Author: rreno Date: Tue Jul 7 09:32:37 2020 -0700 Updated release notes for R4.0.0b0 commit 025bfe73ad401049a40c7d66bb8d62acd1d727d2 Author: rreno Date: Thu Jul 2 17:53:41 2020 -0700 Changed Weight Function button to now be Calibration and lead to new calibration screen commit 24cd6655841ea6ba3aeb255f07633cd0d0632787 Author: rreno Date: Thu Jul 2 17:47:41 2020 -0700 Waveform dbs: -fixed issue with DESC field too long. -fixed wrong RBV records used as input links commit 1d44b283b817e1805188345225e1128bbf842aa4 Author: rreno Date: Thu Jul 2 17:47:10 2020 -0700 Better docstring for BlenPyDMSlider class commit 6b45b4c031e959bd00fcb98feef0a29e33f9200d Author: rreno Date: Thu Jul 2 17:45:58 2020 -0700 Changes to the FPGA Config related display button in blen_waveforms commit ce0b1e4ad6548bf28cb937c10c97052003ce502a Author: rreno Date: Thu Jul 2 17:43:52 2020 -0700 Changed startup scripts to accomodate the new iocMeta.db commit 60dd8af2b9c27a0ca7c25fc62bc28a87104511e6 Author: rreno Date: Thu Jul 2 17:40:33 2020 -0700 FPGA Config: Fixed some issues with the FPGA config screen and implemented the ability to launch the TreeGUI. -Had to disable loading config to the FPGA - it goes into an infinite loop continuously reloading the config. -Created iocMeta database to store CPU, Crate, and Shelf Manager information useful for launching the TreeGUI. commit d93ae3f3dc9c167b636a50060f656a9a9de22c21 Author: rreno Date: Wed Jul 1 14:35:53 2020 -0700 Fixed IP address for BC2B IOC commit 9b79d38c371b3f381b0bccbd267d77bfcbc6ad39 Author: rreno Date: Wed Jul 1 14:34:29 2020 -0700 blen_calibrtation: did some refactoring to remove integer constants: removed need to do "A" if self.inst == INSTA and other badness. commit 59e38739a603bb9dbcb748c1a9b0389502e547c9 Author: rreno Date: Tue Jun 30 14:14:57 2020 -0700 Calibration plots: Sliders now change with the plot (so if you're displaying plot A the sliders above it will be for inst A) Also cleaned up the right click menu: resetting view to 1us and changed text for plot data source commit c1cef6260b1b21ed8d7b66bd18ea17daac8c9fa2 Author: rreno Date: Tue Jun 30 13:00:29 2020 -0700 Blen Calibration plots: Implemented slider controls for weight function and added 'View 1us' context menu choice to narrow x range to 1us commit 6efb04a33723747beb6ab29a8e7f0ab644696b13 Author: rreno Date: Mon Jun 29 17:14:32 2020 -0700 blen_calibration screen progress. Finished implementing working right click menu and plots. WIP: Implementing the integration window sliders commit 06d213459d7c3a09cb02647dfa411acf649f31b8 Author: rreno Date: Mon Jun 29 13:38:28 2020 -0700 Added startup script for BC2B SIOC commit 86fb16998e9e4df00b1cddb9fb2be4b51bd95951 Author: rreno Date: Mon Jun 29 11:48:18 2020 -0700 Renamed li02/li04 siocs to bc1b/bc2b commit 316d187860ea2194c0fa1fc68f6380f17ebb1447 Author: rreno Date: Fri Jun 26 15:48:37 2020 -0700 calibration screen initial commit commit 528c23df818866f5e89105f79a80d5d436349d76 Author: rreno Date: Fri Jun 26 15:47:43 2020 -0700 Added integration window waveform aSub record commit be3c733d6eb7bb71c4c9e67f2e995a2e9c92a536 Author: rreno Date: Wed Jun 24 17:45:57 2020 -0700 Fixed bug where integrated waveform wasn't calculating commit 928d47e8bd38a0d9506063ea785aeb17997524cc Author: rreno Date: Wed Jun 24 17:45:28 2020 -0700 Added correct waveforms to blen_expert ui screen commit af2d76606cfea41cb3eb3a37b557b612986c93cf Author: rreno Date: Wed Jun 24 15:58:27 2020 -0700 Fixed bug with raw waveform asub record: INPA was the correct field commit bb6b10ea116994d7ab6e93f26e61c15bc81d203d Author: rreno Date: Wed Jun 24 15:57:04 2020 -0700 Plot changes commit dc38da0061a8863999a6d077e974ad6d25eed622 Author: rreno Date: Wed Jun 24 12:10:48 2020 -0700 Changed IOC_UNIT in b084 sioc to BL03 commit 93bf6e6bd4367d786594db41810553f08dcc5dfb Author: rreno Date: Wed Jun 24 11:49:48 2020 -0700 Added aSub record for computed U16 waveform commit 1adcc53d4c8c7a0a33cc5b71a570398ca931ddca Author: rreno Date: Wed Jun 24 11:49:04 2020 -0700 Added RWF U16 subroutine from BunchChargeMonitor commit c270c9e76a653056c1ea5c85abb901e947c1ae3b Author: rreno Date: Wed Jun 24 11:26:52 2020 -0700 Changed max elements of slow raw waveform from 2020 to 1024 commit 9b37693f1c7dad1153810d77c80612314c241827 Author: rreno Date: Wed Jun 24 10:23:33 2020 -0700 Added blenCommonLCLS1.cmd - renamed from blenCommonMR.cmd commit a353b87a4433ee8a7f770d99e40a480b8ec0bea8 Author: rreno Date: Wed Jun 24 10:22:55 2020 -0700 Deleted old viocs commit bb398e6a727b12b5280150bdda809c3387ee5e11 Author: rreno Date: Wed Jun 24 10:07:20 2020 -0700 Getting ready for BC2B install: changing b084 sioc to test that setup commit 0b6701358c14f0c1b72cdc47f48b14cc06b917c7 Author: rreno Date: Wed Jun 24 10:06:21 2020 -0700 Changed startup scripts: blenCommonMR to blenCommonLCLS2 commit 4926cb1955462f8de679d7893160306e8d1d6dcb Author: rreno Date: Tue Jun 23 18:16:01 2020 -0700 Changed number of elements in x axis and raw stream PVs commit f2226a6ec4c0a456d304e9839ece2eef92268062 Author: rreno Date: Tue Jun 23 18:15:26 2020 -0700 Clean up asub C code commit 73109dacd3e6a2616bd783790d4ffe32ccb0401f Author: rreno Date: Wed Jun 10 09:21:00 2020 -0700 Changed plot scale defaults in blen_expert and blen_waveforms. Changed filter embedded display in blen_waveforms to stretch horizontally with the screen and lowered minimum width commit d379092fd6d8459865e9a942b30602669f0ea562 Author: rreno Date: Wed Jun 10 09:19:53 2020 -0700 Removed SENS0 and SENS1 versions of TrigDelay registers. Only load the SENS0 version. Also fixed typo in calculatedWF commit 5ecf1f40f20cb9b0a5f80c6b5b907ad16d1d9543 Author: rreno Date: Wed Jun 10 09:18:21 2020 -0700 Fixed main blen.db database - now load one for each AMC card commit 5be9675b7de9b5fee39ad3d306ae3197e8923308 Author: rreno Date: Mon Jun 8 15:54:12 2020 -0700 Added PP to the OUT field of shutter/filter controls so that a value is actually put into the FPGA commit 48de738157b3777f0829a7a426d403ae5832a698 Author: rreno Date: Mon Jun 8 14:39:48 2020 -0700 Fixed typo in streamControl database commit 56ff2a1f62ddea616e586ccf6d3e9d5cb6bc602d Author: rreno Date: Mon Jun 8 14:35:52 2020 -0700 Fixed waveform PV names - added :16 parameter adn changed raw waveform PV name convention to (P): from (P)_ commit ac571284f5da122fb38a1bafd1063439eb4af155 Author: rreno Date: Mon Jun 8 14:34:13 2020 -0700 Rolled back YCPSWASYN module version to recommended release commit 71839b691a6d1910ec6674d68383af88aa90adb2 Author: rreno Date: Mon Jun 8 11:50:48 2020 -0700 Fixed bug in db with mover controls commit ccc22e2af4a76f0058146730fbade00889c264d8 Author: rreno Date: Mon Jun 8 10:31:53 2020 -0700 Renamed filters UI file to reflect LCLS2 config. Fixed filters sizing issue - set height to 180px commit 03ce262a39062e69fea81e634b8de09c1ae78213 Author: rreno Date: Fri Jun 5 16:46:41 2020 -0700 Changed max range of plots and weight function sliders for LCLS2 operation. Will need to implement more general solution for MR/LCLS2 in the future commit c36bdab5fa57f914dcab60ba22792cc4e4aead51 Author: rreno Date: Fri Jun 5 11:33:21 2020 -0700 Adjustments to blen_strm_ctrl and blen_waveforms UIs commit d1f974e0b4128bff44e08c129e8c064e4cd8944c Author: rreno Date: Wed Jun 3 09:53:26 2020 -0700 Refactoring UI: Moved filters and stream controls into separate displays which are embedded in main display commit d7b5867a25a7ccc77b3bc6a797e9288f89d74b5f Author: rreno Date: Wed Jun 3 09:52:46 2020 -0700 Fixed typo in streamControl database commit 0507b45da1d45a329bb26adb8b1ae8e3f7852cd8 Author: rreno Date: Tue Jun 2 10:08:10 2020 -0700 Moved stream crontrol database loading to common script commit 80d044115a1c60975784914851c7ba0d021c0cd9 Author: rreno Date: Tue Jun 2 10:07:23 2020 -0700 Revert manual.req - tprTrigger autosave defines its own autosave PVs commit 86cb57868ee803b3c79995315416ff072b957bc4 Author: rreno Date: Tue Jun 2 10:03:56 2020 -0700 Moved stream control into common. Refactored macros and PV names commit 6532695a82a7810265ed5810c0a752f471f5fcad Author: rreno Date: Mon Jun 1 15:13:46 2020 -0700 Added TPR trigger PVs to autosave request. Added autosave macro file for sioc-b084-bl03 commit 0be47208cfe88d1e38ad99548bdb90658367151c Author: rreno Date: Wed May 27 17:57:03 2020 -0700 Changed inst number for tprTrigger to 1 commit 5ed3e1e1e91b16168f22106e96994f725c4f65a7 Author: rreno Date: Wed May 27 17:56:44 2020 -0700 Changed trigger interface button to tprTrigger EDM screens commit df8b44204b2d5a6edad33b701b049ac7d40754d0 Author: rreno Date: Tue May 26 10:19:02 2020 -0700 Moved crossbarControl db loading to blenCommonMR.cmd commit a92c670ef25cd379be42f0abfced2b6aba9ebe99 Author: rreno Date: Tue May 26 10:07:44 2020 -0700 Organization: Moved crossbarControl out of blenCommon.cmd and moved tprPattern and crossbarControl database installs to Db/mr/ crossbarControl assumes the software is running in slot 2. In the MR configuration this is true but in the LCLS-II config the MPS Link Node will be running the crossbar from slot 2. commit 9b6639e8d3af8737e68b4dcc492fd84b10976a11 Author: rreno Date: Wed May 20 14:05:05 2020 -0700 Loading FPGA PVs commit df7b984aab8364c86733735120dc3a75885badbe Author: rreno Date: Mon May 18 16:09:11 2020 -0700 Fixed saveLoadConfig database load - no longer tries to load for each AMCC commit 23f7f5ad978e44e59d979c181883e5b0e8ad5047 Author: rreno Date: Mon May 18 15:52:04 2020 -0700 Updated release notes for the beta R4.0.0 development branch commit b5d707b33d8f0227983a19c641a0d109be3a1a4d Author: rreno Date: Mon May 18 14:25:31 2020 -0700 changed blenCommon.cmd to load the saveLoadConfig database commit ec9ff5be6b503c5eea22b3291aeb0234f63a5495 Author: rreno Date: Mon May 18 14:16:48 2020 -0700 Roll back l2mps module + lib versions. l2Mps + l2MpsAsyn V3 do not yet support blen. Wait until a V3 release adds support before building against that. commit fd864f1aa983201c5c57f3b71c30b52639149469 Author: rreno Date: Mon May 18 14:13:56 2020 -0700 Added ycpswasyn saveLoadConfig.db back to Db/common/Makefile installs commit 25d57260f94bc7a6663d366fd4762e622514a949 Author: rreno Date: Mon May 18 14:05:02 2020 -0700 Fixed reboot monitor database. Now it uses the ycpswasyn databases. commit fcba3b446690e9eb4b0a2b7a03aa52d494fa97dd Author: rreno Date: Mon May 18 12:44:27 2020 -0700 Changed text labels in editor from PyDMLabel to more descriptive name. commit 55df0df7ef7e04c85cd0c23975771fe8e80ae2e3 Author: rreno Date: Wed May 13 16:04:05 2020 -0700 Made many changes to databases to fix bugs found when testing the screens. Sorry for the terrible commit message! commit aef3a4bb8c6c0db32502e9dc474e763512310c12 Author: rreno Date: Wed May 13 15:35:52 2020 -0700 ACTUALLY bumped module versions this time. commit c81656d959fc9cd6d6002a679ade6e075bed2e92 Author: rreno Date: Wed May 13 15:35:22 2020 -0700 Bumped module versions: BergozBCM-RF-asyn, caPutLog, iocAdmin, l2MpsAsyn, tprPattern, ycpsw commit 6e4c238c81d40006d8f5e26ebf16a7ca3ba388f1 Author: rreno Date: Wed May 13 15:14:10 2020 -0700 Fixed PVs in GUIs. commit e1e2147cdef78d82f54deed3c82fa8ab8baf597e Author: rreno Date: Wed May 13 15:13:08 2020 -0700 Startup scripts: Fixed issues with macros and made them all consistent using parens vice curly braces. commit d1c12d6e5e232709da2ee0d0b7de6f57839b6401 Author: rreno Date: Mon May 11 16:29:03 2020 -0700 Fixed plots in blen expert: X axis now correct and Edit Waveforms dialog no longer black commit 0521513c21803f888e5db34967fa452f8d1ea44b Author: rreno Date: Mon May 11 14:15:58 2020 -0700 Fixed build issue: DBs not installing. The databases wouldn't install! When reorganizing the Db/ folder, I forgot to change the top level Makefile to RULES_DIRS instead of just RULES. Also I had to move manual.req to the correct folder to get autosave to install correctly. commit 5a371b4f97ccaeee14eb8782cb3bda987b808ff0 Author: rreno Date: Mon May 11 11:05:44 2020 -0700 Fixed bug in blen_waveforms.ui with black background in 'Edit Curves' dialog and changed weightFunctionXAxis to $(P):SampTime commit 66b1c0c0e53780c20cad2848285224d878f9dd23 Author: rreno Date: Thu May 7 16:16:09 2020 -0700 Removed AdcData register from commonFpga. commit 015f176c0a287b1be1b062caac6016e2567f9a69 Author: rreno Date: Thu May 7 16:15:41 2020 -0700 Added vim .swo files to gitignore commit 2558e7e4d7049ea05e9cd28e6c47cbdaa3f277a7 Author: rreno Date: Thu May 7 15:34:40 2020 -0700 Changed blenCommon.cmd startup script to reflect changes to Databases. Removed redundant blenLCLS2 db. commit db148f318369b75d3e71afa46d403903239bf18f Merge: ad9dd4d 8de22f4 Author: rreno Date: Thu May 7 14:44:32 2020 -0700 Merge branch 'organize-Db' into lcls2-waveforms Reorganized the blenApp/Db/ heirarchy. DBs common to both MR and LCLS-II configurations are now in common/ while databases specific to each configuration are in their own folder. Also aiming to put all user facing PVs in the blen.db and either of blenLCLS2.db or blenMR.db and keeping all expert PVs and/or intermediate processing records in files more self-contained or at least categorized. commit 8de22f4ceb4b6bb4c2b75b8726a3cfd9f863fc53 Author: rreno Date: Thu May 7 14:38:41 2020 -0700 Put DB folders on their own lines in the Makefile commit 68805f139f599d83caf70243108ed27753d2da04 Author: rreno Date: Thu May 7 14:27:07 2020 -0700 Removed IMAXScale dbs - may need to reimplement once work begins on BSA support commit 7b6b7303beed0152a34bf4b59ca0343f21245e00 Author: rreno Date: Thu May 7 14:23:00 2020 -0700 Added more to blen.substitutions. Renamed temperature-related files. Added a basic template for raw waveforms commit 6604f287e2247fee188d8603b18131e126d85a32 Author: rreno Date: Thu May 7 09:41:10 2020 -0700 Removed bitStatus.db and bpmStatus.substitutions. Unused PV according to PV list by caf@ commit 3499c7527ece5e7ff04f04a03028b202f41b2729 Author: rreno Date: Wed May 6 15:59:25 2020 -0700 Moved processWFHeader database to mr/ subdir commit 2291dc85a1cad93e87905abee239e9e6936c5d70 Author: rreno Date: Wed May 6 15:04:18 2020 -0700 FPGA Reboot: Added record for reloading the yaml config and removed database dependenices no longer required from the Makefile commit 86f1869a0c2fa860878d077a7e40a7cffe4573be Author: rreno Date: Wed May 6 13:04:13 2020 -0700 Checked in iocBoot/common scripts from R4.0.0b0 commit 3e3a3e1fdcd99fa179d4756999ef45c9bfb6b124 Author: rreno Date: Wed May 6 13:03:33 2020 -0700 Further work on database reorg. Checked in iocBoot scripts from R4.0.0b0 branch commit 927989f2afb7718b2f4c3fff0fab485396119bf5 Author: rreno Date: Tue May 5 15:09:55 2020 -0700 LCLS-II/Common: Renamed FPGA substitutions files commit 3d7df04abec317cb43d5f3ae4cf5c602310215c3 Author: rreno Date: Tue May 5 14:47:06 2020 -0700 Merged blenLCLS2.dict from branch R4.0.0b0 and finalized changes to the pyro filters dbs commit 9c97ae15ac11ba09dac105237bc55792cbc1ae4b Author: rreno Date: Tue May 5 12:13:59 2020 -0700 LCLS-II: further organized lcls2-specific databases. Renamed statusBit to pyroFilters and removed the substitutions file - instead leaving macros to be defined at IOC startup commit f5eeffaf48c033e4c858340b1e11447a573b0eec Author: rreno Date: Tue May 5 11:39:23 2020 -0700 LCLS-II: Began separating the interface from other implementation details: Added filter/shutter controls to blenLCLS2.db and moved the register substitutions file to fpgaRegisters.substitutions commit 02491a9d3e1bf2f55eeee89ff6d61f65b12f17b4 Author: rreno Date: Tue May 5 09:11:50 2020 -0700 Renamed and moved databases to better organize the blenApp/Db directory commit 56ef5dc72183201a8d03e9c5244b910601ce8d39 Merge: 0aab929 d65287e Author: rreno Date: Mon May 4 16:13:04 2020 -0700 Merge branch 'master' into organize-Db commit d65287e5d683e787d103c0eff3e38539808de8a8 Author: rreno Date: Mon May 4 16:11:11 2020 -0700 Removed dead code from blenFcom.cpp commit 0aab9290e00946841a707fac78f7b682cb8f4c71 Author: rreno Date: Sun May 3 19:05:00 2020 -0700 Cleaned up root Db Makefile commit f2881c5cb547039084232e9262168efe1eddcc2b Author: rreno Date: Sun May 3 19:02:59 2020 -0700 Began work moving dbs around to more clearly structure the files. Need to start work separating out blen, blenMR, and blenLCLS2 substitution files commit ad9dd4dc215a7a2dfefb30ff7cb8f0113d08fcda Merge: ffb58f6 046cfae Author: rreno Date: Sun May 3 15:42:30 2020 -0700 Merge branch 'R4.0.0b0' into lcls2-waveforms commit f7cc5ebb8aaf64e983e9553134fd1154c1f4e224 Author: rreno Date: Sun May 3 15:37:41 2020 -0700 Merge blenFcom.cpp from R4.0.0b0: Fix a compiler warning: not copying enough bytes to null-terminate string. The compiler complained of copying the exact number of bytes with strncpy which didn't leave space for a null byte. To fix this, BlenFcom::registerAtcaIpToSendTMIT was refactored to more cleanly convert the IP:PORT string from std::string to a C-style char array. This now uses the C function strdup to copy the const char * from std::string::c_str() into a mutable char array that we can later extract tokens from using strtok(). commit 046cfaefa0ff1a503d742746f416c899d9bc6c13 Author: rreno Date: Sun May 3 15:21:57 2020 -0700 Fix a compiler warning: not copying enough bytes to null-terminate string. The compiler complained of copying the exact number of bytes with strncpy which didn't leave space for a null byte. To fix this, BlenFcom::registerAtcaIpToSendTMIT was refactored to more cleanly convert the IP:PORT string from std::string to a C-Style char array. This now uses the C function strdup to copy the const char * from std::string::c_str() into a mutable char array that we can later extract tokens from using strtok(). commit 0b4079c69d2d7de981fa3159a40e07840fd08174 Author: rreno Date: Sat May 2 12:33:28 2020 -0700 Reverted (mostly) blen_waveforms.py I was headed down the wrong path for developing the filter/shutter indicators. Hugo Slepicka (slepicka@) and Matt Gibbs (mgibbs@) guided me toward enum buttons as opposed to bespoke classes and signals/slots. I added a ref to a PV ending in :RWF for the raw plots - this will likely change again in the future. commit ffb58f6048e3341b2b86dea0ff61536a80da09c7 Author: rreno Date: Fri May 1 22:44:38 2020 -0700 Record name changes in weightFunctionXAxis.db Changed the records in weightFunctionXAxis.db from $(PREFIX)_PV_NAME to $(PREFIX):PV_NAME format to work toward standardizing PV names. commit 6e033b4db7b30fd9961880cee3f0ffed380a763b Author: rreno Date: Fri May 1 22:20:34 2020 -0700 asubWeightXAxis -> changed clkFreq from pointer to long int This is a style change. clkFreq was never used as a pointer so it is now declared as a `long` and gets its value from a dereference instead of being dereferenced in the conversion calculation from ADC clock ticks to ns. commit 48c736d59dfd8dcf5c2c038edbeedb203ae7f0c7 Author: rreno Date: Fri May 1 22:16:13 2020 -0700 Removed dead code from asubWeightAxis commit 3a2ac2921dffd5c2fdb07298a3955deee5fe97cc Author: rreno Date: Fri May 1 14:40:31 2020 -0700 Made changes to pyrodetector filter/shutter controls in gui commit 01379aea9a89295c0c7b08836129c2406f712300 Author: rreno Date: Wed Apr 29 12:57:12 2020 -0700 Fixed startup macro for blenLCLS2.db Macro was originally BLEN:$(AREA):$(POS):$(INST)[A/B] but should have been BLEN:$(AREA):$(POS): commit 4b931a54d3175c17794695406268940c4a5cadaa Merge: 563a1a5 527c6ee Author: rreno Date: Tue Apr 28 13:26:53 2020 -0700 Merge branch '4.0.0a0' into R4.0.0b0 commit 563a1a5c4a7c3efc8eb9db99d7cba046c16b6f30 Author: rreno Date: Tue Apr 28 12:55:25 2020 -0700 Made progress toward shutter/filters in UI commit 527c6ee7b03c4781af9e060d77dadf4fe9842a0b Author: rreno Date: Tue Apr 28 12:53:53 2020 -0700 Fixed shutter/filter PVs commit 333552debbfa004a0d9e55a2b005383e816791f2 Author: rreno Date: Mon Apr 27 13:56:16 2020 -0700 Fixed bug with ClkSel both reading and writing values. Also changed dictionary as Mover Attenuation is an array commit 6a26f4f5aa37d73d5078515fcfee94a822999e10 Author: rreno Date: Fri Apr 24 10:18:17 2020 -0700 Removed extra colon in macro commit a80614cd5b07ba2561c0071c267663fc76f99775 Author: rreno Date: Fri Apr 24 10:13:45 2020 -0700 Added loading blen.db in blenCommonLCLS2.cmd commit 5bb02535a064b1d997bb46cfe552eff6a0ac4d86 Author: rreno Date: Fri Apr 24 09:43:30 2020 -0700 Removed fontconfig cache files and pyc files - updated .gitignore commit 00ba6b4908ab001ade3da3c1ae24d4d31036668e Author: rreno Date: Fri Apr 24 09:38:38 2020 -0700 Added blen MR PyDM screens from BunchLengthMonitor_MR repository commit 8bec75d12ac39414ff3911b6204a8f26bdef9f30 Author: rreno Date: Thu Apr 23 19:07:54 2020 -0700 Finalized alpha0: Implemented last of the register paths that still exist in LCLS2 that were present in Db/blen.substitutions. Also removed a lot of the patterns that are MR-specific. TODO: need to reimplement those in blenMR.substitutions commit 11834eaad2fe09cc8cf7918be7dcf2fdeb1eba41 Author: rreno Date: Wed Apr 22 17:32:10 2020 -0700 Added the BLEN: prefix to PVs from blenLCLS2.db commit 41a121df28fb3fd1ff3b842a68c2728ba5beff51 Author: rreno Date: Wed Apr 22 17:10:12 2020 -0700 Fixed up the dictionary and substitutions file to create PVs for FPGA registers commit 7169bb6be1fc23c7969a936de2e0d4fcafb39125 Author: rreno Date: Tue Apr 21 17:14:10 2020 -0700 Fixed issue with Bsa.db not getting all required macros and added in two missing FPGA registers. commit 3211fd0ce0af8e6e2aaf2f2fb032579e84a62bd1 Author: rreno Date: Tue Apr 21 09:26:17 2020 -0700 Added DICT_FILE env variable to sioc-b084-bl03 st.cmd commit 8ed17efca12e15eccc2456be932d33e953fae2df Author: rreno Date: Mon Apr 20 20:35:52 2020 -0700 Made changes to DBs in startup scripts, renamed carrier.substitutions to blenLCLS2. commit d43143db65601c13dce3057329c6425f94c72e1d Author: rreno Date: Wed Apr 15 14:43:37 2020 -0700 Added makefile to sioc-b084-bl03 commit 8d4f7fb57b351730cfcc320e6ecfc8c1c3ce1b4c Author: rreno Date: Wed Apr 15 11:25:18 2020 -0700 Added blenLCLS2 dict file commit 3f765b8b2fa99a7284c6743944c24b94ddf234e8 Author: rreno Date: Tue Apr 14 08:26:10 2020 -0700 Further changes to common scripts. Added new IOC for LCLS2 test stand commit 358227abd2f9c145f22599ca63654f4eec5b0806 Author: rreno Date: Mon Apr 13 16:08:09 2020 -0700 Added LCLS2 common script. Moved YCPSWAsyn init to blenCommon.cmd commit d3d0c181af7b39be928c278e028f4909c9d40633 Author: rreno Date: Mon Apr 13 15:44:33 2020 -0700 Made changes to b084/b34 siocs commit fa1965f8684ed740e7cd81c8ed49c40123f3367f Author: rreno Date: Fri Apr 10 15:24:33 2020 -0700 Separated MR-specific setup to blenCommonMR in preparation for blenCommonLCLS2 commit c5960386ac9b993b7fae75ed550ebde9062e1b22 Author: rreno Date: Thu Apr 9 11:17:08 2020 -0700 Changed CA_MAX_ARRAY_BYTES to Auto commit 5bfc78899eab2a639e1132248fbaa9713b9a2086 Author: Janos Vamosi Date: Sat Apr 4 08:57:59 2020 -0700 Added FACET-II devices commit c9326d5650f1e51f06ff2c7c0de1dcdbb9e543bb Author: carolina Date: Mon Mar 30 21:25:45 2020 -0700 Upgraded to EPICS 7.0.3 commit a6a291f7109ecdad58e62248f987d8515280f58a Author: Marcio Paduan Donadio Date: Wed Dec 18 16:46:06 2019 -0800 Update of the IOC that runs in lab 2 and mirrors li24 BLEN PVs commit b77a70f1ddf64e1e71c828a472ef943c79ea801d Author: Marcio Paduan Donadio Date: Fri Dec 6 14:46:15 2019 -0800 Updated RELEASE_NOTES commit 70d09a010ed13a4173bd9edd4bd2b22a505039e4 Author: Marcio Paduan Donadio Date: Fri Dec 6 14:44:52 2019 -0800 Downgrading some modules because the firmware in production must be changed first before new module versions can be used commit b86cc2118fadff66f1b5abb367fca8033953d1cb Author: Marcio Paduan Donadio Date: Wed Dec 4 15:58:22 2019 -0800 Updated RELEASE_NOTES commit fa54c151f2192cad8d4bb1bce3e1c87247b7a356 Author: Marcio Paduan Donadio Date: Wed Dec 4 15:52:27 2019 -0800 Updated module versions commit 52439284ac22a5e4ca6797dbac73581610b92c2d Author: Marcio Paduan Donadio Date: Wed Jul 10 12:42:58 2019 -0700 Removed database files that must come from the module and not be maintained as local files commit 6aa3735caad0b0cc8a115fff8c14756df13f324d Author: Marcio Paduan Donadio Date: Wed Jul 10 12:25:50 2019 -0700 Copied the right version of file from mission readiness commit 6632cc169c39ace77025ef6848c9c0f652b887b1 Author: Marcio Paduan Donadio Date: Wed Jul 10 12:14:57 2019 -0700 Added support for auto-archiving PVs commit da3ffcff644a9e0b36fa04a0f226fd96564868e6 Author: Marcio Paduan Donadio Date: Wed Jul 10 12:14:24 2019 -0700 Added support for auto-archiving PVs commit 85b1e3ad8e7e0660cbf014dd8915bca83b088be7 Author: Marcio Paduan Donadio Date: Wed Jul 10 12:13:59 2019 -0700 Added fixes that where missing from the copy of mission readiness application from an old version commit 9be06b5a424e133b6d4f0270cfb2a158e38d5459 Author: Marcio Paduan Donadio Date: Wed Jul 10 11:20:58 2019 -0700 tprPattern.db now uses a different macro structure commit 1014bd8fab855d4dc05ed759bc313bf2b5c7bb16 Author: Marcio Paduan Donadio Date: Wed Jul 10 11:01:17 2019 -0700 Now saveLoadConfig.db requires macros SAVE_FILE and LOAD_FILE commit 1564bd358c9921debb4ad5b721a25714ee69e349 Author: Marcio Paduan Donadio Date: Wed Jul 10 10:44:20 2019 -0700 Now saveLoadConfig.db requires macros SAVE_FILE and LOAD_FILE commit 61e5f64f6d30f6812049b6aa489baa0ad4e77143 Author: Marcio Paduan Donadio Date: Wed Jul 10 10:32:55 2019 -0700 Fixed typo that prevented crossbarCtrl.db to be installed commit 57f60c2932c8634e258e87f6bd92e0fc682beaa0 Author: Marcio Paduan Donadio Date: Wed Jul 10 09:42:07 2019 -0700 Added missing blenMR.dict commit 7a8a1fb851f35e5984a6708a3d63507c8434f6bc Author: Marcio Paduan Donadio Date: Wed Jul 10 09:38:31 2019 -0700 Added some files that were missing in Makefile commit fcae427be7896e183bc15dab6ebafa97539a650d Author: Marcio Paduan Donadio Date: Wed Jul 10 09:37:46 2019 -0700 Bringing back newest versions of modules commit 6fa808f8bb2c948467509a6241809bd49288e9c0 Author: Marcio Paduan Donadio Date: Wed Jul 3 12:18:28 2019 -0700 Upgraded RELEASE_NOTES commit 475ea7e8d80f3fef061cabdac06d8b85c3e3ac68 Author: Marcio Paduan Donadio Date: Wed Jul 3 12:16:51 2019 -0700 Downgrading modules because the newest ones were incompatible with our yaml file commit 5e129f718a3c9ed1edda7ea3b43a6d2fe0a5731d Author: Marcio Paduan Donadio Date: Wed Jul 3 11:04:58 2019 -0700 Updated RELEASE_NOTES commit aba4428bc3d468b2ef6ddf2feb87316fd45eb3d6 Author: Marcio Paduan Donadio Date: Wed Jul 3 11:03:22 2019 -0700 Added Mission Readiness iocs commit e87529157d08c7145bcb0f4bb942c97dce1f26f5 Author: Marcio Paduan Donadio Date: Wed Jul 3 11:01:25 2019 -0700 Added .cram commit 0e98dff6b366589a4c3646c6a20162135a86f29d Author: Marcio Paduan Donadio Date: Wed Jul 3 11:01:07 2019 -0700 Upgraded modules and packages commit a59df5e1d1413b7deb7e56c0ed203575c60eb69b Author: carolina Date: Thu Jun 27 11:44:49 2019 -0700 autosave directory added commit 92b42b0571a3445302a2c09e682737faa7d1ad79 Author: carolina Date: Thu Jun 27 11:43:42 2019 -0700 removed RELEASE_SITE commit 38dbe0f2f3551b1d185db360bd1b6340dff614e9 Author: carolina Date: Thu Jun 27 11:42:20 2019 -0700 Marcio: merging FACET-II MR and LCLS-II versions of BLEN App. Upgraading all Modules to EPICS V7 commit 92aeef99ebfa663013feed12eeb4b429c9f045cc Author: Dan Sciortino Date: Fri Jun 1 12:38:28 2018 -0700 doing commit and push for carolina commit 15d8d747d89faeefb052cfe1e07369c2c092ffc9 Author: carolina Date: Tue May 15 17:03:50 2018 -0700 adding crossbarcontrol, TprPattern and TprTrigger for blen application commit 437ff3365970bb67ece91cb776ef57111e5e3ff4 Author: carolina Date: Fri May 11 17:45:40 2018 -0700 updated releases for modules commit a988041a11d7ed1503f3f819d662247f71017ab4 Author: carolina Date: Thu May 10 14:10:59 2018 -0700 Add release comments commit ab4b42a3b940c03b14ba539afda03937945f58df Author: carolina Date: Thu May 10 13:51:42 2018 -0700 New firmware update and configuration files commit 6c1673aa51613cd39954a07e4339bd9717d8ca5e Author: carolina Date: Thu May 10 13:51:26 2018 -0700 New firmware update and configuration files commit 1bb70c21a9e539cc9fc7c59c98ec6cdc8c7fa953 Author: carolina Date: Thu May 10 13:49:52 2018 -0700 Updating addBsa data type, updating BSA load record macros, updating yaml loader fields.. commit 258f9f0f55f71a0fbab1c2e33f6f049854657323 Author: carolina Date: Thu May 10 13:49:32 2018 -0700 Updating addBsa data type, updating BSA load record macros, updating yaml loader fields.. commit e2f44174331105503ae5018ddb2ecac1bc6d559e Author: carolina Date: Thu May 10 13:42:08 2018 -0700 Changed CPSW_FRAMEWORK_VERSION=R3.5.3 to R3.6.3, ASYN_MODULE_VERSION=R4.30-0.3.0 to R4.31-0.1.0, MISCUTILS_MODULE_VERSION=R2.2.4 R2.2.5MISCUTILS_MODULE_VERSION=R2.2.5, YCPSWASYN_MODULE_VERSION=R1.1.6 to R2.0.1 commit 99b922fedb0cce78fba6266ea9da5d8af6e701a8 Author: carolina Date: Thu May 10 13:41:05 2018 -0700 Changed CPSW_FRAMEWORK_VERSION=R3.5.3 to R3.6.3, ASYN_MODULE_VERSION=R4.30-0.3.0 to R4.31-0.1.0, MISCUTILS_MODULE_VERSION=R2.2.4 R2.2.5MISCUTILS_MODULE_VERSION=R2.2.5, YCPSWASYN_MODULE_VERSION=R1.1.6 to R2.0.1 commit 9a9aa67765b5acd9939c5759d49a5ad120b3986c Author: Chris Ford Date: Mon Feb 26 10:35:12 2018 -0800 Fixed missing commas in blen.substitutions file. commit 7e288850ec80947d3dfc332b2d6ac9624448c63c Author: Chris Ford Date: Tue Jul 11 15:55:25 2017 -0700 Update RELEASE_NOTES. Remove vioc-* startup script, as sioc-* is preferred. commit c03787ff50a42e59ab6d3c69f719e243ba46fd46 Author: Chris Ford Date: Tue Jul 11 13:01:37 2017 -0700 Add needed parentheses to CALC expressions. commit e4d1684ac7b49a025694307135a1e76519fd3bbb Author: Chris Ford Date: Tue Jul 11 10:58:30 2017 -0700 Add support for INCONSISTENT shutter and filter state. INCONSISTENT means both limit switches are active. Shutter and filter states: 0=OUT, 1=IN, 2=MOVING, 3=INCONSISTENT. commit f8604852e33ee270a021d621e1f214ddaf973fbf Author: Chris Ford Date: Tue Jul 11 10:20:13 2017 -0700 Add TmitStatus and BpmStatus to expert display. commit d885c62fab6208d8f8947782fe68d99edf9d275e Author: Chris Ford Date: Tue Jul 11 10:19:46 2017 -0700 Remove unused database file. commit b5311c1006794478980761321c9f35cf700d1c8b Author: Chris Ford Date: Tue Jul 11 09:41:43 2017 -0700 Add sensor temperatures to top-level display. commit 1225276d79f1250d56c908355c4eda7f0196f942 Author: Chris Ford Date: Mon Jul 10 21:33:51 2017 -0700 Create PVs to enhance BLEN status reporting. New calc records define shutter and filter error PVs. New template and subsitution files define TmitStatus PV. New template and subsitution files define BpmStatus PV. commit a02292f551251d59a677e5c34ba17ab4788b3390 Author: Chris Ford Date: Fri Jul 7 12:40:13 2017 -0700 Corrected raw waveform attribute name: RFWS commit 4daf52ada114c97dfcdb3797f3602ba44d18cf26 Author: Chris Ford Date: Fri Jul 7 11:00:19 2017 -0700 Implement temperatures PVs. BunchLengthMonitor FW does not define temperature registers, so soft records are used. commit 7e1cce6c39d407495b22ba057354dead0605ff4b Author: Chris Ford Date: Fri Jun 30 15:12:14 2017 -0700 Describe changes in R1.0.5. commit bd95ebd1b6c41cb8e042372e9263bd111958d04c Author: Chris Ford Date: Fri Jun 30 13:55:57 2017 -0700 Update filter PVs to follow LCLS naming conventions. commit eaf5c1469bde37fba9a54234708ce9a00244bc8e Author: Chris Ford Date: Fri Jun 30 13:24:26 2017 -0700 Use DET1 and DET2 in 4th field of detector-specific PVs. Create sioc-* directories under iocBoot. commit 12fdd189b994bd6e75af0155b8c87db5e89d2435 Author: Chris Ford Date: Fri Jun 30 12:36:34 2017 -0700 Change vioc to sioc. commit 7cf2ae0acf84b8e901b1fa0192b407f4419a98cb Author: Chris Ford Date: Thu Jun 29 18:34:36 2017 -0700 Adjust shutter and filter PVs to follow LCLS naming conventions. commit f0e47c48ccc87d2e4e65d725c2d48d6e40b11002 Author: Chris Ford Date: Thu Jun 29 15:23:00 2017 -0700 Rename waveform PVs. Stream0, the raw waveform, is now called RWF. Stream3, the integration window waveform, is now called IWF. commit 6037433bfc4aa6d118a86355b10ea37b27fc91d6 Author: Chris Ford Date: Wed Jun 28 18:29:55 2017 -0700 Update PV names to reflect review feedback from LCLS naming czars. Use the fourth field ("instance") to differentiate PVs that exist for both detectors. commit 6897a23c10c4f179c92d05ccb58099d9685d3cce Author: Chris Ford Date: Wed Jun 28 18:26:18 2017 -0700 Update to latest yaml files. commit e5c0b1e136fdea1aa55ac9823b2b1b7ecf869786 Author: Chris Ford Date: Thu Jun 15 15:39:09 2017 -0700 Update to latest yaml files. Define new PVs for 5 new registers related to status of TMIT and BSA. Add the new PVs to the CmnConfig expert screen. commit b168dcd40d7e2ac6d991b80c2672d8f4451119d8 Author: Chris Ford Date: Mon Jun 5 13:34:53 2017 -0700 update release notes. commit 30c55c625e2445c5f9448d9329d0efd86a8e7664 Author: Chris Ford Date: Thu Jun 1 12:05:46 2017 -0700 Add buttons to top-level screen for enabling waveform display. commit e5aec283862b458f284228b258a4a2e01bf23025 Author: Chris Ford Date: Thu Jun 1 11:42:11 2017 -0700 Add buttons to top-level screen for enabling waveform display. commit 947661a33eed3a69f634badb4d8bf0016cb2e7a3 Author: Chris Ford Date: Tue May 30 17:59:23 2017 -0700 Update YAML files to support new V3 firmware. Enable RW access to attenuator registers. Fine tune default register values. commit 5a20c8e3066769a670bbd6095817e90afbaf950c Author: Chris Ford Date: Fri May 26 12:55:25 2017 -0700 Update gap diode screen to match latest pyro detector screen, displaying four streams. commit a09917800795db1b3728ba56f7894ccce0ba1415 Author: Chris Ford Date: Thu May 25 12:31:39 2017 -0700 Clean up decoding of status bits related to moving filters and shutters, eliminating 12 PVs that were used for intermediate calculations. Add Help button to top-level BLEN screen. Create new Help screen describing movable filter and shutters. commit 11bc7807e6bca6b3447cecd263aa73702abeeed5 Author: Chris Ford Date: Tue May 23 12:49:57 2017 -0700 R1.0.3: Update YAML files to support new firmware, upstream bug fixes. commit f0845c120af363aa2bf500987c2b037c7fbaab1e Author: Chris Ford Date: Mon May 22 15:02:08 2017 -0700 In InputMuxSel, disabled unused Ch1 and Ch2. Only Ch0 and Ch3 are used. Reduced the size of stream buffers to improve performance. Less than a thousand elements are needed for display. commit 37d3e2010bf9756817f15c2570d39d98bc13b773 Author: Chris Ford Date: Mon May 22 14:57:36 2017 -0700 Removed unused db and yaml files. stream_size.template, map, and map_top are obsolete after switching to manual PV name generation. commit 5992985bb5873c01c27c605623ae3a86e9d5acbf Author: Chris Ford Date: Thu May 18 17:11:26 2017 -0700 Scan status of filters and shutters at 2 Hz instead of 1 Hz. Use register readback value as input to calc record. commit 7bf8eecc1f03523839c83098b20fe7f82026d7ba Author: Chris Ford Date: Thu May 18 15:41:28 2017 -0700 Clean up unused YAML files. These files were used for testing older firmware versions. They are now obsolete. commit 44f91ffc7e4c048e63d2962ae7b7ea1d40827a3d Author: Chris Ford Date: Wed May 17 17:32:30 2017 -0700 Clean up unused db files. Temperature monitoring is active for BCM, not BLEN. commit de140077ea53e0b0210208fcb4486af7aba27d16 Author: Chris Ford Date: Wed May 17 15:06:25 2017 -0700 Update to latest YAML files. The changes reflect upstream bug fixes in firmware. In YAML configuration, UdpEngineServer[3] was renamed BpUdpServer. commit 9cc25f61b8ec5e9349dba75f90dcbf4beaa19d31 Author: Chris Ford Date: Wed May 17 14:58:14 2017 -0700 Enhance CmnConfig expert screen by displaying TMIT values both in raw counts and in pC. commit 9bcb285c848a315ba3a52274d6007695f5bead03 Author: Chris Ford Date: Tue May 16 15:40:23 2017 -0700 Connect filter and shutter controls to new PVs. Add application type, Location, and IMAX scale to expert screen. commit 4b0c9363145d7ab2fa8278559f62559cf4e5abd6 Author: Chris Ford Date: Tue May 16 15:34:51 2017 -0700 Decode status and mover bits. Calculate IMAX scale factor. commit 9ad23a126d7a1128a4eac273025acbfdf675ed4f Author: Chris Ford Date: Tue May 16 15:11:20 2017 -0700 Update to latest YAML files. commit d43b6e430ef19c8d0f2523cfd3b642d71875e174 Author: Chris Ford Date: Thu May 11 14:03:52 2017 -0700 Clean up db files. Rename ipABCD.db to ipAddr.db and use substitutions file. Remove acalcStats.db. commit 437ff427cceb59c7803aaaa33d1c7ab3b6cd377a Author: Chris Ford Date: Wed May 10 18:10:11 2017 -0700 Display remote server address on expert screen. commit 193dd35297c1ef2b4e36b5fd0948eb85f27c5434 Author: Chris Ford Date: Wed May 10 18:04:46 2017 -0700 Parse IP addresses commit 148723b3c119ff2b8306125eaf18b24e91097381 Author: Chris Ford Date: Wed May 10 10:40:55 2017 -0700 Updated RELEASE_NOTES commit ff94b26b6fc27e1692b33ca92ff223cad178229e Author: Chris Ford Date: Wed May 10 10:26:01 2017 -0700 Add expert screens: CmnConfig MoverCntl DspCoreRes commit 398b94676746a2af02b347988b8d5cbd9f92b0bd Author: Chris Ford Date: Tue May 9 17:15:33 2017 -0700 Move WaveformEngineBuffers to different addr than BsaBuffers. Partition addresses 0x0:0x7FFFFFFF for BSA and the remainder of the 8GB map for raw waveform diagnostics. commit 3122a220d994d23d44b2c2af90402a47f826b2b0 Author: Chris Ford Date: Tue May 9 16:14:16 2017 -0700 Implement several new register PVs and expert screens. Change TMIT EGU to pC. commit 61562e3057f57871242c3174b1d71f41de40aead Author: Chris Ford Date: Tue May 9 16:00:45 2017 -0700 Build against bsa R1.0.1 (API layer). This matches bsaDriver R0.9.9 RELEASE_NOTES. commit 50a6f8530c3849ff24831cc742f30ca4fbda718b Author: Chris Ford Date: Tue May 9 14:34:13 2017 -0700 Build with newer modules. bsaDriver R0.9.9 yamlLader R1.3.0 ycpswasyn R1.1.6 commit de04326342fee07e7abb7d33e10334df94973ed4 Author: Chris Ford Date: Fri May 5 13:07:49 2017 -0700 Refinements to BSA support. commit 88d41c1c16a646ff19012afff0176cf412ea4deb Author: Chris Ford Date: Thu May 4 17:19:23 2017 -0700 Add support for BSA. Build with ycpswasyn version R1.1.5. Add support for 2 sensors. commit 0f188b0dcd47a8c6e3f8657b7af5928ad67ebf28 Author: Chris Ford Date: Wed May 3 17:00:33 2017 -0700 Add support for BSA-related registers. commit 8121ac30c1cf5e3c80a35249965c29a23ab8c650 Author: Chris Ford Date: Wed May 3 12:35:50 2017 -0700 Use latest YAML configuration files. Add support for Stream3. commit 5256ecc398b079c631307cc5a2e2257e713ae85c Author: Chris Ford Date: Tue May 2 15:08:36 2017 -0700 Add .gitignore file. commit 41d519e1e748d0676ac0329eafc22840cb744376 Author: Chris Ford Date: Tue May 2 15:06:04 2017 -0700 Use new YAML default configuration file. commit 522467567ed7f6e57f7c0fb198185b71f6d6e8e3 Author: Chris Ford Date: Tue May 2 15:01:40 2017 -0700 Increase BuildStamp to 256 chars. commit c50ce09ecffb6be09f36ea0ebc261b829d2aad64 Author: Chris Ford Date: Wed Apr 5 13:14:47 2017 -0700 Use ycpswasyn R1.1.3 commit 46ead0ce1d3e3a91406be6454c61f2de858a28cf Author: Chris Ford Date: Tue Apr 4 14:52:40 2017 -0700 EDL files, cleanup commit 1199e0c70a215e6ec6f418fb9ee9b3d8411db254 Author: Chris Ford Date: Tue Apr 4 10:28:14 2017 -0700 removed CONFIG_EDL commit 987ba9791009ccfd0be297cf8f1804e412b770ce Author: Chris Ford Date: Mon Apr 3 16:17:43 2017 -0700 EDL files, initial commit. commit e387899a3c927e15aaf2dc70c09a73dcbbba108d Author: Chris Ford Date: Mon Apr 3 16:14:58 2017 -0700 Use upper camel case for saveLoadConfig.db PVs. commit a97723c3ed9dc6374794bf6756fdffa7519ab0ee Author: Ernest Williams Date: Mon Apr 3 15:27:52 2017 -0700 fix typo in RULE commit 8bc99460c9065030fefcdab33a2caec50c69fd40 Author: Chris Ford Date: Wed Mar 29 15:28:11 2017 -0700 add LICENSE.txt commit 0c78d993e4c40b9446f6ade2f6a3b97eb57000e5 Author: Chris Ford Date: Wed Mar 29 15:23:29 2017 -0700 Upgrade to ycpswasyn version R1.1.2. commit 26c91cf5cc044a40d358a4da6f8b82edbcb09604 Author: Chris Ford Date: Tue Mar 28 16:57:16 2017 -0700 Defined EGU fields for TMIT and IMAX PVs. commit 86954efa5ee8524312de7f3bfc27ce28db880aa7 Author: Chris Ford Date: Sun Mar 26 17:02:20 2017 -0700 add register templates, include support for EGU. commit 08a6f24c660da39eae49053fadb5d439678eefcc Author: Chris Ford Date: Wed Mar 22 18:25:48 2017 -0700 Add TrigDelay1 register commit 34a33da2766375b9b4774f245b5ccba30e321530 Author: Chris Ford Date: Tue Mar 21 18:31:03 2017 -0700 Map yaml /Stream4 to AMC1:Stream0. Enable creating PVs for both AMC0 and AMC1. Add carrier.substitutions file. Remove unused blen.dict file. commit 469859b87860f8012dad3c3eca20a5eb0ed076fa Author: Chris Ford Date: Tue Mar 21 11:37:38 2017 -0700 Remove unused files. Enable automatic initialization after FPGA reboot. commit b3abc6bec9ef862b2a12627afbe3997ddd97e0b3 Author: Chris Ford Date: Mon Mar 20 14:44:12 2017 -0700 Enable manual creation of PV names commit b1ad35912be8aacecacc9fadf6104fe5c308c7a2 Author: Chris Ford Date: Mon Mar 20 09:38:30 2017 -0700 support blen registers including AMC 0, AMC 1, and carrier card commit 7066cbd33a2bffef51944234ba078b8382d8a0ab Author: Ernest Williams Date: Thu Mar 16 22:17:31 2017 -0700 dbpf is no longer req'd with recent YCPSWASYN including R1.1.1 commit e5a433efa9ad652c692ccb76c9c08eb2cec309aa Author: Ernest Williams Date: Thu Mar 16 21:52:52 2017 -0700 Now using the new ycpswasyn; version R1.1.1 commit 25d1fc9538a77164871edcb1174fe082e56dc427 Author: Ernest Williams Date: Thu Mar 16 09:44:37 2017 -0700 update IOC documentation commit 43e13c29172ef0adb4b8628437614428dc69ae42 Author: Ernest Williams Date: Wed Mar 15 11:22:30 2017 -0700 make RELEASE_SITE match what eco would produce; also change RELEASE to use the proper variable for location of EPICS modules commit 24dc7202ddd66e24506393b3b63b808d4bfe3d67 Author: Ernest Williams Date: Wed Mar 15 00:21:34 2017 -0700 update info about IOC to crate/slot connections commit 053d45fe8b7999d0b5323cc9a051d65aac8bc2ac Author: Ernest Williams Date: Tue Mar 14 22:52:10 2017 -0700 update RELEASE_NOTES and Documentation commit 48ec347ed5bc80b83265d49e704e29e8903be36c Author: Ernest Williams Date: Tue Mar 14 22:40:32 2017 -0700 initial creation of BunchLengthMonitor IOC Application for LCLS II; derived from Chris Ford and Leonid Sapozhnikov