Fix NT only sendables

Oblarg · Feb 27, 2019 · 03f55ee · 03f55ee
1 parent 820d635
commit 03f55ee
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git 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
@@ -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<String, Object> 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
@@ -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
@@ -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/...java/io/github/oblarg/oblog/NTWidget.java → ...o/github/oblarg/oblog/NTSimpleWidget.java b/...java/io/github/oblarg/oblog/NTWidget.java → ...o/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);
     }