diff options
author | Cristian Maglie <c.maglie@bug.st> | 2013-06-04 19:33:38 +0200 |
---|---|---|
committer | Cristian Maglie <c.maglie@bug.st> | 2013-06-04 19:33:38 +0200 |
commit | 5b8fe8acbaa29d5e2673be4a1f1dbf8a4a1d784c (patch) | |
tree | 0df6556e05844f27090369b335afb9af5f7f6cbb | |
parent | 177ad96f866714a4962be57f69cd3d5a6334cde1 (diff) | |
parent | 2bb67f9bceb6ec6c6ba8315c727b87abc5e766d0 (diff) |
Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery
Conflicts:
app/src/processing/app/Base.java
app/src/processing/app/Editor.java
-rw-r--r-- | libraries/Bridge/Bridge.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libraries/Bridge/Bridge.cpp b/libraries/Bridge/Bridge.cpp index 440cde0..f13f909 100644 --- a/libraries/Bridge/Bridge.cpp +++ b/libraries/Bridge/Bridge.cpp @@ -42,9 +42,7 @@ void BridgeClass::begin() { delay(500); // Wait for OpenWRT message // "Press enter to activate console" - print(F("\ncd /usr/lib/python2.7/bridge\n")); - delay(100); - print(F("python -B bridge.py\n")); + print(F("run-bridge\n")); delay(1000); dropAll(); |