arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery

Browse Source 
Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
This commit is contained in:
Cristian Maglie
2013-06-04 19:33:38 +02:00
parent 7452ce824f d7c4481baa
commit b4852f353c
8 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/arduino/avr/libraries/Bridge/Bridge.cpp
View File

@ -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();