Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +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

20
hal/src/main/java/edu/wpi/first/hal/CANAPITypes.java
View File

@@ -35,10 +35,10 @@ public final class CANAPITypes {
kGyroSensor(4), kGyroSensor(4),
/** Accelerometer. */ /** Accelerometer. */
kAccelerometer(5), kAccelerometer(5),
/** Ultrasonic sensor. */ /** Distance sensor. */
kUltrasonicSensor(6), kDistanceSensor(6),
/** Gear tooth sensor. */ /** Encoder. */
kGearToothSensor(7), kEncoder(7),
/** Power distribution. */ /** Power distribution. */
kPowerDistribution(8), kPowerDistribution(8),
/** Pneumatics. */ /** Pneumatics. */
@@ -49,6 +49,8 @@ public final class CANAPITypes {
kIOBreakout(11), kIOBreakout(11),
/** Servo Controller. */ /** Servo Controller. */
kServoController(12), kServoController(12),
/** Color Sensor. */
kColorSensor(13),
/** Firmware update. */ /** Firmware update. */
kFirmwareUpdate(31); kFirmwareUpdate(31);
@@ -105,7 +107,15 @@ public final class CANAPITypes {
/** AndyMark. */ /** AndyMark. */
kAndyMark(15), kAndyMark(15),
/** Vivid-Hosting. */ /** Vivid-Hosting. */
kVividHosting(16); kVividHosting(16),
/** Vertos Robotics. */
kVertosRobotics(17),
/** SWYFT Robotics. */
kSWYFTRobotics(18),
/** Lumyn Labs. */
kLumynLabs(19),
/** Brushland Labs. */
kBrushlandLabs(20);
/** The manufacturer ID. */ /** The manufacturer ID. */
@SuppressWarnings("MemberName") @SuppressWarnings("MemberName")

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

@@ -32,10 +32,10 @@ HAL_ENUM(HAL_CANDeviceType) {
HAL_CAN_Dev_kGyroSensor = 4, HAL_CAN_Dev_kGyroSensor = 4,
/// Accelerometer. /// Accelerometer.
HAL_CAN_Dev_kAccelerometer = 5, HAL_CAN_Dev_kAccelerometer = 5,
/// Ultrasonic sensor. /// Distance sensor.
HAL_CAN_Dev_kUltrasonicSensor = 6, HAL_CAN_Dev_kDistanceSensor = 6,
/// Gear tooth sensor. /// Encoder.
HAL_CAN_Dev_kGearToothSensor = 7, HAL_CAN_Dev_kEncoder = 7,
/// Power distribution. /// Power distribution.
HAL_CAN_Dev_kPowerDistribution = 8, HAL_CAN_Dev_kPowerDistribution = 8,
/// Pneumatics. /// Pneumatics.
@@ -44,8 +44,10 @@ HAL_ENUM(HAL_CANDeviceType) {
HAL_CAN_Dev_kMiscellaneous = 10, HAL_CAN_Dev_kMiscellaneous = 10,
/// IO breakout. /// IO breakout.
HAL_CAN_Dev_kIOBreakout = 11, HAL_CAN_Dev_kIOBreakout = 11,
// Servo controller. /// Servo controller.
HAL_CAN_Dev_kServoController = 12, HAL_CAN_Dev_kServoController = 12,
/// Color Sensor.
HAL_CAN_Dev_ColorSensor = 13,
/// Firmware update. /// Firmware update.
HAL_CAN_Dev_kFirmwareUpdate = 31 HAL_CAN_Dev_kFirmwareUpdate = 31
}; };
@@ -89,6 +91,14 @@ HAL_ENUM(HAL_CANManufacturer) {
/// AndyMark. /// AndyMark.
HAL_CAN_Man_kAndyMark = 15, HAL_CAN_Man_kAndyMark = 15,
/// Vivid-Hosting. /// 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
}; };
/** @} */ /** @} */