Browse Source

AP_HAL: changed base defines for print()

this avoids a conflict with wirish from libmaple
mission-4.1.18
Andrew Tridgell 12 years ago
parent
commit
0e9aef7e52
  1. 32
      libraries/AP_HAL/utility/Print.h

32
libraries/AP_HAL/utility/Print.h

@ -32,10 +32,14 @@ @@ -32,10 +32,14 @@
* not on other platforms)
*/
#define DEC 10
#define HEX 16
#define OCT 8
#define BIN 2
enum {
BASE_DEFAULT = 0,
BASE_BIN = 2,
BASE_OCT = 8,
BASE_DEC = 10,
BASE_HEX = 16
};
class AP_HAL::Print {
private:
@ -52,21 +56,21 @@ class AP_HAL::Print { @@ -52,21 +56,21 @@ class AP_HAL::Print {
public:
size_t print(const char[]);
size_t print(char);
size_t print(unsigned char, int = DEC);
size_t print(int, int = DEC);
size_t print(unsigned int, int = DEC);
size_t print(long, int = DEC);
size_t print(unsigned long, int = DEC);
size_t print(unsigned char, int = BASE_DEC);
size_t print(int, int = BASE_DEC);
size_t print(unsigned int, int = BASE_DEC);
size_t print(long, int = BASE_DEC);
size_t print(unsigned long, int = BASE_DEC);
size_t print(float , int = 2);
size_t print(double , int = 2);
size_t println(const char[]);
size_t println(char);
size_t println(unsigned char, int = DEC);
size_t println(int, int = DEC);
size_t println(unsigned int, int = DEC);
size_t println(long, int = DEC);
size_t println(unsigned long, int = DEC);
size_t println(unsigned char, int = BASE_DEC);
size_t println(int, int = BASE_DEC);
size_t println(unsigned int, int = BASE_DEC);
size_t println(long, int = BASE_DEC);
size_t println(unsigned long, int = BASE_DEC);
size_t println(float , int = 2);
size_t println(double , int = 2);
size_t println(void);

Loading…
Cancel
Save