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

Split Sendable into NT and non-NT portions (#3432)

Browse Source 
The non-NT portion has been moved to wpiutil.
The NT portion has been moved to ntcore (as NTSendable).

SendableBuilder similarly split and moved.

SendableRegistry moved to wpiutil.

In C++, SendableHelper also moved to wpiutil.

This enables use of Sendable from wpimath and also enables
moving several classes from wpilib to wpimath.
This commit is contained in:
Peter Johnson
2021-06-13 16:38:05 -07:00
committed by GitHub
parent ef4ea84cb5
commit b417d961ec
196 changed files with 1147 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibc/src/main/native/cpp/AnalogEncoder.cpp
View File

@@ -5,11 +5,11 @@
#include "frc/AnalogEncoder.h"
#include <wpi/NullDeleter.h>
#include <wpi/sendable/SendableBuilder.h>
#include "frc/AnalogInput.h"
#include "frc/Counter.h"
#include "frc/Errors.h"
#include "frc/smartdashboard/SendableBuilder.h"
using namespace frc;
@@ -50,8 +50,8 @@ void AnalogEncoder::Init() {
m_counter.SetDownSource(
m_analogTrigger.CreateOutput(AnalogTriggerType::kFallingPulse));
SendableRegistry::GetInstance().AddLW(this, "DutyCycle Encoder",
m_analogInput->GetChannel());
wpi::SendableRegistry::GetInstance().AddLW(this, "DutyCycle Encoder",
m_analogInput->GetChannel());
}
units::turn_t AnalogEncoder::Get() const {
@@ -105,7 +105,7 @@ int AnalogEncoder::GetChannel() const {
return m_analogInput->GetChannel();
}
void AnalogEncoder::InitSendable(SendableBuilder& builder) {
void AnalogEncoder::InitSendable(wpi::SendableBuilder& builder) {
builder.SetSmartDashboardType("AbsoluteEncoder");
builder.AddDoubleProperty(
"Distance", [this] { return this->GetDistance(); }, nullptr);