Create the RPC function wrapper directly in wrap.

This allows a simplified usage in dispatcher.
Possibly an IFunctionWrapper* may be directly returned in future
refactorings.

Author: cmaglie

examples/wrapper_example/wrapper_example.ino

@@ -55,9 +55,9 @@ void loop() {
     out_packer.clear();
 
     blink_before();
-    int out = wrapped_add(5, 3);
+    int out = (*wrapped_add)(5, 3);
 
-    bool unpack_ok = wrapped_add(unpacker, out_packer);
+    bool unpack_ok = (*wrapped_add)(unpacker, out_packer);
 
     Serial.print("simple call: ");
     Serial.println(out);
@@ -82,7 +82,7 @@ void loop() {
     unpacker.feed(packer.data(), packer.size());
     out_packer.clear();
 
-    bool should_be_false = wrapped_divide(unpacker, out_packer);
+    bool should_be_false = (*wrapped_divide)(unpacker, out_packer);
 
     if (!should_be_false){
         Serial.println("RPC error call divide by zero ");
@@ -103,7 +103,7 @@ void loop() {
     unpacker.clear();
     unpacker.feed(packer.data(), packer.size());
     out_packer.clear();
-    wrapped_hello(unpacker, out_packer);
+    (*wrapped_hello)(unpacker, out_packer);
 
     for (size_t i=0; i<out_packer.size(); i++){
         Serial.print(out_packer.data()[i], HEX);

src/dispatcher.h

@@ -19,9 +19,7 @@ class RpcFunctionDispatcher {
 
         if (isBound(name)) return false;
 
-        using WrapperT = decltype(wrap(std::forward<F>(f)));
-        WrapperT* instance = new WrapperT(wrap(std::forward<F>(f)));
-        _entries[_count++] = {name, tag, instance};
+        _entries[_count++] = {name, tag, wrap(std::forward<F>(f))};
         return true;
     }
 

src/wrapper.h

@@ -100,11 +100,10 @@ class RpcFunctionWrapper<std::function<R(Args...)>>: public IFunctionWrapper {
     }
 };
 
-
 template<typename F>
-auto wrap(F&& f) -> RpcFunctionWrapper<typename arx::function_traits<typename std::decay<F>::type>::function_type> {
+auto wrap(F&& f) -> RpcFunctionWrapper<typename arx::function_traits<typename std::decay<F>::type>::function_type>* {
     using Signature = typename arx::function_traits<typename std::decay<F>::type>::function_type;
-    return RpcFunctionWrapper<Signature>(std::forward<F>(f));
+    return new RpcFunctionWrapper<Signature>(std::forward<F>(f));
 };
 
 #endif