Differences

This shows you the differences between two versions of the page.

--- sidebar [2014/01/15 12:27]
claes
+++ sidebar [2015/01/13 16:09]
david
@@ Line 4: / Line 4: @@
   * [[robots:hako:welcome|The Hako/AMS - Autonomous Mechanisation System]]
   * [[robots:jd:welcome|JD 4720/AMS2 - Autonomous Mechanisation System 2]]
-  * [[robots:armadillo:welcome|Armadillo Scout]]
+  * [[robots:phoenix:welcome|Phoenix]]
-  * [[robots:agsmr:welcome|agSMR - Talos]]
+  * [[robots:agsmr:welcome|Talos]]
   * [[robots:mindstorm:welcome|Mindstorms]]
@@ Line 18: / Line 18: @@
 ====== Robot Computers ======
-  * [[robots:computer:frobobox|Frobobox]]
-  * [[robots:computer:craftbox:craftbox|CraftBox]]
   * [[robots:computer:navigation:computer|Navigation PC]]
   * [[robots:computer:perception:computer|Perception PC]]
   * [[robots:computer:talos:computer|Talos]]
-  * [[robots:computer:raspberry:raspberry|RaspbarryPi]]
+  * [[robots:computer:raspberry:raspberry|RaspberryPi]]
   * [[robots:computer:robocard:robocard|Robocard]]
@@ Line 56: / Line 54: @@
   *[[employees:virtual_server|Virtual Server]]
 Misc
+  *[[employees:calendar|Holidays in the calendar]]
   *[[employees:links|Links to different relevant things]]
   *[[employees:hiwis|Contact for potential HIWIS]]
@@ Line 78: / Line 77: @@
 ====== External resources======
   * [[External resources|External resources]]
-====== Game Night ======
-  * [[gamenight|Game Nights]]

Technology in Crop Production