Use external dependencies for NI and NetComm libraries (#1304)

This removes a number of large binary files from the repo and enables vendors
to depend on these libraries separately.
This commit is contained in:
Thad House
2018-09-19 21:57:58 -07:00
committed by Peter Johnson
parent bedef476fd
commit d2a5aaafdd
71 changed files with 441 additions and 6937 deletions

View File

@@ -0,0 +1,33 @@
/*
* Autogenerated file! Do not manually edit this file.
*/
package edu.wpi.first.wpilibj.hal;
/**
* JNI wrapper for library <b>FRC_NetworkCommunication</b><br>.
*/
@SuppressWarnings({"MethodName", "LineLength"})
public class FRCNetComm {
/**
* Resource type from UsageReporting.
*/
@SuppressWarnings({"TypeName", "PMD.ConstantsInInterface"})
public static final class tResourceType {
private tResourceType() {
}
${usage_reporting_types}
}
/**
* Instances from UsageReporting.
*/
@SuppressWarnings({"TypeName", "PMD.ConstantsInInterface"})
public static final class tInstances {
private tInstances() {
}
${usage_reporting_instances}
}
}

View File

@@ -0,0 +1,14 @@
#pragma once
/*
* Autogenerated file! Do not manually edit this file.
*/
namespace HALUsageReporting {
typedef enum {
${usage_reporting_types_cpp}
} tResourceType;
typedef enum {
${usage_reporting_instances_cpp}
} tInstances;
}

View File

@@ -0,0 +1,44 @@
kLanguage_LabVIEW = 1
kLanguage_CPlusPlus = 2
kLanguage_Java = 3
kLanguage_Python = 4
kLanguage_DotNet = 5
kCANPlugin_BlackJagBridge = 1
kCANPlugin_2CAN = 2
kFramework_Iterative = 1
kFramework_Simple = 2
kFramework_CommandControl = 3
kFramework_Timed = 4
kFramework_ROS = 5
kFramework_RobotBuilder = 6
kRobotDrive_ArcadeStandard = 1
kRobotDrive_ArcadeButtonSpin = 2
kRobotDrive_ArcadeRatioCurve = 3
kRobotDrive_Tank = 4
kRobotDrive_MecanumPolar = 5
kRobotDrive_MecanumCartesian = 6
kRobotDrive2_DifferentialArcade = 7
kRobotDrive2_DifferentialTank = 8
kRobotDrive2_DifferentialCurvature = 9
kRobotDrive2_MecanumCartesian = 10
kRobotDrive2_MecanumPolar = 11
kRobotDrive2_KilloughCartesian = 12
kRobotDrive2_KilloughPolar = 13
kDriverStationCIO_Analog = 1
kDriverStationCIO_DigitalIn = 2
kDriverStationCIO_DigitalOut = 3
kDriverStationEIO_Acceleration = 1
kDriverStationEIO_AnalogIn = 2
kDriverStationEIO_AnalogOut = 3
kDriverStationEIO_Button = 4
kDriverStationEIO_LED = 5
kDriverStationEIO_DigitalIn = 6
kDriverStationEIO_DigitalOut = 7
kDriverStationEIO_FixedDigitalOut = 8
kDriverStationEIO_PWM = 9
kDriverStationEIO_Encoder = 10
kDriverStationEIO_TouchSlider = 11
kADXL345_SPI = 1
kADXL345_I2C = 2
kCommand_Scheduler = 1
kSmartDashboard_Instance = 1

View File

@@ -0,0 +1,82 @@
kResourceType_Controller = 0
kResourceType_Module = 1
kResourceType_Language = 2
kResourceType_CANPlugin = 3
kResourceType_Accelerometer = 4
kResourceType_ADXL345 = 5
kResourceType_AnalogChannel = 6
kResourceType_AnalogTrigger = 7
kResourceType_AnalogTriggerOutput = 8
kResourceType_CANJaguar = 9
kResourceType_Compressor = 10
kResourceType_Counter = 11
kResourceType_Dashboard = 12
kResourceType_DigitalInput = 13
kResourceType_DigitalOutput = 14
kResourceType_DriverStationCIO = 15
kResourceType_DriverStationEIO = 16
kResourceType_DriverStationLCD = 17
kResourceType_Encoder = 18
kResourceType_GearTooth = 19
kResourceType_Gyro = 20
kResourceType_I2C = 21
kResourceType_Framework = 22
kResourceType_Jaguar = 23
kResourceType_Joystick = 24
kResourceType_Kinect = 25
kResourceType_KinectStick = 26
kResourceType_PIDController = 27
kResourceType_Preferences = 28
kResourceType_PWM = 29
kResourceType_Relay = 30
kResourceType_RobotDrive = 31
kResourceType_SerialPort = 32
kResourceType_Servo = 33
kResourceType_Solenoid = 34
kResourceType_SPI = 35
kResourceType_Task = 36
kResourceType_Ultrasonic = 37
kResourceType_Victor = 38
kResourceType_Button = 39
kResourceType_Command = 40
kResourceType_AxisCamera = 41
kResourceType_PCVideoServer = 42
kResourceType_SmartDashboard = 43
kResourceType_Talon = 44
kResourceType_HiTechnicColorSensor = 45
kResourceType_HiTechnicAccel = 46
kResourceType_HiTechnicCompass = 47
kResourceType_SRF08 = 48
kResourceType_AnalogOutput = 49
kResourceType_VictorSP = 50
kResourceType_PWMTalonSRX = 51
kResourceType_CANTalonSRX = 52
kResourceType_ADXL362 = 53
kResourceType_ADXRS450 = 54
kResourceType_RevSPARK = 55
kResourceType_MindsensorsSD540 = 56
kResourceType_DigitalGlitchFilter = 57
kResourceType_ADIS16448 = 58
kResourceType_PDP = 59
kResourceType_PCM = 60
kResourceType_PigeonIMU = 61
kResourceType_NidecBrushless = 62
kResourceType_CANifier = 63
kResourceType_CTRE_future0 = 64
kResourceType_CTRE_future1 = 65
kResourceType_CTRE_future2 = 66
kResourceType_CTRE_future3 = 67
kResourceType_CTRE_future4 = 68
kResourceType_CTRE_future5 = 69
kResourceType_CTRE_future6 = 70
kResourceType_LinearFilter = 71
kResourceType_XboxController = 72
kResourceType_UsbCamera = 73
kResourceType_NavX = 74
kResourceType_Pixy = 75
kResourceType_Pixy2 = 76
kResourceType_ScanseSweep = 77
kResourceType_Shuffleboard = 78
kResourceType_CAN = 79
kResourceType_DigilentDMC60 = 80
kResourceType_PWMVictorSPX = 81

View File

@@ -1,204 +0,0 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
/*----------------------------------------------------------------------------*/
// Autogenerated by wpilibj_frcnetcomm.py. Do not manually edit this file.
package edu.wpi.first.wpilibj.hal;
/**
* JNI wrapper for library <b>FRC_NetworkCommunication</b><br>.
*/
@SuppressWarnings({"MethodName", "LineLength"})
public class FRCNetComm extends JNIWrapper {
/**
* Module type from LoadOut.h
*/
@SuppressWarnings({"TypeName", "PMD.ConstantsInInterface"})
public static final class tModuleType {
private tModuleType() {
}
public static final int kModuleType_Unknown = 0x00;
public static final int kModuleType_Analog = 0x01;
public static final int kModuleType_Digital = 0x02;
public static final int kModuleType_Solenoid = 0x03;
}
/**
* Target class from LoadOut.h
*/
@SuppressWarnings({"TypeName", "PMD.ConstantsInInterface"})
public static final class tTargetClass {
private tTargetClass() {
}
public static final int kTargetClass_Unknown = 0x00;
public static final int kTargetClass_FRC1 = 0x10;
public static final int kTargetClass_FRC2 = 0x20;
public static final int kTargetClass_FRC3 = 0x30;
public static final int kTargetClass_RoboRIO = 0x40;
public static final int kTargetClass_FRC2_Analog = kTargetClass_FRC2 | tModuleType.kModuleType_Analog;
public static final int kTargetClass_FRC2_Digital = kTargetClass_FRC2 | tModuleType.kModuleType_Digital;
public static final int kTargetClass_FRC2_Solenoid = kTargetClass_FRC2 | tModuleType.kModuleType_Solenoid;
public static final int kTargetClass_FamilyMask = 0xF0;
public static final int kTargetClass_ModuleMask = 0x0F;
}
/**
* Resource type from UsageReporting.h
*/
@SuppressWarnings({"TypeName", "PMD.ConstantsInInterface"})
public static final class tResourceType {
private tResourceType() {
}
public static final int kResourceType_Controller = 0;
public static final int kResourceType_Module = 1;
public static final int kResourceType_Language = 2;
public static final int kResourceType_CANPlugin = 3;
public static final int kResourceType_Accelerometer = 4;
public static final int kResourceType_ADXL345 = 5;
public static final int kResourceType_AnalogChannel = 6;
public static final int kResourceType_AnalogTrigger = 7;
public static final int kResourceType_AnalogTriggerOutput = 8;
public static final int kResourceType_CANJaguar = 9;
public static final int kResourceType_Compressor = 10;
public static final int kResourceType_Counter = 11;
public static final int kResourceType_Dashboard = 12;
public static final int kResourceType_DigitalInput = 13;
public static final int kResourceType_DigitalOutput = 14;
public static final int kResourceType_DriverStationCIO = 15;
public static final int kResourceType_DriverStationEIO = 16;
public static final int kResourceType_DriverStationLCD = 17;
public static final int kResourceType_Encoder = 18;
public static final int kResourceType_GearTooth = 19;
public static final int kResourceType_Gyro = 20;
public static final int kResourceType_I2C = 21;
public static final int kResourceType_Framework = 22;
public static final int kResourceType_Jaguar = 23;
public static final int kResourceType_Joystick = 24;
public static final int kResourceType_Kinect = 25;
public static final int kResourceType_KinectStick = 26;
public static final int kResourceType_PIDController = 27;
public static final int kResourceType_Preferences = 28;
public static final int kResourceType_PWM = 29;
public static final int kResourceType_Relay = 30;
public static final int kResourceType_RobotDrive = 31;
public static final int kResourceType_SerialPort = 32;
public static final int kResourceType_Servo = 33;
public static final int kResourceType_Solenoid = 34;
public static final int kResourceType_SPI = 35;
public static final int kResourceType_Task = 36;
public static final int kResourceType_Ultrasonic = 37;
public static final int kResourceType_Victor = 38;
public static final int kResourceType_Button = 39;
public static final int kResourceType_Command = 40;
public static final int kResourceType_AxisCamera = 41;
public static final int kResourceType_PCVideoServer = 42;
public static final int kResourceType_SmartDashboard = 43;
public static final int kResourceType_Talon = 44;
public static final int kResourceType_HiTechnicColorSensor = 45;
public static final int kResourceType_HiTechnicAccel = 46;
public static final int kResourceType_HiTechnicCompass = 47;
public static final int kResourceType_SRF08 = 48;
public static final int kResourceType_AnalogOutput = 49;
public static final int kResourceType_VictorSP = 50;
public static final int kResourceType_PWMTalonSRX = 51;
public static final int kResourceType_CANTalonSRX = 52;
public static final int kResourceType_ADXL362 = 53;
public static final int kResourceType_ADXRS450 = 54;
public static final int kResourceType_RevSPARK = 55;
public static final int kResourceType_MindsensorsSD540 = 56;
public static final int kResourceType_DigitalGlitchFilter = 57;
public static final int kResourceType_ADIS16448 = 58;
public static final int kResourceType_PDP = 59;
public static final int kResourceType_PCM = 60;
public static final int kResourceType_PigeonIMU = 61;
public static final int kResourceType_NidecBrushless = 62;
public static final int kResourceType_CANifier = 63;
public static final int kResourceType_CTRE_future0 = 64;
public static final int kResourceType_CTRE_future1 = 65;
public static final int kResourceType_CTRE_future2 = 66;
public static final int kResourceType_CTRE_future3 = 67;
public static final int kResourceType_CTRE_future4 = 68;
public static final int kResourceType_CTRE_future5 = 69;
public static final int kResourceType_CTRE_future6 = 70;
public static final int kResourceType_LinearFilter = 71;
public static final int kResourceType_XboxController = 72;
public static final int kResourceType_UsbCamera = 73;
public static final int kResourceType_NavX = 74;
public static final int kResourceType_Pixy = 75;
public static final int kResourceType_Pixy2 = 76;
public static final int kResourceType_ScanseSweep = 77;
public static final int kResourceType_Shuffleboard = 78;
public static final int kResourceType_CAN = 79;
public static final int kResourceType_DigilentDMC60 = 80;
public static final int kResourceType_PWMVictorSPX = 81;
}
/**
* Instances from UsageReporting.h
*/
@SuppressWarnings({"TypeName", "PMD.ConstantsInInterface"})
public static final class tInstances {
private tInstances() {
}
public static final int kLanguage_LabVIEW = 1;
public static final int kLanguage_CPlusPlus = 2;
public static final int kLanguage_Java = 3;
public static final int kLanguage_Python = 4;
public static final int kLanguage_DotNet = 5;
public static final int kCANPlugin_BlackJagBridge = 1;
public static final int kCANPlugin_2CAN = 2;
public static final int kFramework_Iterative = 1;
public static final int kFramework_Simple = 2;
public static final int kFramework_CommandControl = 3;
public static final int kFramework_Timed = 4;
public static final int kFramework_ROS = 5;
public static final int kFramework_RobotBuilder = 6;
public static final int kRobotDrive_ArcadeStandard = 1;
public static final int kRobotDrive_ArcadeButtonSpin = 2;
public static final int kRobotDrive_ArcadeRatioCurve = 3;
public static final int kRobotDrive_Tank = 4;
public static final int kRobotDrive_MecanumPolar = 5;
public static final int kRobotDrive_MecanumCartesian = 6;
public static final int kRobotDrive2_DifferentialArcade = 7;
public static final int kRobotDrive2_DifferentialTank = 8;
public static final int kRobotDrive2_DifferentialCurvature = 9;
public static final int kRobotDrive2_MecanumCartesian = 10;
public static final int kRobotDrive2_MecanumPolar = 11;
public static final int kRobotDrive2_KilloughCartesian = 12;
public static final int kRobotDrive2_KilloughPolar = 13;
public static final int kDriverStationCIO_Analog = 1;
public static final int kDriverStationCIO_DigitalIn = 2;
public static final int kDriverStationCIO_DigitalOut = 3;
public static final int kDriverStationEIO_Acceleration = 1;
public static final int kDriverStationEIO_AnalogIn = 2;
public static final int kDriverStationEIO_AnalogOut = 3;
public static final int kDriverStationEIO_Button = 4;
public static final int kDriverStationEIO_LED = 5;
public static final int kDriverStationEIO_DigitalIn = 6;
public static final int kDriverStationEIO_DigitalOut = 7;
public static final int kDriverStationEIO_FixedDigitalOut = 8;
public static final int kDriverStationEIO_PWM = 9;
public static final int kDriverStationEIO_Encoder = 10;
public static final int kDriverStationEIO_TouchSlider = 11;
public static final int kADXL345_SPI = 1;
public static final int kADXL345_I2C = 2;
public static final int kCommand_Scheduler = 1;
public static final int kSmartDashboard_Instance = 1;
}
}

View File

@@ -18,6 +18,7 @@
#include <FRC_NetworkCommunication/FRCComm.h>
#include <FRC_NetworkCommunication/LoadOut.h>
#include <FRC_NetworkCommunication/UsageReporting.h>
#include <wpi/mutex.h>
#include <wpi/raw_ostream.h>
#include <wpi/timestamp.h>

View File

@@ -41,9 +41,7 @@
#include "hal/Types.h"
#ifdef __cplusplus
#include "UsageReporting.h"
namespace HALUsageReporting = nUsageReporting;
#include "hal/FRCUsageReporting.h"
#endif
/**

View File

@@ -1,183 +0,0 @@
#ifndef __UsageReporting_h__
#define __UsageReporting_h__
#ifdef _WIN32
#include <stdint.h>
#define EXPORT_FUNC __declspec(dllexport) __cdecl
#elif defined (__vxworks)
#include <vxWorks.h>
#define EXPORT_FUNC
#else
#include <stdint.h>
#include <stdlib.h>
#define EXPORT_FUNC
#endif
#define kUsageReporting_version 1
namespace nUsageReporting
{
typedef enum
{
kResourceType_Controller,
kResourceType_Module,
kResourceType_Language,
kResourceType_CANPlugin,
kResourceType_Accelerometer,
kResourceType_ADXL345,
kResourceType_AnalogChannel,
kResourceType_AnalogTrigger,
kResourceType_AnalogTriggerOutput,
kResourceType_CANJaguar,
kResourceType_Compressor, // 10
kResourceType_Counter,
kResourceType_Dashboard,
kResourceType_DigitalInput,
kResourceType_DigitalOutput,
kResourceType_DriverStationCIO,
kResourceType_DriverStationEIO,
kResourceType_DriverStationLCD,
kResourceType_Encoder,
kResourceType_GearTooth,
kResourceType_Gyro, // 20
kResourceType_I2C,
kResourceType_Framework,
kResourceType_Jaguar,
kResourceType_Joystick,
kResourceType_Kinect,
kResourceType_KinectStick,
kResourceType_PIDController,
kResourceType_Preferences,
kResourceType_PWM,
kResourceType_Relay, // 30
kResourceType_RobotDrive,
kResourceType_SerialPort,
kResourceType_Servo,
kResourceType_Solenoid,
kResourceType_SPI,
kResourceType_Task,
kResourceType_Ultrasonic,
kResourceType_Victor,
kResourceType_Button,
kResourceType_Command, // 40
kResourceType_AxisCamera,
kResourceType_PCVideoServer,
kResourceType_SmartDashboard,
kResourceType_Talon,
kResourceType_HiTechnicColorSensor,
kResourceType_HiTechnicAccel,
kResourceType_HiTechnicCompass,
kResourceType_SRF08,
kResourceType_AnalogOutput,
kResourceType_VictorSP, // 50
kResourceType_PWMTalonSRX,
kResourceType_CANTalonSRX,
kResourceType_ADXL362,
kResourceType_ADXRS450,
kResourceType_RevSPARK,
kResourceType_MindsensorsSD540,
kResourceType_DigitalGlitchFilter,
kResourceType_ADIS16448,
kResourceType_PDP,
kResourceType_PCM, // 60
kResourceType_PigeonIMU,
kResourceType_NidecBrushless,
kResourceType_CANifier,
kResourceType_CTRE_future0,
kResourceType_CTRE_future1,
kResourceType_CTRE_future2,
kResourceType_CTRE_future3,
kResourceType_CTRE_future4,
kResourceType_CTRE_future5,
kResourceType_CTRE_future6, // 70
kResourceType_LinearFilter,
kResourceType_XboxController,
kResourceType_UsbCamera,
kResourceType_NavX,
kResourceType_Pixy,
kResourceType_Pixy2,
kResourceType_ScanseSweep,
kResourceType_Shuffleboard,
kResourceType_CAN,
kResourceType_DigilentDMC60, // 80
kResourceType_PWMVictorSPX,
} tResourceType;
typedef enum
{
kLanguage_LabVIEW = 1,
kLanguage_CPlusPlus = 2,
kLanguage_Java = 3,
kLanguage_Python = 4,
kLanguage_DotNet = 5,
kCANPlugin_BlackJagBridge = 1,
kCANPlugin_2CAN = 2,
kFramework_Iterative = 1,
kFramework_Simple = 2,
kFramework_CommandControl = 3,
kFramework_Timed = 4,
kFramework_ROS = 5,
kFramework_RobotBuilder = 6,
kRobotDrive_ArcadeStandard = 1,
kRobotDrive_ArcadeButtonSpin = 2,
kRobotDrive_ArcadeRatioCurve = 3,
kRobotDrive_Tank = 4,
kRobotDrive_MecanumPolar = 5,
kRobotDrive_MecanumCartesian = 6,
kRobotDrive2_DifferentialArcade = 7,
kRobotDrive2_DifferentialTank = 8,
kRobotDrive2_DifferentialCurvature = 9,
kRobotDrive2_MecanumCartesian = 10,
kRobotDrive2_MecanumPolar = 11,
kRobotDrive2_KilloughCartesian = 12,
kRobotDrive2_KilloughPolar = 13,
kDriverStationCIO_Analog = 1,
kDriverStationCIO_DigitalIn = 2,
kDriverStationCIO_DigitalOut = 3,
kDriverStationEIO_Acceleration = 1,
kDriverStationEIO_AnalogIn = 2,
kDriverStationEIO_AnalogOut = 3,
kDriverStationEIO_Button = 4,
kDriverStationEIO_LED = 5,
kDriverStationEIO_DigitalIn = 6,
kDriverStationEIO_DigitalOut = 7,
kDriverStationEIO_FixedDigitalOut = 8,
kDriverStationEIO_PWM = 9,
kDriverStationEIO_Encoder = 10,
kDriverStationEIO_TouchSlider = 11,
kADXL345_SPI = 1,
kADXL345_I2C = 2,
kCommand_Scheduler = 1,
kSmartDashboard_Instance = 1,
} tInstances;
/**
* Report the usage of a resource of interest.
*
* @param resource one of the values in the tResourceType above (max value 51).
* @param instanceNumber an index that identifies the resource instance.
* @param context an optional additional context number for some cases (such as module number). Set to 0 to omit.
* @param feature a string to be included describing features in use on a specific resource. Setting the same resource more than once allows you to change the feature string.
*/
uint32_t EXPORT_FUNC report(tResourceType resource, uint8_t instanceNumber, uint8_t context = 0, const char *feature = NULL);
}
#ifdef __cplusplus
extern "C" {
#endif
uint32_t EXPORT_FUNC FRC_NetworkCommunication_nUsageReporting_report(uint8_t resource, uint8_t instanceNumber, uint8_t context, const char *feature);
#ifdef __cplusplus
}
#endif
#endif // __UsageReporting_h__