proposal for sensors done

diff --git a/marsrover/document/.gitignore b/marsrover/document/.gitignore
index d442799..ac95be6 100644 (file)
--- a/marsrover/document/.gitignore
+++ b/marsrover/document/.gitignore
@@ -11,9 +11,9 @@
 *.dvi
 *-converted-to.*
 # these rules might exclude image files for figures etc.
-# *.ps
-# *.eps
-# *.pdf
+*.ps
+*.eps
+*.pdf
 
 ## Bibliography auxiliary files (bibtex/biblatex/biber):
 *.bbl

diff --git a/marsrover/document/marsrover.tex b/marsrover/document/marsrover.tex
index c7eaa40..250e769 100644 (file)
--- a/marsrover/document/marsrover.tex
+++ b/marsrover/document/marsrover.tex
@@ -1,10 +1,9 @@
 %&marsrover
 \begin{document}
 \maketitle
+\tableofcontents
+\newpage
 \input{req.tex}
-
 \input{prop.tex}
-
 \input{dev.tex}
-
 \end{document}

diff --git a/marsrover/document/preamble.tex b/marsrover/document/preamble.tex
index 79ebcd1..8fa0b0a 100644 (file)
--- a/marsrover/document/preamble.tex
+++ b/marsrover/document/preamble.tex
@@ -1,7 +1,10 @@
-\documentclass[titlepage]{article}
+\documentclass{article}
 
 \usepackage{a4wide} % For not wasting space on a4
 \usepackage{fancyhdr} % For the fancy header with our names
+\usepackage{multirow} % For multirow tables
+\usepackage{booktabs} % For nicer looking tables
+\usepackage[dvipdfm]{hyperref} % For a clickable toc and nice autorefs
 
 \title{MarsRover proposal}
 \author{Natanael Adityasatria (s4417992)\and Mart Lubbers (s4109503)}

diff --git a/marsrover/document/prop.tex b/marsrover/document/prop.tex
index 8ae9817..680ba7c 100644 (file)
--- a/marsrover/document/prop.tex
+++ b/marsrover/document/prop.tex
@@ -1 +1,27 @@
 \section{Proposal for mapping the sensors and actuators}
+We propose to have the components that are the most safety-critical on a single
+brick. In that way the robot can act upon a dangerous situation as quickly as
+possible. The most safety critical sensors are both the light sensors and the
+ultrasone sensor on the back since they detect if the robot almost falls of the
+planet. The most safety critical motors are the motors for the movement since
+they can prevent the robot from falling of the planet. There other actuators
+and sensors can be placed in any configuration. The full mapping proposal is
+described in \autoref{tab:mapping}.
+
+\begin{table}[h]
+       \centering
+       \begin{tabular}{lll}
+               \toprule
+                       & Brick $1$ & Brick $2$\\
+               \midrule
+               \multirow{2}{*}{Actuators} & Left motor & Measurement motor\\
+                       & Right motor & \\
+               \midrule
+               \multirow{4}{*}{Sensors} & Left light sensor & Color sensor\\
+                       & Right light sensor & Front ultrasone sensor\\
+                       & Back ultrasone sensor & Left touch sensor\\
+                       & Gyro sensor & Right touch sensor\\
+               \bottomrule
+       \end{tabular}
+       \caption{Proposed mapping of the sensors and actuators}\label{tab:mapping}
+\end{table}