From 942011dcf54bbba5cc05084013457e0548fdb905 Mon Sep 17 00:00:00 2001 From: Adam Long Date: Fri, 20 Mar 2015 09:03:48 +0000 Subject: [PATCH] Updated 'make deploy' to automatically restart robot code on successful deploy --- DentRobot.cpp | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DentRobot.cpp b/DentRobot.cpp index a9425af..9908499 100644 --- a/DentRobot.cpp +++ b/DentRobot.cpp @@ -29,7 +29,7 @@ void DentRobot::RobotInit(){ // Amount of time to collect a tote SmartDashboard::PutNumber("DriveTime", 1.3); // Sequence of autonomous command - SmartDashboard::PutNumber("Auto Sequence", 4.0); + SmartDashboard::PutNumber("Auto Sequence", 9.0); SmartDashboard::PutNumber("Auto Wait Time", 0.5); // If the robot will be picking up three totes in sequence 3 SmartDashboard::PutBoolean("Two totes", false); diff --git a/Makefile b/Makefile index 37d9756..8ff9eda 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ clean: $(CLEANSER) $(OBJECTS) bin/FRCUserProgram deploy: - @$(READER) bin/FRCUserProgram | ssh admin@$(REMOTEIP) '(rm /home/lvuser/FRCUserProgram) /home/lvuser/FRCUserProgram;chmod a+x /home/lvuser/FRCUserProgram' + @$(READER) bin/FRCUserProgram | ssh admin@$(REMOTEIP) '(rm /home/lvuser/FRCUserProgram) /home/lvuser/FRCUserProgram;chmod a+x /home/lvuser/FRCUserProgram && /usr/local/frc/bin/frcKillRobot.sh -r -t' debug: @$(READER) bin/FRCUserProgram | ssh admin@$(REMOTEIP) '(rm /home/lvuser/FRCUserProgram) /home/lvuser/FRCUserProgram;chmod a+x /home/lvuser/FRCUserProgram;/home/lvuser/run.sh'