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

[hal] Add CAN Mfgrs and Adjust Device Types (#8201)

Browse Source
This commit is contained in:
Kevin-OConnor
2025-08-30 14:36:26 -04:00
committed by GitHub
parent 4e6b9706ff
commit 9fd4ccf95b
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hal/src/main/native/include/hal/CANAPITypes.h
View File

@@ -32,10 +32,10 @@ HAL_ENUM(HAL_CANDeviceType) {
HAL_CAN_Dev_kGyroSensor = 4,
/// Accelerometer.
HAL_CAN_Dev_kAccelerometer = 5,
/// Ultrasonic sensor.
HAL_CAN_Dev_kUltrasonicSensor = 6,
/// Gear tooth sensor.
HAL_CAN_Dev_kGearToothSensor = 7,
/// Distance sensor.
HAL_CAN_Dev_kDistanceSensor = 6,
/// Encoder.
HAL_CAN_Dev_kEncoder = 7,
/// Power distribution.
HAL_CAN_Dev_kPowerDistribution = 8,
/// Pneumatics.
@@ -44,8 +44,10 @@ HAL_ENUM(HAL_CANDeviceType) {
HAL_CAN_Dev_kMiscellaneous = 10,
/// IO breakout.
HAL_CAN_Dev_kIOBreakout = 11,
// Servo controller.
/// Servo controller.
HAL_CAN_Dev_kServoController = 12,
/// Color Sensor.
HAL_CAN_Dev_ColorSensor = 13,
/// Firmware update.
HAL_CAN_Dev_kFirmwareUpdate = 31
};
@@ -89,6 +91,14 @@ HAL_ENUM(HAL_CANManufacturer) {
/// AndyMark.
HAL_CAN_Man_kAndyMark = 15,
/// Vivid-Hosting.
HAL_CAN_Man_kVividHosting = 16
HAL_CAN_Man_kVividHosting = 16,
/// Vertos Robotics.
HAL_CAN_Man_kVertosRobotics = 17,
/// SWYFT Robotics.
HAL_CAN_Man_kSWYFTRobotics = 18,
/// Lumyn Labs.
HAL_CAN_Man_kLumynLabs = 19,
/// Brushland Labs
HAL_CAN_Man_kBrushlandLabs = 20
};
/** @} */