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

Update to the v13 headers and libraries

Browse Source 
Add all of the most recent headers and .SOs

Also make DriverStation work with the new FRC comm protocol, using the new
functions for getting status data

Change-Id: I1c7fc5f90e72c5fbebf87d9923ce0967ed0ef3bc

Initial HAL support for v13 ds

Change-Id: I9a7f37ef8e24241598fa3981cb3df30c07c52e0f

New ds stuff in the HAL

Change-Id: I025910625453baf63f79f49bbc70ba8b2f093f50

New ds stuff in C++

Joysticks are still todo

Driver station IO is pulled out

Change-Id: I1bb59037c097713bd943e7bef00e12f67f13c3ac

New ds works in C++ and Java.  Joysticks still todo

Change-Id: Ic93f8686856761badc592eceaf05964f52355578

Make joysticks work again with the v13 image protocol

Change-Id: Ief7ee95d3398c2262ca07ab7d60499af3c8f60f7
This commit is contained in:
Thomas Clark
2014-08-06 11:29:15 -04:00
parent b8eeeabbb5
commit 8abbcf53f4
106 changed files with 2928 additions and 3479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
hal/lib/Athena/HAL.cpp
View File

@@ -6,7 +6,6 @@
#include "NetworkCommunication/FRCComm.h"
#include "NetworkCommunication/UsageReporting.h"
#include "NetworkCommunication/LoadOut.h"
#include "ChipObject/nInterfaceGlobals.h"
#include <fstream>
#include <iostream>
#include <unistd.h>
@@ -116,26 +115,24 @@ int HALSetErrorData(const char *errors, int errorsLength, int wait_ms)
return setErrorData(errors, errorsLength, wait_ms);
}
int HALSetUserDsLcdData(const char *userDsLcdData, int userDsLcdDataLength,
int wait_ms)
int HALGetControlWord(HALControlWord *data)
{
return setUserDsLcdData(userDsLcdData, userDsLcdDataLength, wait_ms);
return FRC_NetworkCommunication_getControlWord((ControlWord_t*) data);
}
int HALOverrideIOConfig(const char *ioConfig, int wait_ms)
int HALGetAllianceStation(enum HALAllianceStationID *allianceStation)
{
return overrideIOConfig(ioConfig, wait_ms);
return FRC_NetworkCommunication_getAllianceStation((AllianceStationID_t*) allianceStation);
}
int HALGetDynamicControlData(uint8_t type, char *dynamicData, int32_t maxLength,
int wait_ms)
int HALGetJoystickAxes(uint8_t joystickNum, HALJoystickAxes *axes, uint8_t maxAxes)
{
return getDynamicControlData(type, dynamicData, maxLength, wait_ms);
return FRC_NetworkCommunication_getJoystickAxes(joystickNum, (JoystickAxes_t*) axes, maxAxes);
}
int HALGetCommonControlData(HALCommonControlData *data, int wait_ms)
int HALGetJoystickButtons(uint8_t joystickNum, HALJoystickButtons *buttons, uint8_t *count)
{
return getRecentCommonControlData((FRCCommonControlData*) data, wait_ms);
return FRC_NetworkCommunication_getJoystickButtons(joystickNum, buttons, count);
}
void HALSetNewDataSem(pthread_mutex_t * param)
@@ -240,8 +237,12 @@ void HALNetworkCommunicationObserveUserProgramTest(void)
uint32_t HALReport(uint8_t resource, uint8_t instanceNumber, uint8_t context,
const char *feature)
{
//return FRC_NetworkCommunication_nUsageReporting_report( resource, instanceNumber, context, feature);
return 0;
if(feature == NULL)
{
feature = "";
}
return FRC_NetworkCommunication_nUsageReporting_report(resource, instanceNumber, context, feature);
}
// TODO: HACKS
@@ -267,12 +268,3 @@ void imaqGetLastError()
void niTimestamp64()
{
}
#include "NetworkCommunication/LoadOut.h"
namespace nLoadOut
{
bool getModulePresence(tModuleType moduleType, uint8_t moduleNumber)
{
return true;
}
}