Commit Graph

206 Commits

Author SHA1 Message Date
Brad Miller (WPI)
fc3ed33f77 Merge "PDP and PCM updated to rely on CtreCanNode parent class, which uses new CAN API. CtreCanNode registers the periodic tx messages and provides an rx function to child classes for easy getters and setters. Some template magic to make the PDP and PCM getters/setters easy to stamp out." 2014-07-02 14:04:35 -07:00
Omar Zrien
0ef5c3adfa PDP and PCM updated to rely on CtreCanNode parent class, which uses new CAN API.
CtreCanNode registers the periodic tx messages and provides an rx function to child classes for easy getters and setters.
Some template magic to make the PDP and PCM getters/setters easy to stamp out.

Change-Id: Ibdd0745af070756a282df5074504491fadfde336
2014-07-02 16:48:55 -04:00
Brad Miller (WPI)
37ebcabc4a Merge "Fixed periodic voltage status message" 2014-07-02 10:42:04 -07:00
Brad Miller (WPI)
244ee8d920 Merge "Fixed C++ deploy in Eclipse" 2014-07-02 10:41:36 -07:00
thomasclark
b97d2eb0c3 Fixed periodic voltage status message
Previously, the voltage was requested as a percentage and decoded as
a number of volts, which resulted in values being scaled wrong. The
correct message is requested now.

Change-Id: I5e81c7a4a2e2698f2e8a84ba747217e0e14f7676
2014-07-02 12:14:49 -04:00
thomasclark
ae8d22b0f2 Fixed C++ deploy in Eclipse
Eclipse now runs an ant script to deploy C++ programs, which runs the
robot program with the run-at-startup system

Change-Id: I3e63967ebc40ad3c38aa561fd303ca3c577fd2a2
2014-07-01 17:04:28 -04:00
Brad Miller (WPI)
ff8016c088 Merge "Fixes CounterTest for C++" 2014-07-01 13:01:10 -07:00
Brad Miller (WPI)
f0fb3023ad Merge "CANJaguar uses periodic status updates [artf2621]" 2014-07-01 13:00:15 -07:00
Kacper Puczydlowski
1d33edffee Fixes CounterTest for C++
Change-Id: I3446561cd255c56edd3f284a45ec4fd7efaf84e6
2014-07-01 14:16:53 -04:00
thomasclark
5bd546f1fd CANJaguar uses periodic status updates [artf2621]
All status data is now in 3 messages automatically sent periodically
by the Jaguar, removing the need to send several hundred requests
every second.

The C++ integration test was also updated to be more robust against
timing problems.

Change-Id: I13bacc6c8173ea1a2291a96ad3bd80ff5b18d16f
2014-07-01 12:02:44 -04:00
Alex Henning (WPI)
d8003899f5 Merge "Fixed FRCSim artf2615: added more thorough cleaning system to Makefile." 2014-simulation-alpha-rc3 2014-06-30 19:36:06 -07:00
Alex Henning
f7bb5cd8f6 Merge "Re-tuned PID for PacGoat." 2014-06-30 19:35:44 -07:00
Colby Skeggs
4f2d1d9d32 Fixed FRCSim artf2615: added more thorough cleaning system to Makefile.
Change-Id: I2e26b5480a1c4340bcf67c676dc7391c58b77bd5
2014-06-30 16:12:14 -07:00
thomasclark
981f941caf Changed .gitattributes to keep Unix line endings in the robot scripts
Change-Id: Icc20ae4c6eac3725c435208ae2d88ce245a8708f
2014-06-30 18:13:55 -04:00
Brad Miller (WPI)
5ca2506a7b Merge "Fixed Java deploy script" 2014-06-30 07:58:01 -07:00
Brad Miller (WPI)
25f65a1581 Merge "Java Ant script now works with run-at-startup" 2014-06-30 07:56:59 -07:00
thomasclark
15212967ec Fixed Java deploy script
Change-Id: If088f709961baa6b78c2b0e7dda65d7f4f0c0539
2014-06-30 10:26:27 -04:00
Omar Zrien
2aa0301707 comment change
Change-Id: I3eba9bca1daec1e1d8499adab286b38c293d9a49
2014-06-28 13:12:00 -04:00
Brad Miller (WPI)
455506976c Merge "Made Java deploy work with run-at-startup" 2014-06-27 14:33:55 -07:00
thomasclark
ef5729b3dd Made Java deploy work with run-at-startup
Change-Id: I5c6beb1784be51950e6381618828677fc6e91e98
2014-06-27 17:32:30 -04:00
thomasclark
256b052a55 Java Ant script now works with run-at-startup
Change-Id: Ie19f8ec1a4d2346c23e19fddba274e30d67da9ce
2014-06-27 17:25:54 -04:00
Alex Henning
56cf731680 Re-tuned PID for PacGoat.
Change-Id: I0355db7dcfa2c9147845cdcc37322208e5271d98
2014-06-27 11:37:52 -07:00
Brad Miller (WPI)
0926fa4937 Merge changes I7e8735d9,Ida66361c
* changes:
  Adds/Formats the CANJaguar.set() Javadocs
  Adds CANJaguar integration tests testing that in every control mode the motors can be rotated Adds a separate test suite for explicitly testing CAN
