Skip to content

Commit

Permalink
updated models
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArjunBadyal
ArjunBadyal committed Sep 25, 2024
1 parent d68efee commit a156b4a
Show file tree
Hide file tree
Showing 18 changed files with 1,159 additions and 310 deletions.
76 changes: 43 additions & 33 deletions robosim_models/UR5e/.settings/circus.robocalc.robotool.versioning.prefs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,51 @@ circus.robocalc.prism=2.0.0.202105170917
circus.robocalc.prism.edit=2.0.0.202105170917
circus.robocalc.prism.editor=2.0.0.202105170917
circus.robocalc.robochart=2.0.0.202206211010
circus.robocalc.robochart.assertions=2.1.0.202306131236
circus.robocalc.robochart.assertions.ide=2.1.0.202306131236
circus.robocalc.robochart.assertions.ui=2.1.0.202306131236
circus.robocalc.robochart.assertions=2.1.0.202408051515
circus.robocalc.robochart.assertions.ide=2.1.0.202408051515
circus.robocalc.robochart.assertions.ui=2.1.0.202408051515
circus.robocalc.robochart.csp.comparison=1.0.0.202302151129
circus.robocalc.robochart.edit=2.0.0.202206211010
circus.robocalc.robochart.editor=2.0.0.202206211010
circus.robocalc.robochart.generator.cpp=2.0.0.202012181752
circus.robocalc.robochart.generator.csp=3.0.0.202306261132
circus.robocalc.robochart.generator.csp=3.0.0.202408051513
circus.robocalc.robochart.generator.normalForm=1.0.0.202308181049
circus.robocalc.robochart.generator.prism=2.0.0.202302262007
circus.robocalc.robochart.graphical=2.1.0.202306141150
circus.robocalc.robochart.graphical.label=2.1.0.202306141150
circus.robocalc.robochart.graphical.label.ide=2.1.0.202306141150
circus.robocalc.robochart.graphical.label.ui=2.1.0.202306141150
circus.robocalc.robochart.graphical.services=2.1.0.202306141150
circus.robocalc.robochart.graphical.ui=2.1.0.202306141150
circus.robocalc.robochart.generator.prism=2.0.0.202311131836
circus.robocalc.robochart.graphical=2.1.0.202408051519
circus.robocalc.robochart.graphical.label=2.1.0.202408051519
circus.robocalc.robochart.graphical.label.ide=2.1.0.202408051519
circus.robocalc.robochart.graphical.label.ui=2.1.0.202408051519
circus.robocalc.robochart.graphical.services=2.1.0.202408051519
circus.robocalc.robochart.graphical.ui=2.1.0.202408051519
circus.robocalc.robochart.refactoring=1.0.0.202012181643
circus.robocalc.robochart.textual=3.1.0.202306131143
circus.robocalc.robochart.textual=3.1.0.202408051512
circus.robocalc.robochart.textual.exporter=1.0.0.202012181736
circus.robocalc.robochart.textual.ide=3.1.0.202306131143
circus.robocalc.robochart.textual.importer=1.0.0.202302131509
circus.robocalc.robochart.textual.ui=3.1.0.202306131143
circus.robocalc.robochart.tracegen=1.0.0.202308181423
circus.robocalc.robochart.textual.ide=3.1.0.202408051512
circus.robocalc.robochart.textual.importer=1.0.0.202311081122
circus.robocalc.robochart.textual.ui=3.1.0.202408051512
circus.robocalc.robochart.tracegen=1.0.0.202407081450
circus.robocalc.robochart2sim.textual=1.0.0.202205091011
circus.robocalc.robochart2sim.textual.emf=1.0.0.202205091011
circus.robocalc.robochart2sim.textual.ide=1.0.0.202205091011
circus.robocalc.robochart2sim.textual.tools=1.0.0.202205091011
circus.robocalc.robochart2sim.textual.ui=1.0.0.202205091011
circus.robocalc.robosim=2.0.0.202206211021
circus.robocalc.robosim.assertions=2.1.0.202306261128
circus.robocalc.robosim.assertions.ide=2.1.0.202306261128
circus.robocalc.robosim.assertions.ui=2.1.0.202306261128
circus.robocalc.robosim.assertions=2.1.0.202311281758
circus.robocalc.robosim.assertions.ide=2.1.0.202311281758
circus.robocalc.robosim.assertions.ui=2.1.0.202311281758
circus.robocalc.robosim.edit=2.0.0.202206211021
circus.robocalc.robosim.editor=2.0.0.202206211021
circus.robocalc.robosim.generator.csp=3.0.0.202306261139
circus.robocalc.robosim.graphical=2.1.0.202306261116
circus.robocalc.robosim.graphical.label=2.1.0.202306261116
circus.robocalc.robosim.graphical.label.ide=2.1.0.202306261116
circus.robocalc.robosim.graphical.label.ui=2.1.0.202306261116
circus.robocalc.robosim.graphical.services=2.1.0.202306261116
circus.robocalc.robosim.generator.csp=3.0.0.202408051519
circus.robocalc.robosim.graphical=2.1.0.202311131815
circus.robocalc.robosim.graphical.label=2.1.0.202311131815
circus.robocalc.robosim.graphical.label.ide=2.1.0.202311131815
circus.robocalc.robosim.graphical.label.ui=2.1.0.202311131815
circus.robocalc.robosim.graphical.services=2.1.0.202311131815
circus.robocalc.robosim.physmod=3.0.0.202206220907
circus.robocalc.robosim.physmod.edit=3.0.0.202206220907
circus.robocalc.robosim.physmod.editor=3.0.0.202206220907
circus.robocalc.robosim.physmod.generator.cpc=1.0.0.202206220956
circus.robocalc.robosim.physmod.generator.sdf=1.0.0.202206220935
circus.robocalc.robosim.physmod.generator.cpc=1.0.0.202311141235
circus.robocalc.robosim.physmod.generator.sdf=1.0.0.202311272220
circus.robocalc.robosim.physmod.graphical=3.0.0.202206220933
circus.robocalc.robosim.physmod.graphical.label=3.0.0.202206220933
circus.robocalc.robosim.physmod.graphical.label.ide=3.0.0.202206220933
Expand All @@ -55,12 +55,12 @@ circus.robocalc.robosim.physmod.graphical.services=3.0.0.202206220933
circus.robocalc.robosim.physmod.textual=3.0.0.202206220918
circus.robocalc.robosim.physmod.textual.ide=3.0.0.202206220918
circus.robocalc.robosim.physmod.textual.ui=3.0.0.202206220918
circus.robocalc.robosim.textual=3.1.0.202306260829
circus.robocalc.robosim.textual.ide=3.1.0.202306260829
circus.robocalc.robosim.textual.ui=3.1.0.202306260829
circus.robocalc.robosim.textual=3.1.0.202311131811
circus.robocalc.robosim.textual.ide=3.1.0.202311131811
circus.robocalc.robosim.textual.ui=3.1.0.202311131811
circus.robocalc.robotool.versioning=1.0.0.202203061610
circus.robocalc.svgfixer.imagehash=2.1.0.202306141150
circus.robocalc.svgfixer.library=2.1.0.202306141150
circus.robocalc.svgfixer.imagehash=2.1.0.202408051519
circus.robocalc.svgfixer.library=2.1.0.202408051519
eclipse.preferences.version=1
org.eclipse.platform=4.22.0.v20211124-1800
org.eclipse.sirius=6.5.1.202106111115
Expand All @@ -72,7 +72,7 @@ org.eclipse.sirius.common.acceleo.mtl.ide=6.5.1.202106111115
org.eclipse.sirius.common.interpreter=6.5.1.202106111115
org.eclipse.sirius.common.ui=6.5.1.202106111115
org.eclipse.sirius.common.ui.ext=6.5.1.202106111115
org.eclipse.sirius.common.xtext=6.2.0.201903051604
org.eclipse.sirius.common.xtext=6.5.1.202106111115
org.eclipse.sirius.diagram=6.5.1.202106111115
org.eclipse.sirius.diagram.formatdata=6.5.1.202106111115
org.eclipse.sirius.diagram.sequence=6.5.1.202106111115
Expand Down Expand Up @@ -124,6 +124,7 @@ org.eclipse.sirius.ui.ext=6.5.1.202106111115
org.eclipse.sirius.ui.properties=6.5.1.202106111115
org.eclipse.sirius.ui.properties.ext.widgets.reference=6.5.1.202106111115
org.eclipse.xtext=2.25.0.v20210301-0843
org.eclipse.xtext.activities=2.25.0.v20210301-0928
org.eclipse.xtext.builder=2.25.0.v20210301-0928
org.eclipse.xtext.builder.standalone=2.25.0.v20210301-0909
org.eclipse.xtext.buildship=2.25.0.v20210301-0928
Expand All @@ -132,13 +133,17 @@ org.eclipse.xtext.common.types.edit=2.25.0.v20210301-0928
org.eclipse.xtext.common.types.shared=2.25.0.v20210301-0928
org.eclipse.xtext.common.types.shared.jdt38=2.25.0.v20210301-0928
org.eclipse.xtext.common.types.ui=2.25.0.v20210301-0928
org.eclipse.xtext.doc=2.25.0.v20210301-0928
org.eclipse.xtext.ecore=2.25.0.v20210301-0909
org.eclipse.xtext.generator=2.25.0.v20210301-0909
org.eclipse.xtext.ide=2.25.0.v20210301-0843
org.eclipse.xtext.java=2.25.0.v20210301-0909
org.eclipse.xtext.junit4=2.25.0.v20210301-0928
org.eclipse.xtext.logging=1.2.15.v20210301-0928
org.eclipse.xtext.m2e=2.25.0.v20210301-0928
org.eclipse.xtext.purexbase=2.25.0.v20210301-0909
org.eclipse.xtext.purexbase.ide=2.25.0.v20210301-0909
org.eclipse.xtext.purexbase.ui=2.25.0.v20210301-0928
org.eclipse.xtext.smap=2.25.0.v20210301-0909
org.eclipse.xtext.testing=2.25.0.v20210301-0843
org.eclipse.xtext.ui=2.25.0.v20210301-0928
Expand All @@ -154,7 +159,12 @@ org.eclipse.xtext.xbase=2.25.0.v20210301-0909
org.eclipse.xtext.xbase.ide=2.25.0.v20210301-0909
org.eclipse.xtext.xbase.junit=2.25.0.v20210301-0928
org.eclipse.xtext.xbase.lib=2.25.0.v20210301-0821
org.eclipse.xtext.xbase.testing=2.25.0.v20210301-0909
org.eclipse.xtext.xbase.ui=2.25.0.v20210301-0928
org.eclipse.xtext.xbase.ui.testing=2.25.0.v20210301-0928
org.eclipse.xtext.xtext.generator=2.25.0.v20210301-0843
org.eclipse.xtext.xtext.ide=2.25.0.v20210301-0843
org.eclipse.xtext.xtext.ui=2.25.0.v20210301-0928
org.eclipse.xtext.xtext.ui.examples=2.25.0.v20210301-0928
org.eclipse.xtext.xtext.ui.graph=2.25.0.v20210301-0928
org.eclipse.xtext.xtext.wizard=2.25.0.v20210301-0843
3 changes: 3 additions & 0 deletions robosim_models/UR5e/csp-gen/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/file_ur5e_gripper.csp
/file_ur5e_gripper_coreassertions.csp
/instantiations.csp
9 changes: 9 additions & 0 deletions robosim_models/UR5e/csp-gen/defs/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/core_defs.csp
/file_ur5e_gripper.csp
/file_ur5e_gripper_defs.csp
/function_toolkit_defs.csp
/relation_toolkit_defs.csp
/robochart_defs.csp
/sequence_toolkit_defs.csp
/set_toolkit_defs.csp
/state_defs.csp
4 changes: 2 additions & 2 deletions robosim_models/UR5e/csp-gen/defs/file_ur5e_gripper.csp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

