Updates nupkg files, and updates templates

ThadHouse · ThadHouse · commit 0338e05063f4 · 2015-12-31T19:25:47.000-08:00
All templates Tested and working, except for the MonoGame one.
diff --git a/FRC-Extension/FRC-Extension.csproj b/FRC-Extension/FRC-Extension.csproj
@@ -213,16 +213,19 @@
     <Content Include="LICENSE.txt">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\FRC.NetworkTables.2016.0.0.97.nupkg">
+    <Content Include="packages\monogame.framework.windowsdx.3.4.0.459.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\FRC.WPILib.2016.0.0.29.nupkg">
+    <Content Include="packages\FRC.NetworkTables.2016.0.0.146.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\FRC.WPILib.Extras.2016.0.0.29.nupkg">
+    <Content Include="packages\FRC.Simulators.MonoGameSimulator.2016.0.0.4.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\monogame.framework.windowsdx.3.4.0.459.nupkg">
+    <Content Include="packages\FRC.WPILib.2016.0.0.245.nupkg">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="packages\FRC.WPILib.Extras.2016.0.0.245.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="source.extension.vsixmanifest">
diff --git a/FRC-Extension/packages/FRC.NetworkTables.2016.0.0.146.nupkg b/FRC-Extension/packages/FRC.NetworkTables.2016.0.0.146.nupkg
diff --git a/FRC-Extension/packages/FRC.NetworkTables.2016.0.0.97.nupkg b/FRC-Extension/packages/FRC.NetworkTables.2016.0.0.97.nupkg
diff --git a/FRC-Extension/packages/FRC.Simulators.MonoGameSimulator.2016.0.0.4.nupkg b/FRC-Extension/packages/FRC.Simulators.MonoGameSimulator.2016.0.0.4.nupkg
diff --git a/FRC-Extension/packages/FRC.WPILib.2016.0.0.245.nupkg b/FRC-Extension/packages/FRC.WPILib.2016.0.0.245.nupkg
diff --git a/FRC-Extension/packages/FRC.WPILib.2016.0.0.29.nupkg b/FRC-Extension/packages/FRC.WPILib.2016.0.0.29.nupkg
diff --git a/FRC-Extension/packages/FRC.WPILib.Extras.2016.0.0.245.nupkg b/FRC-Extension/packages/FRC.WPILib.Extras.2016.0.0.245.nupkg
diff --git a/FRC-Extension/packages/FRC.WPILib.Extras.2016.0.0.29.nupkg b/FRC-Extension/packages/FRC.WPILib.Extras.2016.0.0.29.nupkg
diff --git a/FRC-Extension/source.extension.vsixmanifest b/FRC-Extension/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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">
   <Metadata>
-    <Identity Id="FRC_Extension" Version="2015.10.10" Language="en-US" Publisher="RobotDotNet" />
+    <Identity Id="FRC_Extension" Version="2015.10.12" Language="en-US" Publisher="RobotDotNet" />
     <DisplayName>FRC Extension</DisplayName>
     <Description xml:space="preserve">A plugin for deploying DotNet code onto FRC Robots. Includes an Extension and Templates.</Description>
     <License>LICENSE.txt</License>
diff --git a/Templates/CSharp/Project-Templates/AttributedCommandRobot/AttributedCommandRobot.vstemplate b/Templates/CSharp/Project-Templates/AttributedCommandRobot/AttributedCommandRobot.vstemplate
@@ -17,6 +17,7 @@
       <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="$safeprojectname$.cs" OpenInEditor="true">Robot.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true">Program.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true">RobotMap.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true">Commands/ExampleAutonomousCommand.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true">Commands/ExampleCommand.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true">Subsystems/ExampleSubsystem.cs</ProjectItem>
@@ -29,9 +30,9 @@
   <WizardData>
     <packages repository="extension"
           repositoryId="FRC_Extension">
