Skip to content

Add non-PWM examples #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Sep 16, 2020
Merged

Add non-PWM examples #22

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cc34b45
init
Jun 7, 2019
e0a8806
added black formatting
Jun 8, 2019
eeb8855
fixed errors
Jun 8, 2019
809d2ac
Fixed errors and added black formatting
Jun 8, 2019
2bf945d
Uncommented lines that led to erroneous testing
Jun 9, 2019
70ef3d8
Tweaked velocity-pid example
Jun 9, 2019
eeb8690
Added can-tank-drive example
Jun 10, 2019
50bc75b
Fixed SmartDashboard configuration
Jun 12, 2019
346064a
Fixed testing environment configuration.
Jun 13, 2019
ddb80c6
Removed unnecessary imports
Tyler-Duckworth Jun 13, 2019
26e93ee
Removed unnecessary imports
Tyler-Duckworth Jun 13, 2019
78ef1de
Merge branch 'master' into master
Tyler-Duckworth Jan 17, 2020
7451939
Merge branch 'master' into master
Tyler-Duckworth Sep 15, 2020
c9d61ff
Fixed enum changes in get-set-params
Tyler-Duckworth Sep 15, 2020
d03829a
Reformatted get-set-params to pass black CI check
Tyler-Duckworth Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/limit-switch/robot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ def teleopPeriodic(self):
# pressed. It will also return true if you do not have a switch
# connected. get() will return false when the switch is released.
wpilib.SmartDashboard.putBoolean(
"Forward Limit Enabled", self.forwardLimit.get()
"Forward Limit Switch", self.forwardLimit.get()
)
wpilib.SmartDashboard.putBoolean(
"Reverse Limit Enabled", self.reverseLimit.get()
"Reverse Limit Switch", self.reverseLimit.get()
)


Expand Down
4 changes: 2 additions & 2 deletions examples/position-pid-control/robot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ def teleopPeriodic(self):
self.pidController.setReference(rotations, rev.ControlType.kPosition)

# Push Setpoint and the motor's current position to SmartDashboard.
wpilib.SmartDashboard.putNumber("Setpoint", rotations)
wpilib.SmartDashboard.putNumber("Process Variable", self.encoder.getPosition())
wpilib.SmartDashboard.putNumber("SetPoint", rotations)
wpilib.SmartDashboard.putNumber("ProcessVariable", self.encoder.getPosition())


if __name__ == "__main__":
Expand Down
6 changes: 3 additions & 3 deletions examples/velocity-pid-control/robot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def robotInit(self):
# configuration parameters in the SPARK MAX to their factory default
# state. If no argument is passed, these parameters will not persist
# between power cycles
self.motor.restoreFactoryDefaults()
# self.motor.restoreFactoryDefaults()

# Set PID Constants
self.pidController.setP(self.kP)
Expand Down Expand Up @@ -110,8 +110,8 @@ def teleopPeriodic(self):
self.pidController.setReference(setpoint, rev.ControlType.kVelocity)

# Push Setpoint and the motor's current velocity to SmartDashboard.
wpilib.SmartDashboard.putNumber("Setpoint", setpoint)
wpilib.SmartDashboard.putNumber("Process Variable", self.encoder.getVelocity())
wpilib.SmartDashboard.putNumber("SetPoint", setpoint)
wpilib.SmartDashboard.putNumber("ProcessVariable", self.encoder.getVelocity())


if __name__ == "__main__":
Expand Down