Changing dynamic model to typedef.

Author: Nathan Seidle

examples/Example20_DynamicModel/Example20_DynamicModel.ino renamed to examples/Example19_DynamicModel/Example19_DynamicModel.ino

@@ -1455,7 +1455,7 @@ boolean SFE_UBLOX_GPS::setPortOutput(uint8_t portID, uint8_t outStreamSettings,
   // Let's make sure we wait for the ACK too (sendCommand will have returned as soon as the module sent its response)
   // This is only required because we are doing two sendCommands in quick succession using the same class and ID
   waitForResponse(UBX_CLASS_CFG, UBX_CFG_PRT, 100); // But we'll only wait for 100msec max
-  
+
   //Yes, this is the depreciated way to do it but it's still supported on v27 so it
   //covers both ZED-F9P (v27) and SAM-M8Q (v18)
 
@@ -1483,7 +1483,7 @@ boolean SFE_UBLOX_GPS::setPortInput(uint8_t portID, uint8_t inStreamSettings, ui
   // Let's make sure we wait for the ACK too (sendCommand will have returned as soon as the module sent its response)
   // This is only required because we are doing two sendCommands in quick succession using the same class and ID
   waitForResponse(UBX_CLASS_CFG, UBX_CFG_PRT, 100); // But we'll only wait for 100msec max
-  
+
   packetCfg.cls = UBX_CLASS_CFG;
   packetCfg.id = UBX_CFG_PRT;
   packetCfg.len = 20;
@@ -1884,22 +1884,22 @@ boolean SFE_UBLOX_GPS::powerSaveMode(bool power_save, uint16_t maxWait)
 //AIRBORNE1g,AIRBORNE2g,AIRBORNE4g,WRIST,BIKE
 //WRIST is not supported in protocol versions less than 18
 //BIKE is supported in protocol versions 19.2
-boolean SFE_UBLOX_GPS::setDynamicModel(uint8_t newDynamicModel, uint16_t maxWait)
+boolean SFE_UBLOX_GPS::setDynamicModel(dynModel newDynamicModel, uint16_t maxWait)
 {
   packetCfg.cls = UBX_CLASS_CFG;
   packetCfg.id = UBX_CFG_NAV5;
   packetCfg.len = 0;
   packetCfg.startingSpot = 0;
 
   if (sendCommand(packetCfg, maxWait) == false) //Ask module for the current navigation model settings. Loads into payloadCfg.
-  return (false);
+    return (false);
 
   // Let's make sure we wait for the ACK too (sendCommand will have returned as soon as the module sent its response)
   // This is only required because we are doing two sendCommands in quick succession using the same class and ID
   waitForResponse(UBX_CLASS_CFG, UBX_CFG_NAV5, 100); // But we'll only wait for 100msec max
 
-  payloadCfg[0] = 0x01; // mask: set only the dyn bit (0)
-  payloadCfg[1] = 0x00; // mask
+  payloadCfg[0] = 0x01;            // mask: set only the dyn bit (0)
+  payloadCfg[1] = 0x00;            // mask
   payloadCfg[2] = newDynamicModel; // dynModel
 
   packetCfg.len = 36;

src/SparkFun_Ublox_Arduino_Library.cpp

@@ -96,11 +96,11 @@ const uint8_t UBX_CLASS_SEC = 0x27;
 const uint8_t UBX_CLASS_HNR = 0x28;
 const uint8_t UBX_CLASS_NMEA = 0xF0;
 
-const uint8_t UBX_CFG_PRT = 0x00;	//Used to configure port specifics
-const uint8_t UBX_CFG_RST = 0x04;	//Used to reset device
-const uint8_t UBX_CFG_RATE = 0x08;   //Used to set port baud rates
-const uint8_t UBX_CFG_CFG = 0x09;	//Used to save current configuration
-const uint8_t UBX_CFG_RXM = 0x11;	//Used to set receiver power management (power save mode)
+const uint8_t UBX_CFG_PRT = 0x00;  //Used to configure port specifics
+const uint8_t UBX_CFG_RST = 0x04;  //Used to reset device
+const uint8_t UBX_CFG_RATE = 0x08; //Used to set port baud rates
+const uint8_t UBX_CFG_CFG = 0x09;  //Used to save current configuration
+const uint8_t UBX_CFG_RXM = 0x11;  //Used to set receiver power management (power save mode)
 const uint8_t UBX_CFG_NAV5 = 0x24; //Used to configure the navigation engine including the dynamic model
 
 const uint8_t UBX_CFG_VALSET = 0x8A; //Used for config of higher version Ublox modules (ie protocol v27 and above)
@@ -187,6 +187,21 @@ const uint8_t VAL_GROUP_I2C_SIZE = VAL_SIZE_8; //All fields in I2C group are cur
 
 const uint8_t VAL_ID_I2C_ADDRESS = 0x01;
 
+enum dynModel // Possible values for the dynamic platform model
+{
+	DYN_MODEL_PORTABLE = 0,
+	// 1 is not defined
+	DYN_MODEL_STATIONARY = 2,
+	DYN_MODEL_PEDESTRIAN,
+	DYN_MODEL_AUTOMOTIVE,
+	DYN_MODEL_SEA,
+	DYN_MODEL_AIRBORNE1g,
+	DYN_MODEL_AIRBORNE2g,
+	DYN_MODEL_AIRBORNE4g,
+	DYN_MODEL_WRIST, // Not supported in protocol versions less than 18
+	DYN_MODEL_BIKE,  // Supported in protocol versions 19.2
+};
+
 #ifndef MAX_PAYLOAD_SIZE
 
 #define MAX_PAYLOAD_SIZE 128
@@ -372,8 +387,8 @@ class SFE_UBLOX_GPS
 
 	boolean powerSaveMode(bool power_save = true, uint16_t maxWait = 2000);
 
-  //Change the dynamic platform model using UBX-CFG-NAV5
-  boolean setDynamicModel(uint8_t newDynamicModel = PEDESTRIAN, uint16_t maxWait = 2000);
+	//Change the dynamic platform model using UBX-CFG-NAV5
+	boolean setDynamicModel(dynModel newDynamicModel = DYN_MODEL_PORTABLE, uint16_t maxWait = 2000);
 
 	//Survey-in specific controls
 	struct svinStructure
@@ -448,21 +463,6 @@ class SFE_UBLOX_GPS
 
 	uint16_t rtcmFrameCounter = 0; //Tracks the type of incoming byte inside RTCM frame
 
-  enum dynModel // Possible values for the dynamic platform model
-  {
-    PORTABLE = 0,
-    // 1 is not defined
-    STATIONARY = 2,
-    PEDESTRIAN,
-    AUTOMOTIVE,
-    SEA,
-    AIRBORNE1g,
-    AIRBORNE2g,
-    AIRBORNE4g,
-    WRIST, // Not supported in protocol versions less than 18
-    BIKE // Supported in protocol versions 19.2
-  };
-
 private:
 	//Depending on the sentence type the processor will load characters into different arrays
 	enum SentenceTypes