2014-06-27 08:46:41 -07:00
Jonathan Leitschuh
4de246876a Adds/Formats the CANJaguar.set() Javadocs
Change-Id: I7e8735d9de336ba906b319b01eff4b2e88fb2a26
2014-06-27 11:24:51 -04:00
Jonathan Leitschuh
130485d760 Adds CANJaguar integration tests testing that in every control mode the motors can be rotated
Adds a separate test suite for explicitly testing CAN

Change-Id: Ida66361c2643486f736b3f80ae0fc30b6f93d99d
2014-06-27 11:19:17 -04:00
Brad Miller (WPI)
3b6e5b9b12 Merge changes I59b6180e,Ic86e922b
* changes:
  Added v10 libraries
  Corrected the number of CAN init attempts in C++
2014-06-27 08:01:55 -07:00
Kevin O'Connor
b2000a20d0 * Fix issue if I2C initialized before DigitalSystem.
Change-Id: I97bbbebb60730ddaad337a4a5dd73c9f40556a86
2014-06-27 10:33:40 -04:00
thomasclark
9e6d04b2e8 Added v10 libraries
Change-Id: I59b6180ec7c1949ae084208edb88ee85c343d821
2014-06-26 17:28:54 -04:00
thomasclark
f380d9c102 Corrected the number of CAN init attempts in C++
Change-Id: Ic86e922b977653515593947d2b3b413c83e056ac
2014-06-26 17:26:56 -04:00
Omar
1ba20bc1eb added space for testing gi review
Change-Id: I3cc800c88a9a14e18264b145feaf232f0aec3bd8
2014-06-26 22:23:45 +01:00
Brad Miller (WPI)
a0799718f6 Merge "Fixes a bug in the TiltPanCameraFixture that would cause the test to freeze and never complete instead of failing" 2014-06-26 13:02:40 -07:00
Brad Miller (WPI)
afe1b0b342 Merge "Adds CANJaguar Java Tests to the Integration Test Suite -Makes the MotorEncoderFixture Generic for a specific motor type -Adds Methods on the FakePotentiometerSource to allow raw values to be set -Adds Runtime Printing of the Tests to indicate where we are in the program if something unexpected happens" 2014-06-26 12:59:43 -07:00
Jonathan Leitschuh
072b92e55a Fixes a bug in the TiltPanCameraFixture that would cause the test to freeze and never complete instead of failing
Change-Id: Iff14f6cac937952cb015d36b967c4dfc5660d6ce
2014-06-26 15:56:37 -04:00
Jonathan Leitschuh
b27791544b Adds CANJaguar Java Tests to the Integration Test Suite
-Makes the MotorEncoderFixture Generic for a specific motor type
-Adds Methods on the FakePotentiometerSource to allow raw values to be set
-Adds Runtime Printing of the Tests to indicate where we are in the program if something unexpected happens

