Skip to content

Commit 02db3e7

Browse files
committed
Fix mbed_memory_status compilation
1 parent 11bbbf9 commit 02db3e7

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

libraries/mbed-memory-status/mbed_memory_status.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
// platform/mbed_version.h says:
3939
// 999999 is default value for development version (master branch)
4040

41-
#include "mbed.h"
41+
#include "Arduino.h"
4242

4343
// Critical sections header file renamed in mbed OS 5.4 release
4444
// See: https://github.com/ARMmbed/mbed-os/commit/aff49d8d1e3b5d4dc18286b0510336c36ae9603c
@@ -205,21 +205,21 @@ static void nway_print_label(const char * label)
205205
#endif
206206
}
207207

208-
static const char HEX[] = "0123456789ABCDEF";
208+
static const char _HEX[] = "0123456789ABCDEF";
209209

210210
static void debug_print_u32(uint32_t u32)
211211
{
212212
char output[9] = {0};
213213

214214
// Always printed as big endian.
215-
output[0] = HEX[(((uint32_t) u32 & 0xf0000000) >> 28)];
216-
output[1] = HEX[(((uint32_t) u32 & 0x0f000000) >> 24)];
217-
output[2] = HEX[(((uint32_t) u32 & 0x00f00000) >> 20)];
218-
output[3] = HEX[(((uint32_t) u32 & 0x000f0000) >> 16)];
219-
output[4] = HEX[(((uint32_t) u32 & 0x0000f000) >> 12)];
220-
output[5] = HEX[(((uint32_t) u32 & 0x00000f00) >> 8)];
221-
output[6] = HEX[(((uint32_t) u32 & 0x000000f0) >> 4)];
222-
output[7] = HEX[(((uint32_t) u32 & 0x0000000f) >> 0)];
215+
output[0] = _HEX[(((uint32_t) u32 & 0xf0000000) >> 28)];
216+
output[1] = _HEX[(((uint32_t) u32 & 0x0f000000) >> 24)];
217+
output[2] = _HEX[(((uint32_t) u32 & 0x00f00000) >> 20)];
218+
output[3] = _HEX[(((uint32_t) u32 & 0x000f0000) >> 16)];
219+
output[4] = _HEX[(((uint32_t) u32 & 0x0000f000) >> 12)];
220+
output[5] = _HEX[(((uint32_t) u32 & 0x00000f00) >> 8)];
221+
output[6] = _HEX[(((uint32_t) u32 & 0x000000f0) >> 4)];
222+
output[7] = _HEX[(((uint32_t) u32 & 0x0000000f) >> 0)];
223223

224224
nway_print_label(output);
225225
}

0 commit comments

Comments
 (0)