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

Add MeadowlarkLC device adapter #341

Merged
merged 32 commits into from
Apr 18, 2023

Conversation

ieivanov
Copy link
Contributor

@ieivanov ieivanov commented Apr 4, 2023

ieivanov and others added 30 commits June 27, 2022 19:22
Updated device adapter for consistent units (Volts) of Voltage input and output. Retardance is updated when voltage is changed, and vice versa
Left TODO comments and updated Serial Number and Device Adapter Version Number fields
@ieivanov
Copy link
Contributor Author

ieivanov commented Apr 4, 2023

@nicost we are ready to push the MeadowlarkLC device adapter. Before that, could you please help me upload the USB driver libraries to the 3rdparty SVN repo and create a page on https://micro-manager.org/Device_Support? Thanks!

@nicost
Copy link
Member

nicost commented Apr 4, 2023

Hi @ieivanov. Can you send me the USB driver library files (or send me a private link)? I can then add them to the 3rdparty svn repo. I believe that you can edit the page on micro-manager.org yourself directly with the edit page link in the top (or clone https://github.com/micro-manager/micro-manager.github.io and create a PR).

@ieivanov
Copy link
Contributor Author

ieivanov commented Apr 4, 2023

Just emailed them to you, thanks. I also found the instructions for updating the wiki, I'll work on that next.

@ieivanov ieivanov marked this pull request as ready for review April 12, 2023 17:07
Copy link
Member

@marktsuchida marktsuchida left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

It would be best if you could also add the MeadowlarkLC.vcxproj.filters file if you have it. That file should be tracked by Git.

Also 3rdparty-revision in the main micro-manager repo needs to be bumped before merging this (I will do).

DeviceAdapters/MeadowlarkLC/MeadowlarkLC.cpp Outdated Show resolved Hide resolved
@ieivanov
Copy link
Contributor Author

Thanks @marktsuchida! I've removed that bit of old code. I don't have a MeadowlarkLC.vcxproj.filters file. I think this device adapter should be ready to merge.

@ieivanov
Copy link
Contributor Author

P.S. I also added a build.xml to pull the mmgr_dal_MeadowlarkLC.csv file into the MM install directory

@marktsuchida marktsuchida merged commit 9634867 into micro-manager:main Apr 18, 2023
@ieivanov
Copy link
Contributor Author

Hey @marktsuchida, we see that the mmgr_dal_MeadowlarkLC.csv is not copied in the MM install directory during the build. Could you please take a quick look at my build.xml file and see if you notice any issues?

@marktsuchida
Copy link
Member

@ieivanov The build.xml is correct (I had tested) but I forgot that not all files get added to the installer automatically. It should work now but let me know if not.

@talonchandler
Copy link

Thanks @marktsuchida and @ieivanov. The .csv is now being distributed with the nightly build and it's working well with the device.

@ieivanov
Copy link
Contributor Author

Thanks Mark!

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.

Upgrade MLO device adapter to work with current firmware version
5 participants