diff --git a/examples/src/main/java/io/github/oblarg/logexample/Robot.java b/examples/src/main/java/io/github/oblarg/logexample/Robot.java index da2ac3e..53db6ed 100644 --- a/examples/src/main/java/io/github/oblarg/logexample/Robot.java +++ b/examples/src/main/java/io/github/oblarg/logexample/Robot.java @@ -50,6 +50,7 @@ public void robotInit() { //Configures logging. Passing "this" specifies the runtime instance of Robot.java as object whose loggable fields //will be make up the shuffleboard tabs. + //Logger.configureLoggingNTOnly(this, "Robot"); Logger.configureLoggingAndConfig(this, false); } diff --git a/lib/src/main/java/io/github/oblarg/oblog/NTComplexWidget.java b/lib/src/main/java/io/github/oblarg/oblog/NTComplexWidget.java index 2ededd0..14c76dd 100644 --- a/lib/src/main/java/io/github/oblarg/oblog/NTComplexWidget.java +++ b/lib/src/main/java/io/github/oblarg/oblog/NTComplexWidget.java @@ -1,8 +1,21 @@ package io.github.oblarg.oblog; +import edu.wpi.first.networktables.NetworkTable; +import edu.wpi.first.wpilibj.Sendable; +import edu.wpi.first.wpilibj.smartdashboard.SendableBuilderImpl; + import java.util.Map; public class NTComplexWidget implements ComplexWidgetWrapper { + + public NTComplexWidget (NetworkTable parent, String title, Sendable sendable) { + SendableBuilderImpl builder = new SendableBuilderImpl(); + builder.setTable(parent.getSubTable(title)); + sendable.initSendable(builder); + builder.startListeners(); + builder.updateTable(); + } + @Override public ComplexWidgetWrapper withProperties(Map properties) { return this; diff --git a/lib/src/main/java/io/github/oblarg/oblog/NTContainer.java b/lib/src/main/java/io/github/oblarg/oblog/NTContainer.java index d2ec92f..fa1f20d 100644 --- a/lib/src/main/java/io/github/oblarg/oblog/NTContainer.java +++ b/lib/src/main/java/io/github/oblarg/oblog/NTContainer.java @@ -19,11 +19,11 @@ public ShuffleboardLayoutWrapper getLayout(String title, LayoutType type) { @Override public SimpleWidgetWrapper add(String title, Object defaultValue) { - return new NTWidget(table.getEntry(title), defaultValue); + return new NTSimpleWidget(table.getEntry(title), defaultValue); } @Override public ComplexWidgetWrapper add(String title, Sendable defaultValue) { - return new NTComplexWidget(); + return new NTComplexWidget(table, title, defaultValue); } } diff --git a/lib/src/main/java/io/github/oblarg/oblog/NTLayout.java b/lib/src/main/java/io/github/oblarg/oblog/NTLayout.java index f2fb7ef..c97c3f8 100644 --- a/lib/src/main/java/io/github/oblarg/oblog/NTLayout.java +++ b/lib/src/main/java/io/github/oblarg/oblog/NTLayout.java @@ -26,11 +26,11 @@ public ShuffleboardLayoutWrapper getLayout(String title, LayoutType type) { @Override public SimpleWidgetWrapper add(String title, Object defaultValue) { - return new NTWidget(table.getEntry(title), defaultValue); + return new NTSimpleWidget(table.getEntry(title), defaultValue); } @Override public ComplexWidgetWrapper add(String title, Sendable defaultValue) { - return new NTComplexWidget(); + return new NTComplexWidget(table, title, defaultValue); } } diff --git a/lib/src/main/java/io/github/oblarg/oblog/NTWidget.java b/lib/src/main/java/io/github/oblarg/oblog/NTSimpleWidget.java similarity index 82% rename from lib/src/main/java/io/github/oblarg/oblog/NTWidget.java rename to lib/src/main/java/io/github/oblarg/oblog/NTSimpleWidget.java index f974b90..8445d7f 100644 --- a/lib/src/main/java/io/github/oblarg/oblog/NTWidget.java +++ b/lib/src/main/java/io/github/oblarg/oblog/NTSimpleWidget.java @@ -4,11 +4,11 @@ import java.util.Map; -class NTWidget implements SimpleWidgetWrapper { +class NTSimpleWidget implements SimpleWidgetWrapper { NetworkTableEntry entry; - NTWidget(NetworkTableEntry entry, Object value){ + NTSimpleWidget(NetworkTableEntry entry, Object value){ this.entry = entry; entry.setValue(value); }