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

 #include "libNMEA/nmea.h"
 #include <cstring>
 #include "libOLED/stm32_halDisplay.H"
 #include "libOLED/fontclass.H"
 #include "libOLED/displayDial.H"
+#include "libLSM9DS1/LSM9DS1.h"
 #include "libBMP280/bmp280.h"
 #include "libSmallPrintf/small_printf.h"
 #if defined USB_DEVICE
 #include "usbd_cdc_if.h"
 #endif
+LSM9DS1Class IMU (&hi2c2);
 namespace
+{
   int const WIDTH = 128;
   int const HEIGHT = 64;
   int const DISPLAY_RAMWIDTH = 132;
 uint32_t lastTick = 0;
 int32_t temp32 = 0;
 uint32_t pres32 = 0;
 int32_t rslt;
+int32_t rslt2; // result from read of second sensor
+// second sensor
+int32_t temp32_out = 0;
 uint8_t displayBuffer[dataSize (WIDTH, HEIGHT)];
 stm32_halDisplay_t display1 (WIDTH, HEIGHT, DISPLAY_RAMWIDTH, displayBuffer,
                              &hspi1,
   dial.draw_scale (0, 360, 8, 1, 45);
   display1.display ();
   memset (loc.time, '-', 6);
+  // every time we receive GPRMC, forward the text line to the USB driver
+  setRmcCallback (&CDC_Transmit_FS);
+  // initialise IMU operations
+  IMU.begin ();
+}
 char fontBuf[] = "01234567";
 extern "C" void
-cc_run (struct bmp280_dev *bmp)
+cc_run (struct bmp280_dev *bmp, struct bmp280_dev *bmp2)
+{
   display1.clearDisplay ();
   dial.draw_scale (0, 360, 8, 1, 45);
   while (1)
                       speedAvgSum += loc.speed * delta;
                       speedAvgTime += delta;
                       lastLocTime = loc.utc;
+                    }
                   else
-                     lastLocTime = loc.utc;
+                    lastLocTime = loc.utc;
+                }
               else
+                {
                   lastLocTime = loc.utc;
+                }
+            }
+        }
       else
+        {
-        memset (loc.time, '-', 6);
+          memset (loc.time, '-', 6);
+        }
+    }
   // process button press
   uint8_t const buttonLimit = 3;
   uint8_t newPush = HAL_GPIO_ReadPin ( encoder_push_GPIO_Port,
           speedAvgTime = 0.0;
+        }
+    }
   // update the display once per second
-  if (HAL_GetTick() > nextPosTime )
+  if (HAL_GetTick () > nextPosTime)
+    {
       nextPosTime += 1000;
       // slow down the output of ata
       if (speedAvgTime > 0)
         speedMPH = loc.speed * KNOTS_TO_MPH;
       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.fontDigits (large_font, 4,1, speedMPH * 10 );
-      display1.gotoxy (0, 32);
-      display1.printString (small_font, "Average", 7, WHITE);
+      display1.printString (small_font, "c", 2, WHITE);
-      display1.gotoxy (0, 40);
+      display1.gotoxy (0,24);
       display1.fontDigits (large_font, 4, 1, speedAvg * 10);
+      display1.printString (small_font, "av", 2, WHITE);
+      float x, y, z;
+      if (IMU.magneticFieldAvailable ())
+        {
+          IMU.readMagneticField (x, y, z);
+        }
+      if (IMU.accelerationAvailable ())
+        {
+          IMU.readAcceleration (x, y, z);
+        }
-      struct bmp280_uncomp_data ucomp_data;
+      struct bmp280_uncomp_data ucomp_data, ucomp_data2;
       if (HAL_GetTick () - lastTick > 100)
+        {
           lastTick = HAL_GetTick ();
           /* Reading the raw data from sensor */
           rslt = bmp280_get_uncomp_data (&ucomp_data, bmp);
+          /* reading the raw data from the second sensor */
+          rslt2 = bmp280_get_uncomp_data (&ucomp_data2, bmp2);
-          if (rslt == BMP280_OK)
+          if (rslt2 == BMP280_OK)
+            {
-              /* Getting the 32 bit compensated temperature */
-              rslt = bmp280_get_comp_temp_32bit (&temp32,
+              rslt2 = bmp280_get_comp_temp_32bit (&temp32_out,
-                                                 ucomp_data.uncomp_temp, bmp);
+                                                  ucomp_data2.uncomp_temp, bmp2);
+            }
+              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,
+                  rslt = bmp280_get_comp_pres_32bit (&pres32,
-                                                 ucomp_data.uncomp_press, bmp);
+                                                     ucomp_data.uncomp_press,
+                                                     bmp);
 #if defined USB_DEVICE
 /*
           *  $--XDR,a,x.x,a,c--c, ..... *hh<CR><LF> \\
            CDC_Transmit_FS(reinterpret_cast<uint8_t*>(&buffer[0]),cnt);
 #endif
+            }
+        }
+      display1.gotoxy (0,40);
+      display1.fontDigits (large_font, 4, 1, temp32_out / 10, WHITE);
+      display1.printString (small_font, "C", 1, WHITE);
       display1.gotoxy (0, 56);
       display1.fontDigits (small_font, 3, 1, temp32 / 10, WHITE);
       display1.printString (small_font, "C", 2, WHITE);
       display1.fontDigits (small_font, 4, -1, pres32 / 100, WHITE);
-      display1.printString (small_font, "mb", 2, WHITE);
+      display1.printString (small_font, "mb ", 2, WHITE);
       display1.display ();
+    }
+}

Subversion Repositories dashGPS

(root)/trunk/src/display.cpp – Rev 25 → 26