Merge branch 'MyScope-MyInstrument-fixes' into MyFit-MyInstrument-fixes
Description
Description
Details
Details
- Committed
GitHub <noreply@github.com> Nov 29 2017, 16:17 - Parents
- rINSTCONTROL1bb2fd6a61be: 1. Fixes relating to readProperty functionality
rINSTCONTROLb5fc72794f24: 1. Changed str_spec to take any arbitrary string - Branches
- Unknown
- Tags
- References
- refs/pull/104/head
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 1bb2fd6a61be | engelsen | 1. Fixes relating to readProperty functionality | Nov 29 2017 | |||
| 394d9d4ddb2c | engelsen | 1. Fixed bugs with MyRsa software 2. Fixed a bug with createSessionPath.m… | Nov 29 2017 | |||
| 268a4e17cce1 | engelsen/GitHub | Merge pull request #102 from engelsen/MyFit-calibration | Nov 28 2017 | |||
| a764b6b613e0 | engelsen/GitHub | Update MyTrace.m | Nov 28 2017 | |||
| 872bd480fb59 | engelsen | 1. Bug fixes on Gui of MyFit.m 2. Bug fixes on calibration of fits 3. Fix merge… | Nov 28 2017 | |||
| f63592f7e2bb | engelsen | Merge branch 'master' into MyFit-calibration | Nov 28 2017 | |||
| 5ac025096528 | engelsen | 1. Made MyDaq compatible with new MyTrace changes 2. Cleaned up MyTrace.m | Nov 28 2017 | |||
| 687fbc40b261 | engelsen | 1. Allow plot function of MyTrace to change interpreter of labels | Nov 28 2017 | |||
| f666d41a7f2f | engelsen | 1. Changed MyTrace plot function to take all formatting inputs of the plot and… | Nov 28 2017 | |||
| 7f398e359c2e | engelsen | 1. Further modification of GUI and calibration functionality of MyFit | Nov 28 2017 | |||
| b5509c907ae8 | engelsen | GuiNa cosmetic edits | Nov 27 2017 | |||
| 96e4cf9e939b | SAFedorov/GitHub | Merge pull request #101 from engelsen/DynamicProps | Nov 27 2017 | |||
| d1a580a8b700 | engelsen | 1. Fixed the Trace.save method 2. Added createSessionPath function | Nov 27 2017 | |||
| ec6e32066aa2 | engelsen | 1. Added CalVals struct for calibration values 2. Added function for… | Nov 24 2017 |