Change-Id: I34c398b7852f1ff07efe1ead6a1169d9222af96a
2014-06-26 15:53:05 -04:00
Alex Henning
e4e199f066 Added support for simulation time.
This allows control loops to behave more predictably in the face of the
simulator running at non-realtime speeds.

Change-Id: I3508ed7ad316a3bf8b2c54b68c93baaf8cc4d941
Closes: artf2607

Conflicts:
	wpilibc/wpilibC++Sim/include/Timer.h
	wpilibc/wpilibC++Sim/src/Utility.cpp
2014-simulation-alpha-rc1
2014-06-26 11:01:56 -07:00
Alex Henning (WPI)
15e3781805 Merge "Fixed C++ side of artf2604 in FRCSim - synchronized C++ codebases, updated examples." 2014-06-26 10:28:24 -07:00
Brad Miller (WPI)
606eaa67b9 Merge "CANJaguar waits in the constructor for initial status data" 2014-06-26 09:28:33 -07:00
Brad Miller (WPI)
6273a407ef Merge "Added a C++ CANJaguar test for initial status data" 2014-06-26 09:28:17 -07:00
thomasclark
1cafebc5a3 CANJaguar waits in the constructor for initial status data
The C++ and Java CANJaguar constructors now wait up to 50 ms for the status
data to arrive at least one time.  They break early if it arrives sooner.

This allows status getters to always work immediately after the object is
constructed.

Change-Id: I4a1f1538837c11b24d45e87251743b6c106ddefb
2014-06-26 11:54:58 -04:00
thomasclark
06f8ff9225 Added a C++ CANJaguar test for initial status data
Change-Id: I027d690027f2d80345f3044ff12ee7bc26f3fe95
2014-06-26 10:51:26 -04:00
Brad Miller (WPI)
cc76500fdb Merge "* Add WriteBulk and ReadOnly to C++ I2C" 2014-06-26 07:05:26 -07:00
Colby Skeggs
ff597e6ac4 Fixed C++ side of artf2604 in FRCSim - synchronized C++ codebases, updated examples.
Change-Id: I2fdc9deb4c8e249448dcbda4214fd900c2bc4ea8
2014-06-25 19:50:32 -07:00
Alex Henning
02e19a0147 Merge "Added PacGoat code for C++." 2014-06-25 17:26:25 -07:00
Alex Henning
c7e17b8e35 Added PacGoat code for C++.
Change-Id: I4fd19fbdc65c25c5bbcdce937a31bc6fa1c11cb4
2014-06-25 16:49:14 -07:00
Brad Miller (WPI)
41897af453 Merge "CANJaguar in Java now requires control mode configuration data at compile time" 2014-06-25 13:31:02 -07:00
Brad Miller (WPI)
73ed1d42ea Merge "CANJaguar in C++ now requires control mode configuration data at compile time" 2014-06-25 13:28:30 -07:00
thomasclark
f3593c6986 CANJaguar in Java now requires control mode configuration data at compile time
Change-Id: I80b63e876d330d693375d69137c78e487c03c1c7
2014-06-25 16:25:39 -04:00
thomasclark
abed665c64 CANJaguar in C++ now requires control mode configuration data at compile time
For example, it's no longer possible to compile a program that uses position
control without specifying a position reference, or one that uses an encoder
as a position reference without specifying a CPR.  This eliminates a lot of
common CANJaguar mistakes.

Change-Id: I2b5fe1e2884cf3a0f9d5ccd233da4c2c9c1cff4c
2014-06-25 15:47:16 -04:00
Brad Miller (WPI)
945c7519e6 Merge "Fixed Java PCM test" 2014-06-25 07:56:57 -07:00
thomasclark
81a0664c58 Fixed Java PCM test
Change-Id: I17bee703a05d800461b56bf5e179e8d9977e5dfd
2014-06-25 10:54:24 -04:00