Add extra extract methods

Author: PaulZC

keywords.txt

@@ -687,12 +687,17 @@ setNMEAGPZDAcallbackPtr	KEYWORD2
 getLatestNMEAGNZDA	KEYWORD2
 setNMEAGNZDAcallbackPtr	KEYWORD2
 
+extractLongLong	KEYWORD2
+extractSignedLongLong	KEYWORD2
 extractLong	KEYWORD2
 extractSignedLong	KEYWORD2
 extractInt	KEYWORD2
 extractSignedInt	KEYWORD2
 extractByte	KEYWORD2
 extractSignedChar	KEYWORD2
+extractFloat	KEYWORD2
+extractDouble	KEYWORD2
+
 
 #######################################
 # Constants (LITERAL1)

src/u-blox_GNSS.cpp

@@ -1560,7 +1560,7 @@ void DevUBLOXGNSS::process(uint8_t incoming, ubxPacket *incomingUBX, uint8_t req
       // Check if it should be passed to processNMEA
       if (processThisNMEA())
       {
-        for(uint8_t i = 0; i < 6; i++)
+        for (uint8_t i = 0; i < 6; i++)
         {
           processNMEA(nmeaAddressField[i]); // Process the start character and address field
           // If user has assigned an output port then pipe the characters there,
@@ -7992,12 +7992,7 @@ bool DevUBLOXGNSS::addCfgValsetFloat(uint32_t key, float value)
   }
 
   // Define a union to convert from float to uint32_t
-  union
-  {
-    float flt;
-    uint32_t unsigned32;
-    //uint8_t bytes[4]; // Could be useful for endian byte reversal?
-  } convert32;
+  unsigned32float convert32;
 
   convert32.flt = value;
 
@@ -8021,12 +8016,7 @@ bool DevUBLOXGNSS::addCfgValsetDouble(uint32_t key, double value)
   }
 
   // Define a union to convert from double to uint64_t
-  union
-  {
-    double dbl;
-    uint64_t unsigned64;
-    //uint8_t bytes[8]; // Could be useful for endian byte reversal?
-  } convert64;
+  unsigned64double convert64;
 
   convert64.dbl = value;
 
@@ -15858,6 +15848,19 @@ uint64_t DevUBLOXGNSS::extractLongLong(ubxPacket *msg, uint16_t spotToStart)
   return (val);
 }
 
+// Given a spot in the payload array, extract eight bytes and build a int64_t
+int64_t DevUBLOXGNSS::extractSignedLongLong(ubxPacket *msg, uint16_t spotToStart)
+{
+  union
+  {
+    uint64_t unsigned64;
+    int64_t signed64;
+  } converter64;
+
+  converter64.unsigned64 = extractLongLong(msg, spotToStart);
+  return (converter64.signed64);
+}
+
 // Given a spot in the payload array, extract four bytes and build a long
 uint32_t DevUBLOXGNSS::extractLong(ubxPacket *msg, uint16_t spotToStart)
 {
@@ -15905,3 +15908,19 @@ int8_t DevUBLOXGNSS::extractSignedChar(ubxPacket *msg, uint16_t spotToStart)
   converter.unsigned8 = extractByte(msg, spotToStart);
   return (converter.signed8);
 }
+
+// Given a spot, extract a signed 32-bit float from the payload
+float DevUBLOXGNSS::extractFloat(ubxPacket *msg, uint16_t spotToStart)
+{
+  unsigned32float converter;
+  converter.unsigned32 = extractLong(msg, spotToStart);
+  return (converter.flt);
+}
+
+// Given a spot, extract a signed 32-bit float from the payload
+double DevUBLOXGNSS::extractDouble(ubxPacket *msg, uint16_t spotToStart)
+{
+  unsigned64double converter;
+  converter.unsigned64 = extractLongLong(msg, spotToStart);
+  return (converter.dbl);
+}

src/u-blox_GNSS.h

@@ -989,12 +989,15 @@ class DevUBLOXGNSS
   // Functions to extract signed and unsigned 8/16/32-bit data from a ubxPacket
   // From v2.0: These are public. The user can call these to extract data from custom packets
   uint64_t extractLongLong(ubxPacket *msg, uint16_t spotToStart);  // Combine eight bytes from payload into uint64_t
+  int64_t extractSignedLongLong(ubxPacket *msg, uint16_t spotToStart);  // Combine eight bytes from payload into uint64_t
   uint32_t extractLong(ubxPacket *msg, uint16_t spotToStart);      // Combine four bytes from payload into long
   int32_t extractSignedLong(ubxPacket *msg, uint16_t spotToStart); // Combine four bytes from payload into signed long (avoiding any ambiguity caused by casting)
   uint16_t extractInt(ubxPacket *msg, uint16_t spotToStart);       // Combine two bytes from payload into int
   int16_t extractSignedInt(ubxPacket *msg, uint16_t spotToStart);
   uint8_t extractByte(ubxPacket *msg, uint16_t spotToStart);      // Get byte from payload
   int8_t extractSignedChar(ubxPacket *msg, uint16_t spotToStart); // Get signed 8-bit value from payload
+  float extractFloat(ubxPacket *msg, uint16_t spotToStart);       // Get signed 32-bit float (R4) from payload
+  double extractDouble(ubxPacket *msg, uint16_t spotToStart);     // Get signed 64-bit double (R8) from payload
 
   // Pointers to storage for the "automatic" messages
   // RAM is allocated for these if/when required.
@@ -1261,4 +1264,16 @@ class DevUBLOXGNSS
     uint8_t unsigned8;
     int8_t signed8;
   } unsignedSigned8;
+
+  typedef union
+  {
+    uint32_t unsigned32;
+    float flt;
+  } unsigned32float;
+
+  typedef union
+  {
+    uint64_t unsigned64;
+    double dbl;
+  } unsigned64double;
 };