From: Thibaut VARÈNE Date: 2023年7月19日 09:36:06 +0000 (+0200) Subject: Version 2.4 X-Git-Tag: v2.4 X-Git-Url: http://vcs.slashdirt.org/git/?a=commitdiff_plain;h=40dad444f1534dcf09cf367e5abbc99446820a2c;p=sw%2Ftic2json.git Version 2.4 --- diff --git a/ChangeLog b/ChangeLog index a5029f8..36c77c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2.4 + * Implement decoder for TIC v02 "PJOURF+1"/"PPOINTE" (-p) + * Improve processing script to parse TEMPO data + 2.3 * Implement partial support for PME-PMI (sponsored by Wiztivi) diff --git a/README.md b/README.md index 9d89949..9db0dfd 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Example Grafana dashboard: GPLv2-only - http://www.gnu.org/licenses/gpl-2.0.html -Copyright: (C) 2021-2022 Thibaut VARÈNE +Copyright: (C) 2021-2023 Thibaut VARÈNE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, @@ -58,7 +58,7 @@ TIC output from electronic meters is either: - **7E1@1200bps** for "historique" mode - **7E1@9600bps** for "standard" mode - For *PME-PMI* meters, the output is **7E1** at a speed set by Enedis (1200 (default), 2400, 4800, 9600 or 19200bps). +For *PME-PMI* meters, the output is **7E1** at a speed set by Enedis (1200 (default), 2400, 4800, 9600 or 19200bps). ## Notes @@ -109,6 +109,8 @@ stdbuf -oL ./tic2json -2 -dr < /dev/ttyS0 | while read line; do echo "$line" | n Will only log `EAST`, `IRMS1`, `URMS1`, `SINSTS`, `SMAXSN` and `UMOY1`, tagged with `PRM` (the meter's ID), at the timestamp provided by the meter. +Note: the 'xpath_json' format parser may be an even better choice than `json_v2`. Setup is left as an exercise for the reader. + Note: 'socket_listener' expects _exactly_ 1 JSON object per UDP packet (decoding of data is done on a per-packet basis), hence the need to send each line individually with `nc`. Another alternative is to use the script provided in `tools/ticprocess.py`. @@ -128,6 +130,8 @@ The following configuration can be used with telegraf's JSON_v2 parser to correc The timestamps will be logged following the telegraf server timezone which is assumed to be the same as that of the meter (adjust as necessary). +Note: if using Telegraf to ingest the data, the 'xpath_json' format parser may actually be more suitable as it makes handling underscores in labels easier. + ## Embedded applications The following embedded applications are based on this tool diff --git a/src/tic2json.c b/src/tic2json.c index d3740da..597e0a4 100644 --- a/src/tic2json.c +++ b/src/tic2json.c @@ -2,7 +2,7 @@ // tic2json.c // A tool to turn ENEDIS TIC data into pure JSON // -// (C) 2021-2022 Thibaut VARENE +// (C) 2021-2023 Thibaut VARENE // License: GPLv2 - http://www.gnu.org/licenses/gpl-2.0.html // @@ -81,7 +81,7 @@ #endif /* PRINT2BUF */ #endif /* BAREBUILD */ -#define TIC2JSON_VER "2.3" +#define TIC2JSON_VER "2.4" extern bool filter_mode; extern bool *etiq_en;

AltStyle によって変換されたページ (->オリジナル) /