Revision 0:0f9ceecf1db8, committed 2014-05-22

Comitter:

diepvriezer

Date:

Thu May 22 08:33:12 2014 +0000

Commit message:

Initial commit

Changed in this revision

diff -r 000000000000 -r 0f9ceecf1db8 AndroidAccessory.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/AndroidAccessory.lib	Thu May 22 08:33:12 2014 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/p07gbar/code/AndroidAccessory/#98fbe1660f0a

diff -r 000000000000 -r 0f9ceecf1db8 MbedCommand.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MbedCommand.h	Thu May 22 08:33:12 2014 +0000
@@ -0,0 +1,23 @@
+#ifndef __MBED_COMMAND_H__
+#define __MBED_COMMAND_H__
+
+#include "USBHost.h"
+
+struct MbedRequest {
+    MbedRequest() { }
+    int id;
+    int commandId;
+    int n;
+    float *args;
+};
+
+struct MbedResponse {
+    MbedResponse() { }
+    int requestId;
+    int commandId;
+    int error;
+    int n;
+    float *values;
+};
+
+#endif
\ No newline at end of file

diff -r 000000000000 -r 0f9ceecf1db8 NetCentricApp.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/NetCentricApp.cpp	Thu May 22 08:33:12 2014 +0000
@@ -0,0 +1,203 @@
+#include "NetCentricApp.h"
+#include "MbedCommand.h"
+
+// Process commands here.
+MbedResponse *NetCentricApp::getResponse(MbedRequest *request) {
+    if (request->commandId == COMMAND_SUM) {
+        return sumCommand(request);
+    } else if (request->commandId == COMMAND_AVG) {
+        return avgCommand(request);
+    } else if (request->commandId == COMMAND_LED) {
+        return ledCommand(request);
+    }
+    
+    MbedResponse *commandNotFound = new MbedResponse();
+    commandNotFound->requestId = request->id;
+    commandNotFound->commandId = request->commandId;
+    commandNotFound->error = ERR_COMMAND_NOT_FOUND;
+    commandNotFound->n = 0;
+    commandNotFound->values = NULL;
+    
+    return commandNotFound;
+}
+
+// Sample commands.
+MbedResponse *NetCentricApp::sumCommand(MbedRequest *request) {
+    float sum = 0.0f;
+    for (int i = 0; i < request->n; i++) {
+        sum += request->args[i];
+    }
+    
+    MbedResponse *r = new MbedResponse();
+    r->requestId = request->id;
+    r->commandId = request->commandId;
+    r->error = NO_ERROR;
+    r->n = 1;
+    r->values = new float[1];
+    r->values[0] = sum;
+    return r;
+}
+
+MbedResponse *NetCentricApp::avgCommand(MbedRequest *request) {
+    float sum = 0.0f;
+    for (int i = 0; i < request->n; i++) {
+        sum += request->args[i];
+    }
+    
+    MbedResponse *r = new MbedResponse();
+    r->requestId = request->id;
+    r->commandId = request->commandId;
+    r->error = NO_ERROR;
+    r->n = 1;
+    r->values = new float[1];
+    
+    if (request->n > 0) {
+        r->values[0] = sum / request->n;
+    } else {
+        r->values[0] = sum;
+    }
+    return r;
+}
+
+// Control the LED's.
+MbedResponse *NetCentricApp::ledCommand(MbedRequest *request) {
+    DigitalOut led1(LED1);
+    DigitalOut led2(LED2);
+    DigitalOut led3(LED3);
+    DigitalOut led4(LED4);
+    
+    if (request->n > 0) led1 = request->args[0];
+    if (request->n > 1) led2 = request->args[1];
+    if (request->n > 2) led3 = request->args[2];
+    if (request->n > 3) led4 = request->args[3];
+    
+    MbedResponse *r = new MbedResponse();
+    r->requestId = request->id;
+    r->commandId = request->commandId;
+    r->error = NO_ERROR;
+    r->n = 4;
+    r->values = new float[4];
+    r->values[0] = led1;
+    r->values[1] = led2;
+    r->values[2] = led3;
+    r->values[3] = led4;
+    
+    return r;
+}
+
+// Setup once a device is connected.
+void NetCentricApp::setupDevice() {
+    printf("Connected to Android!\r\n");
+}
+
+// Called on disconnect.
+void NetCentricApp::resetDevice() {
+    printf("Disconnected\r\n");
+}
+
+
+// Construction of requests.
+int NetCentricApp::callbackRead(u8 *buffer, int len) {
+    if (len > 0) {
+        // Parse request, format:
+        //  int     - request ID
+        //  int     - command ID
+        //  ubyte   - # args
+        //  float[] -- args
+        
+        // Note len is fixed as the packet is always equally big. Don't try to use
+        // packets of variable size, the smallest size of a encountered packet is 
+        // used.
+        
+        MbedRequest *request = new MbedRequest();
+        
+        request->id = getInt(buffer, 0, len);
+        request->commandId = getInt(buffer, 4, len);
+        request->n = getInt(buffer, 8, len);
+        request->args = NULL;
+        
+        printf("request: %i, command: %i, n-args: %i\r\n", request->id, request->commandId, request->n);
+        
+        int n = request->n;
+        if (n > 0) {
+            request->args = new float[n];
+            for (int i = 0; i < n; i++) {
+                int offset = 12 + (i * 4);
+                float f = getFloat(buffer, offset, len);
+                request->args[i] = f;
+            }
+        }
+        
+        // Construct and send response.
+        MbedResponse *response = getResponse(request);
+        int responseSize = 4 + 4 + 4 + 4 + (response->n*4);
+        u8 responseBuffer[responseSize];
+        
+        memcpy(responseBuffer + 0, reinterpret_cast<u8 const *>(&response->requestId), 4);
+        memcpy(responseBuffer + 4, reinterpret_cast<u8 const *>(&response->commandId), 4);
+        memcpy(responseBuffer + 8, reinterpret_cast<u8 const *>(&response->error), 4);
+        memcpy(responseBuffer + 12, reinterpret_cast<u8 const *>(&response->n), 4);
+        if (response->n > 0) {
+            for (int i = 0; i < response->n; i++)  {
+                float f = response->values[i];
+                memcpy(responseBuffer + 16 + i*4, reinterpret_cast<u8 const *>(&f), 4);
+            }
+            
+        }
+        
+        write(responseBuffer, responseSize);
+        
+        // Clean up.
+        if (request->n > 0) {
+            delete[] request->args;
+        }
+        delete request;
+        
+        if (response->n > 0) {
+            delete[] response->values;
+        }
+        delete response;
+    }
+    
+    return 0;
+}
+
+// Called to confirm a write operation.
+int NetCentricApp::callbackWrite() {
+    return 0;
+}
+
+
+/* Unsigned byte to primitives. Little endian assumed, Java sends Big endian by default. */
+float NetCentricApp::getFloat(u8 *buffer, int offset, int bufferLen) {
+    if (offset + 3 > bufferLen) {
+        printf("float index out of bounds!\r\n");
+        return 0.0;
+    }
+        
+    float f;
+    memcpy(&f, buffer + offset, sizeof(f));
+    return f;
+}
+
+int NetCentricApp::getInt(u8 *buffer, int offset, int bufferLen) {
+    if (offset + 3 > bufferLen) {
+        printf("int index out of bounds!\r\n");
+        return 0;
+    }
+        
+    int i;
+    memcpy(&i, buffer + offset, sizeof(i));
+    return i;
+}
+
+u8 NetCentricApp::getUByte(u8 *buffer, int offset, int bufferLen) {
+    if (offset > bufferLen) {
+        printf("byte index out of bounds!\r\n");
+        return 0;
+    }
+    
+    u8 b;
+    memcpy(&b, buffer + offset, sizeof(b));
+    return b;
+}
\ No newline at end of file

