Keep the colleague's microbu-esp32c5 tree in this repository
obu-firmware builds against vanetza-idf from microbu-esp32c5/external, but that tree was gitignored, so a clone of this repository could not build the firmware it ships. It is now committed here as ordinary files in its own folder, microbu-esp32c5/: the colleague's commit cf4b99f plus the V2X2MAP bridge's signature verification (--trust) used on the bench. Nothing is fetched from or pushed to the colleague's repository; this repository and its remotes carry everything. The folder's own .gitignore keeps build output, downloaded components and private key material out, as it did there; the committed file set is identical to that repository's tracked files. The ESP32-C5 is still flashed from obu-firmware/, which only takes vanetza-idf from microbu-esp32c5/, so the two stay separate folders. FLASHING.md says how to take a newer version of the colleague's tree (copy it over the folder, rebuild, test, commit).
This commit is contained in:
@@ -0,0 +1,111 @@
|
||||
#include "areas.hpp"
|
||||
#include "position_vector.hpp"
|
||||
#include "serialization.hpp"
|
||||
|
||||
namespace vanetza
|
||||
{
|
||||
namespace geonet
|
||||
{
|
||||
|
||||
constexpr std::size_t LongPositionVector::length_bytes;
|
||||
constexpr std::size_t ShortPositionVector::length_bytes;
|
||||
|
||||
LongPositionVector::LongPositionVector() : position_accuracy_indicator(false)
|
||||
{
|
||||
}
|
||||
|
||||
GeodeticPosition LongPositionVector::position() const
|
||||
{
|
||||
return GeodeticPosition {
|
||||
static_cast<units::GeoAngle>(latitude),
|
||||
static_cast<units::GeoAngle>(longitude)
|
||||
};
|
||||
}
|
||||
|
||||
ShortPositionVector::ShortPositionVector(const LongPositionVector& lpv) :
|
||||
gn_addr(lpv.gn_addr), timestamp(lpv.timestamp),
|
||||
latitude(lpv.latitude), longitude(lpv.longitude)
|
||||
{
|
||||
}
|
||||
|
||||
bool operator==(const LongPositionVector& lhs, const LongPositionVector& rhs)
|
||||
{
|
||||
return lhs.gn_addr == rhs.gn_addr
|
||||
&& lhs.timestamp == rhs.timestamp
|
||||
&& lhs.latitude == rhs.latitude
|
||||
&& lhs.longitude == rhs.longitude
|
||||
&& lhs.speed == rhs.speed
|
||||
&& lhs.heading == rhs.heading
|
||||
&& lhs.position_accuracy_indicator == rhs.position_accuracy_indicator;
|
||||
}
|
||||
|
||||
bool operator!=(const LongPositionVector& lhs, const LongPositionVector& rhs)
|
||||
{
|
||||
return !(lhs == rhs);
|
||||
}
|
||||
|
||||
bool operator==(const ShortPositionVector& lhs, const ShortPositionVector& rhs)
|
||||
{
|
||||
return lhs.gn_addr == rhs.gn_addr
|
||||
&& lhs.timestamp == rhs.timestamp
|
||||
&& lhs.latitude == rhs.latitude
|
||||
&& lhs.longitude == rhs.longitude;
|
||||
}
|
||||
|
||||
bool operator!=(const ShortPositionVector& lhs, const ShortPositionVector& rhs)
|
||||
{
|
||||
return !(lhs == rhs);
|
||||
}
|
||||
|
||||
bool is_empty(const LongPositionVector& pv)
|
||||
{
|
||||
static const LongPositionVector zero;
|
||||
return pv == zero;
|
||||
}
|
||||
|
||||
bool is_valid(const LongPositionVector& pv)
|
||||
{
|
||||
static const geo_angle_i32t limit_lat { 90.0 * units::degree };
|
||||
static const geo_angle_i32t limit_lon { 180.0 * units::degree };
|
||||
static const heading_u16t limit_hdg { 360.0 * units::degree };
|
||||
|
||||
if (is_empty(pv)) {
|
||||
return false;
|
||||
} else if (pv.latitude < -limit_lat || pv.latitude > limit_lat) {
|
||||
return false;
|
||||
} else if (pv.longitude < -limit_lon || pv.longitude > limit_lon) {
|
||||
return false;
|
||||
} else if (pv.heading > limit_hdg) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void serialize(const LongPositionVector& lpv, OutputArchive& ar)
|
||||
{
|
||||
serialize(lpv.gn_addr, ar);
|
||||
serialize(lpv.timestamp, ar);
|
||||
serialize(lpv.latitude, ar);
|
||||
serialize(lpv.longitude, ar);
|
||||
uint16_t paiAndSpeed = lpv.speed.value().raw();
|
||||
paiAndSpeed |= lpv.position_accuracy_indicator ? 0x8000 : 0x0000;
|
||||
serialize(host_cast(paiAndSpeed), ar);
|
||||
serialize(lpv.heading, ar);
|
||||
}
|
||||
|
||||
void deserialize(LongPositionVector& lpv, InputArchive& ar)
|
||||
{
|
||||
deserialize(lpv.gn_addr, ar);
|
||||
deserialize(lpv.timestamp, ar);
|
||||
deserialize(lpv.latitude, ar);
|
||||
deserialize(lpv.longitude, ar);
|
||||
uint16_t paiAndSpeed = 0;
|
||||
deserialize(paiAndSpeed, ar);
|
||||
lpv.position_accuracy_indicator = ((paiAndSpeed & 0x8000) != 0);
|
||||
lpv.speed = LongPositionVector::speed_u15t::from_value(paiAndSpeed);
|
||||
deserialize(lpv.heading, ar);
|
||||
}
|
||||
|
||||
} // namespace geonet
|
||||
} // namespace vanetza
|
||||
Reference in New Issue
Block a user