Merge branch 'development' into test
This commit is contained in:
@@ -1,11 +1,15 @@
|
|||||||
const serialResultsDiv = document.getElementById("serialResults");
|
const serialResultsDiv = document.getElementById("serialResults");
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
let port, textEncoder, writableStreamClosed, writer;
|
let port, textEncoder, writableStreamClosed, writer;
|
||||||
let readableStreamClosed, reader, openPort = 0;
|
let readableStreamClosed, reader, openPort = 0;
|
||||||
let x, serial, fw, hw, sw, commitCode;
|
let x, serial, fw, hw, sw, commitCode;
|
||||||
let firmwarelocation, upgraded_version, hex_fw;
|
let firmwarelocation, upgraded_version, hex_fw;
|
||||||
|
|
||||||
// Buffer for accumulating received data before logging
|
// Buffer for accumulating received data before logging
|
||||||
|
=======
|
||||||
|
// Buffer for accumulating received data before logging
|
||||||
|
>>>>>>> development
|
||||||
let receivedDataBuffer = '';
|
let receivedDataBuffer = '';
|
||||||
|
|
||||||
// Function to log communication to API
|
// Function to log communication to API
|
||||||
|
|||||||
Reference in New Issue
Block a user