Updated for 1.92

README.md

@@ -400,9 +400,10 @@ Revisions
 -------
 Changes in 1.92
 - HTTPS and WSS support courtesy of Stewart Allen. Sample cert and key provided in release zip/tar file. Copy sample files to cert.pem and key.pem to have SPJS enable HTTPS/WSS support or use command line parameters of -scert mycert.pem -skey mykey.pem to specify files.
+- Added fix for opening 2nd or more serial ports where there was a block opening an additional port
 
 Changes in 1.91
-- Added usblist command
+- Added usblist command so can list USB devices like webcams. Only works on Linux for now.
 - Added username/password authentication to exec command to solve security concerns.
 - Marlin buffer updates from Peter van der Walt
 

compile_go1_5_crosscompile.sh

@@ -14,33 +14,45 @@ cp README.md snapshot/
 echo "Building Linux amd64"
 mkdir snapshot/serial-port-json-server-$1_linux_amd64
 mkdir snapshot/serial-port-json-server-$1_linux_amd64/arduino
+cp sample* snapshot/serial-port-json-server-$1_linux_amd64
 cp -r arduino/hardware  snapshot/serial-port-json-server-$1_linux_amd64/arduino/hardware
 cp -r arduino/tools_linux_64  snapshot/serial-port-json-server-$1_linux_amd64/arduino/tools
 env GOOS=linux GOARCH=amd64 go build -v -o snapshot/serial-port-json-server-$1_linux_amd64/serial-port-json-server
-tar -zcvf snapshot/serial-port-json-server-$1_linux_amd64.tar.gz snapshot/serial-port-json-server-$1_linux_amd64
+cd snapshot
+tar -zcvf serial-port-json-server-$1_linux_amd64.tar.gz serial-port-json-server-$1_linux_amd64
+cd ..
 
 echo "" 
 echo "Building Linux 386"
 mkdir snapshot/serial-port-json-server-$1_linux_386
 mkdir snapshot/serial-port-json-server-$1_linux_386/arduino
+cp sample* snapshot/serial-port-json-server-$1_linux_386
 cp -r arduino/hardware  snapshot/serial-port-json-server-$1_linux_386/arduino/hardware
 cp -r arduino/tools_linux_32  snapshot/serial-port-json-server-$1_linux_386/arduino/tools
 env GOOS=linux GOARCH=386 go build -v -o snapshot/serial-port-json-server-$1_linux_386/serial-port-json-server
-tar -zcvf snapshot/serial-port-json-server-$1_linux_386.tar.gz snapshot/serial-port-json-server-$1_linux_386
+cd snapshot
+tar -zcvf serial-port-json-server-$1_linux_386.tar.gz serial-port-json-server-$1_linux_386
+cd ..
 
 echo "" 
 echo "Building Linux ARM (Raspi)"
 mkdir snapshot/serial-port-json-server-$1_linux_arm
 mkdir snapshot/serial-port-json-server-$1_linux_arm/arduino
+cp sample* snapshot/serial-port-json-server-$1_linux_arm
 cp -r arduino/hardware  snapshot/serial-port-json-server-$1_linux_arm/arduino/hardware
 cp -r arduino/tools_linux_arm  snapshot/serial-port-json-server-$1_linux_arm/arduino/tools
 env GOOS=linux GOARCH=arm go build -v -o snapshot/serial-port-json-server-$1_linux_arm/serial-port-json-server
-tar -zcvf snapshot/serial-port-json-server-$1_linux_arm.tar.gz snapshot/serial-port-json-server-$1_linux_arm
+cd snapshot
+tar -zcvf serial-port-json-server-$1_linux_arm.tar.gz serial-port-json-server-$1_linux_arm
+cd ..
 
 echo "" 
 echo "Building Windows x32"
 mkdir snapshot/serial-port-json-server-$1_windows_386
 mkdir snapshot/serial-port-json-server-$1_windows_386/arduino
+mkdir snapshot/serial-port-json-server-$1_windows_386/drivers
+cp -r drivers/* snapshot/serial-port-json-server-$1_windows_386/drivers
+cp sample* snapshot/serial-port-json-server-$1_windows_386
 cp -r arduino/hardware  snapshot/serial-port-json-server-$1_windows_386/arduino/hardware
 cp -r arduino/tools_windows  snapshot/serial-port-json-server-$1_windows_386/arduino/tools
 env GOOS=windows GOARCH=386 go build -v -o snapshot/serial-port-json-server-$1_windows_386/serial-port-json-server.exe
@@ -52,6 +64,9 @@ echo ""
 echo "Building Windows x64"
 mkdir snapshot/serial-port-json-server-$1_windows_amd64
 mkdir snapshot/serial-port-json-server-$1_windows_amd64/arduino
+mkdir snapshot/serial-port-json-server-$1_windows_amd64/drivers
+cp -r drivers/* snapshot/serial-port-json-server-$1_windows_amd64/drivers
+cp sample* snapshot/serial-port-json-server-$1_windows_amd64
 cp -r arduino/hardware  snapshot/serial-port-json-server-$1_windows_amd64/arduino/hardware
 cp -r arduino/tools_windows  snapshot/serial-port-json-server-$1_windows_amd64/arduino/tools
 env GOOS=windows GOARCH=amd64 go build -v -o snapshot/serial-port-json-server-$1_windows_amd64/serial-port-json-server.exe
@@ -63,9 +78,12 @@ echo ""
 echo "Building Darwin x64"
 mkdir snapshot/serial-port-json-server-$1_darwin_amd64
 mkdir snapshot/serial-port-json-server-$1_darwin_amd64/arduino
+cp sample* snapshot/serial-port-json-server-$1_darwin_amd64
 cp -r arduino/hardware  snapshot/serial-port-json-server-$1_darwin_amd64/arduino/hardware
 cp -r arduino/tools_darwin  snapshot/serial-port-json-server-$1_darwin_amd64/arduino/tools
 env GOOS=darwin GOARCH=amd64 go build -v -o snapshot/serial-port-json-server-$1_darwin_amd64/serial-port-json-server
 cd snapshot/serial-port-json-server-$1_darwin_amd64
 zip -r ../serial-port-json-server-$1_darwin_amd64.zip *
 cd ../..
+
+export GITHUB_TOKEN=d1ce644ff5eef10f4f1e5fbf27515d22c7d68e8b

main.go

@@ -1,4 +1,4 @@
-// Version 1.91
+// Version 1.92
 // Supports Windows, Linux, Mac, and Raspberry Pi, Beagle Bone Black
 
 package main
@@ -22,8 +22,8 @@ import (
 )
 
 var (
-	version      = "1.91"
-	versionFloat = float32(1.91)
+	version      = "1.92"
+	versionFloat = float32(1.92)
 	addr         = flag.String("addr", ":8989", "http service address")
 	saddr        = flag.String("saddr", ":8990", "https service address")
 	scert        = flag.String("scert", "cert.pem", "https certificate file")

release.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+export GITHUB_TOKEN=d1ce644ff5eef10f4f1e5fbf27515d22c7d68e8b
 
 export GITHUB_USER=chilipeppr