Diff: main.cpp

Revision:

16:4bdcdac223d8

Parent:

15:558d279addd9

Child:

20:38560fa3d2eb

--- a/main.cpp	Tue May 19 13:34:37 2015 +0200
+++ b/main.cpp	Tue May 19 13:40:33 2015 +0200
@@ -1,6 +1,5 @@
 #include "mbed.h"
 #include "xbusparser.h"
-#include "mtdata2.h"
 #include "xbusmessage.h"
 
 static Serial pc(PA_2, PA_3);
@@ -60,18 +59,18 @@
 	{
 		pc.printf("MTData2:");
 		uint16_t counter;
-		if (MtData2_getItem(&counter, XDI_PacketCounter, message))
+		if (XbusMessage_getDataItem(&counter, XDI_PacketCounter, message))
 		{
 			pc.printf(" Packet counter: %5d", counter);
 		}
 		float ori[4];
-		if (MtData2_getItem(ori, XDI_Quaternion, message))
+		if (XbusMessage_getDataItem(ori, XDI_Quaternion, message))
 		{
 			pc.printf(" Orientation: (% .3f, % .3f, % .3f, % .3f)", ori[0], ori[1],
 					ori[2], ori[3]);
 		}
 		uint32_t status;
-		if (MtData2_getItem(&status, XDI_StatusWord, message))
+		if (XbusMessage_getDataItem(&status, XDI_StatusWord, message))
 		{
 			pc.printf(" Status:%X", status);
 		}