DiveInoSimulator was updated to support the latest Node SerialPort version

Author: kornel-schrenk

.gitignore

@@ -23,6 +23,7 @@
 /Tools/DiveInoSimulator/node_modules
 /Tools/DiveInoSimulator/.idea
 /Tools/DiveInoSimulator/.git
+/Tools/DiveInoSimulator/package-lock.json
 /PoC/DiveInoTouch/.ino.cpp
 /PoC/DiveInoTouch/sloeber.ino.cpp
 /PoC/DiveInoTouch/spec.d

PoC/DiveInoDroid/README.md

@@ -1,15 +1 @@
-# DiveIno #
-
-Android mobile application for the [DiveIno dive computer](http://www.diveino.hu/about/).
-
-## Development
-
-TODO
-
-## Repository Owner 
-
-* [Kornel Schrenk](http://www.schrenk.hu/about/)
-
-## License
-
-This software is available under [MIT](../master/LICENSE) license.
+Android mobile application for the [DiveIno dive computer](http://www.diveino.hu/about/).

Tools/DiveInoConverter/README.md

@@ -1,7 +1,3 @@
-# DiveIno Converter #
-
-![alt text](../master/src/main/resources/logo_small.png "DiveIno Converter logo")
-
 ## Description
 
 This software converts the dive profile log files from DiveIno dive computer format into UDDF or UDCF format.
@@ -37,11 +33,3 @@ Once you created the _DiveInoConverter.jar_ file, double click on it and the app
 * [UDCF - Universal Dive Computer Format](http://www.streit.cc/extern/udcf/udcf_doc_eng.html#toc2)
 * [UDDF - Universal Dive Data Format](http://www.uddf.org/)
 * [JavaFX deployment](http://code.makery.ch/library/javafx-8-tutorial/part7/)
-
-## Repository Owner 
-
-* [Kornel Schrenk](http://www.schrenk.hu/about/)
-
-## License
-
-This software is available under [MIT](../master/LICENSE) license.

Tools/DiveInoSimulator/README.md

@@ -1,11 +1,3 @@
 # DiveInoSimulator #
 
-This repository contains the source code of the software, which simulates dives on the [DiveIno dive computer](http://www.diveino.hu). More details can be found in the [Dry test](http://www.diveino.hu/2017/01/05/DryTest/) blog post.
-
-## Repository Owner 
-
-* [Kornel Schrenk](http://www.schrenk.hu/about/)
-
-## License
-
-This software is available under [MIT](../master/LICENSE) license.
+This folder contains the source code of the software, which simulates dives on the [DiveIno dive computer](http://www.diveino.hu). More details can be found in the [Dry test](http://www.diveino.hu/2017/01/05/DryTest/) blog post.

Tools/DiveInoSimulator/config.json

@@ -1,6 +1,6 @@
 {
-  "port" : "COM7",
-  "test" : "./data/TestLog4.json",
+  "port" : "COM3",
+  "test" : "./Tools/DiveInoSimulator/data/TestLog4.json",
   "interval": 800,
   "baudrate" : 115200,
   "initialDelay" : 10

Tools/DiveInoSimulator/emulator.js

@@ -1,17 +1,18 @@
-var config = require("./config.json");
+const config = require("./config.json");
 
-var fs = require('fs');
+const fs = require('fs');
 
-var SerialPort = require("serialport");
-var sp = new SerialPort(config.port, {
-	baudrate : config.baudrate,
-	parser : SerialPort.parsers.readline("\n")
+const SerialPort = require("serialport");
+const Readline = require('@serialport/parser-readline');
+const port = new SerialPort(config.port, {
+	baudRate : config.baudrate,
+	parser : new Readline()
 });
 
 var startTimeStamp = Date.now();
 var testData;
 
-sp.on("open", function() {
+port.on("open", function() {
 	console.log("*EMULATOR*: " + config.port + " serial port was opened!");
 	console.log("*EMULATOR*: " + config.test + " test data file will be used!");
 
@@ -21,7 +22,7 @@ sp.on("open", function() {
 		testData = JSON.parse(data);				
 	});
 
-	sp.on("data", function(data) {
+	port.on("data", function(data) {
 		if (data.startsWith("@START#")) {
 			startTimeStamp = Date.now();
 			console.log("*EMULATOR*: Dive started at: " + startTimeStamp);
@@ -38,9 +39,9 @@ sp.on("open", function() {
 				}
 			}
 			console.log("*EMULATOR*: " + durationInSeconds + " sec, " + pressure + " mbar, " + temperature + " cel\n");
-			sp.write(pressure + ", " + temperature + ",");
+			port.write(pressure + ", " + temperature + ",");
 		} else if (data.startsWith("@STOP#")) {
-			sp.write("@EMULATOR OFF#", function(err) {
+			port.write("@EMULATOR OFF#", function(err) {
 				if (err) {
 					return console.log("Error on write: ", err.message);
 				}
@@ -52,7 +53,7 @@ sp.on("open", function() {
 	});
 
 	setTimeout(function() {
-		sp.write("@EMULATOR ON#", function(err) {
+		port.write("@EMULATOR ON#", function(err) {
 			if (err) {
 				return console.log("Error on write: ", err.message);
 			}

Tools/DiveInoSimulator/package.json

@@ -1,12 +1,11 @@
 {
   "name": "diveinosimulator",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Provide a test harness for the open source DiveIno dive computer.",
   "main": "emulator.js",
-  "scripts": {    
-  },
+  "scripts": {},
   "dependencies": {
-	"serialport": "~4.0.7"
+    "serialport": "^9.0.1"
   },
   "author": {
     "name": "Kornel Schrenk",

Tools/DiveInoSimulator/replay.js

@@ -1,19 +1,20 @@
-var config = require("./config.json");
+const config = require("./config.json");
 
-var fs = require('fs');
+const fs = require('fs');
 
-var SerialPort = require("serialport");
-var sp = new SerialPort(config.port, {
-	baudrate : config.baudrate,
-	parser : SerialPort.parsers.readline("\n")
+const SerialPort = require("serialport");
+const Readline = require('@serialport/parser-readline');
+const port = new SerialPort(config.port, {
+	baudRate : config.baudrate,
+	parser : new Readline()
 });
 
-sp.on("open", function () {
+port.on("open", function () {
     console.log("*REPLAY:* " + config.port + " serial port was opened!");
     console.log("*REPLAY:* " + config.test + " test data file will be used!");
 
     //Log out to the console what the client sends back
-    sp.on('data', function(data) {
+    port.on('data', function(data) {
         console.log(data);
     });
 
@@ -22,7 +23,7 @@ sp.on("open", function () {
 
     //Turn on replay
 	setTimeout(function() {
-		sp.write("@REPLAY ON#", function(err) {
+		port.write("@REPLAY ON#", function(err) {
 			if (err) {
 				return console.log("Error on write: ", err.message);
 			}			
@@ -32,7 +33,7 @@ sp.on("open", function () {
 
 function sendMessage(duration, pressure, depth, temperature) {
     setTimeout(function () {
-        sp.write(pressure + ", " + depth + ", " + duration + ", " + temperature + ",");        
+        port.write(pressure + ", " + depth + ", " + duration + ", " + temperature + ",");        
     }, (config.initialDelay * 1000) + (duration * config.interval));
 }
 
@@ -61,7 +62,7 @@ function handleFile(err, data) {
         //Turn off replay
         if (i == data.profile.length-1) {
         	setTimeout(function() {
-        		sp.write("@REPLAY OFF#", function(err) {
+        		port.write("@REPLAY OFF#", function(err) {
         			if (err) {
         				return console.log("Error on write: ", err.message);
         			}