Increased GPS altitude resolution, further fixes

include/payload.h

@@ -18,8 +18,6 @@
 #define LPP_BAROMETER_CHANNEL 30
 #define LPP_AIR_CHANNEL 31
 
-#endif
-
 // MyDevices CayenneLPP 2.0 types for Packed Sensor Payload, not using channels,
 // but different FPorts
 #define LPP_GPS 136          // 3 byte lon/lat 0.0001 °, 3 bytes alt 0.01m
@@ -32,6 +30,8 @@
 #define LPP_HUMIDITY 104     // 1 byte, 0.5 % unsigned
 #define LPP_BAROMETER 115    // 2 bytes, hPa unsigned MSB
 
+#endif
+
 class PayloadConvert {
 
 public:
@@ -54,13 +54,13 @@ public:
   void addSensor(uint8_t[]);
   void addTime(time_t value);
 
-#if PAYLOAD_ENCODER == 1 // format plain
+#if (PAYLOAD_ENCODER == 1) // format plain
 
 private:
   uint8_t *buffer;
   uint8_t cursor;
 
-#elif PAYLOAD_ENCODER == 2 // format packed
+#elif (PAYLOAD_ENCODER == 2) // format packed
 
 private:
   uint8_t *buffer;
@@ -78,7 +78,7 @@ private:
   void writeBitmap(bool a, bool b, bool c, bool d, bool e, bool f, bool g,
                    bool h);
 
-#elif (PAYLOAD_ENCODER == 3 || PAYLOAD_ENCODER == 4) // format cayenne lpp
+#elif ((PAYLOAD_ENCODER == 3) || (PAYLOAD_ENCODER == 4)) // format cayenne lpp
 
 private:
   uint8_t *buffer;