diff --git a/shared/examplecheck.gradle b/shared/examplecheck.gradle index ba6d581359..4e7bdc2be5 100644 --- a/shared/examplecheck.gradle +++ b/shared/examplecheck.gradle @@ -34,6 +34,7 @@ task checkTemplates(type: Task) { assert it.tags != null assert it.foldername != null assert it.gradlebase != null + assert it.commandversion != null if (it.gradlebase == 'java') { assert it.mainclass != null } @@ -51,6 +52,7 @@ task checkExamples(type: Task) { assert it.tags != null assert it.foldername != null assert it.gradlebase != null + assert it.commandversion != null if (it.gradlebase == 'java') { assert it.mainclass != null } diff --git a/wpilibNewCommands/WPILibNewCommands.json b/wpilibNewCommands/WPILibNewCommands.json new file mode 100644 index 0000000000..9a22dbdbdd --- /dev/null +++ b/wpilibNewCommands/WPILibNewCommands.json @@ -0,0 +1,37 @@ +{ + "fileName": "WPILibNewCommands.json", + "name": "WPILib-New-Commands", + "version": "2020.0.0", + "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266", + "mavenUrls": [], + "jsonUrl": "", + "javaDependencies": [ + { + "groupId": "edu.wpi.first.wpilibNewCommands", + "artifactId": "wpilibNewCommands-java", + "version": "wpilib" + } + ], + "jniDependencies": [], + "cppDependencies": [ + { + "groupId": "edu.wpi.first.wpilibNewCommands", + "artifactId": "wpilibNewCommands-cpp", + "version": "wpilib", + "libName": "wpilibNewCommands", + "headerClassifier": "headers", + "sourcesClassifier": "sources", + "sharedLibrary": true, + "skipInvalidPlatforms": true, + "binaryPlatforms": [ + "linuxathena", + "linuxraspbian", + "linuxaarch64bionic", + "windowsx86-64", + "windowsx86", + "linuxx86-64", + "osxx86-64" + ] + } + ] +} diff --git a/wpilibOldCommands/WPILibOldCommands.json b/wpilibOldCommands/WPILibOldCommands.json new file mode 100644 index 0000000000..f9fbc4da7a --- /dev/null +++ b/wpilibOldCommands/WPILibOldCommands.json @@ -0,0 +1,37 @@ +{ + "fileName": "WPILibOldCommands.json", + "name": "WPILib-Old-Commands", + "version": "2020.0.0", + "uuid": "b066afc2-5c18-43c4-b758-43381fcb275e", + "mavenUrls": [], + "jsonUrl": "", + "javaDependencies": [ + { + "groupId": "edu.wpi.first.wpilibOldCommands", + "artifactId": "wpilibOldCommands-java", + "version": "wpilib" + } + ], + "jniDependencies": [], + "cppDependencies": [ + { + "groupId": "edu.wpi.first.wpilibOldCommands", + "artifactId": "wpilibOldCommands-cpp", + "version": "wpilib", + "libName": "wpilibOldCommands", + "headerClassifier": "headers", + "sourcesClassifier": "sources", + "sharedLibrary": true, + "skipInvalidPlatforms": true, + "binaryPlatforms": [ + "linuxathena", + "linuxraspbian", + "linuxaarch64bionic", + "windowsx86-64", + "windowsx86", + "linuxx86-64", + "osxx86-64" + ] + } + ] +} diff --git a/wpilibcExamples/src/main/cpp/examples/examples.json b/wpilibcExamples/src/main/cpp/examples/examples.json index 38f27bbe5b..894080e3a2 100644 --- a/wpilibcExamples/src/main/cpp/examples/examples.json +++ b/wpilibcExamples/src/main/cpp/examples/examples.json @@ -9,7 +9,8 @@ "Complete List" ], "foldername": "MotorControl", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Motor Control With Encoder", @@ -23,7 +24,8 @@ "Complete List" ], "foldername": "MotorControlEncoder", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Relay", @@ -34,7 +36,8 @@ "Complete List" ], "foldername": "Relay", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "PDP CAN Monitoring", @@ -45,7 +48,8 @@ "Sensors" ], "foldername": "CANPDP", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Solenoids", @@ -57,7 +61,8 @@ "Complete List" ], "foldername": "Solenoid", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Encoder", @@ -68,7 +73,8 @@ "Sensors" ], "foldername": "Encoder", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Arcade Drive", @@ -80,7 +86,8 @@ "Complete List" ], "foldername": "ArcadeDrive", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Mecanum Drive", @@ -92,7 +99,8 @@ "Complete List" ], "foldername": "MecanumDrive", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Ultrasonic", @@ -104,7 +112,8 @@ "Analog" ], "foldername": "Ultrasonic", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "UltrasonicPID", @@ -116,7 +125,8 @@ "Analog" ], "foldername": "UltrasonicPID", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Gyro", @@ -129,7 +139,8 @@ "Joystick" ], "foldername": "Gyro", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Gyro Mecanum", @@ -142,7 +153,8 @@ "Joysitck" ], "foldername": "GyroMecanum", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "HID Rumble", @@ -151,7 +163,8 @@ "Joystick" ], "foldername": "HidRumble", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "PotentiometerPID", @@ -164,7 +177,8 @@ "Analog" ], "foldername": "PotentiometerPID", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Elevator with trapezoid profiled PID", @@ -176,7 +190,8 @@ "Joystick" ], "foldername": "ElevatorTrapezoidProfile", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Elevator with profiled PID controller", @@ -188,7 +203,8 @@ "Joystick" ], "foldername": "ElevatorProfiledPID", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Getting Started", @@ -198,7 +214,8 @@ "Complete List" ], "foldername": "GettingStarted", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Simple Vision", @@ -208,7 +225,8 @@ "Complete List" ], "foldername": "QuickVision", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Intermediate Vision", @@ -218,7 +236,8 @@ "Complete List" ], "foldername": "IntermediateVision", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Axis Camera Sample", @@ -228,7 +247,8 @@ "Complete List" ], "foldername": "AxisCameraSample", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "GearsBot", @@ -238,7 +258,8 @@ "Complete List" ], "foldername": "GearsBot", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "PacGoat", @@ -248,7 +269,8 @@ "Complete List" ], "foldername": "PacGoat", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "HAL", @@ -257,7 +279,8 @@ "HAL" ], "foldername": "HAL", - "gradlebase": "c" + "gradlebase": "c", + "commandversion": 1 }, { "name": "ShuffleBoard", @@ -266,7 +289,8 @@ "ShuffleBoard" ], "foldername": "ShuffleBoard", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "'Traditional' Hatchbot", @@ -276,7 +300,8 @@ "Command-based" ], "foldername": "HatchbotTraditional", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "'Inlined' Hatchbot", @@ -287,7 +312,8 @@ "Lambdas" ], "foldername": "HatchbotInlined", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "Select Command Example", @@ -296,7 +322,8 @@ "Command-based" ], "foldername": "SelectCommand", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "Scheduler Event Logging", @@ -306,7 +333,8 @@ "Shuffleboard" ], "foldername": "SchedulerEventLogging", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "Frisbeebot", @@ -316,7 +344,8 @@ "PID" ], "foldername": "Frisbeebot", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "Gyro Drive Commands", @@ -327,7 +356,8 @@ "Gyro" ], "foldername": "GyroDriveCommands", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "SwerveBot", @@ -336,7 +366,8 @@ "SwerveBot" ], "foldername": "SwerveBot", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "MecanumBot", @@ -345,7 +376,8 @@ "MecanumBot" ], "foldername": "MecanumBot", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "DifferentialDriveBot", @@ -354,7 +386,8 @@ "DifferentialDriveBot" ], "foldername": "DifferentialDriveBot", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 }, { "name": "RamseteCommand", @@ -367,6 +400,7 @@ "Path following" ], "foldername": "RamseteCommand", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 } ] diff --git a/wpilibcExamples/src/main/cpp/templates/templates.json b/wpilibcExamples/src/main/cpp/templates/templates.json index c220fbc3d0..89ff989208 100644 --- a/wpilibcExamples/src/main/cpp/templates/templates.json +++ b/wpilibcExamples/src/main/cpp/templates/templates.json @@ -6,7 +6,8 @@ "Timed" ], "foldername": "timed", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Timed Skeleton (Advanced)", @@ -15,7 +16,8 @@ "Timed", "Skeleton" ], "foldername": "timedskeleton", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "RobotBase Skeleton (Advanced)", @@ -24,7 +26,8 @@ "RobotBase", "Skeleton" ], "foldername": "robotbaseskeleton", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 1 }, { "name": "Command Robot", @@ -33,6 +36,7 @@ "Command" ], "foldername": "commandbased", - "gradlebase": "cpp" + "gradlebase": "cpp", + "commandversion": 2 } ] diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json index af1b54ab60..54fa283dea 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json @@ -7,7 +7,8 @@ ], "foldername": "gettingstarted", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Tank Drive", @@ -20,7 +21,8 @@ ], "foldername": "tankdrive", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Arcade Drive", @@ -30,7 +32,8 @@ ], "foldername": "arcadedrive", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Mecanum Drive", @@ -43,7 +46,8 @@ ], "foldername": "mecanumdrive", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "PDP CAN Monitoring", @@ -55,7 +59,8 @@ ], "foldername": "canpdp", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Solenoids", @@ -68,7 +73,8 @@ ], "foldername": "solenoid", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Encoder", @@ -80,7 +86,8 @@ ], "foldername": "encoder", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Relay", @@ -92,7 +99,8 @@ ], "foldername": "relay", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Ultrasonic", @@ -104,7 +112,8 @@ ], "foldername": "ultrasonic", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Ultrasonic PID", @@ -116,7 +125,8 @@ ], "foldername": "ultrasonicpid", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Potentiometer PID", @@ -129,7 +139,8 @@ ], "foldername": "potentiometerpid", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Elevator with trapezoid profiled PID", @@ -142,7 +153,8 @@ ], "foldername": "elevatortrapezoidprofile", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Elevator with profiled PID controller", @@ -155,7 +167,8 @@ ], "foldername": "elevatorprofiledpid", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Gyro", @@ -168,7 +181,8 @@ ], "foldername": "gyro", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Gyro Mecanum", @@ -181,7 +195,8 @@ ], "foldername": "gyromecanum", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "HID Rumble", @@ -191,7 +206,8 @@ ], "foldername": "hidrumble", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Motor Controller", @@ -203,7 +219,8 @@ ], "foldername": "motorcontrol", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Motor Control With Encoder", @@ -217,8 +234,9 @@ "Complete List" ], "foldername": "motorcontrolencoder", - "gradlebase": "java" - ,"mainclass": "Main" + "gradlebase": "java", + "mainclass": "Main", + "commandversion": 1 }, { "name": "GearsBot", @@ -228,7 +246,8 @@ ], "foldername": "gearsbot", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "PacGoat", @@ -238,7 +257,8 @@ ], "foldername": "pacgoat", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Simple Vision", @@ -249,7 +269,8 @@ ], "foldername": "quickvision", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Intermediate Vision", @@ -260,7 +281,8 @@ ], "foldername": "intermediatevision", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Axis Camera Sample", @@ -270,7 +292,8 @@ ], "foldername": "axiscamera", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Shuffleboard Sample", @@ -281,7 +304,8 @@ ], "foldername": "shuffleboard", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "'Traditional' Hatchbot", @@ -292,7 +316,8 @@ ], "foldername": "hatchbottraditional", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "'Inlined' Hatchbot", @@ -304,7 +329,8 @@ ], "foldername": "hatchbotinlined", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "Select Command Example", @@ -314,7 +340,8 @@ ], "foldername": "selectcommand", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "Scheduler Event Logging", @@ -325,7 +352,8 @@ ], "foldername": "schedulereventlogging", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "Frisbeebot", @@ -336,7 +364,8 @@ ], "foldername": "frisbeebot", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "Gyro Drive Commands", @@ -348,7 +377,8 @@ ], "foldername": "gyrodrivecommands", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "SwerveBot", @@ -358,7 +388,8 @@ ], "foldername": "swervebot", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "MecanumBot", @@ -368,7 +399,8 @@ ], "foldername": "mecanumbot", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "DifferentialDriveBot", @@ -378,7 +410,8 @@ ], "foldername": "differentialdrivebot", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 }, { "name": "RamseteCommand", @@ -392,6 +425,7 @@ ], "foldername": "ramsetecommand", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 } ] diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json index ded6e3d079..e909b0ac71 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json @@ -7,7 +7,8 @@ ], "foldername": "timed", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Timed Skeleton (Advanced)", @@ -17,7 +18,8 @@ ], "foldername": "timedskeleton", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "RobotBase Skeleton (Advanced)", @@ -27,7 +29,8 @@ ], "foldername": "robotbaseskeleton", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 1 }, { "name": "Command Robot", @@ -37,6 +40,7 @@ ], "foldername": "commandbased", "gradlebase": "java", - "mainclass": "Main" + "mainclass": "Main", + "commandversion": 2 } ]