Skip to content

Commit

Permalink
Merge branch 'release/v1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
StrubT committed Jun 29, 2017
2 parents 7d52e1d + d281323 commit 2e79462
Show file tree
Hide file tree
Showing 13 changed files with 122 additions and 2 deletions.
4 changes: 4 additions & 0 deletions GPS.CSV
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Date/Time,# Satellites,Horizontal DOP,Latitude,Longitude,Altitude,Course,Speed (kt/100),Speed (km/h),From Home (m)
2017-06-23T14:43:02Z,6,130,47.166217,7.634873,493.30,38.94,,1.63,15.82
2017-06-23T14:43:02Z,6,130,47.166217,7.634873,493.30,38.94,,1.63,15.82
2017-06-23T18:48:35Z,6,190,47.166206,7.634968,501.90,112.17,,0.74,13.43
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# IoTCatTracker

This repository contains the 'Cat Tracker' project realised
in the course Internet of Things (MTE7117) at the Bern University of Applied Sciences (BUAS) in the spring term 2017.

This repository also contains a [short report](doc/report.pdf)
and [slides for the oral presentation](doc/presentation.pdf).
34 changes: 33 additions & 1 deletion TinyDuino.sln
Original file line number Diff line number Diff line change
@@ -1,20 +1,52 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.7
VisualStudioVersion = 15.0.26430.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TinyDuino", "TinyDuino\TinyDuino.vcxproj", "{C5F80730-F44F-4478-BDAE-6634EFC2CA88}"
EndProject
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Visualiser", "Visualiser\", "{974F842F-DA32-4771-BE57-D30995CC54D7}"
ProjectSection(WebsiteProperties) = preProject
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
Debug.AspNetCompiler.VirtualPath = "/localhost_58345"
Debug.AspNetCompiler.PhysicalPath = "Visualiser\"
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_58345\"
Debug.AspNetCompiler.Updateable = "true"
Debug.AspNetCompiler.ForceOverwrite = "true"
Debug.AspNetCompiler.FixedNames = "false"
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.VirtualPath = "/localhost_58345"
Release.AspNetCompiler.PhysicalPath = "Visualiser\"
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_58345\"
Release.AspNetCompiler.Updateable = "true"
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
VWDPort = "58345"
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Debug|Any CPU.ActiveCfg = Debug|Win32
{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Debug|x86.ActiveCfg = Debug|Win32
{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Debug|x86.Build.0 = Debug|Win32
{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Release|Any CPU.ActiveCfg = Release|Win32
{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Release|x86.ActiveCfg = Release|Win32
{C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Release|x86.Build.0 = Release|Win32
{974F842F-DA32-4771-BE57-D30995CC54D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{974F842F-DA32-4771-BE57-D30995CC54D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{974F842F-DA32-4771-BE57-D30995CC54D7}.Debug|x86.ActiveCfg = Debug|Any CPU
{974F842F-DA32-4771-BE57-D30995CC54D7}.Debug|x86.Build.0 = Debug|Any CPU
{974F842F-DA32-4771-BE57-D30995CC54D7}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{974F842F-DA32-4771-BE57-D30995CC54D7}.Release|Any CPU.Build.0 = Debug|Any CPU
{974F842F-DA32-4771-BE57-D30995CC54D7}.Release|x86.ActiveCfg = Debug|Any CPU
{974F842F-DA32-4771-BE57-D30995CC54D7}.Release|x86.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 3 additions & 1 deletion TinyDuino/TinyDuino.ino
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ void ledShowChar(const char c);
//#define _GPS_NO_STATS
//#define GPS_MIN_INFO

#define GPS_DELAY_MS 10000 //29000

#ifdef GPS_FLOAT
typedef float GpsLatLongAltType, GpsCourseSpeedType;
#else
Expand Down Expand Up @@ -107,7 +109,7 @@ void loop() {
#ifndef DEBUG_DISABLE
Serial.print("Reading GPS data...");
#endif
gpsDelay(29000);
gpsDelay(GPS_DELAY_MS);
#ifndef DEBUG_DISABLE
Serial.println(" done.");
#endif
Expand Down
78 changes: 78 additions & 0 deletions Visualiser/visualiser.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>IoTCatTracker &ndash; Visualiser</title>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="robots" content="index, follow" />
<meta name="author" content="Thomas Reto Strub" />
<meta name="description" content="Visualiser for the IoT cat tracker records" />
<meta name="keywords" content="Thomas, Reto, Strub, StrubT, strut1, Hersiwil, Solothurn, Switzerland, IoT, GPS, cat, tracker" />
<link rel="icon" type="image/x-icon" href="https://www.StrubT.ch/favicon.ico" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous" />
<link rel="stylesheet" href="https://use.fontawesome.com/0b7364129d.css" />
<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAWJgjmulnfAxIjUiWguoSY0DJXk89PFS8"></script>
<script>
function visualise(event) {

var home = { lat: 47.166320, lng: 7.635007 };

var reader = new FileReader();
reader.onload = function () {
var coordinates = [home];
var lines = reader.result.split(/[\r\n]+/);

for (var line = 1; line < lines.length; line++) {
var fields = lines[line].split(/,/);
if (fields.length == 10)
coordinates.push({ lat: parseFloat(fields[3]), lng: parseFloat(fields[4]) });
}
coordinates.push(home);

new google.maps.Polyline({
path: coordinates,
geodesic: true,
strokeColor: '#FF0000',
strokeOpacity: 1.0,
strokeWeight: 2
}).setMap(new google.maps.Map(document.getElementById('map'), {
zoom: 17,
center: home,
mapTypeId: 'satellite'
}));
};

reader.readAsText(event.target.files[0]);
}
</script>
</head>
<body style="padding-top: 4rem;">
<header class="navbar navbar-toggleable-md navbar-inverse bg-inverse fixed-top">
<div class="container">
<h1 class="navbar-brand mb-0">IoTCatTracker &ndash; Visualiser</h1>
</div>
</header>
<main class="container">
<section class="jumbotron">
<h2 class="display-4">Intro</h2>
<p class="lead">
I realised the 'Cat Tracker' project in the course Internet of Things (MTE7117) at the Bern University of Applied Sciences (BUAS) in the spring term 2017.
This website can be used to visualise the recorded GPS positions.
</p>
</section>
<section class="mb-4">
<h2>Select File</h2>
<p>
<input type="file" id="file" accept=".csv" onchange="visualise(event)" />
</p>
</section>
<section class="mb-4">
<h2>Visualise GPS Positions</h2>
<div id="map" style="width: 100%; height: 50rem;">
<em class="text-muted">select a file to generate the map</em>
</div>
</section>
</main>
</body>
</html>
Binary file added doc/node-red-mapping.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/node-red.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/presentation.pdf
Binary file not shown.
Binary file added doc/presentation.pptx
Binary file not shown.
Binary file added doc/report.docx
Binary file not shown.
Binary file added doc/report.pdf
Binary file not shown.
Binary file added doc/tinyduino.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/visualiser.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2e79462

Please sign in to comment.