search

analogdevicesinc / libsmu

Software abstractions for the analog signal exploration tools.
http://analogdevicesinc.github.io/libsmu/
BSD 3-Clause "New" or "Revised" License
31 stars 31 forks source link

Libsmu changes to access ADC and DAC config registers #124

Closed damercer closed 5 years ago

damercer commented 5 years ago

Hi: These changes, along with new features in m1k-fw, allow access to the ADC and DAC configuration registers to provide 200KSPS operation modes. I've tested these changes using Mingw32 compiler on Windows and they should not interfere with any existing software. I've made the changes with a minimalistic style sufficient to access the new features provided by my changes to m1k-fw. I think these are the only changes I ended up making. In the process of finding my way around and figuring out how to make the software tools work I may have touched other files and not remembered.

Setting up and using these 200KSPS configurations is more advanced than the typical user would be doing. I've added settings for 4 of the 6 possible combinations and another that just passes raw, unscaled and uncalibrated samples back for debugging and experimenting.

You may wish to make them more in the style consistent with the rest of the code in libsmu. Making style changes is fine as long as the same functionality is provided. Just let me know so I can make accommodations in my Python code (ALICE 1.3).

If you could make a sub-branch with the changes and make a Windows installer version of them (soon) that would be extremely helpful. Right now I have to use my changes only under Mingw32 and can't make stand alone Windows executable (using py2exe) from there. I need to be able to install a new libsmu under the Python in the Windows registry to use py2exe and make the Windows executable. I would like to install this new version of ALICE on another computer to use at the ECEDHA expo next month,

Thanks Doug

AppVeyorBot commented 5 years ago

:x: Build libsmu 1.0.1177 failed (commit https://github.com/analogdevicesinc/libsmu/commit/6ead356c09 by @damercer)

damercer commented 5 years ago

Sorry, I found one more file that changed. libsmu.hpp

Doug

AppVeyorBot commented 5 years ago

:x: Build libsmu 1.0.1178 failed (commit https://github.com/analogdevicesinc/libsmu/commit/b608382643 by @damercer)

AlexandraTrifan commented 5 years ago

Hi, This looks good. We can merge it into master and have an installer that contains it as soon as possible. Just a couple of things: -Can you add a "Signed off-by.." to your commits? -Could you add the function declaration in cpp_libsmu.pxd (located in bindings/python/pysmu/) for the set_adc_mux method? This is required in order to build successfully.

Thank you -Alexandra

damercer commented 5 years ago

Like I said, I might not have remembered all the various files that had changes. They were not all in one place so I lost track. You asked Can you add a "Signed off-by.." to your commits? I'm new to using git hub like this so I don't see any obvious button named that? Thanks Doug

AlexandraTrifan commented 5 years ago

Hi,

Thank you for doing the changes.

I don't think you can do this using the Github web based interface. You can do it if you have an available terminal and git installed. You can squash the last 3 commits into one, modify the commit message and add a "Signed off-by.. " line. This is useful when changes need to be tracked back to some older commits. To squash the commits, you need to run git rebase -i HEAD~3 . An editor will be opened, and you will have the list containing 3 commits. Write squash in front of the last 2 commits you created (the ones with update) and pick in front of the first one you created. This will create a single commit from the previous 3 and let you update the commit message. After that, running git commit --amend --signoff will also add the "Signed off-by..." . In order to publish these changes to your repository, you need to run git push --force origin master .

-Alexandra

damercer commented 5 years ago

I use the Windows Github desktop application to move stuff up and down to Github. Do you by chance know if there is a way to add signoff from there? I didn't see anything obvious. Doug

AlexandraTrifan commented 5 years ago

Hi,

No. From what I have seen, you can't add sign-off or squash commits using the Github desktop application.

-Alexandra

damercer commented 5 years ago

There is a "command line" interface in the desktop app but you need git to be installed. When I have a few minutes I will try to see if I can make that work.

Thanks

Doug

On 2/12/2019 9:45 AM, AlexandraTrifan wrote:

[External]

Hi,

No. From what I have seen, you can't add sign-off or squash commits using the Github desktop application.

-Alexandra

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/analogdevicesinc/libsmu/pull/124#issuecomment-462786561, or mute the thread https://github.com/notifications/unsubscribe-auth/ALIL6tPO8UYnoivD-CTT3mW8F3hT-GL9ks5vMtOZgaJpZM4azOZc.

damercer commented 5 years ago

I'm sorry I don't know how to make any of the alterations you are asking for. I tried to do things from inside Git desktop by installing git for windows (as it suggested) but when I try to open a command line interface from the desktop it says I don't have git installed. I then tried using the Git GUI that came when I installed git for Windows. That does not seem to allow me to do anything either and the interface makes no sense. Again Sorry. Doug

AlexandraTrifan commented 5 years ago

Hi,

There's no problem. If you agree, I can do the following, redirect the PR to a "dev" branch, perform the "squash", sign-off the commit and merge it to master. I just need an email address to put into the signed-off line: (similiar to: "Signed-off-by: Alexandra Trifan Alexandra.Trifan@analog.com") and I can do this if you are ok with it.

Thank you -Alexandra