wn/mbusgateway3variant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

valist in logMsg, test on platform

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-10-29 20:50:50 +01:00
parent b55d74a9cd
commit e476930526
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cube/User/Src/logger.c
View File

@ -8,10 +8,8 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#ifdef TEST
#include <stdarg.h>
#include <stdio.h>
#endif
#include <logger.h>
@ -20,8 +18,10 @@
#ifdef TEST
#define LOGBUFFER_SIZE 32
#define MSGBUFFER_SIZE 16
#else
#define LOGBUFFER_SIZE 1024
#define MSGBUFFER_SIZE 64
#endif // TEST
@ -60,18 +60,25 @@ static void flashGreenLed(void *handle) {
}
#endif // TEST
int logMsg(char *msg) {
int logMsg(const char *format, ...) {
int res = -1;
char msgBuffer[MSGBUFFER_SIZE];
if (-1 == (res = ringbufferPut(&logBuffer, (uint8_t*) msg, strlen(msg)))) {
va_list vl;
va_start(vl, format);
int vcnt = vsnprintf(msgBuffer, MSGBUFFER_SIZE, format, vl);
va_end(vl);
if (vcnt < MSGBUFFER_SIZE) {
if (-1 == (res = ringbufferPut(&logBuffer, (uint8_t*) msgBuffer, strlen(msgBuffer)))) {
#ifndef TEST
// blink the green light or so
flashGreenLed(NULL);
schAdd(flashGreenLed, NULL, 100, 0);
// blink the green light or so
flashGreenLed(NULL);
schAdd(flashGreenLed, NULL, 100, 0);
#else
printf("\n*** green blink ***\n");
printf("\n*** green blink ***\n");
#endif // TEST
}
}
return res;
}