Skip to content

Commit 2c367d2

Browse files
authored
Merge pull request #5 from mikalhart/NsUpdates
Rename bitflags to avoid conflict with u-blox library
2 parents 65cc9a9 + 02acb61 commit 2c367d2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/SparkFun_LG290P_GNSS.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ typedef enum
4444
LG290P_RESULT_CONFIG_PRESENT,
4545
} LG290PResult;
4646

47-
enum { COM_TYPE_NMEA = 1, COM_TYPE_RTCM3 = 4 };
47+
enum { LG290P_COM_TYPE_NMEA = 1, LG290P_COM_TYPE_RTCM3 = 4 };
4848

4949
class LG290P
5050
{
@@ -294,24 +294,24 @@ class LG290P
294294
/**
295295
* @brief Enable or disable the protocols available for input on the specified port
296296
* @param port the LG290P port to be configured (1, 2, or 3)
297-
* @param newFlags a bitfield: some combination of COM_TYPE_NMEA and COM_TYPE_RTCM3. 0 for disable all.
297+
* @param newFlags a bitfield: some combination of LG290P_COM_TYPE_NMEA and LG290P_COM_TYPE_RTCM3. 0 for disable all.
298298
* @return true if the new input protocols were enabled/disabled
299299
*/
300300
bool setPortInputProtocols(int port, uint8_t newFlags);
301301

302302
/**
303303
* @brief Enable or disable the protocols available for output on the specified port
304304
* @param port the LG290P port to be configured (1, 2, or 3)
305-
* @param newFlags a bitfield: some combination of COM_TYPE_NMEA and COM_TYPE_RTCM3. 0 for disable all.
305+
* @param newFlags a bitfield: some combination of LG290P_COM_TYPE_NMEA and LG290P_COM_TYPE_RTCM3. 0 for disable all.
306306
* @return true if the new output protocols were enabled/disabled
307307
*/
308308
bool setPortOutputProtocols(int port, uint8_t newFlags);
309309

310310
/**
311311
* @brief Get the current protocol enable/disable status for the specified port
312312
* @param port the LG290P port to be configured (1, 2, or 3)
313-
* @param inputFlags a reference to a bitfield: returns some combination of COM_TYPE_NMEA and COM_TYPE_RTCM3. 0 for all disabled
314-
* @param outputFlags a reference to a bitfield: returns some combination of COM_TYPE_NMEA and COM_TYPE_RTCM3. 0 for all disabled
313+
* @param inputFlags a reference to a bitfield: returns some combination of LG290P_COM_TYPE_NMEA and LG290P_COM_TYPE_RTCM3. 0 for all disabled
314+
* @param outputFlags a reference to a bitfield: returns some combination of LG290P_COM_TYPE_NMEA and LG290P_COM_TYPE_RTCM3. 0 for all disabled
315315
* @return true if the new protocol flags were successfully acquired
316316
*/
317317
bool getPortProtocols(int port, uint8_t &inputFlags, uint8_t &outputFlags);

0 commit comments

Comments
 (0)