Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +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

4
wpilibc/src/main/include/Dashboard.h
View File

@@ -8,7 +8,7 @@
#define __DASHBOARD_H__
#include "DashboardBase.h"
#include "NetworkCommunication/FRCComm.h"
//#include "NetworkCommunication/FRCComm.h"
#include <stack>
#include <vector>
#include "HAL/HAL.h"
@@ -50,7 +50,7 @@ public:
void GetStatusBuffer(char** userStatusData, int32_t* userStatusDataSize);
void Flush() {}
private:
static const int32_t kMaxDashboardDataSize = USER_STATUS_DATA_SIZE - sizeof(uint32_t) * 3 - sizeof(uint8_t); // 13 bytes needed for 3 size parameters and the sequence number
static const int32_t kMaxDashboardDataSize = HAL_USER_STATUS_DATA_SIZE - sizeof(uint32_t) * 3 - sizeof(uint8_t); // 13 bytes needed for 3 size parameters and the sequence number
// Usage Guidelines...
DISALLOW_COPY_AND_ASSIGN(Dashboard);

4
wpilibc/src/main/include/DriverStation.h
View File

@@ -12,7 +12,7 @@
#include "SensorBase.h"
#include "Task.h"
struct FRCCommonControlData;
struct HALCommonControlData;
class AnalogChannel;
/**
@@ -109,7 +109,7 @@ private:
void Run();
struct FRCCommonControlData *m_controlData;
struct HALCommonControlData *m_controlData;
uint8_t m_digitalOut;
AnalogChannel *m_batteryChannel;
MUTEX_ID m_statusDataSemaphore;

6
wpilibc/src/main/include/DriverStationEnhancedIO.h
View File

@@ -8,7 +8,7 @@
#define __DRIVER_STATION_ENHANCED_IO_H__
#include "ErrorBase.h"
#include "NetworkCommunication/FRCComm.h"
//#include "NetworkCommunication/FRCComm.h"
#include <stack>
#include <vector>
#include "HAL/HAL.h"
@@ -91,8 +91,8 @@ class DriverStationEnhancedIO : public ErrorBase
enum tBlockID
{
kInputBlockID = kFRC_NetworkCommunication_DynamicType_DSEnhancedIO_Input,
kOutputBlockID = kFRC_NetworkCommunication_DynamicType_DSEnhancedIO_Output,
kInputBlockID = HALFRC_NetworkCommunication_DynamicType_DSEnhancedIO_Input,
kOutputBlockID = HALFRC_NetworkCommunication_DynamicType_DSEnhancedIO_Output,
};
enum tStatusFlags {kStatusValid = 0x01, kStatusConfigChanged = 0x02, kForceEnhancedMode = 0x04};

2
wpilibc/src/main/include/RobotBase.h
View File

@@ -33,7 +33,7 @@ class DriverStation;
#define START_ROBOT_CLASS(_ClassName_) \
int main() \
{ \
FRC_NetworkCommunication_Reserve(); \
HALNetworkCommunicationReserve(); \
RobotBase* robot = new _ClassName_(); \
robot->StartCompetition(); \
return 0; \