Diff: Telemetry.cpp

Revision:

5:cd94bb58e096

Parent:

4:8e3de1a314e1

Child:

7:d224bddd5405

--- a/Telemetry.cpp	Mon Feb 22 17:55:46 2016 +0000
+++ b/Telemetry.cpp	Wed Mar 09 12:15:13 2016 +0000
@@ -1,5 +1,5 @@
-#include "Telemetry.h"
-
+#include "Telemetry.hpp"
+#include "c_api/telemetry_core.h"
 #include "BufferedSerial.h"
 
 static BufferedSerial pc(USBTX, USBRX);
@@ -38,7 +38,17 @@
     pc.baud(bauds);
 }
 
-void Telemetry::pub(const char * topic, char * msg)
+void Telemetry::begin(uint32_t bauds)
+{
+    pc.baud(bauds);
+}
+
+TM_transport * Telemetry::get_transport()
+{
+  return &transport;
+}
+
+void Telemetry::pub(const char * topic, const char * msg)
 {
     publish(topic,msg);
 }
@@ -81,52 +91,10 @@
 void Telemetry::sub(void (*callback)(TM_state * s, TM_msg * m),
                     TM_state* userData)
 {
-    set_state(userData);
-    subscribe(callback);
+    subscribe(callback,userData);
 }
 
 void Telemetry::update()
 {
     update_telemetry(0);
 }
-/*
-uint32_t cast(TM_msg * m, char * buf, size_t bufSize)
-{
-    return emplace(m,buf,bufSize);
-}
-
-uint32_t cast_u8(TM_msg * m, uint8_t * dst)
-{
-    return emplace_u8(m,dst);
-}
-
-uint32_t cast_u16(TM_msg * m, uint16_t * dst)
-{
-    return emplace_u16(m,dst);
-}
-
-uint32_t cast_u32(TM_msg * m, uint32_t * dst)
-{
-    return emplace_u32(m,dst);
-}
-
-uint32_t cast_i8(TM_msg * m, int8_t * dst)
-{
-    return emplace_i8(m,dst);
-}
-
-uint32_t cast_i16(TM_msg * m, int16_t * dst)
-{
-    return emplace_i16(m,dst);
-}
-
-uint32_t cast_i32(TM_msg * m, int32_t * dst)
-{
-    return emplace_i32(m,dst);
-}
-
-uint32_t cast_f32(TM_msg * m, float * dst)
-{
-    return emplace_f32(m,dst);
-}
-*/