Updated dependancies
diff --git a/contiki-msp430/Makefile.depend b/contiki-msp430/Makefile.depend
index 919cf52..e48b154 100644
--- a/contiki-msp430/Makefile.depend
+++ b/contiki-msp430/Makefile.depend
@@ -7,18 +7,49 @@
  ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h apps/webserver.h \
  ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
  ../contiki/apps/about-dsc.h ../contiki/apps/netconf-dsc.h \
- ../contiki/apps/processes-dsc.h ../contiki/apps/calc-dsc.h \
- ../contiki/apps/www-dsc.h ../contiki/apps/webserver-dsc.h \
- apps/weblinks-dsc.h uip/rs232.h
-test.o: test.c uip/rs232.h
-http-user-agent-string.o: apps/http-user-agent-string.c
+ ../contiki/apps/processes-dsc.h ../contiki/apps/www-dsc.h \
+ ../contiki/apps/webserver-dsc.h apps/sensorview-dsc.h \
+ msp430/sensors.h msp430/msp430.h msp430/rs232.h
+test.o: test.c msp430/rs232.h
+httpd-cgi.o: apps/httpd-cgi.c ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/apps/httpd.h apps/httpd-cgi.h \
+ apps/httpd-fs.h ../contiki/lib/petsciiconv.h msp430/sensors.h \
+ msp430/tr1001.h
+httpd-fs.o: apps/httpd-fs.c ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/apps/httpd.h apps/httpd-fs.h \
+ apps/httpd-fsdata.h apps/httpd-fsdata.c
 httpd-fsdata.o: apps/httpd-fsdata.c
+httpd.o: apps/httpd.c ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/apps/httpd.h apps/httpd-fs.h apps/httpd-fsdata.h \
+ apps/httpd-cgi.h
 procprint.o: apps/procprint.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
  ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h \
  conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/uip/uip.h \
  ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/loader.h \
- uip/rs232.h
+ msp430/rs232.h
+sensorcheck.o: apps/sensorcheck.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/loader.h \
+ msp430/sensors.h ../contiki/uip/uip-signal.h
+sensorview-dsc.o: apps/sensorview-dsc.c ../contiki/ek/dsc.h \
+ ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
+ ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h
+sensorview.o: apps/sensorview.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/loader.h \
+ msp430/sensors.h
 webclient.o: apps/webclient.c ../contiki/uip/uip.h \
  ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
@@ -26,18 +57,6 @@
  ../contiki/apps/http-strings.h \
  ../contiki/apps/http-user-agent-string.h ../contiki/uip/resolv.h \
  ../contiki/uip/uip_main.h conf/www-conf.h
-weblinks-dsc.o: apps/weblinks-dsc.c ../contiki/ek/dsc.h \
- ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
- ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-weblinks.o: apps/weblinks.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ctk/ctk-draw.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/loader.h \
- ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
- ../contiki/apps/www.h
 webserver.o: apps/webserver.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
  ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h \
  conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
@@ -46,8 +65,83 @@
  ../contiki/apps/http-strings.h ../contiki/uip/uip_main.h \
  ../contiki/lib/petsciiconv.h ../contiki/ek/loader.h apps/webserver.h \
  ../contiki/apps/httpd.h
