Browse Source

Merge pull request #2956 from 42617274/patch-1

fix: range rate assignment in satellite tracker for sgp4
chirpmodem-v8.0.0
Edouard Griffiths 2 months ago committed by GitHub
parent
commit
6627a5cf70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      external/CMakeLists.txt
  2. 2
      plugins/feature/satellitetracker/satellitetrackersgp4.cpp

5
external/CMakeLists.txt vendored

@ -856,7 +856,8 @@ endif () @@ -856,7 +856,8 @@ endif ()
# For Satellite Tracker feature and APT demod
if(ENABLE_FEATURE_SATELLITETRACKER OR ENABLE_CHANNELRX_DEMODAPT)
# No tags for this in github - but doesn't change often
# No tags for this in github. Pin the commit to keep builds reproducible.
set(SGP4_TAG 1c0d4ee99404538572037fabfdcbc7133917eae8)
# Fails to build with CMAKE_INTERPROCEDURAL_OPTIMIZATION=ON on Windows
if (WIN32)
set(SGP4_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/sgp4s.lib" CACHE INTERNAL "")
@ -867,6 +868,8 @@ if(ENABLE_FEATURE_SATELLITETRACKER OR ENABLE_CHANNELRX_DEMODAPT) @@ -867,6 +868,8 @@ if(ENABLE_FEATURE_SATELLITETRACKER OR ENABLE_CHANNELRX_DEMODAPT)
endif()
ExternalProject_Add(sgp4
GIT_REPOSITORY https://github.com/dnwrnr/sgp4.git
GIT_TAG ${SGP4_TAG}
UPDATE_DISCONNECTED TRUE
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/sgp4"
CMAKE_ARGS ${COMMON_CMAKE_ARGS}
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF

2
plugins/feature/satellitetracker/satellitetrackersgp4.cpp

@ -499,7 +499,7 @@ void getSatelliteState(QDateTime dateTime, @@ -499,7 +499,7 @@ void getSatelliteState(QDateTime dateTime,
satState->m_azimuth = Units::radiansToDegrees(topo.azimuth);
satState->m_elevation = Units::radiansToDegrees(topo.elevation);
satState->m_range = topo.range;
satState->m_rangeRate = topo.range_rate;
satState->m_rangeRate = topo.rangeRate;
OrbitalElements ele(tle);
satState->m_speed = eci.Velocity().Magnitude();
satState->m_period = ele.Period();

Loading…
Cancel
Save