diff --git a/Makefile b/Makefile index e48275e..e1393e5 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,28 @@ archive.pdf: intro.pdf requirements.pdf design-doc.pdf \ binary/techreview-ryan.pdf techreview-daniel.pdf binary/techreview-matt.pdf \ binary/blog-ryan.pdf blog-daniel.pdf binary/blog-matt.pdf \ - readme.pdf resources.pdf reflection.pdf listings.pdf review.pdf todo.pdf + readme.pdf resources.pdf reflection.pdf listings.pdf images.pdf review.pdf todo.pdf pdfjam --no-tidy --outfile archive.pdf -- intro.pdf requirements.pdf design-doc.pdf \ binary/techreview-ryan.pdf techreview-daniel.pdf binary/techreview-matt.pdf \ binary/blog-ryan.pdf blog-daniel.pdf binary/blog-matt.pdf \ - readme.pdf resources.pdf reflection.pdf listings.pdf review.pdf todo.pdf + readme.pdf resources.pdf reflection.pdf listings.pdf images.pdf review.pdf todo.pdf todo.pdf: todo.tex pdflatex todo.tex -listings.pdf: listings.tex +images.pdf: images.tex images/app_main.jpg images/app_editor_1.jpg images/app_editor_2.jpg images/app_graph.jpg images/app_details.jpg \ + images/gateway.jpg images/collar.jpg + pdflatex images.tex + +listings.pdf: listings.tex \ + external/app/app/src/main/java/com/danilafe/fencelessgrazing/requests/LoginRequest.kt \ + external/app/app/src/main/java/com/danilafe/fencelessgrazing/ui/activities/CollarDetailActivity.kt \ + external/app/app/src/main/java/com/danilafe/fencelessgrazing/ui/components/GrazingPolygon.kt \ + external/server/fgs/jwt.py \ + external/server/fgs/views.py \ + external/server/fgs/model.py \ + external/gateway/main.py \ + external/collar/collar.cpp pdflatex listings.tex resources.pdf: resources.tex diff --git a/images.tex b/images.tex new file mode 100644 index 0000000..80f0f0b --- /dev/null +++ b/images.tex @@ -0,0 +1,95 @@ +\documentclass[10pt, draftclsnofoot,onecolumn, compsoc]{IEEEtran} + +\def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1}\item[]} +\let\endchangemargin=\endlist + +\usepackage{setspace} +\usepackage{listings} +\usepackage{caption} +\usepackage{subcaption} +\usepackage{graphicx} +\linespread{1} + +\title{Appendix 2: Project Images} + +\begin{document} +\maketitle + +\section*{Android Application Screenshots} + +The following screenshots show the grazing boundary editor that +is included with the Android application: + +\begin{figure}[h] +\centering +\begin{minipage}{.5\textwidth} + \centering + \includegraphics[width=.8\linewidth]{images/app_editor_1.jpg} + \captionof{figure}{Grazing Boundary Editor} + \label{fig:app_editor1} +\end{minipage}% +\begin{minipage}{.5\textwidth} + \centering + \includegraphics[width=.8\linewidth]{images/app_editor_2.jpg} + \captionof{figure}{Grazing Boundary Editor Vertex Delete Dialog} + \label{fig:app_editor2} +\end{minipage} +\end{figure} + +\pagebreak +The Android application starts up with a ``main menu" showing +all the collar devices on a map. Immediately on this screen +is a button that leads to the statistics screen: + +\begin{figure}[h] +\centering +\begin{minipage}{.5\textwidth} + \centering + \includegraphics[width=.8\linewidth]{images/app_main.jpg} + \captionof{figure}{Main Screen of the Android Application} + \label{fig:app_main} +\end{minipage}% +\begin{minipage}{.5\textwidth} + \centering + \includegraphics[width=.8\linewidth]{images/app_graph.jpg} + \captionof{figure}{Graph Screen Accessible from Main Screen} + \label{fig:app_graph} +\end{minipage} +\end{figure} + +\pagebreak +Finally, the user can view the information about an individual +collar device, complete with the collar's location, movement +history, and current grazing area: + +\begin{figure}[h] + \centering + \includegraphics[width=.4\linewidth]{images/app_details.jpg} + \caption{Collar Details Screen} + \label{fig:app_details} +\end{figure} + +\pagebreak +\section*{Hardware} +Below are images of our current hardware assembly at the end +of the term. These can be used as reference for the pinouts. +The exact hardware can be found in the E-bay screenshots +in the project archive folder. + +\begin{figure}[h] +\centering +\begin{minipage}{.5\textwidth} + \centering + \includegraphics[width=.8\linewidth]{images/gateway.jpg} + \captionof{figure}{Gateway Hardware (Raspberry Pi with Custom LoRaWAN shield)} + \label{fig:gateway} +\end{minipage}% +\begin{minipage}{.5\textwidth} + \centering + \includegraphics[width=.8\linewidth]{images/collar.jpg} + \captionof{figure}{Collar Hardware} + \label{fig:collar} +\end{minipage} +\end{figure} + +\end{document} diff --git a/images/app_details.jpg b/images/app_details.jpg new file mode 100644 index 0000000..281598a Binary files /dev/null and b/images/app_details.jpg differ diff --git a/images/app_editor_1.jpg b/images/app_editor_1.jpg new file mode 100644 index 0000000..a723cec Binary files /dev/null and b/images/app_editor_1.jpg differ diff --git a/images/app_editor_2.jpg b/images/app_editor_2.jpg new file mode 100644 index 0000000..e4a0cd4 Binary files /dev/null and b/images/app_editor_2.jpg differ diff --git a/images/app_graph.jpg b/images/app_graph.jpg new file mode 100644 index 0000000..ae62254 Binary files /dev/null and b/images/app_graph.jpg differ diff --git a/images/app_main.jpg b/images/app_main.jpg new file mode 100644 index 0000000..ee1b2a0 Binary files /dev/null and b/images/app_main.jpg differ diff --git a/images/collar.jpg b/images/collar.jpg new file mode 100644 index 0000000..fe7abc4 Binary files /dev/null and b/images/collar.jpg differ diff --git a/images/gateway.jpg b/images/gateway.jpg new file mode 100644 index 0000000..0c5768b Binary files /dev/null and b/images/gateway.jpg differ