-      <package id="FRC.WPILib" version="2016.0.0.29"/>
-      <package id="FRC.NetworkTables" version="2016.0.0.97"/>
-      <package id="FRC.WPILib.Extras" version="2016.0.0.29"/>
+      <package id="FRC.WPILib" version="2016.0.0.245"/>
+      <package id="FRC.NetworkTables" version="2016.0.0.146"/>
+      <package id="FRC.WPILib.Extras" version="2016.0.0.245"/>
     </packages>
   </WizardData>
 </VSTemplate>
diff --git a/Templates/CSharp/Project-Templates/AttributedCommandRobot/Commands/ExampleAutonomousCommand.cs b/Templates/CSharp/Project-Templates/AttributedCommandRobot/Commands/ExampleAutonomousCommand.cs
@@ -8,7 +8,7 @@ namespace $safeprojectname$.Commands
     [RunCommandAtPhaseStart(MatchPhase.Autonomous)]
     public class ExampleAutonomousCommand : Command
     {
-        public ExampleAutonomousCommand($safeprojectname$.Subsystems.ExampleSubsystem subsystem)
+        public ExampleAutonomousCommand(Subsystems.ExampleSubsystem subsystem)
         {
             Requires(subsystem);
         }
diff --git a/Templates/CSharp/Project-Templates/AttributedCommandRobot/Commands/ExampleCommand.cs b/Templates/CSharp/Project-Templates/AttributedCommandRobot/Commands/ExampleCommand.cs
@@ -5,7 +5,7 @@ namespace $safeprojectname$.Commands
 {
     public class ExampleCommand : Command
     {
-        public ExampleCommand($safeprojectname$.Subsystems.ExampleSubsystem subsystem)
+        public ExampleCommand(Subsystems.ExampleSubsystem subsystem)
         {
             Requires(subsystem);
         }
diff --git a/Templates/CSharp/Project-Templates/AttributedCommandRobot/ProjectTemplate.csproj b/Templates/CSharp/Project-Templates/AttributedCommandRobot/ProjectTemplate.csproj
@@ -54,9 +54,9 @@
     
     <Compile Include="RobotMap.cs"/>
     
-    <Compile Include="Subsystems\ExampleAutonomousSubsystem.cs" />
     <Compile Include="Subsystems\ExampleSubsystem.cs" />
     <Compile Include="Commands\ExampleCommand.cs" />
+    <Compile Include="Commands\ExampleAutonomousCommand.cs" />
 		<Compile Include="Properties\AssemblyInfo.cs" />
 	</ItemGroup>
 	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Templates/CSharp/Project-Templates/AttributedCommandRobot/Subsystems/ExampleSubsystem.cs b/Templates/CSharp/Project-Templates/AttributedCommandRobot/Subsystems/ExampleSubsystem.cs
@@ -4,7 +4,7 @@
 
 namespace $safeprojectname$.Subsystems
 {
-    [ExportSubsystem(DefaultCommandType = typeof($safeprojectname$.Commands.ExampleCommand))]
+    [ExportSubsystem(DefaultCommandType = typeof(Commands.ExampleCommand))]
     public class ExampleSubsystem : Subsystem
     {
         // Put methods for controlling this subsystem
diff --git a/Templates/CSharp/Project-Templates/CommandRobot/CommandRobot.vstemplate b/Templates/CSharp/Project-Templates/CommandRobot/CommandRobot.vstemplate
@@ -30,9 +30,9 @@
   <WizardData>
     <packages repository="extension"
           repositoryId="FRC_Extension">
-      <package id="FRC.WPILib" version="2016.0.0.29"/>
-      <package id="FRC.NetworkTables" version="2016.0.0.97"/>
-      <package id="FRC.WPILib.Extras" version="2016.0.0.29"/>
+      <package id="FRC.WPILib" version="2016.0.0.245"/>
+      <package id="FRC.NetworkTables" version="2016.0.0.146"/>
+      <package id="FRC.WPILib.Extras" version="2016.0.0.245"/>
     </packages>
   </WizardData>
 </VSTemplate>
diff --git a/Templates/CSharp/Project-Templates/CommandRobot/Robot.cs b/Templates/CSharp/Project-Templates/CommandRobot/Robot.cs
@@ -1,12 +1,12 @@
 ﻿using System;
 using System.Collections.Generic;
 $if$ ($targetframeworkversion$ >= 3.5)using System.Linq;
-$endif$
-using WPILib;
+$endif$using WPILib;
 using WPILib.Commands;
 using WPILib.LiveWindow;
-using $safeprojectname$.Subsystems
-using $safeprojectname$.Commands
+using WPILib.SmartDashboard;
+using $safeprojectname$.Subsystems;
+using $safeprojectname$.Commands;
 
 namespace $safeprojectname$
 {
@@ -34,11 +34,12 @@ public override void RobotInit()
             chooser = new SendableChooser();
             chooser.AddDefault("Default Auto", new ExampleCommand());
             //chooser.AddObject("My Auto", new MyAutoCommand);
+            SmartDashboard.PutData("Chooser", chooser);
         }
 	
 	    public override void DisabledPeriodic()
         {
-		    Scheduler.GetInstance().Run();
+		    Scheduler.Instance.Run();
 	    }
 
         // This autonomous (along with the sendable chooser above) shows how to select between
@@ -73,7 +74,7 @@ public override void AutonomousInit()
 
         // This function is called periodically during autonomous
         public override void AutonomousPeriodic() {
-            Scheduler.GetInstance().Run();
+            Scheduler.Instance.Run();
         }
 
         public override void TeleopInit() {
@@ -96,7 +97,7 @@ public override void DisabledInit(){
         // This function is called periodically during operator control
         //
         public override void TeleopPeriodic() {
-            Scheduler.GetInstance().Run();
+            Scheduler.Instance.Run();
         }
     
         //
diff --git a/Templates/CSharp/Project-Templates/IterativeRobot/IterativeRobot.vstemplate b/Templates/CSharp/Project-Templates/IterativeRobot/IterativeRobot.vstemplate
@@ -26,9 +26,9 @@
   <WizardData>
     <packages repository="extension"
           repositoryId="FRC_Extension">
-      <package id="FRC.WPILib" version="2016.0.0.29"/>
-      <package id="FRC.NetworkTables" version="2016.0.0.97"/>
-      <package id="FRC.WPILib.Extras" version="2016.0.0.29"/>
+      <package id="FRC.WPILib" version="2016.0.0.245"/>
+      <package id="FRC.NetworkTables" version="2016.0.0.146"/>
+      <package id="FRC.WPILib.Extras" version="2016.0.0.245"/>
     </packages>
   </WizardData>
 </VSTemplate>
diff --git a/Templates/CSharp/Project-Templates/IterativeRobot/Robot.cs b/Templates/CSharp/Project-Templates/IterativeRobot/Robot.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Collections.Generic;
 $if$ ($targetframeworkversion$ >= 3.5)using System.Linq;
-$endif$
-using WPILib;
+$endif$using WPILib;
+using WPILib.SmartDashboard;
 
 namespace $safeprojectname$
 {
@@ -13,8 +13,8 @@ namespace $safeprojectname$
     /// </summary>
     public class $safeprojectname$ : IterativeRobot
     {
-        readonly string defaultAuto = "Default";
-        readonly string customAuto = "My Auto";
+        const string defaultAuto = "Default";
+        const string customAuto = "My Auto";
         string autoSelected;
         SendableChooser chooser;
 
@@ -27,6 +27,7 @@ public override void RobotInit()
             chooser = new SendableChooser();
             chooser.AddDefault("Default Auto", defaultAuto);
             chooser.AddObject("My Auto", customAuto);
+            SmartDashboard.PutData("Chooser", chooser);
         }
 
         // This autonomous (along with the sendable chooser above) shows how to select between
diff --git a/Templates/CSharp/Project-Templates/LabVIEWRobot/LabVIEWRobot.vstemplate b/Templates/CSharp/Project-Templates/LabVIEWRobot/LabVIEWRobot.vstemplate
@@ -26,9 +26,9 @@
   <WizardData>
     <packages repository="extension"
           repositoryId="FRC_Extension">
-      <package id="FRC.WPILib" version="2016.0.0.29"/>
-      <package id="FRC.NetworkTables" version="2016.0.0.97"/>
-      <package id="FRC.WPILib.Extras" version="2016.0.0.29"/>
+      <package id="FRC.WPILib" version="2016.0.0.245"/>
+      <package id="FRC.NetworkTables" version="2016.0.0.146"/>
+      <package id="FRC.WPILib.Extras" version="2016.0.0.245"/>
     </packages>
   </WizardData>
 </VSTemplate>
diff --git a/Templates/CSharp/Project-Templates/LabVIEWRobot/Robot.cs b/Templates/CSharp/Project-Templates/LabVIEWRobot/Robot.cs
@@ -1,8 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 $if$ ($targetframeworkversion$ >= 3.5)using System.Linq;
-$endif$
-using WPILib;
+$endif$using WPILib;
 using WPILib.Extras;
 
 namespace $safeprojectname$
diff --git a/Templates/CSharp/Project-Templates/SampleRobot/Robot.cs b/Templates/CSharp/Project-Templates/SampleRobot/Robot.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 $if$ ($targetframeworkversion$ >= 3.5)using System.Linq;
 $endif$using WPILib;
+using WPILib.SmartDashboard;
 
 namespace $safeprojectname$
 {
@@ -23,8 +24,9 @@ public class $safeprojectname$ : SampleRobot
     {
         RobotDrive myRobot;
         Joystick stick;
-        readonly string defaultAuto = "Default";
-        readonly string customAuto = "My Auto";
+        const string defaultAuto = "Default";
+        const string customAuto = "My Auto";
+        string autoSelected;
         SendableChooser chooser; 
 
 
@@ -35,11 +37,12 @@ public class $safeprojectname$ : SampleRobot
             stick = new Joystick(0);
         }
 
-        public override void RobotInit()
+        protected override void RobotInit()
         {
             chooser = new SendableChooser();
             chooser.AddDefault("Default Auto", defaultAuto);
             chooser.AddObject("My Auto", customAuto);
+            SmartDashboard.PutData("Chooser", chooser);
         }
 
         // This autonomous (along with the sendable chooser above) shows how to select between
diff --git a/Templates/CSharp/Project-Templates/SampleRobot/SampleRobot.vstemplate b/Templates/CSharp/Project-Templates/SampleRobot/SampleRobot.vstemplate
@@ -26,9 +26,9 @@
   <WizardData>
     <packages repository="extension"
           repositoryId="FRC_Extension">
-      <package id="FRC.WPILib" version="2016.0.0.29"/>
-      <package id="FRC.NetworkTables" version="2016.0.0.97"/>
-      <package id="FRC.WPILib.Extras" version="2016.0.0.29"/>
+      <package id="FRC.WPILib" version="2016.0.0.245"/>
+      <package id="FRC.NetworkTables" version="2016.0.0.146"/>
+      <package id="FRC.WPILib.Extras" version="2016.0.0.245"/>
     </packages>
   </WizardData>
 </VSTemplate>
diff --git a/Templates/CSharp/Project-Templates/WindowsMonoGameSimulator/WindowsMonoGameSimulator.vstemplate b/Templates/CSharp/Project-Templates/WindowsMonoGameSimulator/WindowsMonoGameSimulator.vstemplate
@@ -33,11 +33,11 @@
   <WizardData>
     <packages repository="extension"
           repositoryId="FRC_Extension">
-      <package id="FRC.WPILib" version="2016.0.0.29"/>
-      <package id="FRC.NetworkTables" version="2016.0.0.97"/>
-      <package id="FRC.WPILib.Extras" version="2016.0.0.29"/>
+      <package id="FRC.WPILib" version="2016.0.0.245"/>
+      <package id="FRC.NetworkTables" version="2016.0.0.146"/>
+      <package id="FRC.WPILib.Extras" version="2016.0.0.245"/>
       <package id="monogame.framework.windowsdx" version="3.4.0.459"/>
-      <!--TODO Include MonoGame Simulator Package.-->
+      <package id="FRC.Simulators.MonoGameSimulator" version="2016.0.0.4"/>
     </packages>
   </WizardData>
 </VSTemplate>
diff --git a/Templates/VisualBasic/Project-Templates/IterativeRobotVB/IterativeRobotVB.vstemplate b/Templates/VisualBasic/Project-Templates/IterativeRobotVB/IterativeRobotVB.vstemplate
@@ -26,8 +26,9 @@
   <WizardData>
     <packages repository="extension"
           repositoryId="FRC_Extension">
-      <package id="FRC.WPILib" version="2016.0.0.29"/>
-      <package id="FRC.NetworkTables" version="2016.0.0.97"/>
+      <package id="FRC.WPILib" version="2016.0.0.245"/>
+      <package id="FRC.WPILib.Extras" version="2016.0.0.245"/>
+      <package id="FRC.NetworkTables" version="2016.0.0.146"/>
     </packages>
   </WizardData>
 </VSTemplate>
diff --git a/Templates/VisualBasic/Project-Templates/IterativeRobotVB/Robot.vb b/Templates/VisualBasic/Project-Templates/IterativeRobotVB/Robot.vb
@@ -1,4 +1,5 @@
 ﻿Imports WPILib
+Imports WPILib.SmartDashboard
 
 ''' <summary>
 ''' The VM is configured to automatically run this class, and to call the
@@ -8,33 +9,62 @@
 Public Class $safeprojectname$
     Inherits IterativeRobot
 
+    Const defaultAuto As String = "Default"
+    Const customAuto As String = "My Auto"
+    Dim autoSelected As String
+    Dim chooser As SendableChooser
+
     ''' <summary>
     ''' This function is run when the robot is first started up and should be used
     ''' for any initialization code.
     ''' </summary>
     Public Overrides Sub RobotInit()
-        
+        chooser = New SendableChooser()
+        chooser.AddDefault("Default Auto", defaultAuto)
+        chooser.AddObject("My Auto", customAuto)
+        SmartDashboard.PutData("Chooser", chooser)
+    End Sub
+
+    '' This autonomous (along with the sendable chooser above) shows how to select between
+    '' different autonomous modes using the dashboard. The senable chooser code works with
+    '' the Java SmartDashboard. If you prefer the LabVIEW Dashboard, remove all the chooser
+    '' code an uncomment the GetString code to get the uto name from the text box below
+    '' the gyro.
+    '' You can add additional auto modes by adding additional comparisons to the switch
+    '' structure below with additional strings. If using the SendableChooser
+    '' be sure to add them to the chooser code above as well.
+    Public Overrides Sub AutonomousInit()
+        autoSelected = CType(chooser.GetSelected(), String)
+        ''autoSelected = SmartDashboard.GetString("Auto Selector", defaultAuto)
+        Console.WriteLine("Auto selected: " + autoSelected)
     End Sub
 
     ''' <summary>
     ''' This function is called periodically during autonomous
     ''' </summary>
     Public Overrides Sub AutonomousPeriodic()
-        
+        Select Case autoSelected
+            Case customAuto
+            '' Put custom auto code here
+            Case Else
+            '' put default auto code here
+            
+        End Select
+            
     End Sub
 
     ''' <summary>
     ''' This function is called periodically during operator control
     ''' </summary>
     Public Overrides Sub TeleopPeriodic()
-        
+
     End Sub
 
     ''' <summary>
     ''' This function is called periodically during test mode
     ''' </summary>
     Public Overrides Sub TestPeriodic()
-        
+
     End Sub
 
 End Class
