Skip to content

Commit 7b51842

Browse files
sdmeijersdmeijer
committed
preventing playing melody from buffer on reset
1 parent e1ad812 commit 7b51842

4 files changed

Lines changed: 120 additions & 97 deletions

File tree

‎.gitattributes‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

‎Arduino/arduino.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ def __init__(self,baud=9600,port="",timeout=2):
7070
#--time.sleep(2)
7171
self.SoftwareSerial = SoftwareSerial(self)
7272
self.Servos = Servos(self)
73+
self.sr.flush()
7374

7475
def findPort(self):
7576
"""
@@ -305,14 +306,14 @@ def Melody(self, pin, melody, durations):
305306
d = str(durations[duration])
306307
cmd_str = cmd_str+d+"%"
307308
cmd_str = cmd_str[:-1]+"$!"
308-
print cmd_str
309+
#print cmd_str
309310
try:
310311
self.sr.write(cmd_str)
311312
self.sr.flush()
312313
except:
313314
pass
314315
cmd_str=''.join(["@nto%",str(pin),"$!"])
315-
print cmd_str
316+
#print cmd_str
316317
try:
317318
self.sr.write(cmd_str)
318319
self.sr.flush()

‎MIT license.txt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
Copyright (c) 2012-2013 Tristan A. Hearn <tristanhearn@gmail.com>
2-
3-
Permission is hereby granted, free of charge, to any person obtaining a copy
4-
of this software and associated documentation files (the "Software"), to deal
5-
in the Software without restriction, including without limitation the rights
6-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
copies of the Software, and to permit persons to whom the Software is
8-
furnished to do so, subject to the following conditions:
9-
10-
The above copyright notice and this permission notice shall be included in
11-
all copies or substantial portions of the Software.
12-
13-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19-
THE SOFTWARE.
1+
Copyright (c) 2012-2013 Tristan A. Hearn <tristanhearn@gmail.com>
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

‎examples.py‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
#!/usr/bin/env python
2-
from Arduino import Arduino
3-
import time
4-
5-
def Blink(led_pin,baud, port = ""):
6-
"""
7-
Blinks an LED in 1 sec intervals
8-
"""
9-
board = Arduino(baud, port=port)
10-
while True:
11-
board.digitalWrite(led_pin,"LOW")
12-
print board.digitalRead(led_pin) #confirm LOW (0)
13-
time.sleep(1)
14-
board.digitalWrite(led_pin,"HIGH")
15-
print board.digitalRead(led_pin) #confirm HIGH (1)
16-
time.sleep(1)
17-
18-
def softBlink(led_pin,baud, port = ""):
19-
"""
20-
Fades an LED off and on, using
21-
Arduino's analogWrite (PWM) function
22-
"""
23-
board=Arduino(baud, port=port)
24-
i=0
25-
while True:
26-
i+=1
27-
k=i%510
28-
if k%5==0:
29-
if k>255:
30-
k=510-k
31-
board.analogWrite(led_pin,k)
32-
33-
def adjustBrightness(pot_pin,led_pin,baud, port=""):
34-
"""
35-
Adjusts brightness of an LED using a
36-
potentiometer
37-
"""
38-
board=Arduino(baud, port=port)
39-
while True:
40-
time.sleep(0.01)
41-
val=board.analogRead(pot_pin)/4
42-
print val
43-
board.analogWrite(led_pin,val)
44-
45-
46-
def PingSonar(pw_pin,baud, port=""):
47-
"""
48-
Gets distance measurement from Ping)))
49-
ultrasonic rangefinder connected to pw_pin
50-
"""
51-
board = Arduino(baud, port=port)
52-
pingPin=pw_pin
53-
while True:
54-
duration = board.pulseIn(pingPin, "HIGH")
55-
inches = duration/72./2.
56-
cent = duration/29./2.
57-
print inches,"inches"
58-
time.sleep(0.1)
59-
60-
def LCD(tx,baud,ssbaud,message, port=""):
61-
"""
62-
Prints to two-line LCD connected to
63-
pin tx
64-
"""
65-
board = Arduino(baud, port=port)
66-
board.SoftwareSerial.begin(0,tx,ssbaud)
67-
while True:
68-
board.SoftwareSerial.write(" test ")
69-
70-
71-
72-
73-
if __name__=="__main__":
74-
Blink(13,9600)
75-
#LCD(5,9600,9600," test ")
76-
#adjustBrightness(5,11,9600)
1+
#!/usr/bin/env python
2+
from Arduino import Arduino
3+
import time
4+
5+
def Blink(led_pin,baud, port = ""):
6+
"""
7+
Blinks an LED in 1 sec intervals
8+
"""
9+
board = Arduino(baud, port=port)
10+
while True:
11+
board.digitalWrite(led_pin,"LOW")
12+
print board.digitalRead(led_pin) #confirm LOW (0)
13+
time.sleep(1)
14+
board.digitalWrite(led_pin,"HIGH")
15+
print board.digitalRead(led_pin) #confirm HIGH (1)
16+
time.sleep(1)
17+
18+
def softBlink(led_pin,baud, port = ""):
19+
"""
20+
Fades an LED off and on, using
21+
Arduino's analogWrite (PWM) function
22+
"""
23+
board=Arduino(baud, port=port)
24+
i=0
25+
while True:
26+
i+=1
27+
k=i%510
28+
if k%5==0:
29+
if k>255:
30+
k=510-k
31+
board.analogWrite(led_pin,k)
32+
33+
def adjustBrightness(pot_pin,led_pin,baud, port=""):
34+
"""
35+
Adjusts brightness of an LED using a
36+
potentiometer
37+
"""
38+
board=Arduino(baud, port=port)
39+
while True:
40+
time.sleep(0.01)
41+
val=board.analogRead(pot_pin)/4
42+
print val
43+
board.analogWrite(led_pin,val)
44+
45+
46+
def PingSonar(pw_pin,baud, port=""):
47+
"""
48+
Gets distance measurement from Ping)))
49+
ultrasonic rangefinder connected to pw_pin
50+
"""
51+
board = Arduino(baud, port=port)
52+
pingPin=pw_pin
53+
while True:
54+
duration = board.pulseIn(pingPin, "HIGH")
55+
inches = duration/72./2.
56+
cent = duration/29./2.
57+
print inches,"inches"
58+
time.sleep(0.1)
59+
60+
def LCD(tx,baud,ssbaud,message, port=""):
61+
"""
62+
Prints to two-line LCD connected to
63+
pin tx
64+
"""
65+
board = Arduino(baud, port=port)
66+
board.SoftwareSerial.begin(0,tx,ssbaud)
67+
while True:
68+
board.SoftwareSerial.write(" test ")
69+
70+
71+
72+
73+
if __name__=="__main__":
74+
Blink(13,9600)
75+
#LCD(5,9600,9600," test ")
76+
#adjustBrightness(5,11,9600)
7777
#softBlink(11,9600)

0 commit comments

Comments
 (0)