diff -r 000000000000 -r 0f9ceecf1db8 NetCentricApp.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/NetCentricApp.h	Thu May 22 08:33:12 2014 +0000
@@ -0,0 +1,48 @@
+#ifndef __NETCENTRICAPP_H__
+#define __NETCENTRICAPP_H__
+
+#include "AndroidAccessory.h"
+#include "mbed.h"
+#include "MbedCommand.h"
+
+#define READ_BUFF   2048
+#define WRITE_BUFF  2048
+
+#define NO_ERROR                    0
+#define ERR_COMMAND_NOT_FOUND       1
+
+#define COMMAND_SUM                 1
+#define COMMAND_AVG                 2
+#define COMMAND_LED                 3
+
+class NetCentricApp : private AndroidAccessory {
+    public:
+        NetCentricApp():
+            AndroidAccessory(READ_BUFF, WRITE_BUFF,
+                                "ARM",
+                                "mbed",
+                                "mbed - NetCentric",
+                                "0.2",
+                                "http://www.uva.nl",
+                                "0000000012345678")
+            {};
+        
+    protected:
+        virtual void setupDevice();
+        virtual void resetDevice();
+        virtual int callbackRead(u8 *buffer, int len);
+        virtual int callbackWrite();
+        
+        MbedResponse *getResponse(MbedRequest *request);
+    
+    private:
+        static float getFloat(u8 *buffer, int offset, int bufferLen);
+        static int getInt(u8 *buffer, int offset, int bufferLen);
+        static u8 getUByte(u8 *buffer, int offset, int bufferLen);
+        
+        MbedResponse *sumCommand(MbedRequest *request);
+        MbedResponse *avgCommand(MbedRequest *request);
+        MbedResponse *ledCommand(MbedRequest *request);
+};
+
+#endif
\ No newline at end of file

diff -r 000000000000 -r 0f9ceecf1db8 main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.cpp	Thu May 22 08:33:12 2014 +0000
@@ -0,0 +1,13 @@
+#include "NetCentricApp.h"
+#include "mbed.h"
+
+int main() {
+    printf("Started NetCentric App\r\n");
+    
+    NetCentricApp app;
+    
+    USBInit();
+    while (true) {
+        USBLoop();
+    }
+}
\ No newline at end of file

diff -r 000000000000 -r 0f9ceecf1db8 mbed.bld
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed.bld	Thu May 22 08:33:12 2014 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed/builds/0b3ab51c8877
\ No newline at end of file