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

SmartDashboard override .name entry in putData(String, Sendable) (#866)

Browse Source 
Fixes #865
This commit is contained in:
Sam Carlberg
2018-01-02 14:39:16 -08:00
committed by Peter Johnson
parent 0ef9803363
commit ee33296e1f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
View File

@@ -162,10 +162,12 @@ void SmartDashboard::PutData(llvm::StringRef key, Sendable* data) {
auto& sddata = inst.tablesToData[key];
if (!sddata.sendable || sddata.sendable != data) {
sddata = SmartDashboardData(data);
sddata.builder.SetTable(inst.table->GetSubTable(key));
auto dataTable = inst.table->GetSubTable(key);
sddata.builder.SetTable(dataTable);
data->InitSendable(sddata.builder);
sddata.builder.UpdateTable();
sddata.builder.StartListeners();
dataTable->GetEntry(".name").SetString(key);
}
}

4
wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java
View File

@@ -67,10 +67,12 @@ public class SmartDashboard {
}
sddata = new Data(data);
tablesToData.put(key, sddata);
sddata.m_builder.setTable(table.getSubTable(key));
NetworkTable dataTable = table.getSubTable(key);
sddata.m_builder.setTable(dataTable);
data.initSendable(sddata.m_builder);
sddata.m_builder.updateTable();
sddata.m_builder.startListeners();
dataTable.getEntry(".name").setString(key);
}
}