Merge pull request #1212 from sarahmarshy/master

RPC update - rebased with mbed master

workspace_tools/host_tests/mbedrpc.py

@@ -37,9 +37,9 @@ class mbed:
     def rpc(self, name, method, args):
         print("Superclass method not overridden")
 
+
 # Transport mechanisms, derived from mbed
 class SerialRPC(mbed):
-
     def __init__(self, port, baud):
         self.ser = serial.Serial(port)
         self.ser.setBaudrate(baud)
@@ -55,8 +55,8 @@ class SerialRPC(mbed):
         ret_val = self.ser.readline().strip()
         return ret_val
 
-class HTTPRPC(mbed):
 
+class HTTPRPC(mbed):
     def __init__(self, ip):
         self.host = "http://" + ip
 
@@ -72,33 +72,37 @@ class mbed_interface():
         self.mbed = this_mbed
         if isinstance(mpin, str):
             self.name = mpin
+
     def __del__(self):
         r = self.mbed.rpc(self.name, "delete", [])
-	#create new RPC object
-	def new(self, class_name, pin, name):
-        	r = self.mbed.rpc(class_name, "new", [pin, name])
+
+    def new(self, class_name, name, pin1, pin2 = "", pin3 = ""):
+        args = [arg for arg in [pin1,pin2,pin3,name] if arg != ""]
+        r = self.mbed.rpc(class_name, "new", args)
+
     # generic read
     def read(self):
         r = self.mbed.rpc(self.name, "read", [])
         return int(r)
 
+
 # for classes that need write functionality - inherits from the generic reading interface
 class mbed_interface_write(mbed_interface):
-	
     def __init__(self, this_mbed, mpin):
         mbed_interface.__init__(self, this_mbed, mpin)
+
     # generic write
     def write(self, value):
         r = self.mbed.rpc(self.name, "write", [str(value)])
 
+
 # mbed interfaces
 class DigitalOut(mbed_interface_write):
-
     def __init__(self, this_mbed, mpin):
         mbed_interface_write.__init__(self, this_mbed, mpin)
 
-class AnalogIn(mbed_interface):
 
+class AnalogIn(mbed_interface):
     def __init__(self, this_mbed, mpin):
         mbed_interface.__init__(self, this_mbed, mpin)
 
@@ -106,8 +110,8 @@ class AnalogIn(mbed_interface):
         r = self.mbed.rpc(self.name, "read_u16", [])
         return int(r)
 
-class AnalogOut(mbed_interface_write):
 
+class AnalogOut(mbed_interface_write):
     def __init__(self, this_mbed, mpin):
         mbed_interface_write.__init__(self, this_mbed, mpin)
 
@@ -118,13 +122,13 @@ class AnalogOut(mbed_interface_write):
         r = self.mbed.rpc(self.name, "read", [])
         return float(r)
 
-class DigitalIn(mbed_interface):
 
+class DigitalIn(mbed_interface):
     def __init__(self, this_mbed, mpin):
         mbed_interface.__init__(self, this_mbed, mpin)
 
-class PwmOut(mbed_interface_write):
 
+class PwmOut(mbed_interface_write):
     def __init__(self, this_mbed, mpin):
         mbed_interface_write.__init__(self, this_mbed, mpin)
 
@@ -150,8 +154,8 @@ class PwmOut(mbed_interface_write):
     def pulsewidth_us(self, value):
         self.mbed.rpc(self.name, "pulsewidth_us", [str(value)])
 
-class RPCFunction(mbed_interface):
 
+class RPCFunction(mbed_interface):
     def __init__(self, this_mbed, name):
         mbed_interface.__init__(self, this_mbed, name)
 
@@ -159,24 +163,53 @@ class RPCFunction(mbed_interface):
         r = self.mbed.rpc(self.name, "run", [input])
         return r
 
-class RPCVariable(mbed_interface_write):
 
+class RPCVariable(mbed_interface_write):
     def __init__(self, this_mbed, name):
         mbed_interface_write.__init__(self, this_mbed, name)
 
     def read(self):
         r = self.mbed.rpc(self.name, "read", [])
         return r
+
+class Timer(mbed_interface):
+    def __init__(self, this_mbed, name):
+        mbed_interface.__init__(self, this_mbed, name)
+
+    def start(self):
+        r = self.mbed.rpc(self.name, "start", [])
+
+    def stop(self):
+        r = self.mbed.rpc(self.name, "stop", [])
+
+    def reset(self):
+        r = self.mbed.rpc(self.name, "reset", [])
+
+    def read(self):
+        r = self.mbed.rpc(self.name, "read", [])
+        return float(re.search('\d+\.*\d*', r).group(0))
+
+    def read_ms(self):
+        r = self.mbed.rpc(self.name, "read_ms", [])
+        return float(re.search('\d+\.*\d*', r).group(0))
+
+    def read_us(self):
+        r = self.mbed.rpc(self.name, "read_us", [])
+        return float(re.search('\d+\.*\d*', r).group(0))
+
 # Serial
 class Serial():
-		
     def __init__(self, this_mbed, tx, rx=""):
         self.mbed = this_mbed
         if isinstance(tx, str):
             self.name = tx
+
     def __del__(self):
         r = self.mbed.rpc(self.name, "delete", [])
 
+    def baud(self, value):
+        r = self.mbed.rpc(self.name, "baud", [str(value)])
+
     def putc(self, value):
         r = self.mbed.rpc(self.name, "putc", [str(value)])