Skip to content

Commit 09ad8dd

Browse files
committed
Merge against v1.3.4 instead of 1.3.3
not sure what went wrong but here we are... Setting to v1.4.0 as def a functionality change
1 parent 6c9717d commit 09ad8dd

File tree

4 files changed

+120
-90
lines changed

4 files changed

+120
-90
lines changed

hardware/Arduino/35-arduino.html

+35-24
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</div>
1919
<div class="form-row">
2020
<label for="node-config-input-samplingInt" style="width:150px;"><i class="fa fa-circle"></i> <span data-i18n="arduino.label.samplingInt"></span></label>
21-
<input type="number" id="node-config-input-samplingInt" style="width:20%;" data-i18n="[placeholder]arduino.placeholder.samplingInt" min=10 max=65500 />
21+
<input type="number" id="node-config-input-samplingInt" style="width:20%;" data-i18n="[placeholder]arduino.placeholder.samplingInt" min=10 max=65500 /> mS
2222
</div>
2323
<div class="form-row">
2424
<label for="node-config-input-log2consol"><i class="icon-bookmark"></i>Log to console</label>
@@ -43,30 +43,41 @@
4343
},
4444
oneditprepare: function() {
4545
try {
46-
$("#node-config-input-device").autocomplete( "destroy" );
46+
$("#node-config-input-device").autocomplete( "destroy" ); // Remove auto-complete functionality from an <input>.
4747
} catch(err) { };
4848

49-
$("#node-config-lookup-serial").click(function() { // Board's serial port search function
50-
//console.log("Serial Auto-search started.");
51-
$("#node-config-lookup-serial-icon").removeClass('fa-search');
52-
$("#node-config-lookup-serial-icon").addClass('spinner');
53-
$("#node-config-lookup-serial") .addClass('disabled');
54-
55-
$.getJSON('arduinoports', function(data) {
56-
//console.log('Serial Auto-search found data: %o', data);
57-
$("#node-config-lookup-serial-icon").removeClass('spinner');
58-
$("#node-config-lookup-serial") .removeClass('disabled');
59-
$("#node-config-lookup-serial-icon").addClass('fa-search');
60-
let ports = data || [];
61-
$("#node-config-input-device").autocomplete({
62-
source: ports,
63-
minLength: 0,
64-
close: function( event, ui ) {
65-
//console.log("Serial Auto-search closing.");
66-
$("#node-config-input-device").autocomplete( "destroy" );
67-
}
68-
}).autocomplete("search", "");
69-
});
49+
$("#node-config-lookup-serial").click(async function() { // Board's serial port search function
50+
console.log("Serial Auto-search started.");
51+
$("#node-config-lookup-serial-icon").removeClass('fa-search').addClass('spinner');
52+
$("#node-config-lookup-serial").addClass('disabled');
53+
54+
try {
55+
$.getJSON('arduinoports', async function(data, data2) {
56+
//console.log('Serial Auto-search found data: %o', data);
57+
//console.log('Data2: %o', data2);
58+
59+
// UI Updates
60+
$("#node-config-lookup-serial-icon").removeClass('spinner').addClass('fa-search');
61+
$("#node-config-lookup-serial").removeClass('disabled');
62+
// Ensure ports is an array (fallback to empty array)
63+
ports = data || [];
64+
65+
$("#node-config-input-device").autocomplete({
66+
source: ports,
67+
minLength: 0,
68+
close: function(event, ui) {
69+
console.log("Serial Auto-search closing.");
70+
$("#node-config-input-device").autocomplete("destroy");
71+
}
72+
}).autocomplete("search", "");
73+
});
74+
} catch (error) {
75+
console.error('Error fetching serial ports:', error);
76+
77+
// Reset UI on error
78+
$("#node-config-lookup-serial-icon").removeClass('spinner').addClass('fa-search');
79+
$("#node-config-lookup-serial").removeClass('disabled');
80+
}
7081
});
7182
}
7283
});
@@ -216,7 +227,7 @@ <h3>The "in" node:</h3>
216227
color:"#3fadb5",
217228
defaults: {
218229
name: {value:""},
219-
pin: {value:"",validate: function(v) {
230+
pin: {value:"", validate: function(v) {
220231
var ct = $("#node-input-state").val() || this.state;
221232
return ct === 'STRING' || (v !== '');
222233
}},

0 commit comments

Comments
 (0)