From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 5 Oct 2009 16:53:01 +0000 (+0000)
Subject: Extract method to convert string to degree.
X-Git-Tag: 2.3.0~56
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=f1ad08f1aabddfed8945dcfd6d32895cf613c6da;p=bertos.git

Extract method to convert string to degree.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3027 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/bertos/net/nmea.c b/bertos/net/nmea.c
index 11dcf374..a9684a9e 100644
--- a/bertos/net/nmea.c
+++ b/bertos/net/nmea.c
@@ -76,23 +76,33 @@ static uint32_t tokenToInt(const char *s)
 	return num;
 }
 
-
-static udegree_t nmea_latitude(const char *plat, const char *phem)
+static udegree_t convertToDegree(const char *str)
 {
-	int ns;
-	uint32_t lat;
+	uint32_t dec;
 	uint32_t deg;
 	uint32_t min;
 
-	if (*plat == 0)
+	if (*str == 0)
 	{
         return 0;
     }
+
+	dec = tokenToInt(str);
+	deg = dec / 1000000;
+	min = dec - deg * 1000000;
+	dec = deg * 1000000 + ((min * 5) + 1) / 3;
+}
+
+static udegree_t nmea_latitude(const char *plat, const char *phem)
+{
+	int ns;
+
     if (*phem == 0)
 	{
         return 0;
     }
 
+
     /* north lat is +, south lat is - */
     if (*phem == 'N')
 	{
@@ -103,29 +113,13 @@ static udegree_t nmea_latitude(const char *plat, const char *phem)
         ns = -1;
     }
 
-	lat = tokenToInt(plat);
-	deg = lat / 1000000;
-	min = lat - deg * 1000000;
-	lat = deg * 1000000 + ((min * 5) + 1) / 3;
 
-	return ns * lat;
+	return ns * convertToDegree(plat);
 }
 
 static udegree_t nmea_longitude(const char *plot, const char *phem)
 {
 	int ew;
-	uint32_t lot;
-	uint32_t deg;
-	uint32_t min;
-
-	if (*plot == 0)
-	{
-        return 0;
-    }
-    if (*phem == 0)
-	{
-        return 0;
-    }
 
     /* west long is negative, east long is positive */
     if (*phem == 'E')
@@ -136,12 +130,12 @@ static udegree_t nmea_longitude(const char *plot, const char *phem)
         ew = -1;
     }
 
-	lot = tokenToInt(plot);
-	deg = lot / 1000000;
-	min = lot - deg * 1000000;
-	lot = deg * 1000000 + ((min * 5) + 1) / 3;
+    if (*phem == 0)
+	{
+        return 0;
+    }
 
-	return ew  * lot;
+	return ew * convertToDegree(plot);
 }
 
 static uint16_t nmea_altitude(const char *palt, const char *punits)