3 Commits

Author SHA1 Message Date
cedricAbonnel
c0439ba12e Update makefile
LibTeleinfo.h path have changed
2020-08-27 20:50:04 +02:00
Charles
8bdba6f2a5 Fix buffer size 2020-06-14 21:39:37 +02:00
Charles
4e2a5b603d Bump to 1.1.2 2020-06-14 21:39:03 +02:00
4 changed files with 8 additions and 8 deletions

View File

@@ -6,8 +6,8 @@ CFLAGS=-DRASPBERRY_PI
all: raspjson all: raspjson
# ===== Compile # ===== Compile
LibTeleinfo.o: ../../LibTeleinfo.cpp LibTeleinfo.o: ../../src/LibTeleinfo.cpp
$(CC) $(CFLAGS) -c ../../LibTeleinfo.cpp $(CC) $(CFLAGS) -c ../../src/LibTeleinfo.cpp
raspjson.o: raspjson.cpp raspjson.o: raspjson.cpp
$(CC) $(CFLAGS) -c raspjson.cpp $(CC) $(CFLAGS) -c raspjson.cpp
@@ -18,4 +18,4 @@ raspjson: raspjson.o LibTeleinfo.o
clean: clean:
rm -f *.o raspjson rm -f *.o raspjson

View File

@@ -1,6 +1,6 @@
{ {
"name": "LibTeleinfo", "name": "LibTeleinfo",
"version": "1.1.1", "version": "1.1.2",
"keywords": "teleinfo, french, meter, power, erdf, linky, tic", "keywords": "teleinfo, french, meter, power, erdf, linky, tic",
"description": "Decoder for Teleinfo (aka TIC) from French smart power meters", "description": "Decoder for Teleinfo (aka TIC) from French smart power meters",
"repository": "repository":

View File

@@ -1,5 +1,5 @@
name=LibTeleinfo name=LibTeleinfo
version=1.1.1 version=1.1.2
author=Charles-Henri Hallard <hallard.me> author=Charles-Henri Hallard <hallard.me>
maintainer=Charles-Henri Hallard <community.hallard.me> maintainer=Charles-Henri Hallard <community.hallard.me>
sentence=Decoder for Teleinfo (aka TIC) from French smart power meters sentence=Decoder for Teleinfo (aka TIC) from French smart power meters

View File

@@ -422,12 +422,12 @@ char * TInfo::valueGet(char * name, char * value)
me = me->next; me = me->next;
// Check if we match this LABEL // Check if we match this LABEL
if (lgname==strlen(me->name) && strncmp(me->name, name, lgname)==0) { if (lgname==strlen(me->name) && strcmp(me->name, name)==0) {
// this one has a value ? // this one has a value ?
if (me->value) { if (me->value) {
// copy to dest buffer // copy to dest buffer
uint8_t lgvalue = strlen(me->value); uint8_t lgvalue = strlen(me->value);
strlcpy(value, me->value , lgvalue ); strlcpy(value, me->value , lgvalue + 1 );
return ( value ); return ( value );
} }
} }
@@ -662,7 +662,7 @@ ValueList * TInfo::checkLine(char * pline)
return NULL; return NULL;
// Get our own working copy // Get our own working copy
strlcpy( buff, _recv_buff, len+1); strlcpy( buff, pline, len+1);
p = &buff[0]; p = &buff[0];
ptok = p; // for sure we start with token name ptok = p; // for sure we start with token name