From: Sam Moore Date: Fri, 1 Nov 2013 03:05:55 +0000 (+0800) Subject: Changed some things... X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;ds=sidebyside;h=a089928300f6500a31978b8cef356ed70bb232c1;hp=7987ad07f12aa9755fbaa274fa01bec1c844be0b;p=matches%2FMCTX3420.git Changed some things... The only thing I can remember is changing the title page... lack of sleep... --- diff --git a/reports/final/Makefile b/reports/final/Makefile index ea4c15e..e7a2ac7 100644 --- a/reports/final/Makefile +++ b/reports/final/Makefile @@ -11,6 +11,10 @@ report.pdf : report.tex bibtex report pdflatex --shell-escape report pdflatex --shell-escape report + bibtex report + pdflatex --shell-escape report + pdflatex --shell-escape report + rm -f *.bbl *.log *.toc *.lof *.blg *.lot diff --git a/reports/final/chapters/Results.tex b/reports/final/chapters/Results.tex index 69ca9b5..b54e68d 100644 --- a/reports/final/chapters/Results.tex +++ b/reports/final/chapters/Results.tex @@ -4,11 +4,12 @@ This report has described the work of the software team on the MCTX3420 pressuri In summary, we have succeeded in the following goals: \begin{enumerate} - \item Design and implementation of a multithreaded process for providing continuous control over real hardware in response to intermittent user actions (Section \ref{Server Program}, \ref{Hardware Interfacing}) - \item Design and implementation of a configuration allowing this process to interface with the \emph{nginx} HTTP server (Sections \ref{Communications}, \ref{Server Configuration} + \item Design and implementation of a multithreaded process for providing continuous control over real hardware in response to intermittent user actions (Section \ref{Server Program}, \ref{Hardware}) + \item Design and implementation of a configuration allowing this process to interface with the \emph{nginx} HTTP server (Sections \ref{Communications}, \ref{Configuration} \item Design and implementation of a API using the HTTP protocol to allow a client process to supply user commands to the system (Section \ref{Communications}) \item Design and implementation of the client process using a web browser based GUI that requires no additional software to be installed on the client PC (Section \ref{Communications}, \ref{GUI}) \item Design and implementation of several alternative authentication mechanisms for the system which can be integrated with different user management solutions (Section \ref{Authentication}) + \item Design and implementation of image streaming and image processing for use with a dilatometer (Section \ref{Image Processing}) \item Partial design and implementation of a system for managing the datafiles of different users (Section \ref{API}) \item Partial design and implementation of a user management system in PHP based upon UserCake (Sections \ref{Authentication}, \ref{Cookies}) \item Integration and partial testing of the software with the overall MCTX3420 2013 Exploding Cans project (All sections) diff --git a/reports/final/figures/uwa_logo.jpeg b/reports/final/figures/uwa_logo.jpeg new file mode 100644 index 0000000..47e2ae4 Binary files /dev/null and b/reports/final/figures/uwa_logo.jpeg differ diff --git a/reports/final/references/refs.bib b/reports/final/references/refs.bib index 8b96102..e17d740 100644 --- a/reports/final/references/refs.bib +++ b/reports/final/references/refs.bib @@ -1,12 +1,3 @@ -@misc{uwaRef, - author = "Example Reference, - year = 2013, - month = Aug, - title = "Harvard Citation Style", - howpublished = "\url{http://guides.is.uwa.edu.au/harvard}", - note = "UWA Reference guide" -} - @misc{mctx3420_wiki, author = "Justin Kruger and Sam Moore and Jeremy Tan", year = 2013, @@ -17,7 +8,7 @@ @misc{github_fork, author = "GitHub", year = 2013, - title = "Fork a Repo" + title = "Fork a Repo", howpublished = "\url{https://help.github.com/articles/fork-a-repo}" } @@ -38,17 +29,124 @@ author = "Justin Kruger", title = "Safety Systems - General Outline", year = 2013, - month = "August" - howpublished = "\url{https://github.com/szmoore/MCTX3420/blob/master/notes/Safety\%20Systems\%20-\%20general\%20outline.docx} + month = "August", + howpublished = "\url{https://github.com/szmoore/MCTX3420/blob/master/notes/Safety\%20Systems\%20-\%20general\%20outline.docx}" +} + +@misc{jQuery, + author = "jQuery Foundation", + title = "jQuery: write less, do more", + year = "2013", + howpublished = "\url{http://www.jquery.com}", + note = "v1.10.1" +} + +@misc{flot, + author = "FlotCharts.org", + title = "Flot: Attractive JavaScript plotting for jQuery", + year = 2013, + howpublished = "\url{http://www.flotchargs.org}", + note = "v0.8.1" +} + +@misc{jQueryUI, + author = "jQuery Foundation", + title = "jQuery: User Interface", + year = 2013, + howpublished = "\url{http://jqueryui.com}", + note = "v1.10.3" +} + +@misc{chart.js, + author = "Chart.js Organisation", + title = "Chart.js", + year = 2013, + howpublished = "\url{http://www.chartjs.org}" +} + +@misc{logitechC170, + author = "Logitech", + title = "Logitech Webcam C170 Tehnical Specifications", + year = 2013, + howpublished = "\url{http://logitech-en-emea.custhelp.com/app/answers/detail/a_id/24412/~/logitech-webcam-c170-technical-specifications}", + note = "(Driver for GNU/Linux is part of \verb/uvcvideo/\cite{uvc})" +} + +@misc{kaiserbaasKBA03030, + author = "Kaiser Baas", + title = "Digital Microscope: Study fine detail with 200x magnification", + year = 2013, + howpublished = "\url{http://www.kaiserbaas.com/cameras/digital-microscope}", + note = "(Driver for GNU/Linux is part of \verb/uvcvideo/\cite{uvc})" +} + +@misc{uvc, + author = "Linux UVC Project", + title = "USB Video Class (UVC) Linux Device Driver", + year = 2013, + howpublished = "\url{http://www.ideasonboard.org/uvc/}" +} + +@misc{OpenCV, + author = "OpenCV", + title = "Open Source Computer Vision (OpenCV)", + year = 2013, + howpublished = "\url{http://opencv.org/}", + note = "v2.4.6.0 (we are using the C API)" +} + +@misc{OpenCV_Canny, + author = "OpenCV", + title = "OpenCV Documentation and Tutorials: Canny Edge Detector", + howpublished = "\url{http://docs.opencv.org/doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.html}" +} + + +@misc{nginx, + author = "Nginx.org", + title = "Nginx HTTP Server", + howpublished = "\url{http://wiki.nginx.org/Main}", + note = "v1.4.0" +} + +@misc{telelabs, + author = "James Trevelyan", + title = "10 Years Experience with Remote Laboratories", + year = 2004, + month = June, + howpublished = "International Conference on Engineering Education Research, Olomouc, Czech Republic \url{http://telerobot.mech.uwa.edu.au/Information/Trevelyan-INEER-2004.pdf}" +} + +@misc{devicetreetutorial, + author = "Adafruit", + title = "Introduction to the BeagleBone Black Device Tree", + year = 2013, + month = July, + howpublished = "\url{http://www.adafruit.com/blog/2013/07/29/tutorial-introduction-to-the-beaglebone-black-device-tree/}", + note = "(Tutorial of the BeagleBone Black Device Tree)" +} + +@misc{beaglebone3.8, + author = "Pantelis Antoniou and Tom King and Matt Porter", + title = "BeagleBone and the 3.8 Kernel", + year = 2013, + month = July, + howpublished = "\url{http://elinux.org/BeagleBone_and_the_3.8_Kernel}", + note = "(Technical details of the Device Tree)" } @misc{UserCake, - author = "Tyson et. al" - year = 2012 + author = "Tyson et. al", + year = 2012, title = "UserCake: The fully open source user management script", howpublished = "\url{http://usercake.com}" } +@misc{github_issues, + title = "MCTX3420 2013 GitHub Issues Page", + howpublished = "\url{https://github.com/szmoore/MCTX3420/issues?direction=asc\&sort=updated\&state=open}" +} + @misc{github, author = "Sam Moore and Jeremy Tan and Justin Kruger and Callum Schofield and James Rosher and Rowan Heinrich", year = 2013, @@ -62,4 +160,26 @@ howpublished = "\url{http://git.ucc.asn.au/?p=matches/MCTX3420.git}" } +@misc{github_contribs, + title = "MCTX3420 2013 GitHub Contributions Page", + howpublished = "\url{https://github.com/szmoore/MCTX3420/graphs/contributors}" +} + +@misc{rfc2616, + title = "HTTP Specification (RFC2616)", + howpublished = "\url{http://www.w3.org/Protocols/rfc2616/rfc2616.html}" +} + +@misc{valgrind, + title = "Valgrind", + author = "Valgrind Developers", + howpublished = "\url{http://valgrind.org/}", + note = "v3.8.1" +} + +@misc{cameon.net, + title = "BeagleBone: Set CPU Speed", + howpublished = "\url{http://beaglebone.cameon.net/home/set-cpu-speed}" +} + diff --git a/reports/final/report.pdf b/reports/final/report.pdf index 4854328..7ab4f02 100644 Binary files a/reports/final/report.pdf and b/reports/final/report.pdf differ diff --git a/reports/final/titlepage/Titlepage.tex b/reports/final/titlepage/Titlepage.tex index 2eae791..abd5b85 100644 --- a/reports/final/titlepage/Titlepage.tex +++ b/reports/final/titlepage/Titlepage.tex @@ -1,6 +1,14 @@ \begin{titlepage} -\title{MCTX3420} -\author{} +\title{MCTX3420 2013\\Exploding Cans Project\\Software Team Report} +\author{Justin Kruger, 20767264 \\ + Sam Moore, 20503628 \\ + Jeremy Tan, 20933708 \\ + Callum Schofield, 20947475 \\ + James Rosher, 20939143 \\ + Rowan Heinrich, 20939081 \\ \\ \\ + \includegraphics{figures/uwa_logo.jpeg} +} \date{} \maketitle +\centering \end{titlepage}