remove Rotary_Speed Global variable

replaced by `DerivedDrawInfo.AverageGS`
brunotl · Sep 17, 2024 · e15f80a · e15f80a
1 parent 1eab652
commit e15f80a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/Common/Header/Globals.h b/Common/Header/Globals.h
@@ -836,7 +836,6 @@ GEXTERN bool Flags_DrawXC;
 GEXTERN unsigned int Trip_Moving_Time;
 GEXTERN unsigned int Trip_Steady_Time;
 
-GEXTERN double Rotary_Speed;
 GEXTERN double Rotary_Distance;
 
 GEXTERN unsigned short Multimap1;

diff --git a/Common/Source/Calc/LDRotaryBuffer.cpp b/Common/Source/Calc/LDRotaryBuffer.cpp
@@ -79,7 +79,6 @@ bool InitLDRotary(ldrotary_s *buf) {
 
 	Log("InitLdRotary size=%d\r\n", buf->size);
 
-	Rotary_Speed=0;
 	Rotary_Distance=0;
 
 	return false;
@@ -244,10 +243,6 @@ double CalculateLDRotary(ldrotary_s *buf, NMEA_INFO *Basic, DERIVED_INFO *Calcul
 		averias = bc.totalias/bc.size;
 		averias/=100;
 
-		if (ISCAR) {
-			Rotary_Speed=averias;
-		}
-
 		// We use GPS altitude to be sure that the tas is correct, we dont know in fact
 		// if qnh is correct, while gps is generally accurate for the purpose.
 		avertas = TrueAirSpeed(averias, QNHAltitudeToQNEAltitude(Basic->Altitude));

diff --git a/Common/Source/Draw/LKProcess.cpp b/Common/Source/Draw/LKProcess.cpp
@@ -3368,7 +3368,7 @@ bool MapWindow::LKFormatValue(const short lkindex, const bool lktitle,
 			break;
 
 		case LK_SPEED_AVG:
-			_stprintf(BufferValue, _T("%.1f"), Units::ToHorizontalSpeed(Rotary_Speed));
+			_stprintf(BufferValue, _T("%.1f"), Units::ToHorizontalSpeed(DerivedDrawInfo.AverageGS));
 			_stprintf(BufferTitle, _T("AvgSpd"));
 			_stprintf(BufferUnit, TEXT("%s"), (Units::GetHorizontalSpeedName()));
 			valid = true;

diff --git a/Common/Source/Globals.cpp b/Common/Source/Globals.cpp
@@ -620,7 +620,6 @@ void Globals_Init(void) {
   Trip_Moving_Time=0;
   Trip_Steady_Time=0;
 
-  Rotary_Speed=0;
   Rotary_Distance=0;
 
   Flags_DrawTask=true;