From 0059948c325610541e9dd86ee20f1a95de14cf53 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Thu, 17 Oct 2019 10:24:14 +0200 Subject: [PATCH] --- config/plugins.properties | 3 ++- config/settings.properties | 2 +- config/variables.properties | 4 ++-- plugins/LaserUE.java | 2 +- script/test/TestSerial.py | 14 ++++++++++++++ 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 script/test/TestSerial.py diff --git a/config/plugins.properties b/config/plugins.properties index 1568671..472a7ec 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1,6 +1,7 @@ +MXSC-1.12.0.jar=disabled Commands.java=disabled Recovery.java=disabled -MXSC-1.10.0.jar=enabled +MXSC-1.10.0.jar=disabled WagoPanel.java=enabled LaserUEPanel.java=enabled BarcodeReaderPanel.java=enabled diff --git a/config/settings.properties b/config/settings.properties index fc0e737..5bb1f7b 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Thu Oct 10 16:29:55 CEST 2019 +#Wed Oct 16 09:28:42 CEST 2019 dry_mount_counter=0 room_temperature_enabled=true pin_offset=0.0 diff --git a/config/variables.properties b/config/variables.properties index 30fe94c..d3599b8 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Mon Oct 07 16:51:54 CEST 2019 -FileSequentialNumber=4 +#Tue Oct 15 10:38:47 CEST 2019 +FileSequentialNumber=6 diff --git a/plugins/LaserUE.java b/plugins/LaserUE.java index 37dd6ee..e7f1083 100644 --- a/plugins/LaserUE.java +++ b/plugins/LaserUE.java @@ -16,7 +16,7 @@ import java.io.IOException; public class LaserUE extends SerialPortDevice{ final Readable readable; static final double RANGE_MIN = 1.0; - static final double RANGE_MAX = 30.0; + static final double RANGE_MAX = 35.0; public LaserUE(String name, String port) { super(name, port, 921600, SerialPortDeviceConfig.DataBits.DB_8, SerialPortDeviceConfig.StopBits.SB_1, SerialPortDeviceConfig.Parity.None); this.setMode(Mode.FullDuplex); diff --git a/script/test/TestSerial.py b/script/test/TestSerial.py new file mode 100644 index 0000000..41f949c --- /dev/null +++ b/script/test/TestSerial.py @@ -0,0 +1,14 @@ +import ch.psi.pshell.serial.SerialPortDevice as SerialPortDevice +import ch.psi.pshell.serial.SerialPortDeviceConfig.DataBits as DataBits +import ch.psi.pshell.serial.SerialPortDeviceConfig.Parity as Parity +import ch.psi.pshell.serial.SerialPortDeviceConfig.StopBits as StopBits + + +print SerialPortDevice.getPortList() + +baudRate=9600 + +sp = SerialPortDevice("sp", "COM4", 921600, DataBits.DB_8, StopBits.SB_1, Parity.None) +sp.initialize() +rx = sp.waitBytes(50, 3000) +print rx \ No newline at end of file