From fc93b0547625777bc3e115cb260d1df38b0821c3 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 1 Jan 2021 13:57:04 +0100 Subject: [PATCH] Happy New Year --- .../TasmotaSerial-3.1.0/src/TasmotaSerial.cpp | 2 +- .../TasmotaSerial-3.1.0/src/TasmotaSerial.h | 2 +- lib/default/UdpListener/src/UdpListener.h | 2 +- .../src/UnishoxStrings.cpp | 2 +- .../src/UnishoxStrings.h | 22 +++++++++---------- .../jsmn-shadinger-1.0/src/JsonGenerator.cpp | 2 +- .../jsmn-shadinger-1.0/src/JsonGenerator.h | 2 +- .../jsmn-shadinger-1.0/src/JsonParser.cpp | 2 +- .../jsmn-shadinger-1.0/src/JsonParser.h | 4 ++-- .../TasmotaModbus-1.2.0/src/TasmotaModbus.cpp | 2 +- .../TasmotaModbus-1.2.0/src/TasmotaModbus.h | 2 +- .../ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp | 2 +- .../ESP32-to-ESP8266-compat/src/ESP8266WiFi.h | 2 +- tools/decode-status.py | 2 +- tools/serial-plotter.py | 3 +-- tools/templates/templates.py | 2 +- 16 files changed, 27 insertions(+), 28 deletions(-) diff --git a/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.cpp b/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.cpp index d7ac0866e..1d0445351 100644 --- a/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.cpp +++ b/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.cpp @@ -1,7 +1,7 @@ /* TasmotaSerial.cpp - Implementation of software serial with hardware serial fallback for Tasmota - Copyright (C) 2020 Theo Arends + Copyright (C) 2021 Theo Arends This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.h b/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.h index bc5161d65..2a97741e3 100644 --- a/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.h +++ b/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.h @@ -1,7 +1,7 @@ /* TasmotaSerial.h - Implementation of software serial with hardware serial fallback for Tasmota - Copyright (C) 2020 Theo Arends + Copyright (C) 2021 Theo Arends This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/default/UdpListener/src/UdpListener.h b/lib/default/UdpListener/src/UdpListener.h index b4f5af93b..57bce0dae 100644 --- a/lib/default/UdpListener/src/UdpListener.h +++ b/lib/default/UdpListener/src/UdpListener.h @@ -1,7 +1,7 @@ /* UdpListener.h - webserver for Tasmota - Copyright (C) 2020 Theo Arends & Stephan Hadinger + Copyright (C) 2021 Theo Arends & Stephan Hadinger This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/default/Unishox-1.0-shadinger/src/UnishoxStrings.cpp b/lib/default/Unishox-1.0-shadinger/src/UnishoxStrings.cpp index 223399e2f..22b8cbcc3 100644 --- a/lib/default/Unishox-1.0-shadinger/src/UnishoxStrings.cpp +++ b/lib/default/Unishox-1.0-shadinger/src/UnishoxStrings.cpp @@ -1,7 +1,7 @@ /* UnishoxStrings.c - support library for compressed strings in Flash - Copyright (C) 2020 Theo Arends and Stephan Hadinger + Copyright (C) 2021 Theo Arends and Stephan Hadinger This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/default/Unishox-1.0-shadinger/src/UnishoxStrings.h b/lib/default/Unishox-1.0-shadinger/src/UnishoxStrings.h index 12de778d4..3ded62ffe 100644 --- a/lib/default/Unishox-1.0-shadinger/src/UnishoxStrings.h +++ b/lib/default/Unishox-1.0-shadinger/src/UnishoxStrings.h @@ -1,7 +1,7 @@ /* UnishoxStrings.c - support library for compressed strings in Flash - Copyright (C) 2020 Theo Arends and Stephan Hadinger + Copyright (C) 2021 Theo Arends and Stephan Hadinger This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,18 +28,18 @@ /*******************************************************************************************/ /* * UnishoxStrings compressed literal strings - * + * * To be typically used for web UI to have multiple strings like JS, CSS, HTML * compressed in a single list of small strings. This is where Unishox shines. - * + * * Strings before compression are separated with NULL chars, which makes them ready to use * once you know the offset in the global array. - * + * * The list of string is marked by an empty stings, i.e. two consecutive NULL chars - * + * * To distinguish from uncompressed templates, and to indicate the global size * the compressed array is prefixed with NULL and the uncompressed size * 16 bytes. - * + * * Compressed format: * - Byte 00 : \00 - if non-null, then it is not compressed * - Byte 01 : - uncompressed size is * 16 bytes (always rounded up) @@ -54,22 +54,22 @@ * This class is initialzed with either a PMEM uncompressed list of strings * or a PMEM unishox-compressed list of strings; in this case RAM is allocated * to hold the uncompressed data, until the class gets out of scope. - * + * * To encode, use https://tasmota.hadinger.fr/util * and use the "Compress strings template with unishox" * past the C code for the strings, and copy/paste the result * (don't foget to rename the variable). - * + * * Input: * Each string must be terminated with an explicit NULL char "\0". The list is hence * terminated with a double-NULL. - * + * * Each string is then indexed as its byte offset in the whole template. * The offsets are computed at the same time as the compressed version. * You need to use the online compressor even if you don't use the comrpessed version. - * + * * Indexes are marked as C++ comments starting with "//=" - * + * * Example input: * con * // start of strings diff --git a/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.cpp b/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.cpp index 0bdd77768..b823c58d9 100644 --- a/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.cpp +++ b/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.cpp @@ -1,7 +1,7 @@ /* JsonGenerator.cpp - lightweight JSON parser - Copyright (C) 2020 Stephan Hadinger + Copyright (C) 2021 Stephan Hadinger This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.h b/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.h index 589c60167..2f27b846b 100644 --- a/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.h +++ b/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.h @@ -1,7 +1,7 @@ /* JsonGenerator.h - lightweight JSON generator - Copyright (C) 2020 Stephan Hadinger + Copyright (C) 2021 Stephan Hadinger This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/default/jsmn-shadinger-1.0/src/JsonParser.cpp b/lib/default/jsmn-shadinger-1.0/src/JsonParser.cpp index 050505d07..73703d6ed 100644 --- a/lib/default/jsmn-shadinger-1.0/src/JsonParser.cpp +++ b/lib/default/jsmn-shadinger-1.0/src/JsonParser.cpp @@ -1,7 +1,7 @@ /* JsonParser.cpp - lightweight JSON parser - Copyright (C) 2020 Stephan Hadinger + Copyright (C) 2021 Stephan Hadinger This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/default/jsmn-shadinger-1.0/src/JsonParser.h b/lib/default/jsmn-shadinger-1.0/src/JsonParser.h index 85d401407..a31f28c91 100644 --- a/lib/default/jsmn-shadinger-1.0/src/JsonParser.h +++ b/lib/default/jsmn-shadinger-1.0/src/JsonParser.h @@ -1,7 +1,7 @@ /* JsonParser.h - lightweight JSON parser - Copyright (C) 2020 Stephan Hadinger + Copyright (C) 2021 Stephan Hadinger This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -228,7 +228,7 @@ public: // destructor ~JsonParser(); - + // set the current buffer for attribute access (i.e. set the global) void setCurrent(void) { k_current_json_buffer = _json; } diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp b/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp index 057001779..b1a8c48f8 100644 --- a/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp +++ b/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp @@ -1,7 +1,7 @@ /* TasmotaModbus.cpp - Basic modbus wrapper for TasmotaSerial for Tasmota - Copyright (C) 2020 Theo Arends + Copyright (C) 2021 Theo Arends This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h b/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h index 4a5fbc7a8..22d4e12f3 100644 --- a/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h +++ b/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h @@ -1,7 +1,7 @@ /* TasmotaModbus.h - Basic modbus wrapper for TasmotaSerial for Tasmota - Copyright (C) 2020 Theo Arends + Copyright (C) 2021 Theo Arends This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp index a72d95cb6..0e26883ba 100644 --- a/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp +++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp @@ -1,7 +1,7 @@ /* WiFi compat with ESP32 - Copyright (C) 2020 Theo Arends / Jörg Schüler-Maroldt + Copyright (C) 2021 Theo Arends / Jörg Schüler-Maroldt This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h index df9f54273..9649f49f5 100644 --- a/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h +++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h @@ -1,7 +1,7 @@ /* WiFi compat with ESP32 - Copyright (C) 2020 Theo Arends / Jörg Schüler-Maroldt + Copyright (C) 2021 Theo Arends / Jörg Schüler-Maroldt This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tools/decode-status.py b/tools/decode-status.py index 678cf5a73..aa2bfc4e1 100755 --- a/tools/decode-status.py +++ b/tools/decode-status.py @@ -3,7 +3,7 @@ """ decode-status.py - decode status for Tasmota - Copyright (C) 2020 Theo Arends + Copyright (C) 2021 Theo Arends This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tools/serial-plotter.py b/tools/serial-plotter.py index 83ec6dba6..2e08e2c62 100644 --- a/tools/serial-plotter.py +++ b/tools/serial-plotter.py @@ -3,7 +3,7 @@ """ serial-plotter.py - for Tasmota - Copyright (C) 2020 Christian Baars + Copyright (C) 2021 Christian Baars This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -189,4 +189,3 @@ text_box.on_submit(submit) if ser.is_open==True: plt.show() - \ No newline at end of file diff --git a/tools/templates/templates.py b/tools/templates/templates.py index 5387ceaaa..5a6cea513 100644 --- a/tools/templates/templates.py +++ b/tools/templates/templates.py @@ -3,7 +3,7 @@ """ templates.py - template beautify TEMPLATES.md for Tasmota - Copyright (C) 2020 Theo Arends + Copyright (C) 2021 Theo Arends This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by