This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
sidebar [2013/12/09 10:57] claes [PhDs] |
sidebar [2015/01/13 16:13] david |
||
---|---|---|---|
Line 4: | Line 4: | ||
* [[robots: | * [[robots: | ||
* [[robots: | * [[robots: | ||
- | * [[robots:armadillo:welcome|Armadillo Scout]] | + | * [[robots:phoenix:welcome|Phoenix]] |
- | * [[robots: | + | * [[robots: |
* [[robots: | * [[robots: | ||
Line 16: | Line 16: | ||
* [[robotsoftware: | * [[robotsoftware: | ||
* [[robotsoftware: | * [[robotsoftware: | ||
- | |||
- | ====== Robot Computers ====== | ||
- | * [[robots: | ||
- | * [[robots: | ||
- | * [[robots: | ||
- | * [[robots: | ||
- | * [[robots: | ||
- | * [[robots: | ||
- | * [[robots: | ||
- | |||
====== Teaching ====== | ====== Teaching ====== | ||
Line 36: | Line 26: | ||
* [[sensors|Sensors]] | * [[sensors|Sensors]] | ||
* [[sensors: | * [[sensors: | ||
+ | |||
+ | ====== Projects ====== | ||
+ | * [[projects: | ||
+ | * [[projects: | ||
+ | * [[projects: | ||
+ | * [[projects: | ||
+ | * [[projects: | ||
+ | * [[projects: | ||
+ | * [[projects: | ||
+ | * [[projects: | ||
+ | PhDs | ||
+ | * [[projects: | ||
+ | * [[projects: | ||
====== Webpages ====== | ====== Webpages ====== | ||
Line 50: | Line 53: | ||
*[[employees: | *[[employees: | ||
*[[employees: | *[[employees: | ||
+ | *[[employees: | ||
Computers | Computers | ||
*[[employees: | *[[employees: | ||
Line 55: | Line 59: | ||
*[[employees: | *[[employees: | ||
Misc | Misc | ||
+ | *[[employees: | ||
*[[employees: | *[[employees: | ||
*[[employees: | *[[employees: | ||
Line 61: | Line 66: | ||
Linux | Linux | ||
*[[linux: | *[[linux: | ||
- | ====== Projects ====== | ||
- | * [[projects: | ||
- | * [[projects: | ||
- | * [[projects: | ||
- | * [[projects: | ||
- | * [[projects: | ||
- | * [[projects: | ||
- | * [[projects: | ||
- | * [[projects: | ||
- | PhDs | ||
- | * [[projects: | ||
- | * [[projects: | ||
====== Online Presentations ====== | ====== Online Presentations ====== | ||
* None at the moment | * None at the moment | ||
====== External resources====== | ====== External resources====== | ||
* [[External resources|External resources]] | * [[External resources|External resources]] | ||
- | ====== Game Night ====== | ||
- | * [[gamenight|Game Nights]] | ||
- |