Skip to content

Add automatic servo killing #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YggdrasiI wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add automatic servo killing #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ebdb13
Add automatic servo killing to runMovement class
YggdrasiI Jan 31, 2013
240291a
Use moves folder for http server, too
YggdrasiI Jan 31, 2013
e757e54
Include start of http server into PoMoCo.py. Wrote index.html with li…
YggdrasiI Jan 31, 2013
4cc67f1
Add sort to move array
YggdrasiI Jan 31, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions PoMoCo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import servotorComm
from robot import hexapod
import GUI
from HexyServer import startHttpServer

if __name__ == '__main__':

Expand All @@ -27,6 +28,9 @@
moves.append(s1)
__builtins__.moves = moves

# Sort moves by names to fix order.
moves.sort()

# global function for running move files
def move(moveName):
print "Preforming move:",moveName
Expand All @@ -37,9 +41,17 @@ def move(moveName):
__import__(moveName)
__builtins__.move = move

GUI.startGUI(controller)
# Start http server
startHttpServer(8080)

try:
print 'started http server...'
GUI.startGUI(controller)
except KeyboardInterrupt:
print '^C received, close GUI'

# the program only reaches here if the GUI has been closed
del hexy
del controller
print "quitting!"
os._exit(0)
os._exit(0)
Loading