ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-13 23:21:19 +10:00
Code Releases Activity

Refactor allocAtakPli to use configurable team and role; improve position source mapping

Browse Source
This commit is contained in:
Ben Meadors
2026-04-08 14:49:08 -05:00
parent dd65bd2550
commit 94e22b3794
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/AtakPluginModule.cpp
+1 -3
View File
@@ -18,8 +18,6 @@ int32_t AtakPluginModule::runOnce()
ProcessMessage AtakPluginModule::handleReceived(const meshtastic_MeshPacket &mp)
{
// V2 protocol: firmware is a passthrough.
// Payloads are zstd dictionary-compressed TAKPacketV2 protobufs.
// Apps handle all compression/decompression.
(void)mp; // Passthrough — no processing needed, apps handle compression/decompression
return ProcessMessage::CONTINUE;
}
src/modules/PositionModule.cpp
+24 -5
View File
@@ -312,9 +312,19 @@ meshtastic_MeshPacket *PositionModule::allocAtakPli()
meshtastic_TAKPacketV2 takPacket = meshtastic_TAKPacketV2_init_zero;
takPacket.cot_type_id = meshtastic_CotType_CotType_a_f_G_U_C;
takPacket.how = meshtastic_CotHow_CotHow_m_g;
takPacket.team = meshtastic_Team_Cyan;
takPacket.role = meshtastic_MemberRole_TeamMember;
// Use TAK config for team/role if configured, otherwise use defaults (Cyan/TeamMember)
if (moduleConfig.has_tak && moduleConfig.tak.team != meshtastic_Team_Unspecifed_Color) {
takPacket.team = moduleConfig.tak.team;
} else {
takPacket.team = meshtastic_Team_Cyan;
}
if (moduleConfig.has_tak && moduleConfig.tak.role != meshtastic_MemberRole_Unspecifed) {
takPacket.role = moduleConfig.tak.role;
} else {
takPacket.role = meshtastic_MemberRole_TeamMember;
}
takPacket.latitude_i = localPosition.latitude_i;
takPacket.longitude_i = localPosition.longitude_i;
takPacket.altitude = localPosition.altitude_hae;
@@ -327,8 +337,17 @@ meshtastic_MeshPacket *PositionModule::allocAtakPli()
course = 36000;
takPacket.course = static_cast<uint16_t>(course);
takPacket.battery = powerStatus->getBatteryChargePercent();
takPacket.geo_src = meshtastic_GeoPointSource_GeoPointSource_GPS;
takPacket.alt_src = meshtastic_GeoPointSource_GeoPointSource_GPS;
// Map position source to CoT how/geo_src/alt_src
if (config.position.fixed_position || localPosition.location_source == meshtastic_Position_LocSource_LOC_MANUAL) {
takPacket.how = meshtastic_CotHow_CotHow_h_e;
takPacket.geo_src = meshtastic_GeoPointSource_GeoPointSource_USER;
takPacket.alt_src = meshtastic_GeoPointSource_GeoPointSource_USER;
} else {
takPacket.how = meshtastic_CotHow_CotHow_m_g;
takPacket.geo_src = meshtastic_GeoPointSource_GeoPointSource_GPS;
takPacket.alt_src = meshtastic_GeoPointSource_GeoPointSource_GPS;
}
takPacket.which_payload_variant = meshtastic_TAKPacketV2_pli_tag;
takPacket.payload_variant.pli = true;