-rs232.o: uip/rs232.c uip/rs232.h
-rs232dev.o: uip/rs232dev.c uip/rs232.h ../contiki/uip/uip.h \
+slip-main.o: contiki-dtnsn/slip-main.c ../contiki/ctk/ctk.h \
+ conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ctk/ctk-draw.h ../contiki/ctk/ctk-vncserver.h \
+ ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/uip_main.h \
+ ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h apps/webserver.h \
+ ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
+ ../contiki/apps/about-dsc.h ../contiki/apps/netconf-dsc.h \
+ ../contiki/apps/processes-dsc.h ../contiki/apps/www-dsc.h \
+ ../contiki/apps/webserver-dsc.h apps/sensorview-dsc.h \
+ msp430/sensors.h msp430/msp430.h msp430/rs232.h
+slip-tr1001-drv.o: contiki-dtnsn/slip-tr1001-drv.c \
+ ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
+ ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/uip/uip_arp.h ../contiki/uip/uip-signal.h uip/rs232dev.h \
+ msp430/tr1001.h ../contiki/ek/loader.h ../contiki/uip/uip-fw.h
+wireless-main-2.o: contiki-dtnsn/wireless-main-2.c \
+ ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
+ ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk-vncserver.h ../contiki/ek/dispatcher.h \
+ ../contiki/ek/arg.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h msp430/msp430.h ../contiki/uip/uip_main.h \
+ ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h apps/webserver.h \
+ ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
+ ../contiki/apps/about-dsc.h ../contiki/apps/netconf-dsc.h \
+ ../contiki/apps/processes-dsc.h ../contiki/apps/www-dsc.h \
+ ../contiki/apps/webserver-dsc.h apps/sensorview-dsc.h \
+ msp430/sensors.h msp430/rs232.h
+wireless-main-3.o: contiki-dtnsn/wireless-main-3.c \
+ ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
+ ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk-vncserver.h ../contiki/ek/dispatcher.h \
+ ../contiki/ek/arg.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/uip_main.h ../contiki/uip/uip_arp.h \
+ ../contiki/uip/resolv.h apps/webserver.h \
+ ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
+ ../contiki/apps/about-dsc.h ../contiki/apps/netconf-dsc.h \
+ ../contiki/apps/processes-dsc.h ../contiki/apps/www-dsc.h \
+ ../contiki/apps/webserver-dsc.h apps/sensorview-dsc.h \
+ msp430/sensors.h msp430/msp430.h msp430/rs232.h
+wireless-main.o: contiki-dtnsn/wireless-main.c ../contiki/ctk/ctk.h \
+ conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ctk/ctk-draw.h ../contiki/ctk/ctk-vncserver.h \
+ ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h msp430/msp430.h \
+ ../contiki/uip/uip_main.h ../contiki/uip/uip_arp.h \
+ ../contiki/uip/resolv.h apps/webserver.h \
+ ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
+ ../contiki/apps/about-dsc.h ../contiki/apps/netconf-dsc.h \
+ ../contiki/apps/processes-dsc.h ../contiki/apps/www-dsc.h \
+ ../contiki/apps/webserver-dsc.h apps/sensorview-dsc.h \
+ msp430/sensors.h msp430/rs232.h
+msp430.o: msp430/msp430.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ctk/ctk-draw.h ../contiki/ctk/ctk-vncserver.h \
+ ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/uip_main.h \
+ ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h apps/webserver.h \
+ ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
+ ../contiki/apps/about-dsc.h ../contiki/apps/netconf-dsc.h \
+ ../contiki/apps/processes-dsc.h ../contiki/apps/www-dsc.h \
+ ../contiki/apps/webserver-dsc.h apps/sensorview-dsc.h \
+ msp430/sensors.h msp430/rs232.h
+rs232.o: msp430/rs232.c msp430/rs232.h
+sensors.o: msp430/sensors.c
+tr1001.o: msp430/tr1001.c msp430/tr1001.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h msp430/sensors.h
+rs232-backup.o: uip/rs232-backup.c msp430/rs232.h
+rs232dev.o: uip/rs232dev.c msp430/rs232.h ../contiki/uip/uip.h \
  ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h
@@ -56,10 +150,16 @@
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
  ../contiki/ek/arg.h ../contiki/uip/uip_arp.h \
  ../contiki/uip/uip-signal.h uip/rs232dev.h ../contiki/ek/loader.h
+tr1001-drv.o: uip/tr1001-drv.c ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/uip/uip_arp.h \
+ ../contiki/uip/uip-signal.h msp430/tr1001.h ../contiki/ek/loader.h \
+ ../contiki/uip/uip-fw.h
 uip_arch.o: uip/uip_arch.c ../contiki/uip/uip.h \
  ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h uip/uip_arch.h
+ ../contiki/ek/arg.h ../contiki/uip/uip_arch.h
 about-dsc.o: ../contiki/apps/about-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
  ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
@@ -117,16 +217,6 @@
  ../contiki/ek/arg.h ../contiki/apps/httpd.h \
  ../contiki/apps/httpd-fs.h ../contiki/apps/httpd-fsdata.h \
  ../contiki/apps/httpd-cgi.h
