Revision 9:2aa76667c340, committed 2015-04-09

Comitter:

ban4jp

Date:

Thu Apr 09 18:02:10 2015 +0000

Parent:

8:682c65afe534

Commit message:

Change to work with RTOS.

Changed in this revision

diff -r 682c65afe534 -r 2aa76667c340 RPCFunction.cpp
--- a/RPCFunction.cpp	Sat Jan 28 19:12:00 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
- /**
-* @section LICENSE
-*Copyright (c) 2010 ARM Ltd.
-*
-*Permission is hereby granted, free of charge, to any person obtaining a copy
-*of this software and associated documentation files (the "Software"), to deal
-*in the Software without restriction, including without limitation the rights
-*to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-*copies of the Software, and to permit persons to whom the Software is
-*furnished to do so, subject to the following conditions:
-* 
-*The above copyright notice and this permission notice shall be included in
-*all copies or substantial portions of the Software.
-* 
-*THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-*IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-*FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-*AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-*LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-*OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-*THE SOFTWARE.
-*
-* @section Description
-*This class provides an object which can be called over RPC to run the function which is attached to it.
-*
-*/      
-#include "RPCFunction.h"
-#include "rpc.h"
-
-//Parse a char argument without delimiting by anything that is non alphanumeric - based on version in rpc.h line 153
- char *parse_arg_char(const char *arg, const char **next) {
-        const char *ptr = arg;
-        char *res = NULL;
-        if(*arg == '"') {
-            /* quoted string */
-            ptr = ++arg;
-            int len = 0;
-            /* find the end (and length) of the quoted string */
-            for(char c = *ptr; c != 0 && c != '"'; c = *++ptr) {
-                len++;
-                if(c == '\\') {
-                    ptr++;
-                }
-            }  
-            /* copy the quoted string, and unescape characters */
-            if(len != 0) {
-                res = new char[len+1];
-                char *resptr = res;
-                while(arg != ptr) {
-                    *resptr++ = parse_char(arg, &arg);
-                }
-                *resptr = 0;
-            }
-        } else {
-            /* unquoted string */
-            while(isalnum(*ptr) || isgraph(*ptr) || *ptr=='_' || *ptr == ' ') {             //Edit this line to change which types of characters are allowed and which delimit
-                ptr++;
-           }
-            int len = ptr-arg;
-            if(len!=0) {                                //Chnages made to just pass whole string with no next arg or delimiters, these changes just removes space at the beginning
-                res = new char[len];                    //was len+1
-                memcpy(res, arg + 1, len - 1);          // was arg, len
-                res[len-1] = 0;                         //was len 
-            }
-        }
-      
-        if(next != NULL) {
-            *next = ptr;
-        } 
-      return res;
-    }  
-    
-    //Custom rpc method caller for execute so that the string will not be delimited by anything
-    //See line 436 of rpc.h
-    void rpc_method_caller_run(Base *this_ptr, const char *arguments, char *result) {
-    
-        const char *next = arguments;
-        char* arg1 = parse_arg_char(next,NULL);
-        
-        char * res = (static_cast<RPCFunction*>(this_ptr)->run)(arg1);
-        if(result != NULL) {
-            write_result<char*>(res, result);
-        }
-        delete arg1;    // Seems to stop a memory leak issue which prevented an RPCFunction being run more than ~500 times
-    }
-
-   RPCFunction::RPCFunction(void(*f)(char*, char*), const char* name) : Base(name){
-        _ftr = f;   
-    }
-    
-
-    //Just run the attached function using the string thats in private memory - or just using null values, 
-    char * RPCFunction::run(char * input){
-        strcpy(_input, input);
-        (*_ftr)(_input,_output);
-        return(_output);
-    }
-    
-    //Just read the output string
-    char* RPCFunction::read(){
-        return(_output);
-    }
-    
-    
-    #ifdef MBED_RPC
-    const rpc_method *RPCFunction::get_rpc_methods() {
-       static const rpc_method rpc_methods[] = { 
-        { "run", rpc_method_caller_run },                                                 //Run using custom caller, all characters accepted in string
-        { "read", rpc_method_caller<char*, RPCFunction, &RPCFunction::read> },
-        RPC_METHOD_SUPER(Base)
-      };
-      return rpc_methods;
-    }       
-
-#endif

