vcs.slashdirt.org Git - sw/tic2json.git/commitdiff

diff --git a/ChangeLog b/ChangeLog

index a5029f880a4aff91889313d207dca4ba71f82b97..36c77c87602e6bf6e33035a10ce92d90b3853325 100644 (file)

--- a/ChangeLog

+++ b/ChangeLog

+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 9d899494c051d5663473334d4cd980bc265f9725..9db0dfd8fca22e075ad9c2c223082eac28c5a33a 100644 (file)

--- a/README.md

+++ b/README.md

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,

- **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

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`.

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 d3740da5d1c584463b120da39de9a1c9cf888e25..597e0a475f1e5b7163799f6cc817785048a80101 100644 (file)

--- a/src/tic2json.c

+++ b/src/tic2json.c

// 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

//

#endif /* PRINT2BUF */

#endif /* BAREBUILD */

-#define TIC2JSON_VER "2.3"

+#define TIC2JSON_VER "2.4"

extern bool filter_mode;

extern bool *etiq_en;