Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test of Labbrick PLL lock. Fix for #25 #31

Merged
merged 6 commits into from
Jun 22, 2015
Merged

Conversation

CoherenceController
Copy link

Added test for PLL lock status
Tested under Windows 64-bit.

@caryan
Copy link
Contributor

caryan commented Jun 19, 2015

Hmmm... doesn't seem to work on Windows 8.1 due to some DLL dependencies missing.

@caryan
Copy link
Contributor

caryan commented Jun 19, 2015

Tracked it down to a MSVC redistributable version issue. The working computer had a MSVS2012 version and the non-working had up to MSVC2010. Installing 2013 version fixed the issue.

Also change GetModelName to char* version as 64 bit supports both char* and wchar_t*.
@caryan caryan force-pushed the hotfix/labbrick_lock branch 2 times, most recently from a80348f to cdd5ee4 Compare June 22, 2015 13:31
@caryan caryan force-pushed the hotfix/labbrick_lock branch from eb301ce to 8323a58 Compare June 22, 2015 13:57
In internal try and catch the intermittent lock when an external
reference is applied.  In limited testing seems to catch at least 9 out
10 times.

--CAR
caryan added a commit that referenced this pull request Jun 22, 2015
Test for Labbrick PLL lock. Closes #25.
@caryan caryan merged commit 8d5383a into develop Jun 22, 2015
@caryan caryan deleted the hotfix/labbrick_lock branch June 22, 2015 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants