<
From version < 12.1 >
edited by ssm
on 2014/01/24 12:03
To version < 17.1 >
edited by ssm
on 2014/01/29 12:37
>
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -Model Railway Practical (summer term 2014)
1 +Railway Project (summer term 2014)
Content
... ... @@ -1,37 +1,13 @@
1 1  {{layout}}
2 2  {{layout-section ac:type="single"}}
3 3  {{layout-cell}}
4 -{{tip title="Welcome to your new space!"}}
5 -Confluence spaces are great for sharing content and news with your team. This is your home page. Right now it shows recent space activity, but you can customize this page in anyway you like.
6 -{{/tip}}
7 -
8 -== Complete these tasks to get started ==
9 -
10 -{{task-list}}
11 -{{task id="5" status="incomplete"}}
12 -**Edit this home page** - Click //Edit// in the top right of this screen to customize your Space home page
13 -{{/task}}
14 -
15 -{{task id="6" status="incomplete"}}
16 -**Create your first page** - Click the //Create// button in the header to get started
17 -{{/task}}
18 -
19 -{{task id="7" status="incomplete"}}
20 -**Brand your Space** - Click //Configure Sidebar// in the left panel to update space details and logo
21 -{{/task}}
22 -
23 -{{task id="8" status="incomplete"}}
24 -**Set permissions** - Click //Space Tools// in the left sidebar to update permissions and give others access
25 -{{/task}}
26 -{{/task-list}}
27 -
28 -
4 +[[image:attach:railwayheader1b.png]][[image:attach:headline_ifi.png]]
29 29  {{/layout-cell}}
30 30  {{/layout-section}}
31 31  
32 32  {{layout-section ac:type="single"}}
33 33  {{layout-cell}}
34 -[[image:attach:headline_railway.png]][[image:attach:headline_ifi.png]]
10 +**This project is offered as [[Inf-AP-ES: Abschlussprojekt - Echtzeitsysteme/Eingebettete Systeme>>url:http://univis.uni-kiel.de/prg?show=llong&key=95/lectures/2014s:techn/infor/inform/echtze/ba61ec||shape="rect"]] and as [[MSP1101: Masterprojekt - Echtzeitsysteme/Eingebettete Systeme (Modellbahn)>>url:http://univis.uni-kiel.de/prg?show=llong&key=95/lectures/2014s:techn/infor/inform/echtze/prakte||shape="rect"]]**
35 35  {{/layout-cell}}
36 36  {{/layout-section}}
37 37  
... ... @@ -39,13 +39,13 @@
39 39  {{layout-cell}}
40 40  = Welcome! =
41 41  
42 -Welcome to the Confluence Wiki of the Model Railway Practical. What this Wiki is all about:
18 +Welcome to the Confluence Wiki of the Railway Project. What this Wiki is all about:
43 43  
44 -* It's the place where we post important information on the practical, such as due dates and similar information.
45 -* It's also the place where we post tutorials. You will spend the first part of the practical working through the tutorials before starting your individual projects.
20 +* It's the place where we post important information on the project, such as due dates and similar information.
21 +* It's also the place where we post tutorials. You will spend the first part of the project working through the tutorials before starting your individual projects.
46 46  * And finally, it's the place where each group will document their project.
47 47  
48 -== About the Model Railway practical ==
24 +== About the Railway Project ==
49 49  
50 50  This project employs model-based-design and the synchronous approach to control a Model Railway. The application is a local physical existent [[model railway installation>>url:http://www.informatik.uni-kiel.de/~~railway/||shape="rect" class="ext-link"]] where multiple trains shall be driven concurrently on the installation. Development of this project is done in a model-based-design, most likely SCCharts or alternatively the [[SCADE>>url:http://de.wikipedia.org/wiki/SCADE||shape="rect" class="ext-link"]] Suite, which merges control flow ([[Statecharts>>url:http://en.wikipedia.org/wiki/Statechart||shape="rect" class="ext-link"]]) and [[data flow>>url:http://en.wikipedia.org/wiki/Data_flow_diagram||shape="rect" class="ext-link"]].
51 51  
... ... @@ -53,7 +53,7 @@
53 53  {{/layout-cell}}
54 54  
55 55  {{layout-cell}}
56 -= [[image:attach:railway12.jpg]] =
32 +[[image:attach:railway12.jpg]]
57 57  {{/layout-cell}}
58 58  {{/layout-section}}
59 59  
... ... @@ -67,7 +67,38 @@
67 67  
68 68  
69 69  
70 -upcoming...
46 +|=(((
47 +Datum
48 +)))|=(((
49 +Raum
50 +)))|=(((
51 +Termin
52 +)))
53 +|(((
54 +Do, 30.01.
55 +
56 +13:50 - 14:10
57 +)))|(((
58 +R1114/1115
59 +
60 +CAP4
61 +)))|(((
62 +Vorbesprechung
63 +)))
64 +|(% colspan="1" %)(% colspan="1" %)
65 +(((
66 +Mo, 15.04.
67 +
68 +13:50 - 14:10
69 +)))|(% colspan="1" %)(% colspan="1" %)
70 +(((
71 +R1114/1115
72 +
73 +CAP4
74 +)))|(% colspan="1" %)(% colspan="1" %)
75 +(((
76 +Vorbesprechung
77 +)))
71 71  {{/layout-cell}}
72 72  {{/layout-section}}
73 73  {{/layout}}
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -8651646
1 +8651668
URL
... ... @@ -1,1 +1,1 @@
1 -https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/8651646/Model Railway Practical (summer term 2014)
1 +https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/8651668/Railway Project (summer term 2014)