Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ if(CPPLINT)
# also don't check for runtime/references since Google's public style guidelines are behind https://github.com/cpplint/cpplint/issues/148
--exclude=../include/udp_squared
--exclude=../src/utilities/base64.cpp
--filter=-legal,-readability/todo,-build/c++11,-runtime/references
--filter=-legal,-readability/todo,-build/c++11,-build/c++17,-runtime/references
--linelength=100
--recursive
../src
Expand Down
24 changes: 12 additions & 12 deletions include/network/serialize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
*/

namespace serialh {
template <typename T>
void serialize(T* response, boost::asio::streambuf* buf) {
std::ostream os(buf);
boost::archive::binary_oarchive oa(os);
oa << *response;
}
template <typename T>
void serialize(T* response, boost::asio::streambuf* buf) {
std::ostream os(buf);
boost::archive::binary_oarchive oa(os);
oa << *response;
}

template <typename T>
void deserialize(T* response, boost::asio::streambuf* buf) {
std::istream is(buf);
boost::archive::binary_iarchive ia(is);
ia >> *response;
}
template <typename T>
void deserialize(T* response, boost::asio::streambuf* buf) {
std::istream is(buf);
boost::archive::binary_iarchive ia(is);
ia >> *response;
}
} // namespace serialh

#endif // INCLUDE_NETWORK_SERIALIZE_HPP_
2 changes: 1 addition & 1 deletion include/network/udp_client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <boost/asio.hpp>
#include <opencv2/opencv.hpp>
#include <loguru.hpp>
#include "rpi_connection.hpp"
#include "network/rpi_connection.hpp"

namespace asio = boost::asio;

Expand Down
424 changes: 209 additions & 215 deletions include/pathing/dubins.hpp

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions include/pathing/static.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ class ForwardCoveragePathing {
// between search lines)
const RRTPoint start; // start location (doesn't have to be near polygon)
const Environment airspace; // information aobut the airspace
const Dubins dubins; // dubins object to generate paths
const AirdropCoverageConfig config;
};

Expand Down Expand Up @@ -288,7 +287,6 @@ class AirdropApproachPathing {
const XYZCoord goal;
const RRTPoint start;
const Environment airspace;
const Dubins dubins;
const OBCConfig config;

XYZCoord wind;
Expand Down
3 changes: 1 addition & 2 deletions include/pathing/tree.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class RRTNode {

class RRTTree {
public:
RRTTree(RRTPoint root_point, Environment airspace, Dubins dubins);
RRTTree(RRTPoint root_point, Environment airspace);
~RRTTree();

/**
Expand Down Expand Up @@ -284,7 +284,6 @@ class RRTTree {
std::shared_ptr<RRTNode> root;
std::shared_ptr<RRTNode> current_head;
Environment airspace;
Dubins dubins;
int tree_size;

/**
Expand Down
4 changes: 2 additions & 2 deletions include/utilities/http.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ constexpr const char* HTTP_STATUS_TO_STRING(HTTPStatus status) {
}

namespace mime {
const char json[] = "application/json";
const char plaintext[] = "text/plain";
const char json[] = "application/json";
const char plaintext[] = "text/plain";
}

#endif // INCLUDE_UTILITIES_HTTP_HPP_
3 changes: 3 additions & 0 deletions src/camera/interface.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#include "camera/interface.hpp"

#include <filesystem>
#include <memory>
#include <optional>
#include <ostream>
#include <string>
#include <vector>

#include <loguru.hpp>
#include "nlohmann/json.hpp"
Expand Down
7 changes: 5 additions & 2 deletions src/camera/mock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
#include <httplib.h>

#include <chrono>
#include <thread>
#include <optional>
#include <deque>
#include <filesystem>
#include <iostream>
#include <memory>
#include <optional>
#include <thread>
#include <vector>

#include <loguru.hpp>
#include "nlohmann/json.hpp"
Expand Down
6 changes: 4 additions & 2 deletions src/camera/rpi.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#include <chrono>
#include <thread>
#include <deque>
#include <memory>
#include <optional>
#include <string>
#include <thread>
#include <utility>
#include <vector>
#include <deque>

#include <nlohmann/json.hpp>
#include <opencv2/opencv.hpp>
Expand Down
2 changes: 2 additions & 0 deletions src/core/mission_parameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
#include <mutex>
#include <optional>
#include <shared_mutex>
#include <string>
#include <tuple>
#include <unordered_map>
#include <vector>

#include "pathing/cartesian.hpp"
#include "protos/obc.pb.h"
Expand Down
2 changes: 2 additions & 0 deletions src/core/mission_state.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#include <memory>
#include <mutex>
#include <string>
#include <unordered_set>
#include <nlohmann/json.hpp>

#include "camera/interface.hpp"
Expand Down
5 changes: 3 additions & 2 deletions src/core/obc.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include <memory>
#include <thread>
#include <chrono>
#include <cstdint>
#include <future>
#include <memory>
#include <string>
#include <thread>

#include "camera/rpi.hpp"
#include "camera/mock.hpp"
Expand Down
5 changes: 5 additions & 0 deletions src/cv/aggregator.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#include "cv/aggregator.hpp"

#include <exception>
#include <map>
#include <memory>
#include <queue>
#include <utility>
#include <vector>

#include "utilities/constants.hpp"
#include "utilities/lockptr.hpp"
Expand Down
3 changes: 2 additions & 1 deletion src/cv/clustering.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <vector>
#include <algorithm>
#include <utility>
#include <vector>
#include "protos/obc.pb.h"
#include "cv/localization.hpp"
#include "cv/clustering.hpp"
Expand Down
3 changes: 3 additions & 0 deletions src/cv/hdr.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "cv/hdr.hpp"

#include <string>
#include <vector>

std::vector<cv::Mat> generate_test_images() {
std::vector<cv::Mat> img_list;
std::vector<cv::Scalar> colors = {
Expand Down
Loading