msp fix
This commit is contained in:
parent
2c58a16fac
commit
5570afea77
@ -59,12 +59,7 @@ import java.util.function.Consumer;
|
||||
public class MspDevice extends SingleMeasurementDevice implements PortHandler.PortController {
|
||||
public static final String MSP_DEVICE_TYPE = "msp";
|
||||
|
||||
// private static final String PEAK_SET_PATH = "peakJump.peak";
|
||||
private static final int TIMEOUT = 200;
|
||||
// private boolean connected = false;
|
||||
// private boolean selected = false;
|
||||
// private boolean controlled = false;
|
||||
// private boolean storing = false;
|
||||
|
||||
private TcpPortHandler handler;
|
||||
//listener
|
||||
|
@ -18,7 +18,8 @@ limitations under the License.
|
||||
<config>
|
||||
<storage path="D:/temp/test" type = "numass"/>
|
||||
<device type="msp" name="msp">
|
||||
<connection ip="127.0.0.1" port="10014"/>
|
||||
<!--<connection ip="127.0.0.1" port="10014"/>-->
|
||||
<connection ip="192.168.111.11" port="10014"/>
|
||||
<peakJump>
|
||||
<peak mass="2"/>
|
||||
<peak mass="3"/>
|
||||
|
@ -1,12 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<config>
|
||||
<storage path="D:/temp/test"/>
|
||||
<!--<storage path="D:/temp/test"/>-->
|
||||
<device type="numass:vac">
|
||||
<sensor name="P1" color="red" port="com::/dev/ttyUSB0" sensorType="mks"/>
|
||||
<sensor name="P2" color="blue" port="tcp::192.168.111.32:4002" sensorType="CM32"/>
|
||||
<sensor name="P3" color="green" port="tcp::192.168.111.32:4003" sensorType="CM32"/>
|
||||
<sensor name="Px" color="black" port="tcp::192.168.111.33:4003" sensorType="meradat" address="1"/>
|
||||
<sensor name="Baratron" color="cyan" port="tcp::192.168.111.33:4004" sensorType="baratron"/>
|
||||
<sensor name="collector" color="magenta" port="tcp::192.168.111.33:4003" sensorType="meradat" address="5"/>
|
||||
<sensor name="Collector" color="magenta" port="tcp::192.168.111.33:4003" sensorType="meradat" address="5"/>
|
||||
</device>
|
||||
</config>
|
||||
|
@ -1,24 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.geometry.Insets?>
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
<?import java.net.URL?>
|
||||
<BorderPane fx:id="root" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111"
|
||||
xmlns:fx="http://javafx.com/fxml/1"
|
||||
fx:controller="inr.numass.readvac.fx.VacCollectorView">
|
||||
<BorderPane fx:id="root" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="inr.numass.readvac.fx.VacCollectorView">
|
||||
<stylesheets>
|
||||
<URL value="@/styles/vacstyles.css" />
|
||||
</stylesheets>
|
||||
<right>
|
||||
<ScrollPane fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" minWidth="250.0" BorderPane.alignment="CENTER">
|
||||
<content>
|
||||
<VBox fx:id="vacBoxHolder" minWidth="200.0" spacing="2.0" />
|
||||
</content>
|
||||
</ScrollPane>
|
||||
</right>
|
||||
<center>
|
||||
<HBox>
|
||||
<VBox alignment="TOP_CENTER" HBox.hgrow="ALWAYS">
|
||||
<VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER">
|
||||
<ToolBar>
|
||||
<ToggleButton fx:id="startStopButton" mnemonicParsing="false"
|
||||
onAction="#onStartStopToggle" text="Measure"/>
|
||||
<ToggleButton fx:id="storeButton" mnemonicParsing="false" onAction="#onStoreToggle"
|
||||
text="Store"/>
|
||||
<ToggleButton fx:id="startStopButton" mnemonicParsing="false" onAction="#onStartStopToggle" text="Measure" />
|
||||
<ToggleButton fx:id="storeButton" mnemonicParsing="false" onAction="#onStoreToggle" text="Store" />
|
||||
<Separator orientation="VERTICAL" />
|
||||
<Label text="Interval: " />
|
||||
<ChoiceBox fx:id="intervalSelector" prefWidth="150.0" />
|
||||
@ -41,12 +42,5 @@
|
||||
</Label>
|
||||
</HBox>
|
||||
</VBox>
|
||||
<Separator orientation="VERTICAL"/>
|
||||
<VBox fx:id="vacBoxHolder" minWidth="200.0" spacing="2.0">
|
||||
<HBox.margin>
|
||||
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
|
||||
</HBox.margin>
|
||||
</VBox>
|
||||
</HBox>
|
||||
</center>
|
||||
</BorderPane>
|
||||
|
@ -0,0 +1 @@
|
||||
inr.numass.storage.NumassStorageFactory
|
Loading…
Reference in New Issue
Block a user