Skip to content

Commit afd115f

Browse files
committed
Fixes Deploy hang, and moves version back to 2015
That way when 2016 comes at kickoff, 2016.0.0 will be upgraded from properly.
1 parent bc1879a commit afd115f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

FRC-Extension/RoboRIOCode/DeployManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ public async Task UploadCode(string robotName, SettingsPageGrid page, bool debug
294294
}
295295

296296
//Must be run as admin, so is seperate
297-
await RoboRIOConnection.RunCommand("killall netconsole-host", ConnectionUser.Admin);
297+
await RoboRIOConnection.RunCommand("killall -q netconsole-host || :", ConnectionUser.Admin);
298298

299299
//Combining all other commands, since they should be safe running together.
300300
List<string> commands = new List<string>();

FRC-Extension/RoboRIOCode/DeployProperties.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ public static class DeployProperties
1313
public const string DeployDir = "/home/lvuser/mono";
1414
public static readonly string[] DeployKillCommand =
1515
{
16-
"[ ! -f /var/local/natinst/log/FRC_UserProgram.log ] || rm -f /var/local/natinst/log/FRC_UserProgram.log",
17-
$"chown -R lvuser:ni {DeployDir}",
18-
". /etc/profile.d/natinst-path.sh",
19-
"/usr/local/frc/bin/frcKillRobot.sh -t -r"
16+
//"[ ! -f /var/local/natinst/log/FRC_UserProgram.log ] || rm -f /var/local/natinst/log/FRC_UserProgram.log",
17+
//$"chown -R lvuser:ni {DeployDir}",
18+
". /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t -r",
19+
//"/usr/local/frc/bin/frcKillRobot.sh -t -r"
2020
};
2121

2222
public const string DebugFlagDir = "/tmp/";

FRC-Extension/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="FRC_Extension" Version="2016.0.0" Language="en-US" Publisher="RobotDotNet" />
4+
<Identity Id="FRC_Extension" Version="2015.10.10" Language="en-US" Publisher="RobotDotNet" />
55
<DisplayName>FRC Extension</DisplayName>
66
<Description xml:space="preserve">A plugin for deploying DotNet code onto FRC Robots. Includes an Extension and Templates.</Description>
77
<License>LICENSE.txt</License>

0 commit comments

Comments
 (0)