Skip to content
Browse files

added serachList to cd1.xml

  • Loading branch information...
1 parent d82ebec commit c3181fa6bfe7c5b47a5d8b890e1bd3580c2ae584 Sebastian Heckmann committed
View
4 cd1.xml
@@ -33,6 +33,10 @@
<search>
<deviceType>pr:ComputationDevice</deviceType>
</search>
+ <search>
+ <deviceType>pr:ControlDevice</deviceType>
+ <scope>http://www.tu-dortmund.de/mb/flw/anlage/unten/uc3/u0</scope>
+ </search>
</searchList>
</computationDevice>
</computationDeviceList>
View
3 dist/config/deviceConfigs/controllers_u0.xml
@@ -71,9 +71,6 @@
<subDeviceState name="u12#ds_1">
org.roastedkit.control.states.DigitalSensorState
</subDeviceState>
- <subDeviceState name="u0#ds_2">
- org.roastedkit.control.states.DigitalSensorState
- </subDeviceState>
<subDeviceState name="u1#mo_1">
org.roastedkit.control.states.MotorRunState
</subDeviceState>
View
38 exampleDevice.xml
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<computationDeviceList xmlns:pr="http://www.paketroyale.org/dpws">
- <computationDevice>
- <factory>org.roastedkit.control.DefaultHostingServiceFactory</factory>
- <uuid>urn:uuid:69cea223-0159-4edb-ab0c-098767c1bced</uuid>
- <friendlyName>de-DE,cd1</friendlyName>
- <manufacturer>de-DE,RoastedKit</manufacturer>
- <type>pr:ComputationDevice</type>
- <scope>http://www.tu-dortmund.de/mb/flw/anlage/unten/uc1</scope>
- <agentFactory>
- org.roastedkit.control.agents.util.DefaultAgentFactory
- </agentFactory>
- <startupAgent>SupervisorAgent</startupAgent>
- <serviceProxyFactories>
- <serviceProxyFactory>
- <class>org.roastedkit.control.devices.proxy.DefaultServiceProxyFactory</class>
- <portTypes>
- pr:StateService,pr:AnalogSensorService,pr:DigitalSensorService,pr:GoodScannerService,pr:MotorService,pr:StopperService,pr:SwitchService,pr:ConfigService,pr:InventoryService
- </portTypes>
- </serviceProxyFactory>
- <serviceProxyFactory>
- <class>org.roastedkit.control.devices.proxy.CDServiceProxyFactory</class>
- <portTypes>
- pr:ComputationService
- </portTypes>
- </serviceProxyFactory>
- </serviceProxyFactories>
- <searchList>
- <search>
- <deviceType>pr:ControlDevice</deviceType>
- <scope>http://www.tu-dortmund.de/mb/flw/anlage/unten/uc1</scope>
- </search>
- <search>
- <deviceType>pr:ComputationDevice</deviceType>
- </search>
- </searchList>
- </computationDevice>
-</computationDeviceList>
View
2 src/main/java/com/mycompany/strategie/ComputationDeviceStarter.java
@@ -21,8 +21,8 @@ public static void main( String[] args )
String[] cd7 = new String[]{"-ownConfig=cd7.xml", "-loggerConfig=log4j.properties", "-file=properties.ws4d.xml"};
//System.out.println("init: " + org.ws4d.java.util.Properties.initPropertiesWithCommandline(ar));
- ComputationDeviceApp.main(cd3);
ComputationDeviceApp.main(cd1);
+ ComputationDeviceApp.main(cd3);
ComputationDeviceApp.main(cd2);
ComputationDeviceApp.main(cd4);
ComputationDeviceApp.main(cd5);
View
4 src/main/java/com/mycompany/strategie/controllers/section/NotReadyState.java
@@ -54,8 +54,8 @@ public void iterate() throws Exception {
return;
}
-
- if (_prevLeaveSensor.getState() == true) // change to state running.
+
+ if (_prevLeaveSensor.getState() == true)
{
getController().setState(getController().getWaitState());
}
View
1 src/main/java/com/mycompany/strategie/controllers/section/RunState.java
@@ -71,6 +71,7 @@ public void iterate() throws Exception {
if (_nextEnterSensor.getState() == true) {
getController().setState(getController().getNotReadyState());
+ Thread.sleep(1000); //Wait 1sec before the conveyor is stopped. Packet must be carried on the next conveyor
for(int i=0; i<getControlledDevices().size();i++)
{
getControlledDeviceAt(i).setRunning(false);
View
BIN target/classes/com/mycompany/strategie/ComputationDeviceStarter.class
Binary file not shown.
View
2 target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Thu Mar 29 12:03:32 CEST 2012
+#Thu Mar 29 15:20:41 CEST 2012
version=1.0-SNAPSHOT
groupId=com.mycompany
artifactId=strategie

0 comments on commit c3181fa

Please sign in to comment.
Something went wrong with that request. Please try again.