--
-- RoboChart generator version 3.0.0.202306261132
-- Automatically generated on 12-04-2024 11:10:19
-- RoboChart generator version 3.0.0.202408051513
-- Automatically generated on 24-09-2024 06:58:15
--
-- Iterated compression status: true
-- Assertions compression status: false
Expand Down
4 changes: 2 additions & 2 deletions robosim_models/UR5e/csp-gen/defs/file_ur5e_gripper_defs.csp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

--
-- RoboChart generator version 3.0.0.202306261132
-- Automatically generated on 12-04-2024 11:10:19
-- RoboChart generator version 3.0.0.202408051513
-- Automatically generated on 24-09-2024 06:58:15
--
-- Iterated compression status: true
-- Assertions compression status: false
Expand Down
4 changes: 2 additions & 2 deletions robosim_models/UR5e/csp-gen/file_ur5e_gripper.csp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

--
-- RoboChart generator version 3.0.0.202306261132
-- Automatically generated on 12-04-2024 11:10:19
-- RoboChart generator version 3.0.0.202408051513
-- Automatically generated on 24-09-2024 06:58:15
--
-- Iterated compression status: true
-- Assertions compression status: false
Expand Down
4 changes: 2 additions & 2 deletions robosim_models/UR5e/csp-gen/file_ur5e_gripper_coreassertions.csp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

