Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Reduce usage of NTSendable (#5434)

Browse Source
This commit is contained in:
Gold856
2023-07-24 00:34:49 -04:00
committed by GitHub
parent d125711023
commit 99b88be4f3
11 changed files with 134 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/src/main/native/include/frc/ADIS16448_IMU.h
View File

@@ -20,7 +20,6 @@
#include <thread>
#include <hal/SimDevice.h>
#include <networktables/NTSendable.h>
#include <units/acceleration.h>
#include <units/angle.h>
#include <units/angular_velocity.h>
@@ -29,6 +28,7 @@
#include <units/temperature.h>
#include <wpi/condition_variable.h>
#include <wpi/mutex.h>
#include <wpi/sendable/Sendable.h>
#include <wpi/sendable/SendableHelper.h>
#include "frc/DigitalInput.h"
@@ -53,7 +53,7 @@ namespace frc {
* the RoboRIO MXP port.
*/
class ADIS16448_IMU : public nt::NTSendable,
class ADIS16448_IMU : public wpi::Sendable,
public wpi::SendableHelper<ADIS16448_IMU> {
public:
/* ADIS16448 Calibration Time Enum Class */
@@ -216,7 +216,7 @@ class ADIS16448_IMU : public nt::NTSendable,
*/
int GetPort() const;
void InitSendable(nt::NTSendableBuilder& builder) override;
void InitSendable(wpi::SendableBuilder& builder) override;
private:
/** @brief ADIS16448 Register Map Declaration */

6
wpilibc/src/main/native/include/frc/ADIS16470_IMU.h
View File

@@ -20,12 +20,12 @@
#include <thread>
#include <hal/SimDevice.h>
#include <networktables/NTSendable.h>
#include <units/acceleration.h>
#include <units/angle.h>
#include <units/angular_velocity.h>
#include <wpi/condition_variable.h>
#include <wpi/mutex.h>
#include <wpi/sendable/Sendable.h>
#include <wpi/sendable/SendableHelper.h>
#include "frc/DigitalInput.h"
@@ -50,7 +50,7 @@ namespace frc {
* available on the RoboRIO.
*/
class ADIS16470_IMU : public nt::NTSendable,
class ADIS16470_IMU : public wpi::Sendable,
public wpi::SendableHelper<ADIS16470_IMU> {
public:
/* ADIS16470 Calibration Time Enum Class */
@@ -172,7 +172,7 @@ class ADIS16470_IMU : public nt::NTSendable,
*/
int GetPort() const;
void InitSendable(nt::NTSendableBuilder& builder) override;
void InitSendable(wpi::SendableBuilder& builder) override;
private:
/* ADIS16470 Register Map Declaration */