From 641acd57091d2c37a0d2e131674bd969eed55761 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 20 Oct 2013 09:32:23 +0200 Subject: [PATCH] Changed the return value of cPositioner::HorizonLongitude() to 0 in case the latitude of the antenna location is beyond +/-81 degrees --- HISTORY | 5 +++++ config.h | 10 +++++----- positioner.c | 4 ++-- positioner.h | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/HISTORY b/HISTORY index 2c03dd46..c4660b33 100644 --- a/HISTORY +++ b/HISTORY @@ -8009,3 +8009,8 @@ Video Disk Recorder Revision History is unexpected at this point (reported by Helmut Auer). You can still navigate to the last replayed recording (if any) by pressing Ok repeatedly in the Recordings menu. + +2013-10-20: Version 2.1.3 + +- Changed the return value of cPositioner::HorizonLongitude() to 0 in case the + latitude of the antenna location is beyond +/-81 degrees. diff --git a/config.h b/config.h index 90045b5d..c69eab6e 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 3.4 2013/10/19 10:00:00 kls Exp $ + * $Id: config.h 3.5 2013/10/20 09:32:23 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "2.1.2" -#define VDRVERSNUM 20102 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "2.1.3" +#define VDRVERSNUM 20103 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "2.1.2" -#define APIVERSNUM 20102 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "2.1.3" +#define APIVERSNUM 20103 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to diff --git a/positioner.c b/positioner.c index 8b9d2703..c701079e 100644 --- a/positioner.c +++ b/positioner.c @@ -7,7 +7,7 @@ * For an explanation (in German) of the theory behind the calculations see * http://www.vdr-portal.de/board17-developer/board97-vdr-core/p1154305-grundlagen-und-winkelberechnungen-f%C3%BCr-h-h-diseqc-motor-antennenanlagen * - * $Id: positioner.c 3.2 2013/10/10 14:14:10 kls Exp $ + * $Id: positioner.c 3.3 2013/10/20 09:30:03 kls Exp $ */ #include "positioner.h" @@ -71,7 +71,7 @@ int cPositioner::HorizonLongitude(ePositionerDirection Direction) if (abs(Setup.SiteLat) < SAT_VISIBILITY_LAT) Delta = acos(SAT_EARTH_RATIO / cos(RAD(Setup.SiteLat))); else - Delta = RAD(145); + Delta = 0; if ((Setup.SiteLat >= 0) != (Direction == pdLeft)) Delta = -Delta; return NormalizeAngle(round(DEG(RAD(Setup.SiteLon) + Delta))); diff --git a/positioner.h b/positioner.h index 6e019ed6..6db16748 100644 --- a/positioner.h +++ b/positioner.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: positioner.h 3.1 2013/06/10 14:27:14 kls Exp $ + * $Id: positioner.h 3.2 2013/10/20 09:29:41 kls Exp $ */ #ifndef __POSITIONER_H @@ -94,7 +94,7 @@ public: ///< horizon when looking in the given Direction. Note that this function ///< only delivers reasonable values for site latitudes between +/-81 degrees. ///< Beyond these limits (i.e. near the north or south pole) a constant value - ///< of +/-14.5 degrees (integer value 145) will be returned. + ///< of 0 will be returned. int HardLimitLongitude(ePositionerDirection Direction) const; ///< Returns the longitude of the positioner's hard limit in the given ///< Direction. Note that the value returned here may be larger (or smaller,