fixed merge

.gitignore

@@ -6,3 +6,4 @@
 *.toc
 *.pdf
 *.gz
+*.swp

presentation_3_160920.tex

@@ -95,13 +95,22 @@
   \titlepage
 \end{frame}
 
+\begin{frame}
+    \begin{figure}
+        \centering
+        \includegraphics[width=\textwidth]{Pictures/gantpres3}
+    \end{figure}
+\end{frame}
+
+
 \begin{frame}{Progress}{Driver setup}
     \begin{columns}
         \begin{column}{0.5\textwidth}
             \begin{itemize}
                 \item Toolchain properly setup and working
                 \item Updated CMSIS-library to support F7-processor
-                \item Adam Dunkels LwIP library included
+                \item Adam Dunkels lwIP library included
+		\item Peripheral drivers set up
             \end{itemize}
         \end{column}
         \begin{column}{0.5\textwidth}
@@ -113,25 +122,69 @@
     \end{columns}
 \end{frame}
 
-\begin{frame}{Parts}{}
+\begin{frame}{Progress}{Hardware pin setup}
+    \begin{columns}
+        \begin{column}{0.25\textwidth}
+            \begin{itemize}
+                \item Peripherals pins assigned
+            \end{itemize}
+        \end{column}
+        \begin{column}{0.9\textwidth}
+            \begin{figure}
+                \centering
+                \includegraphics[width=0.8\textwidth]{Pictures/copterCubeMX}
+            \end{figure}
+        \end{column}
+    \end{columns}
+\end{frame}
+
+\begin{frame}{Progress}{Software progress}
+    \begin{columns}
+        \begin{column}{0.35\textwidth}
+            \begin{itemize}
+                \item Flashing of Nucleo and debugging works
+                \item Basic ethernet communication established, responds to ping, blinking leds
+            \end{itemize}
+        \end{column}
+        \begin{column}{0.7\textwidth}
+            \begin{figure}
+                \centering
+                \includegraphics[width=0.8\textwidth]{Pictures/ethernetled}
+            \end{figure}
+        \end{column}
+    \end{columns}
+\end{frame}
+
+\begin{frame}{Parts we're working on}{}
     \begin{columns}
         \begin{column}{0.5\textwidth}
             \begin{itemize}
-                \item NUCLEO-F767ZI
-                \item MTi-3-8A7G6-DK, IMU
                 \item Hokuyo UST-10LX Scanning Laser Rangefinder
+                \item MTi-3-8A7G6-DK, IMU
                 \item Ultrasonic distance sensor
-                \item Decawave Limited DWM1000
-                \item SLIP RING 22MM 6WR (Rotation Ethernet)
-                \item Stepper motor, MOTS4/SP, Velleman
-                \item Stepper motor driver, A/4988SP, Velleman
-                \item Explorers Rc Quadcopter
+                \item IR-Sensors
+                \item UWB-radio
+		
             \end{itemize}
         \end{column}
-        \begin{column}{0.5\textwidth}
+        \begin{column}{0.25\textwidth}
             \begin{figure}
                 \centering
-                \includegraphics[width=0.63\textwidth]{Pictures/NUCLEO-F767ZI}
+                \includegraphics[width=0.6\textwidth]{Pictures/HCSR04}
+            \end{figure}
+            \begin{figure}
+                \centering
+                \includegraphics[width=0.6\textwidth]{Pictures/MTi3}
+            \end{figure}
+	\end{column}
+	\begin{column}{0.25\textwidth}
+            \begin{figure}
+                \centering
+                \includegraphics[width=0.6\textwidth]{Pictures/sharpsmall}
+            \end{figure}
+            \begin{figure}
+                \centering
+                \includegraphics[width=0.6\textwidth]{Pictures/sharpbig}
             \end{figure}
         \end{column}
     \end{columns}
@@ -170,17 +223,10 @@ Fight time = (Battery capacity)/(Max amp draw) =\\
     \end{itemize}
 \end{frame}
 
-
-\begin{frame}{Component chart (old)}
-    \begin{figure}
-        \centering
-        \includegraphics[width=\textwidth]{Pictures/componentchart_1}
-    \end{figure}
-\end{frame}
-\begin{frame}{Component chart (updated)}
+\begin{frame}{Component chart} 
     \begin{figure}
         \centering
-        \includegraphics[width=\textwidth]{Pictures/componentchart_2}
+        \includegraphics[width=\textwidth]{Pictures/componentchart_3}
     \end{figure}
 \end{frame}
 
@@ -195,44 +241,25 @@ Fight time = (Battery capacity)/(Max amp draw) =\\
 \end{frame}
 
 
-\begin{frame}{UML}{First Draft}
-    \begin{figure}
-        \centering
-        \includegraphics[width = \textwidth]{Pictures/UML-Copter}
-        \caption{First draft of UML}
-        \label{fig:UML}
-    \end{figure}
-\end{frame}
-
-
-\begin{frame}{Current status}{}
-  \begin{itemize}
-    \item ADC
-    \item Ethernet
-    \item RS232
-    \item PWM
-    \item SPI
-    \item Hardware choices
-    \item Choice of flight controller
-  \end{itemize}
-\end{frame}
 
 \begin{frame}{Next week}{}
   \begin{itemize}
   \item{
-    Set ups
+    Software testing
     \begin{itemize}
-      \item UART
-      \item ADC
-      \item SPI
+      \item UART - IMU
+      \item ADC - IR sensors
+      \item SPI - UWB radio
+      \item Timer - Sonars	      
       \item Preparing Ethernet
     \end{itemize}
   }
   \item{
-    Research
+    Hardware
     \begin{itemize}
-      \item C Object oriented programming
-      \item Hardware
+      \item Flight controller - testing
+      \item Copter - building
+
     \end{itemize}
   }
   \item{
@@ -245,23 +272,6 @@ Fight time = (Battery capacity)/(Max amp draw) =\\
   \end{itemize}
 \end{frame}
 
-  
-
-
-\begin{frame}
-    \begin{figure}
-        \centering
-        \includegraphics[width=\textwidth]{Pictures/copterCubeMX}
-    \end{figure}
-\end{frame}
-
-\begin{frame}
-    \begin{figure}
-        \centering
-        \includegraphics[width=\textwidth]{Pictures/gant}
-    \end{figure}
-\end{frame}
-
 \begin{frame}{}{}
     {\centering Questions?\par}
 \end{frame}