WebSVN – dashGPS – Diff – /trunk/src/display.cpp

 double speedAvgTime = 0;    // sum of all deltaTime;
 double speedAvgSum = 0.0;  // sum of deltaTime * speed for each second
 double lastLocTime = 0.0; // last time there was a location
+uint32_t nextPosTime = 0;
 // convert knots to MPH
 double const KNOTS_TO_MPH = 1.128;
 int heading = 0;
 Location loc;
 cc_run (struct bmp280_dev *bmp)
+{
   display1.clearDisplay ();
   dial.draw_scale (0, 360, 8, 1, 45);
-  bool stat = updateLocation (&loc, &uc1);
-  if (stat && loc.good)
+  while (1)
+    {
-      heading = loc.heading;
+      bool stat = updateLocation (&loc, &uc1);
-      // add in time * speed to give "distance"
+      if (!stat)
+        break;
-      if (loc.valid == 'A')
+      if (stat && loc.good)
+        {
+          heading = loc.heading;
+          // add in time * speed to give "distance"
-          if (lastLocTime != 0)
+          if (loc.valid == 'A')
+            {
+              if (lastLocTime != 0)
+                {
-              double delta = difftime (loc.utc, lastLocTime);
+                  double delta = difftime (loc.utc, lastLocTime);
+                  // believe the speed .
+                  if (delta > 0 && delta < 2)
+                    {
-              // if the difference is > 1 second do the calculations.
+                      speedAvgSum += loc.speed * delta;
+                      speedAvgTime += delta;
+                      lastLocTime = loc.utc;
+                    }
+                  else
+                     lastLocTime = loc.utc;
+                }
-              if (delta > 0)
+              else
+                {
-                  speedAvgSum += loc.speed * delta;
-                  speedAvgTime += delta;
-                  speedAvg = (speedAvgSum / speedAvgTime) * KNOTS_TO_MPH;
                   lastLocTime = loc.utc;
+                }
+            }
+        }
-          else
+      else
-            {
+        {
-            lastLocTime = loc.utc;
+        memset (loc.time, '-', 6);
-            }
+        }
+    }
-  if (loc.valid == 'V')
-    memset (loc.time, '-', 6);
   // process button press
   uint8_t const buttonLimit = 3;
   uint8_t newPush = HAL_GPIO_ReadPin ( encoder_push_GPIO_Port,
   encoder_push_Pin);
   if (newPush == buttonState)
           speedAvgSum = 0.0;
           speedAvgTime = 0.0;
+        }
+    }
-  // print out the GMT time at the top of the screen
+  // update the display once per second
-  display1.gotoxy (0, 0);
+  if (HAL_GetTick() > nextPosTime )
-  display1.printString (small_font, &loc.time[0], 2, WHITE);
+    {
-  display1.printString (small_font, ":", 1, WHITE);
+      nextPosTime += 1000;
-  display1.printString (small_font, &loc.time[2], 2, WHITE);
-  display1.printString (small_font, ":", 1, WHITE);
+      // slow down the output of ata
+      if (speedAvgTime > 0)
-  display1.printString (small_font, &loc.time[4], 2, WHITE);
+        speedAvg = (speedAvgSum / speedAvgTime) * KNOTS_TO_MPH;
+      // print out the GMT time at the top of the screen
-  int dial_ang = heading + 180;
+      display1.gotoxy (0, 0);
+      display1.printString (small_font, &loc.time[0], 2, WHITE);
-  dial.draw_needle (dial_ang);
+      display1.printString (small_font, ":", 1, WHITE);
+      display1.printString (small_font, &loc.time[2], 2, WHITE);
-  display1.gotoxy (70, 25);
-  if (loc.valid == 'A')
-    {
-      display1.fontDigits (large_font, 3, -1, heading);
+      display1.printString (small_font, ":", 1, WHITE);
-    }
-  else
-    display1.printString (large_font, "GPS?", 4, WHITE);
+      display1.printString (small_font, &loc.time[4], 2, WHITE);
-  if (loc.valid == 'A')
+      int dial_ang = heading + 180;
-    speedMPH = loc.speed * KNOTS_TO_MPH;
+      dial.draw_needle (dial_ang);
-  else
-    speedMPH = 0.0;
-  display1.gotoxy (0, 8);
-  display1.printString (small_font, "Speed", 5, WHITE);
-  display1.gotoxy (0, 16);
-  display1.fontDigits (large_font, 4, 1, speedMPH * 10);
-  display1.gotoxy (0, 32);
-  display1.printString (small_font, "Average", 7, WHITE);
-  display1.gotoxy (0, 40);
-  display1.fontDigits (large_font, 4, 1, speedAvg * 10);
-  struct bmp280_uncomp_data ucomp_data;
+      display1.gotoxy (70, 25);
+      if (loc.valid == 'A')
+        {
+          display1.fontDigits (large_font, 3, -1, heading);
+        }
+      else
+        display1.printString (large_font, "GPS?", 4, WHITE);
-  if (HAL_GetTick () - lastTick > 100)
+      if (loc.valid == 'A')
+        speedMPH = loc.speed * KNOTS_TO_MPH;
-    {
+      else
+        speedMPH = 0.0;
-      lastTick = HAL_GetTick ();
+      display1.gotoxy (0, 8);
+      display1.printString (small_font, "Speed", 5, WHITE);
+      display1.gotoxy (0, 16);
+      display1.fontDigits (large_font, 4, 1, speedMPH * 10);
+      display1.gotoxy (0, 32);
+      display1.printString (small_font, "Average", 7, WHITE);
+      display1.gotoxy (0, 40);
-      /* Reading the raw data from sensor */
+      display1.fontDigits (large_font, 4, 1, speedAvg * 10);
-      rslt = bmp280_get_uncomp_data (&ucomp_data, bmp);
+      struct bmp280_uncomp_data ucomp_data;
-      if (rslt == BMP280_OK)
+      if (HAL_GetTick () - lastTick > 100)
+        {
+          lastTick = HAL_GetTick ();
-          /* Getting the 32 bit compensated temperature */
+          /* Reading the raw data from sensor */
-          rslt = bmp280_get_comp_temp_32bit (&temp32, ucomp_data.uncomp_temp,
+          rslt = bmp280_get_uncomp_data (&ucomp_data, bmp);
-                                             bmp);
+          if (rslt == BMP280_OK)
+            {
+              /* Getting the 32 bit compensated temperature */
+              rslt = bmp280_get_comp_temp_32bit (&temp32,
+                                                 ucomp_data.uncomp_temp, bmp);
-          rslt = bmp280_get_comp_pres_32bit (&pres32, ucomp_data.uncomp_press,
+              rslt = bmp280_get_comp_pres_32bit (&pres32,
-                                             bmp);
+                                                 ucomp_data.uncomp_press, bmp);
 #if defined USB_DEVICE
 /*
           *  $--XDR,a,x.x,a,c--c, ..... *hh<CR><LF> \\
            cnt+= small_sprintf(buffer+cnt,"*%02X\n",sum);
            CDC_Transmit_FS(reinterpret_cast<uint8_t*>(&buffer[0]),cnt);
 #endif
+            }
+        }
-    }
-  display1.gotoxy (0, 56);
+      display1.gotoxy (0, 56);
-  display1.printString (small_font, "T", 2, WHITE);
+      display1.printString (small_font, "T", 2, WHITE);
-  display1.fontDigits (small_font, 4, 1, temp32 / 10, WHITE);
+      display1.fontDigits (small_font, 4, 1, temp32 / 10, WHITE);
-  display1.printString (small_font, " P", 2, WHITE);
+      display1.printString (small_font, " P", 2, WHITE);
-  display1.fontDigits (small_font, 5, 0, pres32 / 100, WHITE);
+      display1.fontDigits (small_font, 5, 0, pres32 / 100, WHITE);
-  display1.printString (small_font, " ", 1, WHITE);
+      display1.printString (small_font, " ", 1, WHITE);
-  display1.display ();
+      display1.display ();
+    }
+}

Subversion Repositories dashGPS

(root)/trunk/src/display.cpp – Rev 23 → 24