alex/GY-63_MS5611
1
0
Fork 0
mirror of https://github.com/RobTillaart/Arduino.git synced 2024-10-03 18:09:02 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge solved

Browse Source
This commit is contained in:
rob tillaart 2015-03-08 00:19:11 +01:00
commit 87bf6e2cea
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/XMLWriter/XMLWriter.cpp
View File

@ -175,12 +175,21 @@ void XMLWriter::writeNode(char* tag, uint8_t value, uint8_t base)
}
void XMLWriter::writeNode(char* tag, uint16_t value, uint8_t base)
<<<<<<< HEAD
{
writeNode(tag, (uint32_t) value, base);
}
void XMLWriter::writeNode(char* tag, uint32_t value, uint8_t base)
{
=======
{
writeNode(tag, (uint32_t) value, base);
}
void XMLWriter::writeNode(char* tag, uint32_t value, uint8_t base)
{
>>>>>>> 35b6713f81bd68c64c2fc4ee7a9607716e0769ba
tagOpen(tag, "", NONEWLINE);
_stream->print(value, base);
tagClose(NOINDENT);