I remember when I first joined robotics and started programming, the one thing I really wanted was to look at code from other teams. I was able to find some here and there, but I’d like to centralize it for anyone to see. This way, you can just send someone the link and they can look at an assortment of FRC repositories.
Anyways, the link is here. It’s a google spreadsheet that anyone can edit to add their team, and I’d love it if you could add your team’s, or another that you know of to the list. Just follow the form of the other teams already in there.
It would make sense to expand this so that non-github source code repositories could be entered. You’d just have to pre-pend https://github.com to each entry in column A, and this would allow other sites to be entered.
Edit: FWIW, Gixxy, our founder and first head programmer, set up that github account, and we always keep it up to date – it’s how our programmers sync with each other during build season as well as during off-season. We don’t just sync the code the first week of January - this is really our current code, except for individual edits not yet shared to the rest of our team. During each event we are in, we have a “key” laptop for programming, but other than that, we’re up to date on github.
Notes on installing Labview Merge and Commit tools for GIT.
Not sure if Gabe has CD, but E2 goes by MasterEric on CD, questions can be directed at him.
Hello everyone! After the request from E2 to look into methods of being able to properly implement labview files with git, and more specifically Tortoisegit, I have just found a labview package that implements Tortoisegit inside of a labview project, and was able to sucessfully test comparing files with a temporary repository I created.
To save from further research, I have listed the steps below:
1. Download/extract the builds file in the Builds.zip file anywhere.
2. Open Labview and go to the JKI VI Package manager (Tools/VI Package Manager)
3. Once everything is finished loading in the JKI VI Package Manager, Go to File/Open Package File(s).
4. Open your extraced builds folder, open the VIPM folder, then select/open lv_tortoisegit-0.8.1.7
5. Make sure that the box in the upper left hand corner of the new window says "2015", and click the Install button below it. (Also agree to the licence agreements)
6. A new window will pop up called "TortoiseGit Labview Addon Settings", it will ask you to specify your git path, Tortoise Git path, and Git bash path. Generally, the Git path is: C:\Program Files\Git\cmd\git.exe, the Tortoise Git Path is: C:\Program Files\TortoiseGit\bin\TortoiseGitProc.exe, and the Git Bash Path is: C:\Program Files\Git\bin\sh.exe.
7. Click the Test button next to the Git path file entry and the Tortoise git path file entry, and click okay on the next windows.
8. Make sure that "Enable Tortoise Git Addon" is checked, and click "Save".
9. Wait for the Package Manager to finish installing the package, and click Finish.
10. Close out of the package manager, and close out of Labview.
11. Right click anywhere on the desktop, and go to TortoiseGit/Settings.
12. Click on "Diff Viewer", and click the Advanced... button.
13. Click the Add button, and write .vi in the extension text entry, and direct the "External Program" to C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe
14. Click OK on the Advanced diff settings windows, and click Apply.
15. Now click on "Merge Tool" at the left of the Tortoisegit settings, and click advanced.
16. Similar to last time, click Add, type ".vi" in the Extension box, but this time direct the External Program to: C:\Program Files (x86)\National Instruments\Shared\LabVIEW Merge\LVMerge.exe
17. Click Okay, and Apply.
18. You can now exit out of TortoiseGit settings.
To test this out, open up a Labview project, and you should notice that files now have the "TortoiseGit Checks" around them, indicating if a local file is different from the remote file. Right click on any .VI, for example, Begin.VI, go to Git, and Diff. You should now see two windows of the VI of your selection, the local one on your right, and remote one on your left. You can click "Show Difference" to highlight what is different between the two, but if you have the most recent on the repo, there shouldn't be any differences. To compare a VI with an older version of the VI, right click again, go back to Git, and click on "Show Log". Select an old commit from the log, and right click on it, and select "Compare with working tree". Neat, huh?
I did this with the (as of now) current Begin.VI, and the Begin.VI from 3/4/2016.Inline image 1
From the Screenshot, you can see how the VI compare program works with TortoiseGit. From the project, you can also commit/push, merge, and all of the other goodness. Try it out on the programming computers/your computers, tell me how it works for you! Hopefully this can help in being a much better way of effectively pushing code/comparing it.
--
-Gabe
