@@ -8,12 +8,13 @@ class Arduino(object):
8
8
9
9
def __init__ (self , port , baudrate = 115200 ):
10
10
self .serial = serial .Serial (port , baudrate )
11
- self .serial .write ('99 ' )
11
+ self .serial .write ('100 ' )
12
12
13
13
def __str__ (self ):
14
14
return "Arduino is on port %s at %d baudrate" % (self .serial .port , self .serial .baudrate )
15
15
16
16
def output (self , pinArray ):
17
+ self .__sendData ('99' )
17
18
self .__sendData (len (pinArray ))
18
19
19
20
if (isinstance (pinArray , list ) or isinstance (pinArray , tuple )):
@@ -46,20 +47,31 @@ def analogWrite(self, pin, value):
46
47
def analogRead (self , pin ):
47
48
self .__sendData ('4' )
48
49
self .__sendData (pin )
49
- return self .__getData ()
50
+ return int ( self .__getData () )
50
51
51
52
def turnOff (self ):
52
53
for each_pin in self .__OUTPUT_PINS :
53
54
self .setLow (each_pin )
54
55
return True
55
56
57
+ def getID (self ):
58
+ self .__sendData ('97' )
59
+ return self .__getData ()
60
+
61
+ def setID (self , ID ):
62
+ self .__sendData ('98' )
63
+ self .__sendData (ID )
64
+ return True
65
+
56
66
def __sendData (self , serial_data ):
57
67
while (self .__getData ()[0 ] != "w" ):
58
68
pass
69
+ #print("writing data: " + str(serial_data))
59
70
self .serial .write (str (serial_data ))
60
71
61
72
def __getData (self ):
62
- return self .serial .readline ().rstrip ('\n ' )
73
+ #print("reading data")
74
+ return self .serial .readline ().rstrip ('\n ' ).rstrip ('\r ' )
63
75
64
76
def __formatPinState (self , pinValue ):
65
77
if pinValue == '1' :
0 commit comments