From 61c0826261cf52ea82136aa95b22d29d99bd3098 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 13 Nov 2019 21:52:01 +0000
Subject: [PATCH] update arduino node for node12

---
 hardware/Arduino/35-arduino.html | 17 +++++++----------
 hardware/Arduino/35-arduino.js   | 12 +++++++++---
 hardware/Arduino/package.json    |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/hardware/Arduino/35-arduino.html b/hardware/Arduino/35-arduino.html
index 90df533b..b492fa28 100644
--- a/hardware/Arduino/35-arduino.html
+++ b/hardware/Arduino/35-arduino.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="arduino in">
+<script type="text/html" data-template-name="arduino in">
     <div class="form-row">
         <label for="node-input-arduino"><i class="fa fa-tasks"></i> Arduino</label>
         <input type="text" id="node-input-arduino">
@@ -24,7 +24,7 @@
     <div class="form-tips"><span data-i18n="[html]arduino.tip.io"></span></div>
 </script>
 
-<script type="text/x-red" data-help-name="arduino in">
+<script type="text/html" data-help-name="arduino in">
     <p>Arduino input node. Connects to a local Arduino and monitors the selected pin for changes. Uses <a href="http://firmata.org/" target="_new"><i>Firmata</i>.</a></p>
     <p>The Arduino must be loaded with the Standard Firmata sketch available in the Arduino examples.</p>
     <p>You can select either Digital or Analogue input. Outputs the value read as <code>msg.payload</code> and the pin number as <code>msg.topic</code>.</p>
@@ -60,7 +60,7 @@
     });
 </script>
 
-<script type="text/x-red" data-template-name="arduino out">
+<script type="text/html" data-template-name="arduino out">
     <div class="form-row">
         <label for="node-input-arduino"><i class="fa fa-tasks"></i> Arduino</label>
         <input type="text" id="node-input-arduino">
@@ -85,7 +85,7 @@
     <div class="form-tips"><span data-i18n="[html]arduino.tip.io"></span></div>
 </script>
 
-<script type="text/x-red" data-help-name="arduino out">
+<script type="text/html" data-help-name="arduino out">
     <p>Arduino output node. Connects to local Arduino and writes to the selected digital
     pin. Uses <a href="http://firmata.org/" target="_new"><i>Firmata</i>.</a></p>
     <p>The Arduino must be loaded with the Standard Firmata sketch available in the Arduino examples.</p>
@@ -121,11 +121,11 @@
 </script>
 
 
-<script type="text/x-red" data-template-name="arduino-board">
+<script type="text/html" data-template-name="arduino-board">
     <div class="form-row">
         <label for="node-config-input-device"><i class="fa fa-random"></i> <span data-i18n="arduino.label.port"></span></label>
         <input type="text" id="node-config-input-device" style="width:60%;" data-i18n="[placeholder]arduino.placeholder.port"/>
-        <a id="node-config-lookup-serial" class="btn"><i id="node-config-lookup-serial-icon" class="fa fa-search"></i></a>
+        <a id="node-config-lookup-serial" class="red-ui-button"><i id="node-config-lookup-serial-icon" class="fa fa-search"></i></a>
     </div>
     <div class="form-tips"><span data-i18n="[html]arduino.tip.conf"></span></div>
 </script>
@@ -152,10 +152,7 @@
                     $("#node-config-lookup-serial-icon").addClass('fa-search');
                     $("#node-config-lookup-serial-icon").removeClass('spinner');
                     $("#node-config-lookup-serial").removeClass('disabled');
-                    var ports = [];
-                    $.each(data, function(i, port) {
-                        ports.push(port.comName);
-                    });
+                    var ports = data || [];
                     $("#node-config-input-device").autocomplete({
                         source:ports,
                         minLength:0,
diff --git a/hardware/Arduino/35-arduino.js b/hardware/Arduino/35-arduino.js
index fc3ffe1f..5e6302bd 100644
--- a/hardware/Arduino/35-arduino.js
+++ b/hardware/Arduino/35-arduino.js
@@ -204,8 +204,14 @@ module.exports = function(RED) {
     RED.nodes.registerType("arduino out",DuinoNodeOut);
 
     RED.httpAdmin.get("/arduinoports", RED.auth.needsPermission("arduino.read"), function(req,res) {
-        SP.list(function(error, ports) {
-            res.json(ports);
-        });
+        SP.list().then(
+            ports => {
+                const a = ports.map(p => p.comName);
+                res.json(a);
+            },
+            err => {
+                this.log('Error listing serial ports', err)
+            }
+        )
     });
 }
diff --git a/hardware/Arduino/package.json b/hardware/Arduino/package.json
index 0e325ac9..45ab3bb0 100644
--- a/hardware/Arduino/package.json
+++ b/hardware/Arduino/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-arduino",
-    "version"       : "0.2.4",
+    "version"       : "0.3.0",
     "description"   : "A Node-RED node to talk to an Arduino running firmata",
     "dependencies"  : {
         "firmata"   : "^2.0.0"