Closed evinugur closed 10 years ago
So would it be easier to make a new branch now and re-enter some of the changes, or try to merge all the upstream changes not related to CAN?
It will be easier if we make a new branch from the latest master and work from there. I think we should do it at tonight's meeting to lower the risk of any one person making a mistake (having 2 or 3 sets of eyes on something is nice)
I understand the CAN stuff needs to be removed from data sending, but a lot of other modifications to DataSending were made that do not pertain to this hardware swap at all. Tonight we only should make changes that are 100% critical to this hardware swap.
On Wed, May 7, 2014 at 6:28 AM, Willard Wider notifications@github.comwrote:
So would it be easier to make a new branch now and re-enter some of the changes, or try to merge all the upstream changes not related to CAN?
— Reply to this email directly or view it on GitHubhttps://github.com/FRCTeam1073-TheForceTeam/robot14/issues/17#issuecomment-42411364 .
Evin Ugur http://evinugur.com
I'll lend a hand with that. There are a lot of important changes that we made that aren't present in Willie's code. Much of the changes with the hardware update are robot builder stuff so it shouldn't be too involved.
Jeremy I just texted you to come to cav block, Willie and I have started working.
I wrapped Victor together with WPILibExtension's Invertable to create a SmartVictor per Mr. Cowan and Greg's request for Inversion, although nowhere in robot14 did we ever call Invert on a SmartCANJaguar obejct. (it is still handy to have)
Willie and I are going to start off a fresh branch of master (with a submod index to the new WPILibExtensions with the SmartVictor) and patch in only the needed parts of the Victor code.
The test board has been finished by Alex too.
See you all tonight.
On Wed, May 7, 2014 at 9:09 AM, jeremy97 notifications@github.com wrote:
I'll lend a hand with that. There are a lot of important changes that we made that aren't present in Willie's code. Much of the changes with the hardware update are robot builder stuff so it shouldn't be too involved.
— Reply to this email directly or view it on GitHubhttps://github.com/FRCTeam1073-TheForceTeam/robot14/issues/17#issuecomment-42424293 .
Evin Ugur http://evinugur.com
@Willster419 can you please provide us with a status update about the bot
Sure. The robot is not back together fully; the shooter is not on. However, everything that is on the robot right now is working %100. The victors were calibrated and now work great on the robot. In high gear, we had it push against the wall for a solid 5 seconds, and nothing faulted or tripped. It is fully capable of full forward to full reverse, and strafes at more than 3ft/sec without problems. The arm Jaguar also works as intended. The code in the WPIBattlecry branch is exactly what is on the robot. The plan is that mechanical will put the shooter on Monday, and it will be ready for a full systems test by 8:00.
That's great. I'll be there because of 2015 VP interviews anyway, but I'll see you then. If everything is good we should merge the code into master and call it a day.
In the meantime, I've added some content to our trello for the post-season meetings.
https://trello.com/b/HWx0Nqct/1073-software
On Sun, May 11, 2014 at 12:42 PM, Willard Wider notifications@github.comwrote:
Sure. The robot is not back together fully; the shooter is not on. However, everything that is on the robot right now is working %100. The victors were calibrated and now work great on the robot. In high gear, we had it push against the wall for a solid 5 seconds, and nothing faulted or tripped. It is fully capable of full forward to full reverse, and strafes at more than 3ft/sec without problems. The arm Jaguar also works as intended. The code in the WPIBattlecry branch is exactly what is on the robot. The plan is that mechanical will put the shooter on Monday, and it will be ready for a full systems test by 8:00.
— Reply to this email directly or view it on GitHubhttps://github.com/FRCTeam1073-TheForceTeam/robot14/issues/17#issuecomment-42775644 .
Evin Ugur http://evinugur.com
Willie this is a good start. Here are some thoughts on the code that's been written so far.
After talking with most of the leads we reached the conclusion that this code will not be put on Atlus and the hardware will not be updated for WPI BattleCry unless we can get the code running on a test board (which will be built for Wednesday meeting, and have the Software working on it by Thursday's Cav Block). We simply don't have much time and this project requires mechanical updates and testing after the new hardware is put on which also is time consuming.
The test board will have the following:
PWMMode
is 31 commits behind master. This is likely missing some competition code and will set us back down the line when we merge over stuff that uses CAN. Fetching master from the upstream will patch the changes from competition but will still present an issue with merging considering we overwrote over many large blocks of code. Since the changes should be relatively small it might just be cleaner git wise to start with a fresh branch off master and manually patch in the few blocks of code to get the robot running with the new hardware.