Go to Post It's very confusing to other people on the message boards when you make things up that are incorrect and assert them as fact. Please don't do this. - Dave Flowerday [more]
Home
Go Back   Chief Delphi > Technical > Programming
CD-Media   CD-Spy  
portal register members calendar search Today's Posts Mark Forums Read FAQ rules

 
Closed Thread
 
Thread Tools Rate Thread Display Modes
  #1   Spotlight this post!  
Unread 05-05-2013, 15:57
Woolly's Avatar
Woolly Woolly is offline
Programming Mentor
AKA: Dillon Woollums
FRC #1806 (S.W.A.T.)
Team Role: Mentor
 
Join Date: Feb 2012
Rookie Year: 2012
Location: Springfield, MO
Posts: 512
Woolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond repute
Team 1806's 2013 Code

https://code.google.com/p/2013swat-r...e%25 3Dclosed

To check it out, it works best if you have Tortoise SVN (http://tortoisesvn.net/) and check out from http://2013swat-robot-code.googlecode.com/svn/trunk/

Admittedly it might be a bit of a spaghetti-like jumble, and it's not documented incredibly well, but it worked. Feel free to ask any questions about what something does or how/why we did something.
We'll try to make it a summer project to retroactively clean it up and comment it better.

Also it was our first year using an SVN system for code management, which was a huge success.
__________________


Team 1806 Student: 2012-2013 | Mentor: 2013-Present
  #2   Spotlight this post!  
Unread 05-05-2013, 16:14
joelg236 joelg236 is offline
4334 Retired Mentor & Alumni
AKA: Joel Gallant
no team
Team Role: Mentor
 
Join Date: Dec 2011
Rookie Year: 2012
Location: Calgary
Posts: 733
joelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond repute
Re: Team 1806's 2013 Code

How does SVN work for labview? Did you have any specific problems?
__________________
All opinions are my own.
  #3   Spotlight this post!  
Unread 05-05-2013, 16:16
Woolly's Avatar
Woolly Woolly is offline
Programming Mentor
AKA: Dillon Woollums
FRC #1806 (S.W.A.T.)
Team Role: Mentor
 
Join Date: Feb 2012
Rookie Year: 2012
Location: Springfield, MO
Posts: 512
Woolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond repute
Re: Team 1806's 2013 Code

Quote:
Originally Posted by joelg236 View Post
How does SVN work for labview? Did you have any specific problems?
Well, you can't diff or merge very well to my knowledge, but otherwise as far as committing, branching, updating, etc. it works very well. It's good just to have you code in the cloud so every member on the team can access it, and having a backup copy you can access from anywhere you have internet.
__________________


Team 1806 Student: 2012-2013 | Mentor: 2013-Present
  #4   Spotlight this post!  
Unread 05-05-2013, 20:59
Greg McKaskle Greg McKaskle is offline
Registered User
FRC #2468 (Team NI & Appreciate)
 
Join Date: Apr 2008
Rookie Year: 2008
Location: Austin, TX
Posts: 4,751
Greg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond reputeGreg McKaskle has a reputation beyond repute
Re: Team 1806's 2013 Code

I use compare more often than merge. I generally don't need to merge and instead just review that my changes make sense.

I attached an image of what diff looks like. The window on the bottom shows the description of the diff and the upper two windows are the two files with the objects selected and some items circled.

Greg McKaskle
Attached Thumbnails
Click image for larger version

Name:	Clipboard 1.png
Views:	90
Size:	997.3 KB
ID:	14787  
  #5   Spotlight this post!  
Unread 05-05-2013, 23:07
Joe Ross's Avatar Unsung FIRST Hero
Joe Ross Joe Ross is offline
Registered User
FRC #0330 (Beachbots)
Team Role: Engineer
 
Join Date: Jun 2001
Rookie Year: 1997
Location: Los Angeles, CA
Posts: 8,567
Joe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond reputeJoe Ross has a reputation beyond repute
Re: Team 1806's 2013 Code

Here's how to set up graphical diffing and merging for TortoiseSVN. It would be similar for other tools.

https://decibel.ni.com/content/docs/DOC-2936
  #6   Spotlight this post!  
Unread 06-05-2013, 13:24
bumblebee3339's Avatar
bumblebee3339 bumblebee3339 is offline
Team's main account
FRC #3339 (BumbleBee)
 
Join Date: Feb 2013
Rookie Year: 2009
Location: Israel
Posts: 34
bumblebee3339 is an unknown quantity at this point
Re: Team 1806's 2013 Code

Is there a way to download it without the SVN?
  #7   Spotlight this post!  
Unread 06-05-2013, 15:18
Woolly's Avatar
Woolly Woolly is offline
Programming Mentor
AKA: Dillon Woollums
FRC #1806 (S.W.A.T.)
Team Role: Mentor
 
Join Date: Feb 2012
Rookie Year: 2012
Location: Springfield, MO
Posts: 512
Woolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond reputeWoolly has a reputation beyond repute
Re: Team 1806's 2013 Code

Quote:
Originally Posted by Greg McKaskle View Post
I use compare more often than merge. I generally don't need to merge and instead just review that my changes make sense.

I attached an image of what diff looks like. The window on the bottom shows the description of the diff and the upper two windows are the two files with the objects selected and some items circled.

Greg McKaskle
Quote:
Originally Posted by Joe Ross View Post
Here's how to set up graphical diffing and merging for TortoiseSVN. It would be similar for other tools.

https://decibel.ni.com/content/docs/DOC-2936
Alright, there's actually a toolbar inside of labview for all that stuff, definately will be helpful for summer projects and next year. Thanks!

Quote:
Originally Posted by bumblebee3339 View Post
Is there a way to download it without the SVN?
Here's a rar file of it! http://2013swat-robot-code.googlecod...lds%202013.rar
__________________


Team 1806 Student: 2012-2013 | Mentor: 2013-Present
Closed Thread


Thread Tools
Display Modes Rate This Thread
Rate This Thread:

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

vB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Forum Jump


All times are GMT -5. The time now is 03:05.

The Chief Delphi Forums are sponsored by Innovation First International, Inc.


Powered by vBulletin® Version 3.6.4
Copyright ©2000 - 2017, Jelsoft Enterprises Ltd.
Copyright © Chief Delphi