diff -r 682c65afe534 -r 2aa76667c340 RPCFunction.h
--- a/RPCFunction.h	Sat Jan 28 19:12:00 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
- /**
-* @section LICENSE
-*Copyright (c) 2010 ARM Ltd.
-*
-*Permission is hereby granted, free of charge, to any person obtaining a copy
-*of this software and associated documentation files (the "Software"), to deal
-*in the Software without restriction, including without limitation the rights
-*to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-*copies of the Software, and to permit persons to whom the Software is
-*furnished to do so, subject to the following conditions:
-* 
-*The above copyright notice and this permission notice shall be included in
-*all copies or substantial portions of the Software.
-* 
-*THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-*IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-*FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-*AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-*LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-*OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-*THE SOFTWARE.
-* 
-* @section Description
-*This class provides an object which can be called over RPC to run the function which is attached to it.
-* 
-*/     
-#ifndef RPCFUNCTION_RPC
-#define RPCFUNCTION_RPC
-/**
-*Includes
-*/
-#include "mbed.h"
-#include "platform.h"
-#include "rpc.h"
-#define STR_LEN 64
-#include "platform.h"
- 
-#ifdef MBED_RPC
-#include "rpc.h"
-#endif
-/**
-*
-*Class to call custom functions over RPC
-*
-*/
-class RPCFunction : public Base{
-public:
-    /**
-    * Constructor
-    * 
-    *@param f Pointer to the function to call. the function must be of the form void foo(char * input, char * output)
-    *@param name The name of this object
-    */
-    RPCFunction(void(*f)(char*, char*), const char* = NULL);
-
-    /** 
-    *run 
-    *
-    *Calls the attached function passing the string in but doesn't return the result.
-    *@param str The string to be passed into the attached function. This string can consist of any ASCII characters apart from escape codes. The usual limtations on argument content for RPC strings has been removed
-    *@return A string output from the function
-    */
-    char * run(char* str);
-    
-    /**
-    *Reads the value of the output string.
-    *
-    *@returns the string outputted from the last time the function was called
-    */
-    char * read();
-
-
-     #ifdef MBED_RPC
-    virtual const struct rpc_method *get_rpc_methods();      
-     #endif
-
-private:
-    void (*_ftr)(char*, char*);
-    
-    char _input[STR_LEN];
-    char _output[STR_LEN];
-    
-};
-#endif
\ No newline at end of file

diff -r 682c65afe534 -r 2aa76667c340 RPCVariable.h
--- a/RPCVariable.h	Sat Jan 28 19:12:00 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
- /**
-* @section LICENSE
-*Copyright (c) 2010 ARM Ltd.
-*
-*Permission is hereby granted, free of charge, to any person obtaining a copy
-*of this software and associated documentation files (the "Software"), to deal
-*in the Software without restriction, including without limitation the rights
-*to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-*copies of the Software, and to permit persons to whom the Software is
-*furnished to do so, subject to the following conditions:
-* 
-*The above copyright notice and this permission notice shall be included in
-*all copies or substantial portions of the Software.
-* 
-*THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-*IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-*FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-*AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-*LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-*OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-*THE SOFTWARE.
-*
-* @section Description
-*This class provides an object to which a variable can be attached. Any type 
-*for which a parse_args function specilisation exists can be attached. This includes 
-*all of the standard types.
-*
-*/
- #ifndef RPCVARIABLE_H_  
- #define RPCVARIABLE_H_
-
-#include "mbed.h"
-#include "platform.h"
-#include "rpc.h"
- /**
- *Class to read and set an attached variable using the RPC
- *
- */
-template<class T>
-class RPCVariable : public Base{
-public:
-    /**
-    * Constructor
-    * 
-    *@param ptr Pointer to the variable to make accessible over RPC. Any type of 
-    *variable can be connected
-    *@param name The name of that this object will be over RPC
-    */
-    template<class A>
-    RPCVariable(A * ptr, const char * name) : Base(name){
-        _ptr = ptr;
-    }
-    /**
-    *Read the variable over RPC.
-    * 
-    *@return The value of the variable
-    */
-    T read(){
-        return(*_ptr);
-    }
-    /**
-    *Write a value to the variable over RPC
-    * 
-    *@param The value to be written to the attached variable.
-    */
-    void write(T value){
-        *_ptr = value;
-    }
-
-                                                                                   #ifdef MBED_RPC
-    virtual const struct rpc_method *get_rpc_methods();    
-    static struct rpc_class *get_rpc_class();
-                     #endif
-
-private:
-    T * _ptr;
-                                           
-};
-
-//Set up RPC methods
-#ifdef MBED_RPC
-template <class T>
-    const rpc_method *RPCVariable<T>::get_rpc_methods() {
-       static const rpc_method rpc_methods[] = {
-        { "read", rpc_method_caller<T, RPCVariable, &RPCVariable::read> },
-        { "write", rpc_method_caller<RPCVariable, T, &RPCVariable::write> },
-        RPC_METHOD_SUPER(Base)
-      };
-      return rpc_methods;
-    }       
-    template <class T>
-    rpc_class *RPCVariable<T>::get_rpc_class() {
-        static const rpc_function funcs[] = {"new", rpc_function_caller<const char*, T,const char* , &Base::construct<RemoteVar, T ,const char*> >,RPC_METHOD_END};
-        static rpc_class c = { "RPCVariable", funcs, NULL };
-        return &c;
-    }
-#endif
-
-//There could be specialisation for integer, to also give increment and decrements
-
-
-#endif  //RPCVARIABLE_H_
\ No newline at end of file

diff -r 682c65afe534 -r 2aa76667c340 SerialRPCInterface.cpp
--- a/SerialRPCInterface.cpp	Sat Jan 28 19:12:00 2012 +0000
+++ b/SerialRPCInterface.cpp	Thu Apr 09 18:02:10 2015 +0000
@@ -30,29 +30,32 @@
 using namespace mbed;
 
 //Requires multiple contstructors for each type, serial to set different pin numbers, TCP for port.
