Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

JNI for java

Browse Source 
Normal vs recursive mutex
HAL delineation
This commit is contained in:
charris
2014-01-06 10:12:21 -05:00
parent b62b606110
commit f7146d4230
134 changed files with 2377 additions and 3358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wpilibc/src/main/native/IterativeRobot.cpp
View File

@@ -7,7 +7,7 @@
#include "IterativeRobot.h"
#include "DriverStation.h"
#include "NetworkCommunication/UsageReporting.h"
//#include "NetworkCommunication/UsageReporting.h"
#include "HAL/HAL.h"
#include "SmartDashboard/SmartDashboard.h"
#include "LiveWindow/LiveWindow.h"
@@ -92,7 +92,7 @@ double IterativeRobot::GetLoopsPerSec()
*/
void IterativeRobot::StartCompetition()
{
nUsageReporting::report(nUsageReporting::kResourceType_Framework, nUsageReporting::kFramework_Iterative);
HALReport(HALUsageReporting::kResourceType_Framework, HALUsageReporting::kFramework_Iterative);
LiveWindow *lw = LiveWindow::GetInstance();
// first and one-time initialization
@@ -121,7 +121,7 @@ void IterativeRobot::StartCompetition()
}
if (NextPeriodReady())
{
FRC_NetworkCommunication_observeUserProgramDisabled();
HALNetworkCommunicationObserveUserProgramDisabled();
DisabledPeriodic();
}
}
@@ -141,7 +141,7 @@ void IterativeRobot::StartCompetition()
}
if (NextPeriodReady())
{
FRC_NetworkCommunication_observeUserProgramAutonomous();
HALNetworkCommunicationObserveUserProgramAutonomous();
AutonomousPeriodic();
}
}
@@ -161,7 +161,7 @@ void IterativeRobot::StartCompetition()
}
if (NextPeriodReady())
{
FRC_NetworkCommunication_observeUserProgramTest();
HALNetworkCommunicationObserveUserProgramTest();
TestPeriodic();
}
}
@@ -182,7 +182,7 @@ void IterativeRobot::StartCompetition()
}
if (NextPeriodReady())
{
FRC_NetworkCommunication_observeUserProgramTeleop();
HALNetworkCommunicationObserveUserProgramTeleop();
TeleopPeriodic();
}
}