wip

RoboticsBrno · Jul 5, 2024 · 2d38b64 · 2d38b64
1 parent f295228
commit 2d38b64
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/idf_component.yml b/idf_component.yml
@@ -2,4 +2,4 @@ dependencies:
   idf: ">=5.1"
   RB3201-RBProtocol-library:
     git: https://github.com/RoboticsBrno/RB3201-RBProtocol-library.git
-    version: v13.3.3
+    version: 49f81d8fae9d5eea1ce2b44ed786ec6ed25174b7
diff --git a/src/builder/arm.h b/src/builder/arm.h
@@ -31,12 +31,6 @@ class Arm : public Widget, public BuilderMixin<Arm, gridui::Arm> {
         addCallback("grab", cb);
         return *this;
     }
-
-protected:
-    virtual void serialize(std::ostream& ss) {
-        Widget::serialize(ss);
-        extra().remove("info");
-    }
 };
 
 };

diff --git a/src/builder/widget.cpp b/src/builder/widget.cpp
@@ -13,9 +13,6 @@ Widget::Widget(const char* type, WidgetState& state)
     , m_type(type) {
 }
 
-Widget::~Widget() {
-}
-
 rbjson::Object& Widget::extra() {
     return m_state.data();
 }

diff --git a/src/builder/widget.h b/src/builder/widget.h
@@ -77,14 +77,13 @@ class Widget {
 
 public:
     Widget(Widget&& o) noexcept;
-    virtual ~Widget();
 
     const char *widgetTypeName() const { return m_type; }
 
 protected:
     Widget(const char* type, WidgetState& state);
 
-    virtual void serialize(std::ostream& ss);
+    void serialize(std::ostream& ss);
 
     rbjson::Object& extra();
     rbjson::Object& style();

diff --git a/src/gridui.cpp b/src/gridui.cpp
@@ -195,6 +195,9 @@ void _GridUi::commit() {
 
             auto& w = m_widgets[i];
             w->serialize(stream);
+            if(strcmp(w->m_type, "Arm") == 0) {
+                w->extra().remove("info");
+            }
             w.reset();
         }
         m_widgets.clear();