WebSVN - Projects - Diff - Rev 440 and 449 - /QMK-Groundstation/branches/libMK/libMK/Parser.cpp

 #include <Parser.h>
+/**
+ * create a frame that can be send to the MK using the
+ * connection class.
+ * see http://www.mikrokopter.com/ucwiki/en/SerialProtocol
+ * how the protocol is encoded and
+ * see http://www.mikrokopter.com/ucwiki/en/SerialCommands
+ * to look at the possible commands that are already coded
+ * in data
+ */
+void Parser::create_frame(char cmd, int address, char * data, unsigned int length) {
+        //if # is cmd we do not touch anything, because
+        // the command is already encoded in data
+        if (cmd != '#') {
+            /*
+            //calculate buffer length
+            //(4 Bytes for 1-byte '#', 1-byte address, and 2-byte crc)
+            //(the rest for the data length - see encode how this is calculated)
+            int buff_len = 4+(length/3 + (length%3==0?0:1) )*4;
+            //allociate memory for the data we want to send
+            char * send_data = (char *)malloc(buf_len);
+            */
+            char send_data[150];
+            send_data[0]='#';
+            send_data[1]=(char)address;
+            send_data[2]=cmd;
+            for (int i = 0; i < length; i++)
+                send_data[i+3] = data[i];
+            //TODO: abgleich mit MKCommunication::send_command
+            Parser::encode64(send_data, length);
+            address = 'a' + address;
+        }
+}
+/**
-// Base64 Decoder
+ * Base64 Decoder
+ * see Parser.h for details about sRxData
+ * data = data that will be decoded
+ * len = length of data
-// see Parser.h for details about sRxData
+ * ptrOut = pointer to decoded data
+ * offset = offset in data
+ */
-bool Parser::decode64(sRxData &rx)
+int Parser::decode64(char * data, int len, unsigned char *ptrOut, int offset)
-{
     int length = rx.str.size();
     unsigned char a,b,c,d;
     unsigned char ptr = 0;
-    unsigned char x,y,z;
-    int ptrOut[150];
-    int ptrIn = 3;
-    int max = length;
+    unsigned char x,y,z;
-    int len = length;
+    int decLen = 0;
-    int decLen = 0;
+/*
+    //FIXME: dies wieder einklammern!
-    if (rx.input[ptrIn] == 0) {
+    if (data[ptrIn] == 0) {
-        return false;
+        return -1;
         //TODO: catch error to show that something went wrong during the decode process
+        //throw "Nothing received";
+    }
+*/
+    //decode data
+    while(len) {
+        a = data[offset++] - '=';
+        b = data[offset++] - '=';
-        //throw "Nothing received";
-    }
-    while(len != 0) {
-        a = rx.input[ptrIn++] - '=';
-        b = rx.input[ptrIn++] - '=';
-        c = rx.input[ptrIn++] - '=';
+        c = data[offset++] - '=';
-        d = rx.input[ptrIn++] - '=';
+        d = data[offset++] - '=';
-        if(ptrIn > max - 2) break;
+        //if(offset > max - 2) break;
         x = (a << 2) | (b >> 4);
         y = ((b & 0x0f) << 4) | (c >> 2);
         z = ((c & 0x03) << 6) | d;
+        if(len--) ptrOut[ptr++] = x; else break;
-        if(len--) ptrOut[ptr++] = x; else break;
+        if(len--) ptrOut[ptr++] = y; else break;
-        if(len--) ptrOut[ptr++] = y; else break;
+        if(len--) ptrOut[ptr++] = z; else break;
+    }
+    //decoded data
+    unsigned char * decData;
-        if(len--) ptrOut[ptr++] = z; else break;
+    for (int a=0; a<ptr; a++) {
         if (len) {
             decData[decLen] = ptrOut[a];
-    for (int a=0; a<ptr; a++) {
+            decLen++;
-        if (length == false) {
+        } else {
             int b1, b2, b3;
-            b1 = ptrOut[a++];
-            b2 = ptrOut[a];
-            b3 = (b2 << 8) | b1;
+            b1 = ptrOut[a++];
             b2 = ptrOut[a];
-            if (b3 > 32767)
                 b3 = b3 - 65536;
+            b3 = (b2 << 8) | b1;
-            rx.decode[decLen] = b3;
+            if (b3 > 32767)
+                b3 = b3 - 65536;
-            decLen++;
+            decData[decLen] = b3;
-        } else {
+            decLen++;
             rx.decode[decLen] = ptrOut[a];
             decLen++;
     ptrOut = decData;
-        rx.decLen = decLen;
+    return decLen;
         tx_buff[pt++] = '=' + (((b & 0x0f) << 2) | ((c & 0xc0) >> 6));
         tx_buff[pt++] = '=' + ( c & 0x3f);
+    }
     tx_buff[pt] = 0;
+    //move pointer of tx_buff to data
-    return string(tx_buff);
+    data = tx_buff;
+}
 // Datensatz nach 8bit Integer
       out = out - 256;
     return out;
+}
-}
+/**
  * received char to 8 bit integer
-// received char to 8 bit integer
+ */
 int Parser::charToData(int data) {
     if (data < 0)
         return data + 256;
+    return data;
-    return data;
+}
 /**
  * convert data to 16bit Integer
-// convert data to 16bit Integer
+ */
 int Parser::dataToInt(int *Data , int Start, bool is_signed)
     return Out;
+}
 /**
  * convert data to 32bit Long
-// convert data to 32bit Long
+ */
 long Parser::dataToLong(int *Data , int Start, bool is_signed)
     float temp = value;
     return temp / num;
-}
+}
-string Parser::dataToString(int Data[150], int Start, int End)
-{
-    char String[150];
-    for (int a = Start; a < End; a++)
-    {
+/**
-        String[a - Start] = Data[a];
-    }
-    String[End - Start] = '\0';
-    return string(String);
-}
+ * check CRC
-// check CRC
+ */
-bool Parser::check_CRC(string RXstr)
 bool Parser::check_CRC(char * rx, int length)
-    int length = RXstr.size();
-    int CRC = 0;
+{
-    char *RX = (char *)RXstr.c_str();
+    int CRC = 0;
-    if (RX[1] == 127)
+    if (rx[1] == 127)
+    {
-        RX[1] = 0;
+        rx[1] = 0;
     }
     for(int i=0; i < length-2; i++)
     {
-            CRC+=RX[i];
+            CRC+=rx[i];
+    }
     CRC = CRC % 4096;
-    if(RX[length - 2] != ('=' + (CRC / 64)))
+    if(rx[length - 2] != ('=' + (CRC / 64)))
+    {
         return false;
+    }
+    if(rx[length - 1] != ('=' + CRC % 64))
+    {
-    if(RX[length - 1] != ('=' + CRC % 64))
+        return false;
+    }
-        return false;
-    return true;
     return true;
+}
-// add CRC
-string Parser::add_CRC(string TX)
+/**
  * create CRC and add it to tx
-    int length = TX.size();
+ */
-    unsigned int tmpCRC = 0;
+void Parser::add_CRC(char * tx, int length)
+{
-    char CRC[2];
-    for(int i = 0; i < length; i++)
+    unsigned int tmpCRC = 0;

Subversion Repositories Projects

(root)/QMK-Groundstation/branches/libMK/libMK/Parser.cpp @ 450 - Rev 440 → 449