mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Found more places to set explicit has_optional on position (#4542)

pull/4551/head
Ben Meadors 2024-08-23 07:04:34 -05:00 zatwierdzone przez GitHub
rodzic f99b81acf7
commit 7abc194ef5
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
1 zmienionych plików z 12 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
src/mesh/TypeConversions.cpp
Wyświetl plik

@ -16,8 +16,14 @@ meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfo
if (lite->has_position) { if (lite->has_position) {
info.has_position = true; info.has_position = true;
if (lite->position.latitude_i > 0)
info.position.has_latitude_i = true;
info.position.latitude_i = lite->position.latitude_i; info.position.latitude_i = lite->position.latitude_i;
if (lite->position.longitude_i > 0)
info.position.has_longitude_i = true;
info.position.longitude_i = lite->position.longitude_i; info.position.longitude_i = lite->position.longitude_i;
if (lite->position.altitude > 0)
info.position.has_altitude = true;
info.position.altitude = lite->position.altitude; info.position.altitude = lite->position.altitude;
info.position.location_source = lite->position.location_source; info.position.location_source = lite->position.location_source;
info.position.time = lite->position.time; info.position.time = lite->position.time;
@ -48,8 +54,14 @@ meshtastic_PositionLite TypeConversions::ConvertToPositionLite(meshtastic_Positi
meshtastic_Position TypeConversions::ConvertToPosition(meshtastic_PositionLite lite) meshtastic_Position TypeConversions::ConvertToPosition(meshtastic_PositionLite lite)
{ {
meshtastic_Position position = meshtastic_Position_init_default; meshtastic_Position position = meshtastic_Position_init_default;
if (lite.latitude_i > 0)
position.has_latitude_i = true;
position.latitude_i = lite.latitude_i; position.latitude_i = lite.latitude_i;
if (lite.longitude_i > 0)
position.has_longitude_i = true;
position.longitude_i = lite.longitude_i; position.longitude_i = lite.longitude_i;
if (lite.altitude > 0)
position.has_altitude = true;
position.altitude = lite.altitude; position.altitude = lite.altitude;
position.location_source = lite.location_source; position.location_source = lite.location_source;
position.time = lite.time; position.time = lite.time;