--
-- RoboChart generator version 3.0.0.202306261132
-- Automatically generated on 12-04-2024 11:10:19
-- RoboChart generator version 3.0.0.202408051513
-- Automatically generated on 24-09-2024 06:58:15
--
-- Iterated compression status: true
-- Assertions compression status: false
Expand Down
3 changes: 3 additions & 0 deletions robosim_models/UR5e/csp-gen/timed/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/file_ur5e_gripper.csp
/file_ur5e_gripper_coreassertions.csp
/instantiations.csp
11 changes: 11 additions & 0 deletions robosim_models/UR5e/csp-gen/timed/defs/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/core_defs.csp
/core_timed_defs.csp
/file_ur5e_gripper.csp
/file_ur5e_gripper_defs.csp
/function_toolkit_defs.csp
/relation_toolkit_defs.csp
/robochart_defs.csp
/sequence_toolkit_defs.csp
/set_toolkit_defs.csp
/state_defs.csp
/state_timed_defs.csp
6 changes: 6 additions & 0 deletions robosim_models/UR5e/csp-gen/timed/defs/core_timed_defs.csp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ TimeOut_1(P__,Q__) = (USTOP[+{tock}+]P__) [] (tock -> Q__)

TimedInterrupt_1(P__) = (USTOP[+{tock}+]P__) /\ (tock -> TSKIP)

