Merge remote-tracking branch 'origin/TekRSA-Freq-vs-Time' into confint-fix
- Conflicts:
- Daq apps/MyDaq.mlapp
Description
Description
Details
Details
- Committed
abeccari Jan 14 2022, 15:39 - Parents
- rINSTCONTROLa3ebb1eb0ca9: Fixed a few graphical mistakes with the app
rINSTCONTROL34ab4133951e: Update MyZiRingdown.m - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 34ab4133951e | alessio_zicoschi | Update MyZiRingdown.m | Sep 1 2021 | |||
| dda1c22d54cc | SAFedorov | Update MySpringShiftFit.m | Mar 12 2021 | |||
| d2f056a0d986 | AmiraliArabmoheghi | Spring shift bugs fixed | Feb 26 2021 | |||
| 904f510c0cbd | AmiraliArabmoheghi | Spring shift and optical Lorentzian fit completed | Feb 25 2021 | |||
| 0f1dd08d700d | AmiraliArabmoheghi | Spring shift fit | Feb 25 2021 | |||
| 7d305bd89f0f | AmiraliArabmoheghi | Spring shift fit | Feb 24 2021 | |||
| 5d90b2f48336 | AmiraliArabmoheghi | Added eta_c calculation to optical Lorentzian fir | Feb 24 2021 | |||
| 72321c068f70 | He3 | TekRsa-Freq-vs-Time | Feb 19 2021 | |||
| 844b5fcb8d23 | SAFedorov | In MyLog, fixed a compatibility issue with Matlab 2020a | Nov 27 2020 | |||
| 0cbcd5993498 | SAFedorov | Debugging of MyNewpTlb6300 and its gui | Nov 24 2020 | |||
| cb6fe53eaba2 | SAFedorov | MSO restore | Oct 19 2020 | |||
| a9d8889e07e9 | SAFedorov | Merge branch 'Tek_MSO' of https://github.com/engelsen/Instrument-control into… | Oct 19 2020 | |||
| d3985846aeb9 | SAFedorov | Compatibility update for Matlab 2019 | Oct 19 2020 | |||
| e10c22efd725 | SAFedorov | Reverted GuiTekMso to one version before | Aug 28 2020 | |||
| 18439902058f | Guanhao | Update MyTekMso.m | May 8 2020 | |||
| 90dad2613501 | Guanhao | MSO spectrum view data capture fixed | May 8 2020 | |||
| ace189b1a0ac | Guanhao | MSO54 tested in lab | May 8 2020 | |||
| da3e26212996 | Guanhao | Tek MSO added spectrum view control, fixed trace aquisition bug | May 1 2020 | |||
| 684dbb31e286 | Guanhao | added Tektronix MSO5000 support | Apr 30 2020 | |||
| 9f217a1b084f | Guanhao | renaming, fixed span/rbw inversion, now support 6 traces | Apr 28 2020 | |||
| 2cecb5eaa640 | Guanhao | FSW GUI countbox removed, added bw ratio adjustment | Apr 26 2020 | |||
| 589ab5564315 | Guanhao | FSW added | Apr 26 2020 | |||
| d8df371f2b67 | Guanhao | Revert "FSW added" | Apr 26 2020 | |||
| 97dcc9dc6715 | Guanhao | FSW added | Apr 26 2020 | |||
| 5a9c6b6f6799 | SAFedorov | MyDaq - 1) fixed a bug in the operation of "Aquisition instrument" button 2)… | Mar 15 2020 |