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

diff --git a/ChangeLog b/ChangeLog

index b80cbc7464d00f44c62cdca5454017858714ebb5..2e64762f8a5300eb4fe6fa7730fe99ab29b4cb57 100644 (file)

--- a/ChangeLog

+++ b/ChangeLog

+2.1

+ * Add '-V' commandline option to print version

+ * Simplify BAREBUILD and add embedded recipes

+ * Improve code documentation

+ * Add embedded stubs

+

2.0

* Support TIC version 01 ("historique") for Linky, Bleu & CTR

* Purify parsers so they can be used for any output producer

diff --git a/README.md b/README.md

index f555dbb062b27c1e171ccdb4cf60f132e9009064..4d484d35de4eb2bab13124e101cc46659d87ead1 100644 (file)

--- a/README.md

+++ b/README.md

modify it under the terms of the GNU General Public License version 2,

as published by the Free Software Foundation.

+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;

+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+

See LICENSE.md for details

## Dependencies

The current implementation supports TIC versions **01** and **02** (a.k.a *historique* and *standard* modes).

-A tty interfaced to the meter TIC output can be set using the following `stty`

-settings:

+A tty interfaced to the meter TIC output (using e.g. [TIC2UART](http://hacks.slashdirt.org/hw/tic2uart/))

+can be set using the following `stty` settings:

```sh

stty -F <serial_tty> <speed> raw evenp

Where `<serial_tty>` is the target tty (e.g. `/dev/ttyS0`) and `<speed>` is either 1200 or 9600.

TIC output from electronic meters is either:

- - 7E1@1200bps for "historique" mode

- - 7E1@9600bps for "standard" mode

+ - **7E1@1200bps** for "historique" mode

+ - **7E1@9600bps** for "standard" mode

## Notes

The following command line can be used to send adequate data:

```sh

-stdbuf -oL ./tic2json -2 < /dev/ttyS0 2>/dev/null | while read line; do echo "$line" | nc -q 0 -u telegraf_host 8094; done

+stdbuf -oL ./tic2json -2 < /dev/ttyS0 | while read line; do echo "$line" | nc -q 0 -u telegraf_host 8094; done

```

## Embedded applications

- Espressif ESP8266 and ESP32

- Raspberry Pi Pico

+- ARM Mbed (not functional)

+

+These are very simple stubs that (ab)use the stdio interface provided by these platforms.

diff --git a/tic2json.c b/tic2json.c

index f841c18b61258cfbf54914b38560751619e5e0c8..b0de76ba17f36305bf2f37345c9971d2b19d318a 100644 (file)

--- a/tic2json.c

+++ b/tic2json.c

#warning BAREBUILD currently requires defining only one version of supported TIC and does not provide main()

#endif

-#define TIC2JSON_VER "2.0"

+#define TIC2JSON_VER "2.1"

extern bool filter_mode;

extern bool *etiq_en;