diff --git a/LabVIEW/Velocity Closed Loop Control/2019 roboRIO Project.aliases b/LabVIEW/Velocity Closed Loop Control/2019 roboRIO Project.aliases deleted file mode 100644 index d4db8e6..0000000 --- a/LabVIEW/Velocity Closed Loop Control/2019 roboRIO Project.aliases +++ /dev/null @@ -1,6 +0,0 @@ -[My Computer] -My Computer = "10.2.69.32" - -[Target] -Target = "172.22.11.2" - diff --git a/LabVIEW/Velocity Closed Loop Control/Periodic Tasks.vi b/LabVIEW/Velocity Closed Loop Control/Periodic Tasks.vi index fe05e77..ce09794 100644 Binary files a/LabVIEW/Velocity Closed Loop Control/Periodic Tasks.vi and b/LabVIEW/Velocity Closed Loop Control/Periodic Tasks.vi differ diff --git a/LabVIEW/Velocity Closed Loop Control/README.md b/LabVIEW/Velocity Closed Loop Control/README.md index 9b2f760..818514d 100644 --- a/LabVIEW/Velocity Closed Loop Control/README.md +++ b/LabVIEW/Velocity Closed Loop Control/README.md @@ -1,4 +1,13 @@ ## Running -In this example, velocity is set and read in Periodic Tasks.vi +Open "Robot Main.vi" and run. + +Set desired velocity using sliders and upate tuning constants as needed. + +Review "Begin.vi" and "Periodic Tasks.vi" for initialization and control of Spark Max. + +This example uses the followng CAN Ids. These are used in "Begin.vi" + + - Left = 1 + - Right = 2 ![alt text](https://github.com/REVrobotics/SPARK-MAX-Examples/blob/master/LabVIEW/Velocity%20Closed%20Loop%20Control/Output.PNG "Output") diff --git a/LabVIEW/Velocity Closed Loop Control/Robot Global Data.vi b/LabVIEW/Velocity Closed Loop Control/Robot Global Data.vi index 1786ade..19874b7 100644 Binary files a/LabVIEW/Velocity Closed Loop Control/Robot Global Data.vi and b/LabVIEW/Velocity Closed Loop Control/Robot Global Data.vi differ diff --git a/LabVIEW/Velocity Closed Loop Control/Robot Main.vi b/LabVIEW/Velocity Closed Loop Control/Robot Main.vi index df963e1..db48c4e 100644 Binary files a/LabVIEW/Velocity Closed Loop Control/Robot Main.vi and b/LabVIEW/Velocity Closed Loop Control/Robot Main.vi differ diff --git a/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.aliases b/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.aliases deleted file mode 100644 index 5342361..0000000 --- a/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.aliases +++ /dev/null @@ -1,6 +0,0 @@ -[My Computer] -My Computer = "10.0.75.1" - -[Target] -Target = "172.22.11.2" - diff --git a/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.lvlps b/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.lvlps deleted file mode 100644 index 3f6a8f9..0000000 --- a/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.lvlps +++ /dev/null @@ -1,3 +0,0 @@ -[ProjectWindow_Data] -ProjectExplorer.ClassicPosition[String] = "209,622,609,994" - diff --git a/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.lvproj b/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.lvproj index 110dd0d..44fd066 100644 --- a/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.lvproj +++ b/LabVIEW/Velocity Closed Loop Control/Velocity Closed Loop Control.lvproj @@ -113,6 +113,7 @@ AddOutputFilter chunkFilter + @@ -120,8 +121,12 @@ AddOutputFilter chunkFilter + + + + @@ -129,6 +134,17 @@ AddOutputFilter chunkFilter + + + + + + + + + + + @@ -170,10 +186,16 @@ AddOutputFilter chunkFilter + + + + + + @@ -226,8 +248,15 @@ AddOutputFilter chunkFilter + + + + + + + @@ -248,8 +277,11 @@ AddOutputFilter chunkFilter + + + @@ -277,6 +309,7 @@ AddOutputFilter chunkFilter + @@ -290,6 +323,7 @@ AddOutputFilter chunkFilter + @@ -378,11 +412,7 @@ AddOutputFilter chunkFilter - - - - @@ -429,6 +459,7 @@ AddOutputFilter chunkFilter + @@ -484,7 +515,6 @@ AddOutputFilter chunkFilter - @@ -536,6 +566,9 @@ AddOutputFilter chunkFilter true + + true + true