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

Merge branch '2022'

Browse Source
This commit is contained in:
Peter Johnson
2021-05-09 14:15:40 -07:00
parent ba08baabb9 a3cd90dd71
commit 3cc2da3328
765 changed files with 5914 additions and 13714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/src/main/native/include/frc/smartdashboard/MechanismLigament2d.h
View File

@@ -68,7 +68,7 @@ class MechanismLigament2d : public MechanismObject2d {
void SetLineWeight(double lineWidth);
protected:
void UpdateEntries(std::shared_ptr<NetworkTable> table) override;
void UpdateEntries(std::shared_ptr<nt::NetworkTable> table) override;
private:
void Flush();

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

@@ -37,7 +37,7 @@ class MechanismObject2d {
*
* @param table the new table.
*/
virtual void UpdateEntries(std::shared_ptr<NetworkTable> table) = 0;
virtual void UpdateEntries(std::shared_ptr<nt::NetworkTable> table) = 0;
mutable wpi::mutex m_mutex;
@@ -82,7 +82,7 @@ class MechanismObject2d {
private:
std::string m_name;
wpi::StringMap<std::unique_ptr<MechanismObject2d>> m_objects;
std::shared_ptr<NetworkTable> m_table;
void Update(std::shared_ptr<NetworkTable> table);
std::shared_ptr<nt::NetworkTable> m_table;
void Update(std::shared_ptr<nt::NetworkTable> table);
};
} // namespace frc

2
wpilibc/src/main/native/include/frc/smartdashboard/MechanismRoot2d.h
View File

@@ -40,7 +40,7 @@ class MechanismRoot2d : private MechanismObject2d {
using MechanismObject2d::Append;
private:
void UpdateEntries(std::shared_ptr<NetworkTable> table) override;
void UpdateEntries(std::shared_ptr<nt::NetworkTable> table) override;
inline void Flush();
double m_x;
double m_y;

27
wpilibc/src/main/native/include/frc/smartdashboard/SendableBase.h
View File

@@ -1,27 +0,0 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
#pragma once
#include <wpi/deprecated.h>
#include "frc/smartdashboard/Sendable.h"
#include "frc/smartdashboard/SendableHelper.h"
namespace frc {
class SendableBase : public Sendable, public SendableHelper<SendableBase> {
public:
/**
* Creates an instance of the sensor base
*
* @deprecated use Sendable and SendableHelper
*
* @param addLiveWindow if true, add this Sendable to LiveWindow
*/
WPI_DEPRECATED("use Sendable and SendableHelper")
explicit SendableBase(bool addLiveWindow = true);
};
} // namespace frc

2
wpilibc/src/main/native/include/frc/smartdashboard/SendableRegistry.h
View File

@@ -285,7 +285,7 @@ class SendableRegistry {
* @param sendableUid sendable unique id
* @param table network table
*/
void Publish(UID sendableUid, std::shared_ptr<NetworkTable> table);
void Publish(UID sendableUid, std::shared_ptr<nt::NetworkTable> table);
/**
* Updates network table information from an object.

5
wpilibc/src/main/native/include/frc/smartdashboard/SmartDashboard.h
View File

@@ -11,16 +11,13 @@
#include <networktables/NetworkTableEntry.h>
#include <networktables/NetworkTableValue.h>
#include "frc/ErrorBase.h"
#include "frc/smartdashboard/ListenerExecutor.h"
#include "frc/smartdashboard/Sendable.h"
#include "frc/smartdashboard/SendableHelper.h"
namespace frc {
class SmartDashboard : public ErrorBase,
public Sendable,
public SendableHelper<SmartDashboard> {
class SmartDashboard : public Sendable, public SendableHelper<SmartDashboard> {
public:
static void init();