-SerialRPCInterface::SerialRPCInterface(PinName tx, PinName rx, int baud):pc(tx, rx) {
+SerialRPCInterface::SerialRPCInterface(PinName tx, PinName rx, int baud):pc(tx, rx), _thread(SerialRPCInterface::_MsgProcessStarter, this, osPriorityNormal, 1024) {
     _RegClasses();
     _enabled  = true;
+    _command_ptr = _command;
      pc.attach(this, &SerialRPCInterface::_RPCSerial, Serial::RxIrq);
      if(baud != 9600)pc.baud(baud);
 }
 
 void SerialRPCInterface::_RegClasses(void){
     //Register classes with base 
-    Base::add_rpc_class<AnalogIn>();
-    Base::add_rpc_class<DigitalIn>();
-    Base::add_rpc_class<DigitalOut>();
-    Base::add_rpc_class<DigitalInOut>();
-    Base::add_rpc_class<PwmOut>();
-    Base::add_rpc_class<Timer>();
-    Base::add_rpc_class<BusOut>();
-    Base::add_rpc_class<BusIn>();
-    Base::add_rpc_class<BusInOut>();
-    Base::add_rpc_class<Serial>();
+    //RPC::add_rpc_class<RpcAnalogIn>();
+    RPC::add_rpc_class<RpcDigitalIn>();
+    RPC::add_rpc_class<RpcDigitalOut>();
+    RPC::add_rpc_class<RpcDigitalInOut>();
+    RPC::add_rpc_class<RpcPwmOut>();
+    RPC::add_rpc_class<RpcTimer>();
+    //RPC::add_rpc_class<RpcBusOut>();
+    //RPC::add_rpc_class<RpcBusIn>();
+    //RPC::add_rpc_class<RpcBusInOut>();
+    RPC::add_rpc_class<RpcSerial>();
+    RPC::add_rpc_class<RpcSPI>();
+    //RPC::add_rpc_class<RpcI2C>();
     
     //AnalogOut not avaliable on mbed LPC11U24 so only compile for other devices
     #if !defined(TARGET_LPC11U24) 
-    Base::add_rpc_class<AnalogOut>();
+    //RPC::add_rpc_class<RpcAnalogOut>();
     #endif
 }
 
@@ -62,18 +65,38 @@
 void SerialRPCInterface::Enable(void){
     _enabled = true;
 }
+void SerialRPCInterface::_MsgProcessStarter(const void *args){
+    SerialRPCInterface *instance = (SerialRPCInterface*)args;
+    while(1){
+        instance->_MsgProcess();
+    }
+}
 void SerialRPCInterface::_MsgProcess(void) {
-    if(_enabled == true){
-        rpc(_command, _response);
+    osEvent evt = _commandMail.get();
+    if(evt.status == osEventMail){
+        mail_t *mail = (mail_t*)evt.value.p;
+        if(_enabled == true){
+            RPC::call(_command, _response);
+            pc.printf("%s\n", _response);
+        }
+        _commandMail.free(mail);
     }
 }
 
 void SerialRPCInterface::_RPCSerial() {
     _RPCflag = true;
     if(_enabled == true){
-        pc.gets(_command, 256);
-        _MsgProcess();
-        pc.printf("%s\n", _response);
+        char c = pc.getc();
+        if(c == 13){
+            *_command_ptr = '\0';
+            mail_t *mail = _commandMail.alloc();
+            strcpy(mail->command, _command);
+            _commandMail.put(mail);
+            _command_ptr = _command;
+        }else if(_command_ptr - _command < 256){
+            *_command_ptr = c;
+            _command_ptr++;
+        }
     }
     _RPCflag = false;
 }

diff -r 682c65afe534 -r 2aa76667c340 SerialRPCInterface.h
--- a/SerialRPCInterface.h	Sat Jan 28 19:12:00 2012 +0000
+++ b/SerialRPCInterface.h	Thu Apr 09 18:02:10 2015 +0000
@@ -32,10 +32,14 @@
 *Includes
 */
 #include "mbed.h"
+#include "rtos.h"
 #include "platform.h"
 #include "rpc.h"
 #include "RPCFunction.h"
 #include "RPCVariable.h"
+#include "RpcClasses.h"
+
+#define PROCESS_THREAD 1
 
 
 namespace mbed{
@@ -73,18 +77,26 @@
     void Enable(void);
     
     //The Serial Port
-    Serial pc;
+    RawSerial pc;
     
 
 private:
+    typedef struct {
+        char command[256];
+    } mail_t;
+
     //Handle messgaes and take appropriate action
+    static void _MsgProcessStarter(const void *args);
     void _MsgProcess(void);
     void _RegClasses(void);
     void _RPCSerial();
     bool _enabled;
     char _command[256];
+    char* _command_ptr;
     char _response[256];
     bool _RPCflag;
+    Thread _thread;
+    Mail<mail_t, 8> _commandMail;
 };
 }
 #endif
\ No newline at end of file