From e95d4a9010a4e3afd4b3163ff1010c253525145e Mon Sep 17 00:00:00 2001
From: Dave C-J <conway@uk.ibm.com>
Date: Sat, 4 Oct 2014 22:26:02 +0100
Subject: [PATCH] Update Ardunio node slightly in line with latest Windows
 Serialport patches. (But there is still a possibly bad underlying problem -
 error not being caught -  in the upstream npm - reported.)

---
 nodes/core/hardware/35-arduino.html |  2 +-
 nodes/core/hardware/35-arduino.js   | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/nodes/core/hardware/35-arduino.html b/nodes/core/hardware/35-arduino.html
index fb81ecd61..17f028928 100644
--- a/nodes/core/hardware/35-arduino.html
+++ b/nodes/core/hardware/35-arduino.html
@@ -125,7 +125,7 @@
 <script type="text/x-red" data-template-name="arduino-board">
     <div class="form-row">
         <label for="node-config-input-device"><i class="fa fa-random"></i> Port</label>
-        <input type="text" id="node-config-input-device" style="width:60%;" placeholder="/dev/ttyUSB0"/>
+        <input type="text" id="node-config-input-device" style="width:60%;" placeholder="e.g. /dev/ttyUSB0  COM1"/>
         <a id="node-config-lookup-serial" class="btn"><i id="node-config-lookup-serial-icon" class="fa fa-search"></i></a>
     </div>
     <div class="form-tips"><b>Tip:</b> Use search to try to auto-detect serial port.</div>
diff --git a/nodes/core/hardware/35-arduino.js b/nodes/core/hardware/35-arduino.js
index 94dfd4b3b..206fa9c75 100644
--- a/nodes/core/hardware/35-arduino.js
+++ b/nodes/core/hardware/35-arduino.js
@@ -28,20 +28,23 @@ module.exports = function(RED) {
         this.repeat = n.repeat||25;
         //node.log("opening connection "+this.device);
         var node = this;
-        var pre = "\\\\.\\";
-        if (!plat.match(/^win/)) { pre = ""; }
-
         node.board = new ArduinoFirmata();
-        if (!fs.existsSync(pre+node.device)) {
-            node.warn("Device "+node.device+" not found");
+        if (!plat.match(/^win/)) {   // not Windows
+            if (!fs.existsSync(node.device)) {
+                node.warn("Device "+node.device+" not found");
+            }
+            else {
+                node.board.connect(node.device);
+            }
         }
-        else {
+        else { // Windows - try to connect anyway... this can be bad...
             node.board.connect(node.device);
-            node.board.on('connect', function(){
-                node.log("version "+node.board.boardVersion);
-            });
         }
 
+        node.board.on('boardReady', function(){
+            node.log("version "+node.board.boardVersion);
+        });
+
         node.on('close', function() {
             if (node.board) {
                 try {