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

fix logger (lost first two chars) and setting meterbus uart (8bit data plus parity, so 9bit incl. parity)

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-10-29 23:16:03 +01:00
parent 6ccf85abdb
commit 877dd0fca3
8 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/test.c
View File

@ -834,8 +834,9 @@ void testLogger0() {
#ifdef DEBUG
printf("\nLog a message\n");
#endif
char goldValue1[] = "Wolfgang\n";
logMsg(goldValue1);
char msg[] = "Wolfgang";
char goldValue[] = "Wolfgang\r\n";
logMsg(msg);
#ifdef DEBUG
printf("\nRead all chars from logging\n");
@ -850,7 +851,8 @@ void testLogger0() {
buffer[i] = (uint8_t) c;
i++;
}
CU_ASSERT(strcmp(goldValue1, buffer) == 0);
// printf(buffer);
CU_ASSERT(strcmp(goldValue, buffer) == 0);
}
void testLogger1() {
@ -859,18 +861,18 @@ void testLogger1() {
#endif
char goldValueFull[128];
memset(goldValueFull, 0, 128);
char goldValue1[] = "Wolfgang\n"; // 9
char goldValue1[] = "Wolfgang"; // 9
strcat(goldValueFull, goldValue1);
strcat(goldValueFull, "\r\n");
logMsg(goldValue1);
char goldValue2[] = "Andreas\n"; // +8 = 17
char goldValue2[] = "Andreas"; // +8 = 17
strcat(goldValueFull, goldValue2);
strcat(goldValueFull, "\r\n");
logMsg(goldValue2);
char goldValue3[] = "Frank\n"; // +6 = 23
char goldValue3[] = "Frank"; // +6 = 23
strcat(goldValueFull, goldValue3);
strcat(goldValueFull, "\r\n");
logMsg(goldValue3);
char goldValue4[] = "Thomas\n"; // +7 = 30
strcat(goldValueFull, goldValue4);
logMsg(goldValue4);
#ifdef DEBUG
printf("\nRead all chars from logging\n");
@ -898,27 +900,33 @@ void testLogger2() {
memset(goldValueFullNotOk, 0, 128);
char goldValueFullOk[128];
memset(goldValueFullOk, 0, 128);
char goldValue1[] = "Wolfgang\n"; // 9
char goldValue1[] = "Wolfgang"; // 9
strcat(goldValueFullNotOk, goldValue1);
strcat(goldValueFullOk, goldValue1);
strcat(goldValueFullNotOk, "\r\n");
strcat(goldValueFullOk, "\r\n");
int r = logMsg(goldValue1);
CU_ASSERT(r == 0);
char goldValue2[] = "Andreas\n"; // +8 = 17
char goldValue2[] = "Andreas"; // +8 = 17
strcat(goldValueFullNotOk, goldValue2);
strcat(goldValueFullOk, goldValue2);
strcat(goldValueFullNotOk, "\r\n");
strcat(goldValueFullOk, "\r\n");
r = logMsg(goldValue2);
CU_ASSERT(r == 0);
char goldValue3[] = "Frank\n"; // +6 = 23
char goldValue3[] = "Frank"; // +6 = 23
strcat(goldValueFullNotOk, goldValue3);
strcat(goldValueFullOk, goldValue3);
strcat(goldValueFullNotOk, "\r\n");
strcat(goldValueFullOk, "\r\n");
r = logMsg(goldValue3);
CU_ASSERT(r == 0);
char goldValue4[] = "Thomas\n"; // +7 = 30
char goldValue4[] = "Thomas"; // +7 = 30
strcat(goldValueFullNotOk, goldValue4);
strcat(goldValueFullOk, goldValue4);
strcat(goldValueFullNotOk, "\r\n");
r = logMsg(goldValue4);
CU_ASSERT(r == 0);
char goldValue5[] = "Barbara\n"; // +8 = 38, too much
CU_ASSERT(r == -1);
char goldValue5[] = "Barbara"; // +8 = 38, too much
strcat(goldValueFullNotOk, goldValue5);
r = logMsg(goldValue5);
CU_ASSERT(r == -1);