kleiax/Bachelorarbeit-Rover
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

removed arduino dependency

Browse Source
This commit is contained in:
kleiax
2023-08-09 13:03:33 +02:00
parent bc79b2a4a6
commit 6b8b56fc1a
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Navigation/route.cpp
+11 -11
View File
@@ -11,35 +11,35 @@
#include "route.h" #include "route.h"
Point::Point(double lat, double lon, uint32_t horizontalAccuracy) { Point::Point(double lat, double lon, uint32_t horizontalAccuracy, uint32_t creationTime) {
this->coordinates.lat = lat; this->coordinates.lat = lat;
this->coordinates.lon = lon; this->coordinates.lon = lon;
this->init(horizontalAccuracy); this->init(horizontalAccuracy, creationTime);
} }
Point::Point(int32_t lat, int32_t lon, uint32_t horizontalAccuracy) { Point::Point(int32_t lat, int32_t lon, uint32_t horizontalAccuracy, uint32_t creationTime) {
this->coordinates.lat = lat / 10000000.0; this->coordinates.lat = lat / 10000000.0;
this->coordinates.lon = lon / 10000000.0; this->coordinates.lon = lon / 10000000.0;
this->init(horizontalAccuracy); this->init(horizontalAccuracy, creationTime);
} }
Point::Point(Coordinates coords, uint32_t horizontalAccuracy) { Point::Point(Coordinates coords, uint32_t horizontalAccuracy, uint32_t creationTime) {
this->coordinates = coords; this->coordinates = coords;
this->init(horizontalAccuracy); this->init(horizontalAccuracy, creationTime);
} }
Point::Point(Coordinates coords, bool imported) { Point::Point(Coordinates coords, bool imported) {
this->coordinates = coords; this->coordinates = coords;
if (imported) if (imported)
this->init(UINT32_MAX); this->init(UINT32_MAX, 0);
else else
this->init(0); this->init(0, 0);
} }
Point::Point() { Point::Point() {
this->coordinates.lat = 0; this->coordinates.lat = 0;
this->coordinates.lon = 0; this->coordinates.lon = 0;
this->init(0); this->init(0, 0);
} }
bool Point::operator==(const Point& rhs) const { bool Point::operator==(const Point& rhs) const {
@@ -86,8 +86,8 @@ int16_t Point::courseTo(const Point &point) const {
return this->courseTo(point.getCoordinates()); return this->courseTo(point.getCoordinates());
} }
void Point::init(uint32_t horizontalAccuracy) { void Point::init(uint32_t horizontalAccuracy, uint32_t creationTime) {
this->creationTime = millis(); this->creationTime = creationTime;
if (horizontalAccuracy == UINT32_MAX) if (horizontalAccuracy == UINT32_MAX)
this->accuracy = Accuracy::imported; this->accuracy = Accuracy::imported;
lib/Navigation/route.h
+4 -6
View File
@@ -12,8 +12,6 @@
#ifndef ROUTE_H #ifndef ROUTE_H
#define ROUTE_H #define ROUTE_H
#include <Arduino.h>
#include <cstdint> #include <cstdint>
#include <list> #include <list>
#include <cmath> #include <cmath>
@@ -66,9 +64,9 @@ class Point{
* @param coords Coordinates * @param coords Coordinates
* @param imported if true than highest accuracy * @param imported if true than highest accuracy
*/ */
Point(double lat, double lon, uint32_t horizontalAccuracy = 0); Point(double lat, double lon, uint32_t horizontalAccuracy = 0, uint32_t creationTime = 0);
Point(int32_t lat, int32_t lon, uint32_t horizontalAccuracy = 0); Point(int32_t lat, int32_t lon, uint32_t horizontalAccuracy = 0, uint32_t creationTime = 0);
Point(Coordinates coords, uint32_t horizontalAccuracy = 0); Point(Coordinates coords, uint32_t horizontalAccuracy = 0, uint32_t creationTime = 0);
Point(Coordinates coords, bool imported); Point(Coordinates coords, bool imported);
Point(); Point();
@@ -133,7 +131,7 @@ class Point{
Accuracy getAccuracy() { return this->accuracy; } Accuracy getAccuracy() { return this->accuracy; }
private: private:
void init(uint32_t horizontalAccuracy); void init(uint32_t horizontalAccuracy, uint32_t creationTime);
Accuracy accuracy = Accuracy::none; Accuracy accuracy = Accuracy::none;
Coordinates coordinates; Coordinates coordinates;