mirror of
https://github.com/lumapu/ahoy.git
synced 2025-06-09 22:21:39 +02:00
Merge branch 'development03' into hms
This commit is contained in:
commit
3d82e127f8
12 changed files with 40 additions and 16 deletions
|
@ -190,7 +190,7 @@ class Web {
|
|||
|
||||
msg.replace("\r\n", "<rn>");
|
||||
if(mSerialAddTime) {
|
||||
if((9 + mSerialBufFill) <= WEB_SERIAL_BUF_SIZE) {
|
||||
if((9 + mSerialBufFill) < WEB_SERIAL_BUF_SIZE) {
|
||||
if(mApp->getTimestamp() > 0) {
|
||||
strncpy(&mSerialBuf[mSerialBufFill], mApp->getTimeStr(mApp->getTimezoneOffset()).c_str(), 9);
|
||||
mSerialBufFill += 9;
|
||||
|
@ -208,7 +208,7 @@ class Web {
|
|||
mSerialAddTime = true;
|
||||
|
||||
uint16_t length = msg.length();
|
||||
if((length + mSerialBufFill) <= WEB_SERIAL_BUF_SIZE) {
|
||||
if((length + mSerialBufFill) < WEB_SERIAL_BUF_SIZE) {
|
||||
strncpy(&mSerialBuf[mSerialBufFill], msg.c_str(), length);
|
||||
mSerialBufFill += length;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue