diff options
author | daniel-Jones <daniel@danieljon.es> | 2017-04-07 09:17:10 +0930 |
---|---|---|
committer | daniel-Jones <daniel@danieljon.es> | 2017-04-07 09:17:10 +0930 |
commit | 9ff573e9fe4c40ffb342ce2b215042c39b518aeb (patch) | |
tree | e4168caacbb934b072da417275ea578d26229db6 /arduino | |
parent | 1189c8c2671b2463dbca7842a81adfe00c35549c (diff) | |
download | RGB-Controller-9ff573e9fe4c40ffb342ce2b215042c39b518aeb.tar.gz RGB-Controller-9ff573e9fe4c40ffb342ce2b215042c39b518aeb.zip |
Merged source into one .cpp and .h. Added serial communication from the Arduino to the host computer. Added ping/pong system to maintain a connection, once 3 failed tries have occured, the connection is force closed, this restores the ui to a desired state. A ping is sent every 60 seconds and a response is required within one second. Some debug UI additions and code is still present, to be removed.
Diffstat (limited to 'arduino')
-rw-r--r-- | arduino/rgb/.rgb.ino.swo | bin | 20480 -> 0 bytes | |||
-rw-r--r-- | arduino/rgb/rgb.ino | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arduino/rgb/.rgb.ino.swo b/arduino/rgb/.rgb.ino.swo Binary files differdeleted file mode 100644 index 2ab1ac4..0000000 --- a/arduino/rgb/.rgb.ino.swo +++ /dev/null diff --git a/arduino/rgb/rgb.ino b/arduino/rgb/rgb.ino index 195eff2..aa35aa0 100644 --- a/arduino/rgb/rgb.ino +++ b/arduino/rgb/rgb.ino @@ -104,7 +104,6 @@ void parse(String com) { String p1; String p2; - p1 = com.substring(0, com.indexOf("=")); p2 = com.substring(com.indexOf("=") + 1); @@ -176,6 +175,8 @@ void parse(String com) bf = p2.toInt(); if (p1.equalsIgnoreCase("bt")) bt = p2.toInt(); + if (p1.equalsIgnoreCase("ping")) + Serial.write("ping=pong\n"); } String line; @@ -202,6 +203,5 @@ void loop() { line += c; } - } } |