Keep vanetza-idf in obu-firmware, so a plain clone builds the firmware
obu-firmware builds against the vanetza-idf C-ITS library, which until now came from the colleague's microbu-esp32c5 tree beside the repository and was not tracked here, so a clone of this repository could not build the firmware it ships. The library alone is now part of obu-firmware, as obu-firmware/external/vanetza-idf: their external/vanetza-idf at commit cf4b99f, unchanged (9775 files; see its PROVENANCE.md). CMake takes it from there by default; -DVANETZA_IDF_DIR still points the build elsewhere. The rest of the colleague's tree (their own VAM firmware, PKI tooling, station-link Python tools, the V2X2MAP bridge) stays out of this repository and gitignored; nothing is pushed to their repository. NOTES.md, docs/06, TODO.md and the pcap verifier's usage line point at the new location.
This commit is contained in:
@@ -0,0 +1,93 @@
|
||||
#include "data_request.hpp"
|
||||
#include <vanetza/btp/data_request.hpp>
|
||||
#include <vanetza/units/time.hpp>
|
||||
#include <boost/units/cmath.hpp>
|
||||
#include <stdexcept>
|
||||
|
||||
namespace vanetza
|
||||
{
|
||||
namespace geonet
|
||||
{
|
||||
|
||||
void decrement_by_one(DataRequest::Repetition& repetition)
|
||||
{
|
||||
const auto zero = 0.0 * units::si::seconds;
|
||||
if (repetition.maximum > zero && repetition.interval > zero
|
||||
&& repetition.maximum > repetition.interval) {
|
||||
repetition.maximum = repetition.maximum - repetition.interval;
|
||||
|
||||
} else {
|
||||
repetition.maximum = zero;
|
||||
}
|
||||
}
|
||||
|
||||
bool has_further_repetition(const DataRequest& request)
|
||||
{
|
||||
bool repeat = false;
|
||||
if (request.repetition) {
|
||||
repeat = has_further_repetition(request.repetition.get());
|
||||
}
|
||||
return repeat;
|
||||
}
|
||||
|
||||
bool has_further_repetition(const DataRequest::Repetition& repetition)
|
||||
{
|
||||
const auto zero = 0.0 * units::si::seconds;
|
||||
return repetition.maximum > zero && repetition.interval > zero &&
|
||||
repetition.maximum >= repetition.interval;
|
||||
}
|
||||
|
||||
struct access_request_visitor : public boost::static_visitor<DataRequest&>
|
||||
{
|
||||
template<typename REQUEST>
|
||||
DataRequest& operator()(REQUEST& request)
|
||||
{
|
||||
return request;
|
||||
}
|
||||
};
|
||||
|
||||
DataRequest& access_request(DataRequestVariant& variant)
|
||||
{
|
||||
access_request_visitor visitor;
|
||||
return boost::apply_visitor(visitor, variant);
|
||||
}
|
||||
|
||||
void copy_request_parameters(const btp::DataRequestB& btp, DataRequest& gn)
|
||||
{
|
||||
gn.upper_protocol = geonet::UpperProtocol::BTP_B;
|
||||
gn.communication_profile = btp.gn.communication_profile;
|
||||
gn.its_aid = btp.gn.its_aid;
|
||||
if (btp.gn.maximum_lifetime) {
|
||||
gn.maximum_lifetime = *btp.gn.maximum_lifetime;
|
||||
}
|
||||
gn.repetition = btp.gn.repetition;
|
||||
if (btp.gn.maximum_hop_limit) {
|
||||
gn.max_hop_limit = *btp.gn.maximum_hop_limit;
|
||||
}
|
||||
gn.traffic_class = btp.gn.traffic_class;
|
||||
}
|
||||
|
||||
void copy_request_parameters(const btp::DataRequestB& btp, DataRequestWithAddress& gn)
|
||||
{
|
||||
copy_request_parameters(btp, static_cast<DataRequest&>(gn));
|
||||
const Address* address = boost::get<Address>(&btp.gn.destination);
|
||||
if (address) {
|
||||
gn.destination = *address;
|
||||
} else {
|
||||
throw std::runtime_error("BTP-B data request lacks destination address");
|
||||
}
|
||||
}
|
||||
|
||||
void copy_request_parameters(const btp::DataRequestB& btp, DataRequestWithArea& gn)
|
||||
{
|
||||
copy_request_parameters(btp, static_cast<DataRequest&>(gn));
|
||||
const Area* area = boost::get<Area>(&btp.gn.destination);
|
||||
if (area) {
|
||||
gn.destination = *area;
|
||||
} else {
|
||||
throw std::runtime_error("BTP-B data request lacks destination area");
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace geonet
|
||||
} // namespace vanetza
|
||||
Reference in New Issue
Block a user