2
0
mirror of https://github.com/team2059/Dent synced 2024-12-18 20:52:29 -05:00

Updated 'make deploy' to automatically restart robot code on successful deploy

This commit is contained in:
Adam Long 2015-03-20 09:03:48 +00:00
parent ad725fc065
commit 942011dcf5
2 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@ void DentRobot::RobotInit(){
// Amount of time to collect a tote // Amount of time to collect a tote
SmartDashboard::PutNumber("DriveTime", 1.3); SmartDashboard::PutNumber("DriveTime", 1.3);
// Sequence of autonomous command // Sequence of autonomous command
SmartDashboard::PutNumber("Auto Sequence", 4.0); SmartDashboard::PutNumber("Auto Sequence", 9.0);
SmartDashboard::PutNumber("Auto Wait Time", 0.5); SmartDashboard::PutNumber("Auto Wait Time", 0.5);
// If the robot will be picking up three totes in sequence 3 // If the robot will be picking up three totes in sequence 3
SmartDashboard::PutBoolean("Two totes", false); SmartDashboard::PutBoolean("Two totes", false);

View File

@ -20,7 +20,7 @@ clean:
$(CLEANSER) $(OBJECTS) bin/FRCUserProgram $(CLEANSER) $(OBJECTS) bin/FRCUserProgram
deploy: deploy:
@$(READER) bin/FRCUserProgram | ssh admin@$(REMOTEIP) '(rm /home/lvuser/FRCUserProgram)</dev/null;cat > /home/lvuser/FRCUserProgram;chmod a+x /home/lvuser/FRCUserProgram' @$(READER) bin/FRCUserProgram | ssh admin@$(REMOTEIP) '(rm /home/lvuser/FRCUserProgram)</dev/null;cat > /home/lvuser/FRCUserProgram;chmod a+x /home/lvuser/FRCUserProgram && /usr/local/frc/bin/frcKillRobot.sh -r -t'
debug: debug:
@$(READER) bin/FRCUserProgram | ssh admin@$(REMOTEIP) '(rm /home/lvuser/FRCUserProgram)</dev/null;cat > /home/lvuser/FRCUserProgram;chmod a+x /home/lvuser/FRCUserProgram;/home/lvuser/run.sh' @$(READER) bin/FRCUserProgram | ssh admin@$(REMOTEIP) '(rm /home/lvuser/FRCUserProgram)</dev/null;cat > /home/lvuser/FRCUserProgram;chmod a+x /home/lvuser/FRCUserProgram;/home/lvuser/run.sh'