Homec4science

Merge remote-tracking branch 'origin/confint-fix' into confint-fix

Authored by abeccari on Jan 14 2022, 16:02.

Description

Merge remote-tracking branch 'origin/confint-fix' into confint-fix

  1. Conflicts:
  2. Daq apps/MyDaq.mlapp

Merged Changes

CommitAuthorDetailsCommitted
9be650d90f42abeccari
Merge remote-tracking branch 'origin/TekRSA-Freq-vs-Time' into confint-fix 
Jan 14
34ab4133951ealessio_zicoschi
Update MyZiRingdown.m 
Sep 1 2021
dda1c22d54ccSAFedorov
Update MySpringShiftFit.m 
Mar 12 2021
d2f056a0d986AmiraliArabmoheghi
Spring shift bugs fixed 
Feb 26 2021
904f510c0cbdAmiraliArabmoheghi
Spring shift and optical Lorentzian fit completed 
Feb 25 2021
0f1dd08d700dAmiraliArabmoheghi
Spring shift fit 
Feb 25 2021
7d305bd89f0fAmiraliArabmoheghi
Spring shift fit 
Feb 24 2021
5d90b2f48336AmiraliArabmoheghi
Added eta_c calculation to optical Lorentzian fir 
Feb 24 2021
72321c068f70He3
TekRsa-Freq-vs-Time 
Feb 19 2021
844b5fcb8d23SAFedorov
In MyLog, fixed a compatibility issue with Matlab 2020a 
Nov 27 2020
0cbcd5993498SAFedorov
Debugging of MyNewpTlb6300 and its gui 
Nov 24 2020
cb6fe53eaba2SAFedorov
MSO restore 
Oct 19 2020
a9d8889e07e9SAFedorov
Merge branch 'Tek_MSO' of https://github.com/engelsen/Instrument-control into… 
Oct 19 2020
d3985846aeb9SAFedorov
Compatibility update for Matlab 2019 
Oct 19 2020
e10c22efd725SAFedorov
Reverted GuiTekMso to one version before 
Aug 28 2020
18439902058fGuanhao
Update MyTekMso.m 
May 8 2020
90dad2613501Guanhao
MSO spectrum view data capture fixed 
May 8 2020
ace189b1a0acGuanhao
MSO54 tested in lab 
May 8 2020
da3e26212996Guanhao
Tek MSO added spectrum view control, fixed trace aquisition bug 
May 1 2020
684dbb31e286Guanhao
added Tektronix MSO5000 support 
Apr 30 2020
9f217a1b084fGuanhao
renaming, fixed span/rbw inversion, now support 6 traces 
Apr 28 2020
2cecb5eaa640Guanhao
FSW GUI countbox removed, added bw ratio adjustment 
Apr 26 2020
589ab5564315Guanhao
FSW added 
Apr 26 2020
d8df371f2b67Guanhao
Revert "FSW added" 
Apr 26 2020
97dcc9dc6715Guanhao
FSW added 
Apr 26 2020