-maze-dsc.o: ../contiki/apps/maze-dsc.c ../contiki/ek/dsc.h \
- ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
- ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-maze.o: ../contiki/apps/maze.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ctk/ctk-draw.h ../contiki/ctk/ctk-mouse.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/loader.h
 netconf-dsc.o: ../contiki/apps/netconf-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
  ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
@@ -205,16 +295,17 @@
  conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/arg.h \
  ../contiki/uip/uip_main.h ../contiki/lib/petsciiconv.h \
  ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h \
- ../contiki/apps/shell.h ../contiki/uip/uip-signal.h
+ ../contiki/lib/memb.h ../contiki/apps/shell.h \
+ ../contiki/uip/uip-signal.h
 vnc-dsc.o: ../contiki/apps/vnc-dsc.c ../contiki/ek/dsc.h \
  ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
  ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h
 vnc-viewer.o: ../contiki/apps/vnc-viewer.c ../contiki/apps/vnc-draw.h \
- uip/uip_arch.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/ek/dispatcher.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/apps/vnc-viewer.h
+ ../contiki/uip/uip_arch.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/apps/vnc-viewer.h
 vnc.o: ../contiki/apps/vnc.c ../contiki/lib/petsciiconv.h \
  ../contiki/uip/uip_main.h ../contiki/uip/uip.h \
  ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
@@ -222,7 +313,7 @@
  ../contiki/ek/arg.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
  ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h ../contiki/uip/resolv.h \
  ../contiki/apps/telnet.h ../contiki/apps/vnc.h \
- ../contiki/apps/vnc-draw.h uip/uip_arch.h \
+ ../contiki/apps/vnc-draw.h ../contiki/uip/uip_arch.h \
  ../contiki/apps/vnc-viewer.h conf/vnc-conf.h ../contiki/ek/loader.h
 webclient.o: ../contiki/apps/webclient.c ../contiki/uip/uip.h \
  ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
@@ -257,10 +348,10 @@
  ../contiki/uip/resolv.h ../contiki/lib/petsciiconv.h \
  ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
  ../contiki/ek/loader.h conf/www-conf.h
-ctk-remote.o: ../contiki/ctk/ctk-remote.c ../contiki/ctk/ctk-remote.h \
- ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
- ../contiki/ctk/ctk-vncarch.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
+ctk-conio.o: ../contiki/ctk/ctk-conio.c ../contiki/ctk/ctk.h \
+ conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ctk/ctk-draw.h conf/ctk-conio-conf.h
 ctk-vncfont.o: ../contiki/ctk/ctk-vncfont.c
 ctk-vncserver.o: ../contiki/ctk/ctk-vncserver.c ../contiki/ctk/ctk.h \
  conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-vncarch.h \
@@ -305,6 +396,7 @@
  ../contiki/uip/uipopt.h conf/uip-conf.h
 libconio.o: ../contiki/lib/libconio.c ../contiki/lib/libconio.h \
  conf/libconio-conf.h
+memb.o: ../contiki/lib/memb.c ../contiki/lib/memb.h
 petsciiconv.o: ../contiki/lib/petsciiconv.c
 strncasecmp.o: ../contiki/lib/strncasecmp.c
 resolv.o: ../contiki/uip/resolv.c ../contiki/uip/resolv.h \
@@ -312,6 +404,10 @@
  ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
  ../contiki/uip/uip-signal.h
+uip-fw.o: ../contiki/uip/uip-fw.c ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/uip/uip_arch.h ../contiki/uip/uip-fw.h
 uip-signal.o: ../contiki/uip/uip-signal.c ../contiki/uip/uip-signal.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/ek/dispatcher.h \
  ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
@@ -319,7 +415,7 @@
 uip.o: ../contiki/uip/uip.c ../contiki/uip/uip.h \
  ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
  ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h uip/uip_arch.h
+ ../contiki/ek/arg.h ../contiki/uip/uip_arch.h
 uip_arp.o: ../contiki/uip/uip_arp.c ../contiki/uip/uip_arp.h \
  ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
  ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \