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

Fix shuffleboard C++ tests, and run them on desktop (#1351)

Browse Source
This commit is contained in:
Thad House
2018-10-02 20:55:03 -07:00
committed by Peter Johnson
parent 7b471d8c62
commit fd82153456
12 changed files with 318 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponentBase.h
View File

@@ -42,7 +42,7 @@ class ShuffleboardComponentBase : public virtual ShuffleboardValue {
protected:
wpi::StringMap<std::shared_ptr<nt::Value>> m_properties;
bool m_metadataDirty = false;
bool m_metadataDirty = true;
int m_column = -1;
int m_row = -1;
int m_width = -1;

12
wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardContainer.h
View File

@@ -139,6 +139,18 @@ class ShuffleboardContainer : public virtual ShuffleboardValue {
*/
SimpleWidget& Add(const wpi::Twine& title, const wpi::Twine& defaultValue);
/**
* Adds a widget to this container to display the given data.
*
* @param title the title of the widget
* @param defaultValue the default value of the widget
* @return a widget to display the sendable data
* @throws IllegalArgumentException if a widget already exists in this
* container with the given title
* @see #addPersistent(String, Object) add(String title, Object defaultValue)
*/
SimpleWidget& Add(const wpi::Twine& title, const char* defaultValue);
/**
* Adds a widget to this container to display the given data.
*

1
wpilibc/src/main/native/include/frc/shuffleboard/SimpleWidget.h
View File

@@ -37,7 +37,6 @@ class SimpleWidget final : public ShuffleboardWidget<SimpleWidget> {
private:
nt::NetworkTableEntry m_entry;
bool m_entryInitialized = false;
void ForceGenerate();
};