Merge Network code with webserver etc
authorJim Morris <morris@wolfman.com>
Sun, 22 Dec 2013 09:56:41 +0000 (01:56 -0800)
committerJim Morris <morris@wolfman.com>
Sun, 22 Dec 2013 09:56:41 +0000 (01:56 -0800)
commitd4ee6ee239981a7fbc9fb24849182d5b9e2cee29
treefa43ed74326f07488048915562d84ffe7e1577d0
parentbd815749500e0c790957e39791722218af102b7f
Merge Network code with webserver etc
Add some re entrancy fixes to circbuffer and ringbuffer
Allow network to be eliminated from build with make NONETWORK=1
104 files changed:
ConfigSamples/Smoothieboard/config
build/common.mk
mbed/src/mbed-lpc1768.mk
smoothie-stream.py [new file with mode: 0644]
smoothie-upload.py [new file with mode: 0644]
src/libs/Kernel.cpp
src/libs/Network/Drivers/LPC17XX_Ethernet.cpp
src/libs/Network/Drivers/LPC17XX_Ethernet.h
src/libs/Network/net_util.h
src/libs/Network/uip/CallbackStream.cpp [new file with mode: 0644]
src/libs/Network/uip/CallbackStream.h [new file with mode: 0644]
src/libs/Network/uip/CommandQueue.cpp [new file with mode: 0644]
src/libs/Network/uip/CommandQueue.h [new file with mode: 0644]
src/libs/Network/uip/Network.cpp [new file with mode: 0644]
src/libs/Network/uip/Network.h [new file with mode: 0644]
src/libs/Network/uip/NetworkPublicAccess.h [new file with mode: 0644]
src/libs/Network/uip/c-fifo.h [new file with mode: 0644]
src/libs/Network/uip/clock-arch.c [new file with mode: 0644]
src/libs/Network/uip/clock-arch.h [new file with mode: 0644]
src/libs/Network/uip/dhcpc/dhcpc.c [new file with mode: 0644]
src/libs/Network/uip/dhcpc/dhcpc.h [new file with mode: 0644]
src/libs/Network/uip/fifo.cpp [new file with mode: 0644]
src/libs/Network/uip/fifo.h [new file with mode: 0644]
src/libs/Network/uip/lib/memb.c [new file with mode: 0644]
src/libs/Network/uip/lib/memb.h [new file with mode: 0644]
src/libs/Network/uip/sftp/sftpd.cpp [new file with mode: 0644]
src/libs/Network/uip/sftp/sftpd.h [new file with mode: 0644]
src/libs/Network/uip/telnetd/shell.cpp [new file with mode: 0644]
src/libs/Network/uip/telnetd/shell.h [new file with mode: 0644]
src/libs/Network/uip/telnetd/telnetd.cpp [new file with mode: 0644]
src/libs/Network/uip/telnetd/telnetd.h [new file with mode: 0644]
src/libs/Network/uip/uip-conf.h [new file with mode: 0644]
src/libs/Network/uip/uip/clock.h [new file with mode: 0644]
src/libs/Network/uip/uip/lc-addrlabels.h [new file with mode: 0644]
src/libs/Network/uip/uip/lc-switch.h [new file with mode: 0644]
src/libs/Network/uip/uip/lc.h [new file with mode: 0644]
src/libs/Network/uip/uip/psock.c [new file with mode: 0644]
src/libs/Network/uip/uip/psock.h [new file with mode: 0644]
src/libs/Network/uip/uip/pt.h [new file with mode: 0644]
src/libs/Network/uip/uip/timer.c [new file with mode: 0644]
src/libs/Network/uip/uip/timer.h [new file with mode: 0644]
src/libs/Network/uip/uip/uip-fw.c [new file with mode: 0644]
src/libs/Network/uip/uip/uip-fw.h [new file with mode: 0644]
src/libs/Network/uip/uip/uip-neighbor.c [new file with mode: 0644]
src/libs/Network/uip/uip/uip-neighbor.h [new file with mode: 0644]
src/libs/Network/uip/uip/uip-split.c [new file with mode: 0644]
src/libs/Network/uip/uip/uip-split.h [new file with mode: 0644]
src/libs/Network/uip/uip/uip.c [new file with mode: 0644]
src/libs/Network/uip/uip/uip.h [new file with mode: 0644]
src/libs/Network/uip/uip/uip_arch.h [new file with mode: 0644]
src/libs/Network/uip/uip/uip_arp.c [new file with mode: 0644]
src/libs/Network/uip/uip/uip_arp.h [new file with mode: 0644]
src/libs/Network/uip/uip/uiplib.c [new file with mode: 0644]
src/libs/Network/uip/uip/uiplib.h [new file with mode: 0644]
src/libs/Network/uip/uip/uipopt.h [new file with mode: 0644]
src/libs/Network/uip/webserver/http-strings [new file with mode: 0644]
src/libs/Network/uip/webserver/http-strings.c [new file with mode: 0644]
src/libs/Network/uip/webserver/http-strings.h [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd-fs.c [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd-fs.h [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd-fs/404.html [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd-fs/img/control_xy.png [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd-fs/img/control_z.png [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd-fs/index.html [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd-fsdata.h [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd-fsdata2.h [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd.c [new file with mode: 0644]
src/libs/Network/uip/webserver/httpd.h [new file with mode: 0644]
src/libs/Network/uip/webserver/makefsdata.pl [new file with mode: 0644]
src/libs/Network/uip/webserver/makestrings [new file with mode: 0755]
src/libs/Network/uip/webserver/webserver.h [new file with mode: 0644]
src/libs/Pin.cpp
src/libs/Pin.h
src/libs/RingBuffer.h
src/libs/StreamOutputPool.h
src/libs/USBDevice/USBSerial/CircBuffer.h
src/main.cpp
src/modules/robot/Conveyor.h
src/modules/robot/Robot.cpp
src/modules/tools/endstops/Endstops.cpp
src/modules/utils/panel/panels/VikiLCD.cpp
src/modules/utils/panel/screens/WatchScreen.cpp
src/modules/utils/panel/screens/WatchScreen.h
src/modules/utils/player/Player.cpp
src/modules/utils/simpleshell/SimpleShell.cpp
src/modules/utils/simpleshell/SimpleShell.h
webif/404.html [new file with mode: 0644]
webif/css/font-awesome-ie7.css [new symlink]
webif/css/font-awesome.css [new symlink]
webif/css/style.css [new file with mode: 0644]
webif/images/control_e.png [new file with mode: 0755]
webif/images/control_xy.png [new file with mode: 0755]
webif/images/control_z.png [new file with mode: 0755]
webif/images/prusa_icon.png [new file with mode: 0644]
webif/images/upload_stripe.png [new file with mode: 0644]
webif/img/control_xy.png [new file with mode: 0644]
webif/img/control_z.png [new file with mode: 0644]
webif/index.html [new file with mode: 0644]
webif/js/boundvalue.js [new file with mode: 0644]
webif/js/jog.js [new file with mode: 0644]
webif/js/netrap.js [new file with mode: 0644]
webif/js/prototype.js [new file with mode: 0644]
webif/netrap.html [new file with mode: 0644]
webif/netrap_old.html [new file with mode: 0644]