TimedInterruptSeq(e__,d__,Q__) =
let
TT(n__) = if n__ < d__ then TimeOut_1(e__ -> SKIP,TT(n__ + 1)) else Q__
within
TT(0)

-- The following process TCHAOS is a version of CHAOS suitable for use
-- in tick-tock: it offers the events in S__ non-deterministically and
-- can either timelock or deadlock. Note that tock does not need to
Expand Down
4 changes: 2 additions & 2 deletions robosim_models/UR5e/csp-gen/timed/defs/file_ur5e_gripper.csp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

--
-- RoboChart generator version 3.0.0.202306261132
-- Automatically generated on 12-04-2024 11:10:19
-- RoboChart generator version 3.0.0.202408051513
-- Automatically generated on 24-09-2024 06:58:15
--
-- Iterated compression status: true
-- Assertions compression status: false
Expand Down
4 changes: 2 additions & 2 deletions robosim_models/UR5e/csp-gen/timed/defs/file_ur5e_gripper_defs.csp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

--
-- RoboChart generator version 3.0.0.202306261132
-- Automatically generated on 12-04-2024 11:10:19
-- RoboChart generator version 3.0.0.202408051513
-- Automatically generated on 24-09-2024 06:58:15
--
-- Iterated compression status: true
-- Assertions compression status: false
Expand Down
2 changes: 2 additions & 0 deletions robosim_models/UR5e/csp-gen/timed/defs/state_timed_defs.csp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ channel share__, timed_share__
-- Definition of RUN that includes tock
CRUN(x__) = RUN(union(x__,{tock}))

TRUN(x__) = CRUN(x__)

-- Timed version of SStop
SStop = CRUN({|share__|})

Expand Down
4 changes: 2 additions & 2 deletions robosim_models/UR5e/csp-gen/timed/file_ur5e_gripper.csp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

--
-- RoboChart generator version 3.0.0.202306261132
-- Automatically generated on 12-04-2024 11:10:19
-- RoboChart generator version 3.0.0.202408051513
-- Automatically generated on 24-09-2024 06:58:15
--
-- Iterated compression status: true
-- Assertions compression status: false
Expand Down
4 changes: 2 additions & 2 deletions robosim_models/UR5e/csp-gen/timed/file_ur5e_gripper_coreassertions.csp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

--
-- RoboChart generator version 3.0.0.202306261132
-- Automatically generated on 12-04-2024 11:10:19
-- RoboChart generator version 3.0.0.202408051513
-- Automatically generated on 24-09-2024 06:58:15
--
-- Iterated compression status: true
-- Assertions compression status: false
Expand Down
Loading

0 comments on commit a156b4a

Please sign in to comment.