Skip to content

Commit 5bad4db

Browse files
committed
Solve SPI compile issues when Arduino_STD_PRINTF enabled
- Modify wiring_constant.h to resolve min not declared when Arduino_STD_PRINTF is enabled
1 parent 04c3982 commit 5bad4db

File tree

1 file changed

+54
-56
lines changed

1 file changed

+54
-56
lines changed

Arduino_package/hardware/cores/ambd/wiring_constants.h

Lines changed: 54 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,37 @@
2020
#define _WIRING_CONSTANTS_
2121

2222
#ifdef __cplusplus
23-
extern "C"{
24-
#endif // __cplusplus
23+
extern "C" {
24+
#endif // __cplusplus
2525

2626
#define HIGH 0x1
2727
#define LOW 0x0
2828

29-
// 0X00 NA
30-
#define INPUT_PULLDOWN 0x01
31-
#define INPUT INPUT_PULLDOWN
32-
#define OUTPUT 0x02
33-
#define INPUT_PULLUP 0x03
34-
#define INPUT_PULLNONE 0x04
35-
#define OUTPUT_OPENDRAIN 0x05
36-
#define INPUT_IRQ_FALL 0x06
37-
#define INPUT_IRQ_RISE 0x07
38-
#define INPUT_IRQ_LOW 0x08
39-
#define INPUT_IRQ_HIGH 0x09
40-
#define INPUT_IRQ_CHANGE 0x0a
41-
42-
#define true 0x1
43-
#define false 0x0
44-
45-
#define PI 3.1415926535897932384626433832795
46-
#define HALF_PI 1.5707963267948966192313216916398
47-
#define TWO_PI 6.283185307179586476925286766559
48-
#define DEG_TO_RAD 0.017453292519943295769236907684886
49-
#define RAD_TO_DEG 57.295779513082320876798154814105
50-
#define EULER 2.718281828459045235360287471352
51-
52-
#define SERIAL 0x0
53-
#define DISPLAY 0x1
29+
// 0X00 NA
30+
#define INPUT_PULLDOWN 0x01
31+
#define INPUT INPUT_PULLDOWN
32+
#define OUTPUT 0x02
33+
#define INPUT_PULLUP 0x03
34+
#define INPUT_PULLNONE 0x04
35+
#define OUTPUT_OPENDRAIN 0x05
36+
#define INPUT_IRQ_FALL 0x06
37+
#define INPUT_IRQ_RISE 0x07
38+
#define INPUT_IRQ_LOW 0x08
39+
#define INPUT_IRQ_HIGH 0x09
40+
#define INPUT_IRQ_CHANGE 0x0a
41+
42+
#define true 0x1
43+
#define false 0x0
44+
45+
#define PI 3.1415926535897932384626433832795
46+
#define HALF_PI 1.5707963267948966192313216916398
47+
#define TWO_PI 6.283185307179586476925286766559
48+
#define DEG_TO_RAD 0.017453292519943295769236907684886
49+
#define RAD_TO_DEG 57.295779513082320876798154814105
50+
#define EULER 2.718281828459045235360287471352
51+
52+
#define SERIAL 0x0
53+
#define DISPLAY 0x1
5454

5555
enum BitOrder {
5656
LSBFIRST = 0,
@@ -59,59 +59,57 @@ enum BitOrder {
5959

6060
// LOW 0
6161
// HIGH 1
62-
#define CHANGE 2
63-
#define FALLING 3
64-
#define RISING 4
62+
#define CHANGE 2
63+
#define FALLING 3
64+
#define RISING 4
6565

66-
#define DEFAULT 1
67-
#define EXTERNAL 0
66+
#define DEFAULT 1
67+
#define EXTERNAL 0
6868

6969
// undefine stdlib's abs if encountered
7070
#ifdef abs
7171
#undef abs
72-
#endif // abs
72+
#endif // abs
7373

74-
#ifndef Arduino_STD_PRINTF
75-
#ifndef min
76-
#define min(a,b) ((a)<(b)?(a):(b))
77-
#endif // min
74+
#ifndef min
75+
#define min(a, b) ((a) < (b) ? (a) : (b))
76+
#endif // min
7877
#ifndef max
79-
#define max(a,b) ((a)>(b)?(a):(b))
80-
#endif // max
81-
#endif // Arduino_STD_PRINTF
78+
#define max(a, b) ((a) > (b) ? (a) : (b))
79+
#endif // max
8280

83-
#define abs(x) ((x)>0?(x):-(x))
84-
#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
85-
#define round(x) ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
86-
#define radians(deg) ((deg)*DEG_TO_RAD)
87-
#define degrees(rad) ((rad)*RAD_TO_DEG)
88-
#define sq(x) ((x)*(x))
81+
#define abs(x) ((x) > 0 ? (x) : -(x))
82+
#define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
83+
#define round(x) ((x) >= 0 ? (long)((x) + 0.5) : (long)((x)-0.5))
84+
#define radians(deg) ((deg) * DEG_TO_RAD)
85+
#define degrees(rad) ((rad) * RAD_TO_DEG)
86+
#define sq(x) ((x) * (x))
8987

9088
extern uint32_t ulSetInterruptMaskFromISR(void);
9189
extern void vClearInterruptMaskFromISR(uint32_t ulNewMask);
9290

93-
#define interrupts() vClearInterruptMaskFromISR(0)
91+
#define interrupts() vClearInterruptMaskFromISR(0)
9492
#define noInterrupts() ulSetInterruptMaskFromISR()
9593

96-
#define lowByte(w) ((uint8_t) ((w) & 0xff))
97-
#define highByte(w) ((uint8_t) ((w) >> 8))
94+
#define lowByte(w) ((uint8_t)((w) & 0xff))
95+
#define highByte(w) ((uint8_t)((w) >> 8))
9896

99-
#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
100-
#define bitSet(value, bit) ((value) |= (1UL << (bit)))
101-
#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
97+
#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
98+
#define bitSet(value, bit) ((value) |= (1UL << (bit)))
99+
#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
102100
#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
103101

104102
typedef unsigned int word;
105103

106104
#define bit(b) (1UL << (b))
107105

108106
// TODO: to be checked
109-
typedef uint8_t boolean ;
110-
typedef uint8_t byte ;
107+
typedef uint8_t boolean;
108+
typedef uint8_t byte;
111109

112110

113111
#ifdef __cplusplus
114-
} // extern "C"
115-
#endif // __cplusplus
112+
} // extern "C"
113+
#endif // __cplusplus
116114

117115
#endif /* _WIRING_CONSTANTS_ */

0 commit comments

Comments
 (0)