Some adjustmenst

Dev v2.1.0

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ["https://paypal.me/gskjold"]

.github/workflows/build.yml

@@ -32,16 +32,14 @@ jobs:
       with:
         path: ~/.pio/libdeps
         key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
-    - name: Set up Python 3.7
+    - name: Set up Python 3.9
       uses: actions/setup-python@v1
       with:
-        python-version: 3.7
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -U platformio css_html_js_minify
-    - name: Configure build targets
-      run: echo "[platformio]\ndefault_envs = esp8266, esp32" > platformio-user.ini
     - name: PlatformIO lib install
       run: pio lib install
     - name: PlatformIO run

.github/workflows/release.yml

@@ -33,10 +33,10 @@ jobs:
       with:
         path: ~/.pio/libdeps
         key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
-    - name: Set up Python 3.7
+    - name: Set up Python 3.9
       uses: actions/setup-python@v1
       with:
-        python-version: 3.7
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -45,6 +45,8 @@ jobs:
       run: pio lib install
     - name: PlatformIO run
       run: pio run
+    - name: Create zip files
+      run: /bin/sh scripts/mkzip.sh
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1.0.0
@@ -55,6 +57,35 @@ jobs:
         release_name: Release ${{ github.ref }}
         draft: false
         prerelease: false
+
+    - name: Upload esp8266 zip to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: esp8266.zip
+        asset_name: ams2mqtt-esp8266-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip
+    - name: Upload esp32 zip to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: esp32.zip
+        asset_name: ams2mqtt-esp32-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip
+    - name: Upload esp32s2 zip to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: esp32s2.zip
+        asset_name: ams2mqtt-esp32s2-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip
+
     - name: Upload esp8266 binary to release
       uses: actions/upload-release-asset@v1
       env:
@@ -73,12 +104,21 @@ jobs:
         asset_path: .pio/build/esp32/firmware.bin
         asset_name: ams2mqtt-esp32-${{ steps.release_tag.outputs.tag }}.bin
         asset_content_type: application/octet-stream
-    - name: Upload esp32 partitions to release
+    - name: Upload esp32solo binary to release
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: .pio/build/esp32/partitions.bin
-        asset_name: ams2mqtt-esp32-partitions-${{ steps.release_tag.outputs.tag }}.bin
+        asset_path: .pio/build/esp32solo/firmware.bin
+        asset_name: ams2mqtt-esp32solo-${{ steps.release_tag.outputs.tag }}.bin
+        asset_content_type: application/octet-stream
+    - name: Upload esp32s2 binary to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: .pio/build/esp32s2/firmware.bin
+        asset_name: ams2mqtt-esp32s2-${{ steps.release_tag.outputs.tag }}.bin
         asset_content_type: application/octet-stream

.gitignore

@@ -14,3 +14,4 @@ platformio-user.ini
 /web/test.html
 /sdkconfig
 /.tmp
+/*.zip

LICENSE

@@ -0,0 +1,617 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.

doc/Denmark/Kamstrup_encrypted_OBIS.txt

@@ -2,7 +2,7 @@
 1.1.2.8.0.255 - Active- Energy
 1.1.3.8.0.255 - Reactive+ Energy
 1.1.4.8.0.255 - Reactive- Energy
-1.1.0.0.1.255 - Electricity ID?
+1.1.0.0.1.255 - Meter number 1
 1.1.1.7.0.255 - Active+ Instantaneous value
 1.1.2.7.0.255 - Active- Instantaneous value
 1.1.3.7.0.255 - Reactive+ Instantaneous value

frames/Kamstrup-1p.raw

@@ -0,0 +1,51 @@
+7E A0 BA 2B 21 13 ED AA E6 E7 00 0F 00 00 00 00
+0C 07 E6 02 05 06 0D 00 0A FF 80 00 00 
+02 19 
+0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 
+09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37 
+09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30 
+09 06 01 01 01 07 00 FF 06 00 00 02 68 
+09 06 01 01 02 07 00 FF 06 00 00 00 00 
+09 06 01 01 03 07 00 FF 06 00 00 00 53 
+09 06 01 01 04 07 00 FF 06 00 00 00 00 
+09 06 01 01 1F 07 00 FF 06 00 00 01 22 
+00 00 00 00 
+09 06 01 01 20 07 00 FF 12 00 E2 
+00 00 00 00 
+05 D8 7E
+
+7E A0 BA 2B 21 13 ED AA E6 E7 00 0F 00 00 00 00
+0C 07 E6 02 05 06 0D 00 14 FF 80 00 00 
+02 19 
+0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 
+09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37 
+09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30 
+09 06 01 01 01 07 00 FF 06 00 00 02 68 
+09 06 01 01 02 07 00 FF 06 00 00 00 00 
+09 06 01 01 03 07 00 FF 06 00 00 00 53 
+09 06 01 01 04 07 00 FF 06 00 00 00 00 
+09 06 01 01 1F 07 00 FF 06 00 00 01 23 
+00 00 00 00 
+09 06 01 01 20 07 00 FF 12 00 E1 
+00 00 00 00 
+8E 5E 7E
+
+7E A1 04 2B 21 13 77 6E E6 E7 00 0F 00 00 00 00
+0C 07 E6 02 05 06 0D 00 19 FF 80 00 00 
+02 23 0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 
+09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37 
+09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30 
+09 06 01 01 01 07 00 FF 06 00 00 02 6B 
+09 06 01 01 02 07 00 FF 06 00 00 00 00 
+09 06 01 01 03 07 00 FF 06 00 00 00 54 
+09 06 01 01 04 07 00 FF 06 00 00 00 00 
+09 06 01 01 1F 07 00 FF 06 00 00 01 25 
+00 00 00 00 
+09 06 01 01 20 07 00 FF 12 00 E1 
+00 00 00 00 
+09 06 00 01 01 00 00 FF 09 0C 07 E6 02 05 06 0D 00 19 FF 80 00 00 
+09 06 01 01 01 08 00 FF 06 00 12 CF 93 
+09 06 01 01 02 08 00 FF 06 00 00 00 00
+09 06 01 01 03 08 00 FF 06 00 00 8C CE 
+09 06 01 01 04 08 00 FF 06 00 05 E5 04 
+7F E9 7E

frames/Kamstrup-Sweden.raw

@@ -0,0 +1,23 @@
+7E A1 2C 2B 21 13 FC 04 E6 E7 00 0F 00 00 00 00
+0C 07 E6 02 12 05 16 00 23 FF 80 00 00 
+02 23 
+0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 
+09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 33 33 31 33 32 33 35 32 36 
+09 06 01 01 60 01 01 FF 0A 12 36 38 34 31 31 33 31 42 4E 32 34 35 31 30 31 30 39 32 
+09 06 01 01 01 07 00 FF 06 00 00 08 DD 
+09 06 01 01 02 07 00 FF 06 00 00 00 00 
+09 06 01 01 03 07 00 FF 06 00 00 00 00 
+09 06 01 01 04 07 00 FF 06 00 00 01 90 
+09 06 01 01 1F 07 00 FF 06 00 00 01 1F 
+09 06 01 01 33 07 00 FF 06 00 00 02 57 
+09 06 01 01 47 07 00 FF 06 00 00 00 6A
+09 06 01 01 20 07 00 FF 12 00 F1 
+09 06 01 01 34 07 00 FF 12 00 F0 
+09 06 01 01 48 07 00 FF 12 00 F3 
+09 06 00 01 01 00 00 FF 09 0C 07 E6 02 12 05 16 00 23 FF 80 00 00 
+09 06 01 01 01 08 00 FF 06 01 E8 7F 4E 
+09 06 01 01 02 08 00 FF 06 00 00 00 00 
+09 06 01 01 03 08 00 FF 06 00 58 71 8B 
+09 06 01 01 04 08 00 FF 06 00 10 60 23 
+B8 1C 
+7E

frames/Kamstup-Encrypted.raw

@@ -6,7 +6,7 @@ DB // Encrypted
 08 4B 41 4D 45 01 AC 4D 6E // System title
 82 // Prefix for 2-byte length
 01 D0 // Length 464
-30 // Security tag 0011 0000, 0=Compression off, 0=Unicast, 1=Encryption, 0=Authentication, 0000= Security Suite ID
+30 // Security tag 0011 0000, 0=Compression off, 0=Unicast, 1=Encryption, 1=Authentication, 0000= Security Suite ID
 00 00 A3 2F // Frame counter
 
 // Decrypted frame below

frames/lng.raw

@@ -0,0 +1,45 @@
+7E // Flag
+A08B
+CEFF03
+13
+EEE1
+E6E700 
+E0 // GBT (Green book 9.4.6.13)
+40 // Block control 0100 0000, last block=no, streaming=yes, remainig=window
+0001 // Block sequence
+0000 // Block sequence ack
+77 // How many bytes in this block
+
+0F 00000DB7 // APDU tag, Invoke ID and priority 
+
+0C07E604020607220FFF800000 // Date and time
+0205 // Structure with 5 items
+0105 // Array with 5 items
+020412002809060008190900FF0F02120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (0-8:25.9.0;2)
+020412002809060008190900FF0F01120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (0-8:25.9.0;1)
+020412000109060000600101FF0F02120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (96.1.1 - Meter model)
+020412000309060100010700FF0F02120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (1.7.0 Active import)
+020412000309060100020700FF0F02120000 // Structure with 4 items, uint16, OBIS, int8, uint16 (2.7.0 Active export)
+09060008190900  // OBIS 0-8:25.9.0 Object list push settings consumer information 1
+ABA6
+7E
+
+
+
+7E
+A024
+CEFF03
+13
+D661
+E0 // GBT
+C0 // Block control 0100 0000, last block=yes, streaming=yes, remainig=window
+0002 // Block sequence
+0000 // Block sequence ack
+13 // How many bytes in this block
+
+FF // Last byte of OBIS in previous block
+0906363031313039 // Device ID
+0600000028 // Accumulated import
+0600000000 // Accumulated export
+8BA4
+7E

platformio.ini

@@ -7,26 +7,56 @@ lib_ignore = OneWire
 
 [env:esp8266]
 platform = espressif8266@3.2.0
+framework = arduino
 board = esp12e
 board_build.ldscript = eagle.flash.4m2m.ld
-framework = arduino
+build_flags = -D WEBSOCKET_DISABLED=1
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 extra_scripts =
     pre:scripts/addversion.py
     scripts/makeweb.py
-build_flags =
-    -D WEBSOCKET_DISABLED=1
-
 
 [env:esp32]
 platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-board = esp32dev
 framework = arduino
+board = esp32dev
+board_build.f_cpu = 160000000L
+build_flags = -D WEBSOCKET_DISABLED=1
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+extra_scripts =
+    pre:scripts/addversion.py
+    scripts/makeweb.py
+
+# Tasmota has pre-built platform for C3, S2, S3 and Solo, more information at:
+# https://github.com/Jason2866/esp32-arduino-lib-builder
+
+[env:esp32s2]
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-v.2.0.3.zip
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3
+framework = arduino
+board = esp32dev
+board_build.mcu = esp32s2
+board_build.variant = esp32s2
+board_build.flash_mode = qio
+board_build.f_cpu = 160000000L
+board_build.f_flash = 40000000L
+build_flags = -D WEBSOCKET_DISABLED=1
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+extra_scripts =
+    pre:scripts/addversion.py
+    scripts/makeweb.py
+
+[env:esp32solo]
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-solo1-v.2.0.3.zip
+framework = arduino
+board = esp32dev
+board_build.f_cpu = 160000000L
+build_flags = -D WEBSOCKET_DISABLED=1 -fexceptions
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 extra_scripts =
     pre:scripts/addversion.py
     scripts/makeweb.py
-build_flags =
-    -D WEBSOCKET_DISABLED=1

scripts/addversion.py

@@ -1,16 +1,24 @@
 import os
+import subprocess
+from time import time
 
 FILENAME_VERSION_H = 'src/version.h'
 version = os.environ.get('GITHUB_TAG')
 if version == None:
-    version = "SNAPSHOT"
-
-import datetime
+    try:
+      result = subprocess.run(['git','rev-parse','--short','HEAD'], capture_output=True, check=False)
+      if result.returncode == 0:
+        version = result.stdout.decode('utf-8').strip()
+      else:
+        version = "SNAPSHOT"
+    except:
+      version = "SNAPSHOT"
 
 hf = """
 #ifndef VERSION
   #define VERSION "{}"
 #endif
-""".format(version)
+#define BUILD_EPOCH {}
+""".format(version, time())
 with open(FILENAME_VERSION_H, 'w+') as f:
     f.write(hf)

scripts/esp32/flash.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+if [ -z "$1" ];then
+    echo "Usage: "
+    echo "  Flashing first time            :   $0 flash /dev/ttyUSB0"
+    echo "  When upgrading to new version  :   $0 upgrade /dev/ttyUSB0"
+    echo "    NOTE: Replace /dev/ttyUSB0 with correct port"
+    exit 1
+fi
+
+if [ -z "$2" ];then
+    echo "Please specify port"
+    exit 1
+fi
+
+esptool=`which esptool`
+if [ -z "$esptool" ];then
+    esptool=`which esptool.py`
+fi
+if [ -z "$esptool" ];then
+    if [ -f esptool.py ];then
+        esptool="esptool.py"
+    fi
+fi
+if [ -z "$esptool" ];then
+    echo "esptool.py not available to run following command: "
+    esptool="echo esptool.py"
+fi
+
+if [ "$1" = "flash" ];then
+    $esptool --chip esp32 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect \
+    0x1000 bootloader_dio_40m.bin \
+    0x8000 partitions.bin \
+    0xe000 boot_app0.bin \
+    0x10000 firmware.bin
+    exit $?
+elif [ "$1" = "upgrade" ];then
+    $esptool --chip esp32 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x10000 firmware.bin
+    exit $?
+fi

scripts/esp32/mkzip.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+env="esp32"
+build_dir=".pio/build/$env/"
+
+if [ ! -d $build_dir ];then
+    echo "No build directory"
+    exit 1
+fi
+
+cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/$env/bin/bootloader_dio_40m.bin $build_dir
+cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin $build_dir
+chmod +x scripts/$env/flash.sh
+zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

scripts/esp32s2/flash.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+if [ -z "$1" ];then
+    echo "Usage: "
+    echo "  Flashing first time            :   $0 flash /dev/ttyUSB0"
+    echo "  When upgrading to new version  :   $0 upgrade /dev/ttyUSB0"
+    echo "    NOTE: Replace /dev/ttyUSB0 with correct port"
+    exit 1
+fi
+
+if [ -z "$2" ];then
+    echo "Please specify port"
+    exit 1
+fi
+
+esptool=`which esptool`
+if [ -z "$esptool" ];then
+    esptool=`which esptool.py`
+fi
+if [ -z "$esptool" ];then
+    if [ -f esptool.py ];then
+        esptool="esptool.py"
+    fi
+fi
+if [ -z "$esptool" ];then
+    echo "esptool.py not available to run following command: "
+    esptool="echo esptool.py"
+fi
+
+if [ "$1" = "flash" ];then
+    $esptool --chip esp32s2 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect \
+    0x1000 bootloader_qio_40m.bin \
+    0x8000 partitions.bin \
+    0xe000 boot_app0.bin \
+    0x10000 firmware.bin
+    exit $?
+elif [ "$1" = "upgrade" ];then
+    $esptool --chip esp32s2 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x10000 firmware.bin
+    exit $?
+fi

scripts/esp32s2/mkzip.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+env="esp32s2"
+build_dir=".pio/build/$env/"
+
+if [ ! -d $build_dir ];then
+    echo "No build directory"
+    exit 1
+fi
+
+cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/$env/bin/bootloader_qio_40m.bin $build_dir
+cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin $build_dir
+chmod +x scripts/$env/flash.sh
+zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

scripts/esp32solo/flash.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+if [ -z "$1" ];then
+    echo "Usage: "
+    echo "  Flashing first time            :   $0 flash /dev/ttyUSB0"
+    echo "  When upgrading to new version  :   $0 upgrade /dev/ttyUSB0"
+    echo "    NOTE: Replace /dev/ttyUSB0 with correct port"
+    exit 1
+fi
+
+if [ -z "$2" ];then
+    echo "Please specify port"
+    exit 1
+fi
+
+esptool=`which esptool`
+if [ -z "$esptool" ];then
+    esptool=`which esptool.py`
+fi
+if [ -z "$esptool" ];then
+    if [ -f esptool.py ];then
+        esptool="esptool.py"
+    fi
+fi
+if [ -z "$esptool" ];then
+    echo "esptool.py not available to run following command: "
+    esptool="echo esptool.py"
+fi
+
+if [ "$1" = "flash" ];then
+    $esptool --chip esp32 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect \
+    0x1000 bootloader_dio_40m.bin \
+    0x8000 partitions.bin \
+    0xe000 boot_app0.bin \
+    0x10000 firmware.bin
+    exit $?
+elif [ "$1" = "upgrade" ];then
+    $esptool --chip esp32 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x10000 firmware.bin
+    exit $?
+fi

scripts/esp32solo/mkzip.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+env="esp32solo"
+build_dir=".pio/build/$env/"
+
+if [ ! -d $build_dir ];then
+    echo "No build directory"
+    exit 1
+fi
+
+cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/$env/bin/bootloader_dio_40m.bin $build_dir
+cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin $build_dir
+chmod +x scripts/$env/flash.sh
+zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

scripts/esp8266/flash.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+if [ -z "$1" ];then
+    echo "Usage: "
+    echo "  Flashing first time            :   $0 flash /dev/ttyUSB0"
+    echo "  When upgrading to new version  :   $0 upgrade /dev/ttyUSB0"
+    echo "    NOTE: Replace /dev/ttyUSB0 with correct port"
+    exit 1
+fi
+
+if [ -z "$2" ];then
+    echo "Please specify port"
+    exit 1
+fi
+
+esptool=`which esptool`
+if [ -z "$esptool" ];then
+    esptool=`which esptool.py`
+fi
+if [ -z "$esptool" ];then
+    if [ -f esptool.py ];then
+        esptool="esptool.py"
+    fi
+fi
+if [ -z "$esptool" ];then
+    echo "esptool.py not available to run following command: "
+    esptool="echo esptool.py"
+fi
+
+$esptool --before default_reset --after hard_reset --chip esp8266 --port $2 --baud 115200 write_flash 0x0 firmware.bin
+exit $?

scripts/esp8266/mkzip.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+env="esp8266"
+build_dir=".pio/build/$env/"
+
+if [ ! -d $build_dir ];then
+    echo "No build directory"
+    exit 1
+fi
+
+chmod +x scripts/$env/flash.sh
+zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

scripts/makeweb.py

@@ -1,6 +1,7 @@
 import os
 import re
 import shutil
+import subprocess
 
 try:
     from css_html_js_minify import html_minify, js_minify, css_minify
@@ -29,7 +30,14 @@ srcroot = "src/web/root"
 
 version = os.environ.get('GITHUB_TAG')
 if version == None:
-    version = "SNAPSHOT"
+    try:
+      result = subprocess.run(['git','rev-parse','--short','HEAD'], capture_output=True, check=False)
+      if result.returncode == 0:
+        version = result.stdout.decode('utf-8').strip()
+      else:
+        version = "SNAPSHOT"
+    except:
+      version = "SNAPSHOT"
 
 if os.path.exists(srcroot):
     shutil.rmtree(srcroot)
@@ -59,7 +67,7 @@ for filename in os.listdir(webroot):
         print("WARN: Unable to minify")
 
     with open(dstfile, "w") as dst:
-        dst.write("const char ")
+        dst.write("static const char ")
         dst.write(varname)
         dst.write("[] PROGMEM = R\"==\"==(")
         dst.write(content)

scripts/mkzip.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+find -name firmware.bin | while read firmware;do
+    dir=`dirname $firmware`
+    env=`basename $dir`
+    if [ -f scripts/$env/mkzip.sh ];then
+        echo "Building zip for env '$env'"
+        chmod +x scripts/$env/mkzip.sh 
+        scripts/$env/mkzip.sh
+    fi
+done

src/AmsConfiguration.cpp

@@ -37,11 +37,14 @@ bool AmsConfiguration::setWiFiConfig(WiFiConfig& config) {
 		wifiChanged |= strcmp(config.ssid, existing.ssid) != 0;
 		wifiChanged |= strcmp(config.psk, existing.psk) != 0;
 		wifiChanged |= strcmp(config.ip, existing.ip) != 0;
-		wifiChanged |= strcmp(config.gateway, existing.gateway) != 0;
-		wifiChanged |= strcmp(config.subnet, existing.subnet) != 0;
-		wifiChanged |= strcmp(config.dns1, existing.dns1) != 0;
-		wifiChanged |= strcmp(config.dns2, existing.dns2) != 0;
+		if(strlen(config.ip) > 0) {
+			wifiChanged |= strcmp(config.gateway, existing.gateway) != 0;
+			wifiChanged |= strcmp(config.subnet, existing.subnet) != 0;
+			wifiChanged |= strcmp(config.dns1, existing.dns1) != 0;
+			wifiChanged |= strcmp(config.dns2, existing.dns2) != 0;
+		}
 		wifiChanged |= strcmp(config.hostname, existing.hostname) != 0;
+		wifiChanged |= config.power != existing.power;
 	} else {
 		wifiChanged = true;
 	}
@@ -209,6 +212,10 @@ void AmsConfiguration::clearMeter(MeterConfig& config) {
 	config.productionCapacity = 0;
 	memset(config.encryptionKey, 0, 16);
 	memset(config.authenticationKey, 0, 16);
+	config.wattageMultiplier = 0;
+	config.voltageMultiplier = 0;
+	config.amperageMultiplier = 0;
+	config.accumulatedMultiplier = 0;
 }
 
 bool AmsConfiguration::isMeterChanged() {
@@ -233,7 +240,7 @@ bool AmsConfiguration::getDebugConfig(DebugConfig& config) {
 
 bool AmsConfiguration::setDebugConfig(DebugConfig& config) {
 	if(!config.serial && !config.telnet)
-		config.level = 5; // Force error level when debug is disabled
+		config.level = 4; // Force warning level when debug is disabled
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_DEBUG_START, config);
 	bool ret = EEPROM.commit();
@@ -492,6 +499,63 @@ void AmsConfiguration::ackEntsoeChange() {
 	entsoeChanged = false;
 }
 
+
+bool AmsConfiguration::getEnergyAccountingConfig(EnergyAccountingConfig& config) {
+	if(hasConfig()) {
+		EEPROM.begin(EEPROM_SIZE);
+		EEPROM.get(CONFIG_ENERGYACCOUNTING_START, config);
+		EEPROM.end();
+		if(config.thresholds[9] != 255) {
+			clearEnergyAccountingConfig(config);
+		}
+		return true;
+	} else {
+		return false;
+	}
+}
+
+bool AmsConfiguration::setEnergyAccountingConfig(EnergyAccountingConfig& config) {
+	EnergyAccountingConfig existing;
+	if(getEnergyAccountingConfig(existing)) {
+		for(int i = 0; i < 9; i++) {
+			if(existing.thresholds[i] != config.thresholds[i]) {
+				energyAccountingChanged = true;
+			}
+		}
+		config.thresholds[9] = 255;
+	} else {
+		energyAccountingChanged = true;
+	}
+	EEPROM.begin(EEPROM_SIZE);
+	EEPROM.put(CONFIG_ENERGYACCOUNTING_START, config);
+	bool ret = EEPROM.commit();
+	EEPROM.end();
+	return ret;
+
+}
+
+void AmsConfiguration::clearEnergyAccountingConfig(EnergyAccountingConfig& config) {
+	config.thresholds[0] = 5;
+	config.thresholds[1] = 10;
+	config.thresholds[2] = 15;
+	config.thresholds[3] = 20;
+	config.thresholds[4] = 25;
+	config.thresholds[5] = 50;
+	config.thresholds[6] = 75;
+	config.thresholds[7] = 100;
+	config.thresholds[8] = 150;
+	config.thresholds[9] = 255;
+}
+
+bool AmsConfiguration::isEnergyAccountingChanged() {
+	return energyAccountingChanged;
+}
+
+void AmsConfiguration::ackEnergyAccountingChange() {
+	energyAccountingChanged = false;
+}
+
+
 void AmsConfiguration::clear() {
 	EEPROM.begin(EEPROM_SIZE);
 	MeterConfig meter;
@@ -522,6 +586,10 @@ void AmsConfiguration::clear() {
 	clearEntsoe(entsoe);
 	EEPROM.put(CONFIG_ENTSOE_START, entsoe);
 
+	EnergyAccountingConfig eac;
+	clearEnergyAccountingConfig(eac);
+	EEPROM.put(CONFIG_ENERGYACCOUNTING_START, eac);
+
 	EEPROM.put(EEPROM_CONFIG_ADDRESS, -1);
 	EEPROM.commit();
 	EEPROM.end();
@@ -533,54 +601,68 @@ bool AmsConfiguration::hasConfig() {
 		configVersion = EEPROM.read(EEPROM_CONFIG_ADDRESS);
 		EEPROM.end();
 	}
-	switch(configVersion) {
-		case 83:
-			configVersion = -1; // Prevent loop
-			if(loadConfig83(EEPROM_CONFIG_ADDRESS+1)) {
-				configVersion = EEPROM_CHECK_SUM;
-				return true;
-			} else {
-				configVersion = 0;
-				return false;
-			}
-			break;
-		case 86:
-			configVersion = -1; // Prevent loop
-			if(relocateConfig86()) {
-				configVersion = 87;
-			} else {
-				configVersion = 0;
-				return false;
-			}
-		case 87:
-			configVersion = -1; // Prevent loop
-			if(relocateConfig87()) {
-				configVersion = 88;
-			} else {
-				configVersion = 0;
-				return false;
-			}
-		case 90:
-			configVersion = -1; // Prevent loop
-			if(relocateConfig90()) {
-				configVersion = 91;
-			} else {
-				configVersion = 0;
-				return false;
-			}
-		case 91:
-			configVersion = -1; // Prevent loop
-			if(relocateConfig91()) {
-				configVersion = 92;
-			} else {
-				configVersion = 0;
-				return false;
-			}
-		case EEPROM_CHECK_SUM:
-			return true;
-		default:
+	if(configVersion > EEPROM_CHECK_SUM) {
+		if(loadFromFs(EEPROM_CHECK_SUM)) {
+			configVersion = EEPROM_CHECK_SUM;
+		} else {
 			configVersion = 0;
-			return false;
+		}
+	} else {
+		switch(configVersion) {
+			case 86:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig86()) {
+					configVersion = 87;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case 87:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig87()) {
+					configVersion = 88;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case 90:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig90()) {
+					configVersion = 91;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case 91:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig91()) {
+					configVersion = 92;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case 92:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig92()) {
+					configVersion = 93;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case 93:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig93()) {
+					configVersion = 94;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case EEPROM_CHECK_SUM:
+				return true;
+			default:
+				configVersion = 0;
+				return false;
+		}
 	}
 	return configVersion == EEPROM_CHECK_SUM;
 }
@@ -627,116 +709,6 @@ void AmsConfiguration::saveTempSensors() {
 	}
 }
 
-bool AmsConfiguration::loadConfig83(int address) {
-	ConfigObject83 c;
-	EEPROM.begin(EEPROM_SIZE);
-	EEPROM.get(address, c);
-
-	EntsoeConfig entsoe {"", "", "", 1000};
-	EEPROM.put(CONFIG_ENTSOE_START, entsoe);
-
-	NtpConfig ntp {
-		c.ntpEnable,
-		c.ntpDhcp,
-		c.ntpOffset,
-		c.ntpSummerOffset
-	};
-	strcpy(ntp.server, c.ntpServer);
-	EEPROM.put(CONFIG_NTP_START, ntp);
-
-	DomoticzConfig domo {
-		c.domoELIDX,
-		c.domoVL1IDX,
-		c.domoVL2IDX,
-		c.domoVL3IDX,
-		c.domoCL1IDX
-	};
-	EEPROM.put(CONFIG_DOMOTICZ_START, domo);
-
-	GpioConfig gpio {
-		c.hanPin,
-		c.apPin,
-		c.ledPin,
-		c.ledInverted,
-		c.ledPinRed,
-		c.ledPinGreen,
-		c.ledPinBlue,
-		c.ledRgbInverted,
-		c.tempSensorPin,
-		c.tempAnalogSensorPin,
-		c.vccPin,
-		c.vccOffset,
-		c.vccMultiplier,
-		c.vccBootLimit,
-		0,
-		0
-	};
-	EEPROM.put(CONFIG_GPIO_START, gpio);
-
-	DebugConfig debug {
-		c.debugTelnet,
-		c.debugSerial,
-		c.debugLevel
-	};
-	EEPROM.put(CONFIG_DEBUG_START, debug);
-
-	MeterConfig meter {
-		2400,
-		c.meterType == 3 || c.meterType == 4 ? 3 : 11,
-		false,
-		c.distributionSystem,
-		c.mainFuse,
-		c.productionCapacity,
-		{0},
-		{0}
-	};
-	memcpy(meter.encryptionKey, c.meterEncryptionKey, 16);
-	memcpy(meter.authenticationKey, c.meterAuthenticationKey, 16);
-	EEPROM.put(CONFIG_METER_START, meter);
-
-	WebConfig web {
-		c.authSecurity
-	};
-	strcpy(web.username, c.authUser);
-	strcpy(web.password, c.authPassword);
-	EEPROM.put(CONFIG_WEB_START, web);
-
-	MqttConfig mqtt;
-	strcpy(mqtt.host, c.mqttHost);
-	mqtt.port = c.mqttPort;
-	strcpy(mqtt.clientId, c.mqttClientId);
-	strcpy(mqtt.publishTopic, c.mqttPublishTopic);
-	strcpy(mqtt.subscribeTopic, c.mqttSubscribeTopic);
-	strcpy(mqtt.username, c.mqttUser);
-	strcpy(mqtt.password, c.mqttPassword);
-	mqtt.payloadFormat = c.mqttPayloadFormat;
-	mqtt.ssl = c.mqttSsl;
-	EEPROM.put(CONFIG_MQTT_START, mqtt);
-
-	WiFiConfig wifi;
-	strcpy(wifi.ssid, c.wifiSsid);
-	strcpy(wifi.psk, c.wifiPassword);
-    strcpy(wifi.ip, c.wifiIp);
-    strcpy(wifi.gateway, c.wifiGw);
-    strcpy(wifi.subnet, c.wifiSubnet);
-	strcpy(wifi.dns1, c.wifiDns1);
-	strcpy(wifi.dns2, c.wifiDns2);
-	strcpy(wifi.hostname, c.wifiHostname);
-	wifi.mdns = c.mDnsEnable;
-	EEPROM.put(CONFIG_WIFI_START, wifi);
-
-	SystemConfig sys  {
-		c.boardType
-	};
-	EEPROM.put(CONFIG_SYSTEM_START, sys);
-	
-	EEPROM.put(EEPROM_CONFIG_ADDRESS, EEPROM_CHECK_SUM);
-	bool ret = EEPROM.commit();
-	EEPROM.end();
-
-	return ret;
-}
-
 bool AmsConfiguration::relocateConfig86() {
 	MqttConfig86 mqtt86;
 	MqttConfig mqtt;
@@ -814,6 +786,42 @@ bool AmsConfiguration::relocateConfig91() {
 	return ret;
 }
 
+bool AmsConfiguration::relocateConfig92() {
+	WiFiConfig wifi;
+	EEPROM.begin(EEPROM_SIZE);
+    EEPROM.get(CONFIG_WIFI_START, wifi);
+	#if defined(ESP32)
+		wifi.power = 195;
+	#elif defined(ESP8266)
+		wifi.power = 205;
+	#endif
+	EEPROM.put(CONFIG_WIFI_START, wifi);
+
+	EnergyAccountingConfig eac;
+	clearEnergyAccountingConfig(eac);
+	EEPROM.put(CONFIG_ENERGYACCOUNTING_START, eac);
+
+	EEPROM.put(EEPROM_CONFIG_ADDRESS, 93);
+	bool ret = EEPROM.commit();
+	EEPROM.end();
+	return ret;
+}
+
+bool AmsConfiguration::relocateConfig93() {
+	MeterConfig meter;
+	EEPROM.begin(EEPROM_SIZE);
+    EEPROM.get(CONFIG_METER_START_93, meter);
+	meter.wattageMultiplier = 0;
+	meter.voltageMultiplier = 0;
+	meter.amperageMultiplier = 0;
+	meter.accumulatedMultiplier = 0;
+	EEPROM.put(CONFIG_METER_START, meter);
+	EEPROM.put(EEPROM_CONFIG_ADDRESS, 94);
+	bool ret = EEPROM.commit();
+	EEPROM.end();
+	return ret;
+}
+
 bool AmsConfiguration::save() {
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(EEPROM_CONFIG_ADDRESS, EEPROM_CHECK_SUM);
@@ -879,37 +887,16 @@ bool AmsConfiguration::isSensorAddressEqual(uint8_t a[8], uint8_t b[8]) {
     return true;
 }
 
-
-int AmsConfiguration::readString(int pAddress, char* pString[]) {
-	int address = 0;
-	byte length = EEPROM.read(pAddress + address);
-	address++;
-
-	char* buffer = new char[length];
-	for (int i = 0; i<length; i++)
-	{
-		buffer[i] = EEPROM.read(pAddress + address++);
-	}
-	*pString = buffer;
-	return address;
+void AmsConfiguration::saveToFs() {
+	
 }
 
-int AmsConfiguration::readInt(int address, int *value) {
-	int lower = EEPROM.read(address);
-	int higher = EEPROM.read(address + 1);
-	*value = lower + (higher << 8);
-	return 2;
+bool AmsConfiguration::loadFromFs(uint8_t version) {
+	return false;
 }
 
-int AmsConfiguration::readBool(int address, bool *value) {
-	byte y = EEPROM.read(address);
-	*value = (bool)y;
-	return 1;
-}
+void AmsConfiguration::deleteFromFs(uint8_t version) {
 
-int AmsConfiguration::readByte(int address, byte *value) {
-	*value = EEPROM.read(address);
-	return 1;
 }
 
 void AmsConfiguration::print(Print* debugger)

src/AmsConfiguration.h

@@ -4,15 +4,16 @@
 #include "Arduino.h"
 
 #define EEPROM_SIZE 1024*3
-#define EEPROM_CHECK_SUM 92 // Used to check if config is stored. Change if structure changes
+#define EEPROM_CHECK_SUM 94 // Used to check if config is stored. Change if structure changes
 #define EEPROM_CONFIG_ADDRESS 0
 #define EEPROM_TEMP_CONFIG_ADDRESS 2048
 
 #define CONFIG_SYSTEM_START 8
-#define CONFIG_METER_START 224
+#define CONFIG_METER_START 32
 #define CONFIG_GPIO_START 266
 #define CONFIG_ENTSOE_START 290
 #define CONFIG_WIFI_START 360
+#define CONFIG_ENERGYACCOUNTING_START 576
 #define CONFIG_WEB_START 648
 #define CONFIG_DEBUG_START 824
 #define CONFIG_DOMOTICZ_START 856 
@@ -23,6 +24,7 @@
 #define CONFIG_METER_START_87 784
 #define CONFIG_ENTSOE_START_90 286
 #define CONFIG_WIFI_START_91 16
+#define CONFIG_METER_START_93 224
 
 
 struct SystemConfig {
@@ -51,7 +53,8 @@ struct WiFiConfig {
 	char dns2[16];
 	char hostname[32];
 	bool mdns;
-}; // 209
+	uint8_t power;
+}; // 210
 
 struct MqttConfig86 {
 	char host[128];
@@ -92,7 +95,11 @@ struct MeterConfig {
 	uint8_t productionCapacity;
 	uint8_t encryptionKey[16];
 	uint8_t authenticationKey[16];
-}; // 41
+	uint16_t wattageMultiplier;
+	uint16_t voltageMultiplier;
+	uint16_t amperageMultiplier;
+	uint16_t accumulatedMultiplier;
+}; // 49
 
 struct MeterConfig87 {
 	uint8_t type;
@@ -152,71 +159,9 @@ struct EntsoeConfig {
 	uint32_t multiplier;
 }; // 62
 
-struct ConfigObject83 {
-	uint8_t boardType;
-	char wifiSsid[32];
-	char wifiPassword[64];
-    char wifiIp[15];
-    char wifiGw[15];
-    char wifiSubnet[15];
-	char wifiDns1[15];
-	char wifiDns2[15];
-	char wifiHostname[32];
-	char mqttHost[128];
-	uint16_t mqttPort;
-	char mqttClientId[32];
-	char mqttPublishTopic[64];
-	char mqttSubscribeTopic[64];
-	char mqttUser[64];
-	char mqttPassword[64];
-	uint8_t mqttPayloadFormat;
-	bool mqttSsl;
-	uint8_t authSecurity;
-	char authUser[64];
-	char authPassword[64];
-
-	uint8_t meterType;
-	uint8_t distributionSystem;
-	uint8_t mainFuse;
-	uint8_t productionCapacity;
-	uint8_t meterEncryptionKey[16];
-	uint8_t meterAuthenticationKey[16];
-	bool substituteMissing;
-	bool sendUnknown;
-
-	bool debugTelnet;
-	bool debugSerial;
-	uint8_t debugLevel;
-
-	uint8_t hanPin;
-	uint8_t apPin;
-	uint8_t ledPin;
-	bool ledInverted;
-	uint8_t ledPinRed;
-	uint8_t ledPinGreen;
-	uint8_t ledPinBlue;
-	bool ledRgbInverted;
-	uint8_t tempSensorPin;
-	uint8_t vccPin;
-	int16_t vccOffset;
-	uint16_t vccMultiplier;
-	uint8_t vccBootLimit;
-
-	uint16_t domoELIDX;
-	uint16_t domoVL1IDX;
-	uint16_t domoVL2IDX;
-	uint16_t domoVL3IDX;
-	uint16_t domoCL1IDX;
-
-	bool mDnsEnable;
-	bool ntpEnable;
-	bool ntpDhcp;
-	int16_t ntpOffset;
-	int16_t ntpSummerOffset;
-	char ntpServer[64];
-
-	uint8_t tempAnalogSensorPin;
-};
+struct EnergyAccountingConfig {
+	uint8_t thresholds[10];
+}; // 10
 
 struct TempSensorConfig {
 	uint8_t address[8];
@@ -288,6 +233,12 @@ public:
 	bool isEntsoeChanged();
 	void ackEntsoeChange();
 
+	bool getEnergyAccountingConfig(EnergyAccountingConfig&);
+	bool setEnergyAccountingConfig(EnergyAccountingConfig&);
+	void clearEnergyAccountingConfig(EnergyAccountingConfig&);
+	bool isEnergyAccountingChanged();
+	void ackEnergyAccountingChange();
+
 	void loadTempSensors();
 	void saveTempSensors();
 	uint8_t getTempSensorCount();
@@ -303,20 +254,20 @@ protected:
 private:
 	uint8_t configVersion = 0;
 
-	bool wifiChanged, mqttChanged, meterChanged = true, domoChanged, ntpChanged = true, entsoeChanged = false;
+	bool wifiChanged, mqttChanged, meterChanged = true, domoChanged, ntpChanged = true, entsoeChanged = false, energyAccountingChanged = true;
 
 	uint8_t tempSensorCount = 0;
 	TempSensorConfig** tempSensors = NULL;
 
-	bool loadConfig83(int address);
-	bool relocateConfig86();
-	bool relocateConfig87();
+	bool relocateConfig86(); // 1.5.0
+	bool relocateConfig87(); // 1.5.4
 	bool relocateConfig90(); // 2.0.0
 	bool relocateConfig91(); // 2.0.2
+	bool relocateConfig92(); // 2.0.3
+	bool relocateConfig93(); // 2.1 beta
 
-	int readString(int pAddress, char* pString[]);
-	int readInt(int pAddress, int *pValue);
-	int readBool(int pAddress, bool *pValue);
-	int readByte(int pAddress, byte *pValue);
+	void saveToFs();
+	bool loadFromFs(uint8_t version);
+	void deleteFromFs(uint8_t version);
 };
 #endif

src/AmsData.cpp

@@ -40,11 +40,12 @@ void AmsData::apply(AmsData& other) {
     if(other.getListType() > this->listType)
         this->listType = other.getListType();
     switch(other.getListType()) {
-        case 3:
+        case 4:
             this->powerFactor = other.getPowerFactor();
             this->l1PowerFactor = other.getL1PowerFactor();
             this->l2PowerFactor = other.getL2PowerFactor();
             this->l3PowerFactor = other.getL3PowerFactor();
+        case 3:
             this->meterTimestamp = other.getMeterTimestamp();
             this->activeImportCounter = other.getActiveImportCounter();
             this->activeExportCounter = other.getActiveExportCounter();
@@ -160,19 +161,19 @@ float AmsData::getL3PowerFactor() {
     return this->l3PowerFactor;
 }
 
-float AmsData::getActiveImportCounter() {
+double AmsData::getActiveImportCounter() {
     return this->activeImportCounter;
 }
 
-float AmsData::getReactiveImportCounter() {
+double AmsData::getReactiveImportCounter() {
     return this->reactiveImportCounter;
 }
 
-float AmsData::getActiveExportCounter() {
+double AmsData::getActiveExportCounter() {
     return this->activeExportCounter;
 }
 
-float AmsData::getReactiveExportCounter() {
+double AmsData::getReactiveExportCounter() {
     return this->reactiveExportCounter;
 }
 

src/AmsData.h

@@ -53,10 +53,10 @@ public:
     float getL2PowerFactor();
     float getL3PowerFactor();
 
-    float getActiveImportCounter();
-    float getReactiveImportCounter();
-    float getActiveExportCounter();
-    float getReactiveExportCounter();
+    double getActiveImportCounter();
+    double getReactiveImportCounter();
+    double getActiveExportCounter();
+    double getReactiveExportCounter();
 
     bool isThreePhase();
     bool isTwoPhase();
@@ -71,7 +71,7 @@ protected:
     uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
     float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
     float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0;
-    float activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
+    double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
     bool threePhase = false, twoPhase = false, counterEstimated = false;
 };
 

src/AmsDataStorage.cpp

@@ -1,12 +1,12 @@
 #include "AmsDataStorage.h"
 #include <lwip/apps/sntp.h>
-#include "EEPROM.h"
 #include "LittleFS.h"
 #include "AmsStorage.h"
+#include "version.h"
 
 AmsDataStorage::AmsDataStorage(RemoteDebug* debugger) {
-    day.version = 3;
-    month.version = 4;
+    day.version = 4;
+    month.version = 5;
     this->debugger = debugger;
 }
 
@@ -15,72 +15,44 @@ void AmsDataStorage::setTimezone(Timezone* tz) {
 }
 
 bool AmsDataStorage::update(AmsData* data) {
-    time_t now = time(nullptr);
-    if(debugger->isActive(RemoteDebug::VERBOSE)) {
-        debugger->printf("(AmsDataStorage) Time is: %d\n", now);
+    if(isHappy()) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Data is up to date\n");
+        return false;
     }
-    if(now < EPOCH_2021_01_01) {
-        if(data->getMeterTimestamp() > 0) {
+
+    time_t now = time(nullptr);
+    if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Time is: %lld\n", (int64_t) now);
+    if(tz == NULL) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Timezone is missing\n");
+        return false;
+    }
+    if(now < BUILD_EPOCH) {
+        if(data->getMeterTimestamp() > BUILD_EPOCH) {
             now = data->getMeterTimestamp();
             if(debugger->isActive(RemoteDebug::DEBUG)) {
-                debugger->printf("(AmsDataStorage) Using meter timestamp, which is: %d\n", now);
+                debugger->printf("(AmsDataStorage) Using meter timestamp, which is: %lld\n", (int64_t) now);
             }
-        } else if(data->getPackageTimestamp() > 0) {
+        } else if(data->getPackageTimestamp() > BUILD_EPOCH) {
             now = data->getPackageTimestamp();
             if(debugger->isActive(RemoteDebug::DEBUG)) {
-                debugger->printf("(AmsDataStorage) Using package timestamp, which is: %d\n", now);
+                debugger->printf("(AmsDataStorage) Using package timestamp, which is: %lld\n", (int64_t) now);
             }
         }
     }
-    if(now < EPOCH_2021_01_01) {
+    if(now < BUILD_EPOCH) {
         if(debugger->isActive(RemoteDebug::VERBOSE)) {
-            debugger->printf("(AmsDataStorage) Invalid time: %d\n", now);
-        }
-        return false;
-    }
-    if(now-day.lastMeterReadTime < 3595) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) {
-            debugger->printf("(AmsDataStorage) It is only %d seconds since last update, ignoring\n", (now-day.lastMeterReadTime));
+            debugger->printf("(AmsDataStorage) Invalid time: %lld\n", (int64_t) now);
         }
         return false;
     }
 
-    tmElements_t tm, last;
-    breakTime(now, tm);
-
-    if(day.lastMeterReadTime > EPOCH_2021_01_01) {
-        if(debugger->isActive(RemoteDebug::DEBUG)) {
-            debugger->printf("(AmsDataStorage) Last day update: %d\n", day.lastMeterReadTime);
-        }
-        breakTime(day.lastMeterReadTime, last);
-        for(int i = last.Hour; i < tm.Hour; i++) {
-            if(debugger->isActive(RemoteDebug::VERBOSE)) {
-                debugger->printf("(AmsDataStorage) Clearing hour: %d\n", i);
-            }
-            setHour(i, 0);
-        }
-    }
-
-    if(month.lastMeterReadTime > EPOCH_2021_01_01) {
-        if(debugger->isActive(RemoteDebug::DEBUG)) {
-            debugger->printf("(AmsDataStorage) Last month update: %d\n", month.lastMeterReadTime);
-        }
-        if(tz != NULL) {
-            breakTime(tz->toLocal(now), tm);
-            breakTime(tz->toLocal(month.lastMeterReadTime), last);
-        } else {
-            breakTime(now, tm);
-            breakTime(month.lastMeterReadTime, last);
-        }
-
-        for(int i = last.Day; i < tm.Day; i++) {
-            if(debugger->isActive(RemoteDebug::VERBOSE)) {
-                debugger->printf("(AmsDataStorage) Clearing day: %d\n", i);
-            }
-            setDay(i, 0);
-        }
-    }
+    tmElements_t utc, ltz, utcYesterday, ltzYesterDay;
+    breakTime(now, utc);
+    breakTime(tz->toLocal(now), ltz);
+    breakTime(now-3600, utcYesterday);
+    breakTime(tz->toLocal(now-3600), ltzYesterDay);
 
+    // Clear hours between last update and now
     if(day.lastMeterReadTime > now) {
         if(debugger->isActive(RemoteDebug::WARNING)) {
             debugger->printf("(AmsDataStorage) Invalid future timestamp for day plot, resetting\n");
@@ -88,75 +60,23 @@ bool AmsDataStorage::update(AmsData* data) {
         day.activeImport = data->getActiveImportCounter() * 1000;
         day.activeExport = data->getActiveExportCounter() * 1000;
         day.lastMeterReadTime = now;
-    }
-
-    if(data->getListType() != 3) return false;
-    else if(tm.Minute > 5) return false;
-
-    // Update day plot
-    if(day.activeImport == 0 || now - day.lastMeterReadTime > 86400) {
-        day.activeImport = data->getActiveImportCounter() * 1000;
-        day.activeExport = data->getActiveExportCounter() * 1000;
-        day.lastMeterReadTime = now;
-        if(debugger->isActive(RemoteDebug::WARNING)) {
-            debugger->printf("(AmsDataStorage) Too long since last day update, clearing data\n");
-        }
-        for(int i = 0; i<24; i++) {
-            setHour(i, 0);
-        }
-    } else if(now - day.lastMeterReadTime < 4000) {
-        breakTime(now - 3600, tm);
-        int16_t val = (((data->getActiveImportCounter() * 1000) - day.activeImport) - ((data->getActiveExportCounter() * 1000) - day.activeExport));
-        setHour(tm.Hour, val);
-
-        if(debugger->isActive(RemoteDebug::INFO)) {
-            debugger->printf("(AmsDataStorage) Usage for hour %d: %d\n", tm.Hour, val);
-        }
-
-        day.activeImport = data->getActiveImportCounter() * 1000;
-        day.activeExport = data->getActiveExportCounter() * 1000;
-        day.lastMeterReadTime = now;
+        return true;
     } else {
-        float mins = (now - day.lastMeterReadTime) / 60.0;
-        uint16_t im = ((data->getActiveImportCounter() * 1000) - day.activeImport);
-        uint16_t ex = ((data->getActiveExportCounter() * 1000) - day.activeExport);
-        float ipm = im / mins;
-        float epm = ex / mins;
-
         if(debugger->isActive(RemoteDebug::DEBUG)) {
-            debugger->printf("(AmsDataStorage) Since last day update, minutes: %.1f, import: %d (%.2f/min), export: %d (%.2f/min)\n", mins, im, ipm, ex, epm);
+            debugger->printf("(AmsDataStorage) Last day update: %lld\n", (int64_t) day.lastMeterReadTime);
         }
-
-        breakTime(day.lastMeterReadTime, tm);
-        day.lastMeterReadTime = day.lastMeterReadTime - (tm.Minute * 60) - tm.Second;
-        breakTime(now, tm);
-        time_t stopAt = now - (tm.Minute * 60) - tm.Second;
-        while(day.lastMeterReadTime < stopAt) {
-            time_t cur = min(day.lastMeterReadTime + 3600, stopAt);
-            uint8_t minutes = round((cur - day.lastMeterReadTime) / 60.0);
-            if(minutes < 1) break;
-
-            breakTime(day.lastMeterReadTime, last);
-            float val = ((ipm * minutes) - (epm * minutes));
-            setHour(last.Hour, val);
-
-            if(debugger->isActive(RemoteDebug::INFO)) {
-                debugger->printf("(AmsDataStorage) Estimated usage for hour %u: %.1f (%lu)\n", last.Hour, val, cur);
+        tmElements_t last;
+        breakTime(day.lastMeterReadTime, last);
+        for(int i = last.Hour; i < utc.Hour; i++) {
+            if(debugger->isActive(RemoteDebug::VERBOSE)) {
+                debugger->printf("(AmsDataStorage) Clearing hour: %d\n", i);
             }
-
-            day.activeImport += ipm * minutes;
-            day.activeExport += epm * minutes;
-            day.lastMeterReadTime = cur;
+            setHourImport(i, 0);
+            setHourExport(i, 0);
         }
     }
 
-    // Update month plot
-    if(tz != NULL) {
-        breakTime(tz->toLocal(now), tm);
-    } else {
-        breakTime(now, tm);
-    }
-
+    // Clear days between last update and now
     if(month.lastMeterReadTime > now) {
         if(debugger->isActive(RemoteDebug::WARNING)) {
             debugger->printf("(AmsDataStorage) Invalid future timestamp for month plot, resetting\n");
@@ -164,9 +84,91 @@ bool AmsDataStorage::update(AmsData* data) {
         month.activeImport = data->getActiveImportCounter() * 1000;
         month.activeExport = data->getActiveExportCounter() * 1000;
         month.lastMeterReadTime = now;
+    } else {
+        if(debugger->isActive(RemoteDebug::DEBUG)) {
+            debugger->printf("(AmsDataStorage) Last month update: %lld\n", (int64_t) month.lastMeterReadTime);
+        }
+        tmElements_t last;
+        breakTime(tz->toLocal(month.lastMeterReadTime), last);
+        for(int i = last.Day; i < ltz.Day; i++) {
+            if(debugger->isActive(RemoteDebug::VERBOSE)) {
+                debugger->printf("(AmsDataStorage) Clearing day: %d\n", i);
+            }
+            setDayImport(i, 0);
+            setDayExport(i, 0);
+        }
     }
 
-    if(tm.Hour == 0 && now - month.lastMeterReadTime > 86300) {
+    if(data->getListType() < 3) {
+        debugger->printf("(AmsDataStorage) Not enough data in list type: %d\n", data->getListType());
+        return false;
+    }
+
+    bool ret = false;
+
+    // Update day plot
+    if(!isDayHappy()) {
+        if(day.activeImport == 0 || now - day.lastMeterReadTime > 86400) {
+            day.activeImport = data->getActiveImportCounter() * 1000;
+            day.activeExport = data->getActiveExportCounter() * 1000;
+            day.lastMeterReadTime = now;
+            if(debugger->isActive(RemoteDebug::WARNING)) {
+                debugger->printf("(AmsDataStorage) Too long since last day update, clearing data\n");
+            }
+            for(int i = 0; i<24; i++) {
+                setHourImport(i, 0);
+                setHourExport(i, 0);
+            }
+        } else if(now - day.lastMeterReadTime < 4000) {
+            uint32_t imp = (data->getActiveImportCounter() * 1000) - day.activeImport;
+            uint32_t exp = (data->getActiveExportCounter() * 1000) - day.activeExport;
+            setHourImport(utcYesterday.Hour, imp);
+            setHourExport(utcYesterday.Hour, exp);
+
+            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(AmsDataStorage) Usage for hour %d: %d - %d\n", ltzYesterDay.Hour, imp, exp);
+            day.activeImport = data->getActiveImportCounter() * 1000;
+            day.activeExport = data->getActiveExportCounter() * 1000;
+            day.lastMeterReadTime = now;
+        } else {
+            float mins = (now - day.lastMeterReadTime) / 60.0;
+            uint32_t im = (data->getActiveImportCounter() * 1000) - day.activeImport;
+            uint32_t ex = (data->getActiveExportCounter() * 1000) - day.activeExport;
+            float ipm = im / mins;
+            float epm = ex / mins;
+
+            if(debugger->isActive(RemoteDebug::DEBUG)) {
+                debugger->printf("(AmsDataStorage) Since last day update, minutes: %.1f, import: %d (%.2f/min), export: %d (%.2f/min)\n", mins, im, ipm, ex, epm);
+            }
+
+            tmElements_t last;
+            breakTime(day.lastMeterReadTime, last);
+            day.lastMeterReadTime = day.lastMeterReadTime - (last.Minute * 60) - last.Second;
+            time_t stopAt = now - (utc.Minute * 60) - utc.Second;
+            while(day.lastMeterReadTime < stopAt) {
+                time_t cur = min(day.lastMeterReadTime + 3600, stopAt);
+                uint8_t minutes = round((cur - day.lastMeterReadTime) / 60.0);
+                if(minutes < 1) break;
+
+                breakTime(day.lastMeterReadTime, last);
+                float imp = (ipm * minutes);
+                float exp = (epm * minutes);
+                setHourImport(last.Hour, imp);
+                setHourExport(last.Hour, exp);
+
+                if(debugger->isActive(RemoteDebug::INFO)) {
+                    debugger->printf("(AmsDataStorage) Estimated usage for hour %u: %.1f - %.1f (%lld)\n", last.Hour, imp, exp, (int64_t) cur);
+                }
+
+                day.activeImport += imp;
+                day.activeExport += exp;
+                day.lastMeterReadTime = cur;
+            }
+        }
+        ret = true;
+    }
+
+    // Update month plot
+    if(ltz.Hour == 0 && !isMonthHappy()) {
         if(month.activeImport == 0 || now - month.lastMeterReadTime > 2678400) {
             month.activeImport = data->getActiveImportCounter() * 1000;
             month.activeExport = data->getActiveExportCounter() * 1000;
@@ -175,97 +177,104 @@ bool AmsDataStorage::update(AmsData* data) {
                 debugger->printf("(AmsDataStorage) Too long since last month update, clearing data\n");
             }
             for(int i = 1; i<=31; i++) {
-                setDay(i, 0);
+                setDayImport(i, 0);
+                setDayExport(i, 0);
             }
-        } else if(now - month.lastMeterReadTime < 87000) {
-            int32_t val = (month.activeImport == 0 ? 0 : ((data->getActiveImportCounter() * 1000) - month.activeImport) - ((data->getActiveExportCounter() * 1000) - month.activeExport));
+        } else if(now - month.lastMeterReadTime < 86500 && now - month.lastMeterReadTime > 86300) {
+            int32_t imp = (data->getActiveImportCounter() * 1000) - month.activeImport;
+            int32_t exp = (data->getActiveExportCounter() * 1000) - month.activeExport;
 
             if(debugger->isActive(RemoteDebug::INFO)) {
-                debugger->printf("(AmsDataStorage) Usage for day %d: %d\n", tm.Day, val);
+                debugger->printf("(AmsDataStorage) Usage for day %d: %d - %d\n", ltzYesterDay.Day, imp, exp);
             }
 
-            time_t yesterday = now - 3600;
-            breakTime(yesterday, tm);
-            setDay(tm.Day, val);
-
+            setDayImport(ltzYesterDay.Day, imp);
+            setDayExport(ltzYesterDay.Day, exp);
             month.activeImport = data->getActiveImportCounter() * 1000;
             month.activeExport = data->getActiveExportCounter() * 1000;
             month.lastMeterReadTime = now;
         } else {
+            // Make sure last month read is at midnight
+            tmElements_t last;
+            breakTime(tz->toLocal(month.lastMeterReadTime), last);
+            month.lastMeterReadTime = month.lastMeterReadTime - (last.Hour * 3600) - (last.Minute * 60) - last.Second;
+            if(debugger->isActive(RemoteDebug::DEBUG)) {
+                debugger->printf("(AmsDataStorage) Last month read after resetting to midnight: %lld\n", (int64_t) month.lastMeterReadTime);
+            }
+
             float hrs = (now - month.lastMeterReadTime) / 3600.0;
-            uint16_t im = ((data->getActiveImportCounter() * 1000) - month.activeImport);
-            uint16_t ex = ((data->getActiveExportCounter() * 1000) - month.activeExport);
+            uint32_t im = (data->getActiveImportCounter() * 1000) - month.activeImport;
+            uint32_t ex = (data->getActiveExportCounter() * 1000) - month.activeExport;
             float iph = im / hrs;
             float eph = ex / hrs;
 
-            // There is something wacky going on when it ends up here. The total value (im) is way way lower than it should be, which in 
-            // turn causes low values for all estimates. And then when it returns to the normal case above, the value is waaay higher.
-
             if(debugger->isActive(RemoteDebug::DEBUG)) {
                 debugger->printf("(AmsDataStorage) Since last month update, hours: %.1f, import: %d (%.2f/hr), export: %d (%.2f/hr)\n", hrs, im, iph, ex, eph);
             }
 
-            // Make sure last month read is at midnight
-            if(tz != NULL) {
-                breakTime(tz->toLocal(month.lastMeterReadTime), tm);
-            } else {
-                breakTime(month.lastMeterReadTime, tm);
-            }
-            month.lastMeterReadTime = month.lastMeterReadTime - (tm.Hour * 3600) - (tm.Minute * 60) - tm.Second;
-            if(debugger->isActive(RemoteDebug::DEBUG)) {
-                debugger->printf("(AmsDataStorage) Last month read after resetting to midnight: %lu\n", month.lastMeterReadTime);
-            }
-
-            if(tz != NULL) {
-                breakTime(tz->toLocal(now), tm);
-            } else {
-                breakTime(now, tm);
-            }
-            time_t stopAt = now - (tm.Hour * 3600) - (tm.Minute * 60) - tm.Second;
+            time_t stopAt = now - (ltz.Hour * 3600) - (ltz.Minute * 60) - ltz.Second;
             while(month.lastMeterReadTime < stopAt) {
                 time_t cur = min(month.lastMeterReadTime + 86400, stopAt);
                 uint8_t hours = round((cur - month.lastMeterReadTime) / 3600.0);
 
-                if(tz != NULL) {
-                    breakTime(tz->toLocal(month.lastMeterReadTime), last);
-                } else {
-                    breakTime(month.lastMeterReadTime, last);
-                }
-
-                float val = ((iph * hours) - (eph * hours));
-                setDay(last.Day, val);
+                breakTime(tz->toLocal(month.lastMeterReadTime), last);
+                float imp = (iph * hours);
+                float exp = (eph * hours);
+                setDayImport(last.Day, imp);
+                setDayExport(last.Day, exp);
 
                 if(debugger->isActive(RemoteDebug::INFO)) {
-                    debugger->printf("(AmsDataStorage) Estimated usage for day %u: %.1f (%lu)\n", last.Day, val, cur);
+                    debugger->printf("(AmsDataStorage) Estimated usage for day %u: %.1f - %.1f (%lld)\n", last.Day, imp, exp, (int64_t) cur);
                 }
 
-                month.activeImport += iph * hours;
-                month.activeExport += eph * hours;
+                month.activeImport += imp;
+                month.activeExport += exp;
                 month.lastMeterReadTime = cur;
             }
         }
+        ret = true;
     }
-    return true;
+    return ret;
 }
 
-void AmsDataStorage::setHour(uint8_t hour, int32_t val) {
+void AmsDataStorage::setHourImport(uint8_t hour, int32_t val) {
     if(hour < 0 || hour > 24) return;
-    day.points[hour] = val / 10;
+    day.hImport[hour] = val / 10;
 }
 
-int16_t AmsDataStorage::getHour(uint8_t hour) {
+int32_t AmsDataStorage::getHourImport(uint8_t hour) {
     if(hour < 0 || hour > 24) return 0;
-    return day.points[hour] * 10;
+    return day.hImport[hour] * 10;
 }
 
-void AmsDataStorage::setDay(uint8_t day, int32_t val) {
+void AmsDataStorage::setHourExport(uint8_t hour, int32_t val) {
+    if(hour < 0 || hour > 24) return;
+    day.hExport[hour] = val / 10;
+}
+
+int32_t AmsDataStorage::getHourExport(uint8_t hour) {
+    if(hour < 0 || hour > 24) return 0;
+    return day.hExport[hour] * 10;
+}
+
+void AmsDataStorage::setDayImport(uint8_t day, int32_t val) {
     if(day < 1 || day > 31) return;
-    month.points[day-1] = val / 10;
+    month.dImport[day-1] = val / 10;
 }
 
-int32_t AmsDataStorage::getDay(uint8_t day) {
+int32_t AmsDataStorage::getDayImport(uint8_t day) {
     if(day < 1 || day > 31) return 0;
-    return (month.points[day-1] * 10);
+    return (month.dImport[day-1] * 10);
+}
+
+void AmsDataStorage::setDayExport(uint8_t day, int32_t val) {
+    if(day < 1 || day > 31) return;
+    month.dExport[day-1] = val / 10;
+}
+
+int32_t AmsDataStorage::getDayExport(uint8_t day) {
+    if(day < 1 || day > 31) return 0;
+    return (month.dExport[day-1] * 10);
 }
 
 bool AmsDataStorage::load() {
@@ -283,13 +292,7 @@ bool AmsDataStorage::load() {
         file.readBytes(buf, file.size());
         DayDataPoints* day = (DayDataPoints*) buf;
         file.close();
-
-        if(day->version == 3) {
-            memcpy(&this->day, day, sizeof(this->day));
-            ret = true;
-        } else {
-            ret = false;
-        }
+        ret = setDayData(*day);
     }
 
     if(LittleFS.exists(FILE_MONTHPLOT)) {
@@ -298,13 +301,7 @@ bool AmsDataStorage::load() {
         file.readBytes(buf, file.size());
         MonthDataPoints* month = (MonthDataPoints*) buf;
         file.close();
-
-        if(month->version == 4) {
-            memcpy(&this->month, month, sizeof(this->month));
-            ret = ret && true;
-        } else {
-            ret = false;
-        }
+        ret = ret && setMonthData(*month);
     }
 
     LittleFS.end();
@@ -323,7 +320,7 @@ bool AmsDataStorage::save() {
         File file = LittleFS.open(FILE_DAYPLOT, "w");
         char buf[sizeof(day)];
         memcpy(buf, &day, sizeof(day));
-        for(int i = 0; i < sizeof(day); i++) {
+        for(unsigned long i = 0; i < sizeof(day); i++) {
             file.write(buf[i]);
         }
         file.close();
@@ -332,7 +329,7 @@ bool AmsDataStorage::save() {
         File file = LittleFS.open(FILE_MONTHPLOT, "w");
         char buf[sizeof(month)];
         memcpy(buf, &month, sizeof(month));
-        for(int i = 0; i < sizeof(month); i++) {
+        for(unsigned long i = 0; i < sizeof(month); i++) {
             file.write(buf[i]);
         }
         file.close();
@@ -341,3 +338,92 @@ bool AmsDataStorage::save() {
     LittleFS.end();
     return true;
 }
+
+DayDataPoints AmsDataStorage::getDayData() {
+    return day;
+}
+
+MonthDataPoints AmsDataStorage::getMonthData() {
+    return month;
+}
+
+bool AmsDataStorage::setDayData(DayDataPoints& day) {
+    if(day.version == 4) {
+        this->day = day;
+        return true;
+    } else if(day.version == 3) {
+        this->day = day;
+        for(uint8_t i = 0; i < 24; i++) this->day.hExport[i] = 0;
+        this->day.version = 4;
+        return true;
+    }
+    return false;
+}
+
+bool AmsDataStorage::setMonthData(MonthDataPoints& month) {
+    if(month.version == 5) {
+        this->month = month;
+        return true;
+    } else if(month.version == 4) {
+        this->month = month;
+        for(uint8_t i = 0; i < 31; i++) this->month.dExport[i] = 0;
+        this->month.version = 5;
+        return true;
+    }
+    return false;
+}
+
+bool AmsDataStorage::isHappy() {
+    return isDayHappy() && isMonthHappy();
+}
+
+bool AmsDataStorage::isDayHappy() {
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return false;
+    tmElements_t tm, last;
+
+    if(now < day.lastMeterReadTime) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %lld < %lld\n", (int64_t) now, (int64_t) day.lastMeterReadTime);
+        return false;
+    }
+    if(now-day.lastMeterReadTime > 3600) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %lld - %lld > 3600\n", (int64_t) now, (int64_t) day.lastMeterReadTime);
+        return false;
+    }
+    breakTime(tz->toLocal(now), tm);
+    breakTime(tz->toLocal(day.lastMeterReadTime), last);
+    if(tm.Hour > last.Hour) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %d > %d\n", tm.Hour, last.Hour);
+        return false;
+    }
+
+    return true;
+}
+
+bool AmsDataStorage::isMonthHappy() {
+    if(tz == NULL) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Timezone is missing\n");
+        return false;
+    }
+
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return false;
+    tmElements_t tm, last;
+    
+    if(now < month.lastMeterReadTime) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %lld < %lld\n", (int64_t) now, (int64_t) month.lastMeterReadTime);
+        return false;
+    }
+    if(now-month.lastMeterReadTime > 86400) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %lld - %lld > 3600\n", (int64_t) now, (int64_t) month.lastMeterReadTime);
+        return false;
+    }
+    breakTime(tz->toLocal(now), tm);
+    breakTime(tz->toLocal(month.lastMeterReadTime), last);
+    if(tm.Day > last.Day) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %d > %d\n", tm.Day, last.Day);
+        return false;
+    }
+
+    return true;
+}

src/AmsDataStorage.h

@@ -5,45 +5,64 @@
 #include "RemoteDebug.h"
 #include "Timezone.h"
 
-#define EPOCH_2021_01_01 1609459200
-
 struct DayDataPoints {
     uint8_t version;
-    int16_t points[24];
+    int16_t hImport[24];
     time_t lastMeterReadTime;
     uint32_t activeImport;
     uint32_t activeExport;
-}; // 37 bytes
+    int16_t hExport[24];
+}; // 112 bytes
 
 struct MonthDataPoints {
     uint8_t version;
-    int16_t points[31];
+    int16_t dImport[31];
     time_t lastMeterReadTime;
     uint32_t activeImport;
     uint32_t activeExport;
-}; // 75 bytes
+    int16_t dExport[31];
+}; // 141 bytes
 
 class AmsDataStorage {
 public:
     AmsDataStorage(RemoteDebug*);
     void setTimezone(Timezone*);
     bool update(AmsData*);
-    int16_t getHour(uint8_t);
-    int32_t getDay(uint8_t);
+    int32_t getHourImport(uint8_t);
+    int32_t getHourExport(uint8_t);
+    int32_t getDayImport(uint8_t);
+    int32_t getDayExport(uint8_t);
     bool load();
     bool save();
 
+    DayDataPoints getDayData();
+    bool setDayData(DayDataPoints&);
+    MonthDataPoints getMonthData();
+    bool setMonthData(MonthDataPoints&);
+
+    bool isHappy();
+    bool isDayHappy();
+    bool isMonthHappy();
+
 private:
     Timezone* tz;
     DayDataPoints day = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
     MonthDataPoints month = {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0, 
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
     RemoteDebug* debugger;
-    void setHour(uint8_t, int32_t);
-    void setDay(uint8_t, int32_t);
+    void setHourImport(uint8_t, int32_t);
+    void setHourExport(uint8_t, int32_t);
+    void setDayImport(uint8_t, int32_t);
+    void setDayExport(uint8_t, int32_t);
 };
 
 #endif

src/AmsStorage.h

@@ -9,5 +9,8 @@
 
 #define FILE_DAYPLOT "/dayplot.bin"
 #define FILE_MONTHPLOT "/monthplot.bin"
+#define FILE_ENERGYACCOUNTING "/energyaccounting.bin"
+
+#define FILE_CFG "/configfile.cfg"
 
 #endif

src/AmsToMqttBridge.h

@@ -1,7 +1,7 @@
 #ifndef _AMSTOMQTTBRIDGE_H
 #define _AMSTOMQTTBRIDGE_H
 
-#define WIFI_CONNECTION_TIMEOUT 60000;
+#define WIFI_CONNECTION_TIMEOUT 30000;
 
 #define INVALID_BUTTON_PIN  0xFFFFFFFF
 

src/EnergyAccounting.cpp

@@ -0,0 +1,265 @@
+#include "EnergyAccounting.h"
+#include "LittleFS.h"
+#include "AmsStorage.h"
+#include "version.h"
+
+EnergyAccounting::EnergyAccounting(RemoteDebug* debugger) {
+    data.version = 1;
+    this->debugger = debugger;
+}
+
+void EnergyAccounting::setup(AmsDataStorage *ds, EntsoeApi *eapi, EnergyAccountingConfig *config) {
+    this->ds = ds;
+    this->eapi = eapi;
+    this->config = config;
+    this->currentThresholdIdx = 0;
+}
+
+EnergyAccountingConfig* EnergyAccounting::getConfig() {
+    return config;
+}
+
+void EnergyAccounting::setTimezone(Timezone* tz) {
+    this->tz = tz;
+}
+
+bool EnergyAccounting::update(AmsData* amsData) {
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return false;
+    if(tz == NULL) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Timezone is missing\n");
+        return false;
+    }
+
+    bool ret = false;
+    tmElements_t local;
+    breakTime(tz->toLocal(now), local);
+
+    if(!init) {
+        currentHour = local.Hour;
+        currentDay = local.Day;
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) Initializing data at %lld\n", (int64_t) now);
+        if(!load()) {
+            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) Unable to load existing data");
+            data = { 1, local.Month, 0, 0, 0, 0 };
+            if(calcDayUse()) ret = true;
+        }
+        init = true;
+    }
+
+    if(!initPrice && eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) Initializing prices at %lld\n", (int64_t) now);
+        calcDayCost();
+    }
+
+    if(local.Hour != currentHour && (amsData->getListType() >= 3 || local.Minute == 1)) {
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) New local hour %d\n", local.Hour);
+
+        if(calcDayUse()) ret = true;
+        if(local.Hour > 0) {
+            calcDayCost();
+        }
+
+        use = 0;
+        costHour = 0;
+        currentHour = local.Hour;
+
+        if(local.Day != currentDay) {
+            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) New day %d\n", local.Day);
+            data.costYesterday = costDay * 100;
+            data.costThisMonth += costDay * 100;
+            costDay = 0;
+            currentDay = local.Day;
+            ret = true;
+        }
+
+        if(local.Month != data.month) {
+            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) New month %d\n", local.Month);
+            data.costLastMonth = data.costThisMonth;
+            data.costThisMonth = 0;
+            data.maxHour = 0;
+            data.month = local.Month;
+            currentThresholdIdx = 0;
+            ret = true;
+        }
+    }
+
+    unsigned long ms = this->lastUpdateMillis > amsData->getLastUpdateMillis() ? 0 : amsData->getLastUpdateMillis() - this->lastUpdateMillis;
+    float kwh = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    lastUpdateMillis = amsData->getLastUpdateMillis();
+    if(kwh > 0) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh\n", kwh);
+        use += kwh;
+        if(eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
+            float price = eapi->getValueForHour(0);
+            float cost = price * kwh;
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  and %.4f %s\n", cost / 100.0, eapi->getCurrency());
+            costHour += cost;
+            costDay += cost;
+        }
+    }
+
+    if(config != NULL) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  calculating threshold, currently at %d\n", currentThresholdIdx);
+        while(getMonthMax() > config->thresholds[currentThresholdIdx] && currentThresholdIdx < 10) currentThresholdIdx++;
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  new threshold %d\n", currentThresholdIdx);
+    }
+
+    return ret;
+}
+
+bool EnergyAccounting::calcDayUse() {
+    time_t now = time(nullptr);
+    tmElements_t local, utc;
+    breakTime(tz->toLocal(now), local);
+
+    bool ret = false;
+    uint8_t lim = local.Day == 1 ? local.Hour : 24;
+    for(int i = 0; i < lim; i++) {
+        breakTime(now - ((lim - i) * 3600), utc);
+        int16_t val = ds->getHourImport(utc.Hour) / 10.0;
+        if(val > data.maxHour) {
+            data.maxHour = val;
+            ret = true;
+        }
+    }
+    return ret;
+}
+
+void EnergyAccounting::calcDayCost() {
+    time_t now = time(nullptr);
+    tmElements_t local, utc;
+    breakTime(tz->toLocal(now), local);
+
+    if(eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
+        if(initPrice) costDay = 0;
+        for(int i = 0; i < local.Hour; i++) {
+            float price = eapi->getValueForHour(i - local.Hour);
+            if(price == ENTSOE_NO_VALUE) break;
+            breakTime(now - ((local.Hour - i) * 3600), utc);
+            int16_t wh = ds->getHourImport(utc.Hour);
+            costDay += price * (wh / 1000.0);
+        }
+        initPrice = true;
+    }
+}
+
+double EnergyAccounting::getUseThisHour() {
+    return use;
+}
+
+double EnergyAccounting::getCostThisHour() {
+    return costHour;
+}
+
+double EnergyAccounting::getUseToday() {
+    float ret = 0.0;
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    tmElements_t local, utc;
+    breakTime(tz->toLocal(now), local);
+    for(int i = 0; i < local.Hour; i++) {
+        breakTime(now - ((local.Hour - i) * 3600), utc);
+        ret += ds->getHourImport(utc.Hour) / 1000.0;
+    }
+    return ret + getUseThisHour();
+}
+
+double EnergyAccounting::getCostToday() {
+    return costDay;
+}
+
+double EnergyAccounting::getCostYesterday() {
+    return data.costYesterday / 100.0;
+}
+
+double EnergyAccounting::getUseThisMonth() {
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    tmElements_t tm;
+    if(tz != NULL)
+        breakTime(tz->toLocal(now), tm);
+    else
+        breakTime(now, tm);
+    float ret = 0;
+    for(int i = 0; i < tm.Day; i++) {
+        ret += ds->getDayImport(i) / 1000.0;
+    }
+    return ret + getUseToday();
+}
+
+double EnergyAccounting::getCostThisMonth() {
+    return (data.costThisMonth / 100.0) + getCostToday();
+}
+
+double EnergyAccounting::getCostLastMonth() {
+    return data.costLastMonth / 100.0;
+}
+
+uint8_t EnergyAccounting::getCurrentThreshold() {
+    if(config == NULL)
+        return 0;
+    return config->thresholds[currentThresholdIdx];
+}
+
+float EnergyAccounting::getMonthMax() {
+    return data.maxHour / 100.0;
+}
+
+bool EnergyAccounting::load() {
+    if(!LittleFS.begin()) {
+        if(debugger->isActive(RemoteDebug::ERROR)) {
+            debugger->printf("(EnergyAccounting) Unable to load LittleFS\n");
+        }
+        return false;
+    }
+
+    bool ret = false;
+    if(LittleFS.exists(FILE_ENERGYACCOUNTING)) {
+        File file = LittleFS.open(FILE_ENERGYACCOUNTING, "r");
+        char buf[file.size()];
+        file.readBytes(buf, file.size());
+        EnergyAccountingData* data = (EnergyAccountingData*) buf;
+        file.close();
+
+        if(data->version == 1) {
+            memcpy(&this->data, data, sizeof(this->data));
+            ret = true;
+        } else {
+            ret = false;
+        }
+    }
+
+    LittleFS.end();
+
+    return ret;
+}
+
+bool EnergyAccounting::save() {
+    if(!LittleFS.begin()) {
+        if(debugger->isActive(RemoteDebug::ERROR)) {
+            debugger->printf("(EnergyAccounting) Unable to load LittleFS\n");
+        }
+        return false;
+    }
+    {
+        File file = LittleFS.open(FILE_ENERGYACCOUNTING, "w");
+        char buf[sizeof(data)];
+        memcpy(buf, &data, sizeof(data));
+        for(unsigned long i = 0; i < sizeof(data); i++) {
+            file.write(buf[i]);
+        }
+        file.close();
+    }
+
+    LittleFS.end();
+    return true;
+}
+
+EnergyAccountingData EnergyAccounting::getData() {
+    return this->data;
+}
+
+void EnergyAccounting::setData(EnergyAccountingData& data) {
+    this->data = data;
+}

src/EnergyAccounting.h

@@ -0,0 +1,59 @@
+#ifndef _ENERGYACCOUNTING_H
+#define _ENERGYACCOUNTING_H
+
+#include "Arduino.h"
+#include "AmsData.h"
+#include "AmsDataStorage.h"
+#include "entsoe/EntsoeApi.h"
+
+struct EnergyAccountingData {
+    uint8_t version;
+    uint8_t month;
+    uint16_t maxHour;
+    uint16_t costYesterday;
+    uint16_t costThisMonth;
+    uint16_t costLastMonth;
+};
+
+class EnergyAccounting {
+public:
+    EnergyAccounting(RemoteDebug*);
+    void setup(AmsDataStorage *ds, EntsoeApi *eapi, EnergyAccountingConfig *config);
+    void setTimezone(Timezone*);
+    EnergyAccountingConfig* getConfig();
+    bool update(AmsData* amsData);
+    bool save();
+
+    double getUseThisHour();
+    double getCostThisHour();
+    double getUseToday();
+    double getCostToday();
+    double getCostYesterday();
+    double getUseThisMonth();
+    double getCostThisMonth();
+    double getCostLastMonth();
+
+    float getMonthMax();
+    uint8_t getCurrentThreshold();
+
+    EnergyAccountingData getData();
+    void setData(EnergyAccountingData&);
+
+private:
+    RemoteDebug* debugger = NULL;
+    unsigned long lastUpdateMillis = 0;
+    bool init = false, initPrice = false;
+    AmsDataStorage *ds = NULL;
+    EntsoeApi *eapi = NULL;
+    EnergyAccountingConfig *config = NULL;
+    Timezone *tz = NULL;
+    uint8_t currentHour = 0, currentDay = 0, currentThresholdIdx = 0;
+    double use, costHour, costDay;
+    EnergyAccountingData data = { 0, 0, 0, 0, 0, 0 };
+
+    bool load();
+    bool calcDayUse();
+    void calcDayCost();
+};
+
+#endif

src/GBTAssembler.cpp

@@ -0,0 +1,53 @@
+#include "Arduino.h"
+#include "GBTAssembler.h"
+#include "ams/crc.h"
+
+GBTAssembler::GBTAssembler() {
+    buf = (uint8_t *)malloc((size_t)1024); // TODO find out from first package ?
+}
+
+void GBTAssembler::init(const uint8_t* d, HDLCContext* context) {
+    memcpy(buf, d, context->headersize);
+    pos = headersize = context->headersize;
+    buf[pos++] = 0x00; // HCS
+    buf[pos++] = 0x00; // HCS
+    buf[pos++] = 0xE6;
+    buf[pos++] = 0xE7;
+    buf[pos++] = 0x00;
+    lastSequenceNumber = 0;
+}
+
+int GBTAssembler::append(HDLCContext* context, const uint8_t* d, int length, Print* debugger) {
+    GBTHeader* h = (GBTHeader*) (d+context->apduStart);
+    uint16_t sequence = ntohs(h->sequence);
+
+    if(h->flag != 0xE0) return -9;
+
+    if(sequence == 1) {
+        init(d, context);
+    } else if(lastSequenceNumber != sequence-1) {
+        return -1;
+    }
+
+    uint8_t* ptr = (uint8_t*) &h[1];
+    memcpy(buf + pos, ptr, h->size);
+    pos += h->size;
+    lastSequenceNumber = sequence;
+    return 0;
+}
+
+uint16_t GBTAssembler::write(const uint8_t* d) {
+    uint16_t head = (0xA000) | pos+1;
+    buf[1] = (head>>8) & 0xFF;
+    buf[2] = head & 0xFF;
+    uint16_t hcs = crc16_x25(buf+1, headersize-1);
+    buf[headersize] = (hcs>>8) & 0xFF;
+    buf[headersize+1] = hcs & 0xFF;
+
+    uint16_t fcs = crc16_x25(buf+1, pos-1);
+    buf[pos++] = (fcs>>8) & 0xFF;
+    buf[pos++] = fcs & 0xFF;
+    buf[pos++] = HDLC_FLAG;
+    memcpy((uint8_t *) d, buf, pos);
+    return pos;
+}

src/GBTAssembler.h

@@ -0,0 +1,29 @@
+#ifndef _GBT_ASSEMBLER_H
+#define _GBT_ASSEMBLER_H
+
+#include <stdint.h>
+#include "ams/hdlc.h"
+
+typedef struct GBTHeader {
+	uint8_t flag;
+	uint8_t control;
+	uint16_t sequence;
+	uint16_t sequenceAck;
+    uint8_t size;
+} __attribute__((packed)) GBTHeader;
+
+class GBTAssembler {
+public:
+    GBTAssembler();
+    void init(const uint8_t* d, HDLCContext* context);
+    int append(HDLCContext* context, const uint8_t* d, int length, Print* debugger);
+    uint16_t write(const uint8_t* d);
+
+private:
+    uint16_t pos = 0;
+    uint8_t headersize = 0;
+    uint8_t *buf;
+    uint8_t lastSequenceNumber = 0;
+};
+
+#endif

src/HwTools.cpp

@@ -14,10 +14,32 @@ void HwTools::setup(GpioConfig* config, AmsConfiguration* amsConf) {
         config->tempSensorPin = 0xFF;
     }
 
+    #if defined(CONFIG_IDF_TARGET_ESP32S2)
+        analogReadResolution(13);
+        analogRange = 8192;
+        analogSetAttenuation(ADC_11db);
+    #elif defined(ESP32)
+        analogReadResolution(12);
+        analogRange = 4096;
+        analogSetAttenuation(ADC_6db);
+    #endif
     if(config->vccPin > 0 && config->vccPin < 40) {
-        getAdcChannel(config->vccPin, voltAdc);
-        if(voltAdc.unit != 0xFF) {
-            #if defined(CONFIG_IDF_TARGET_ESP32)
+        #if defined(CONFIG_IDF_TARGET_ESP32S2)
+            getAdcChannel(config->vccPin, voltAdc);
+            if(voltAdc.unit != 0xFF) {
+                if(voltAdc.unit == ADC_UNIT_1) {
+                    voltAdcChar = (esp_adc_cal_characteristics_t*) calloc(1, sizeof(esp_adc_cal_characteristics_t));
+                    esp_adc_cal_value_t adcVal = esp_adc_cal_characterize((adc_unit_t) voltAdc.unit, ADC_ATTEN_DB_11, ADC_WIDTH_BIT_13, 1100, voltAdcChar);
+                    adc1_config_channel_atten((adc1_channel_t) voltAdc.channel, ADC_ATTEN_DB_11);
+                } else if(voltAdc.unit == ADC_UNIT_2) {
+                    voltAdcChar = (esp_adc_cal_characteristics_t*) calloc(1, sizeof(esp_adc_cal_characteristics_t));
+                    esp_adc_cal_value_t adcVal = esp_adc_cal_characterize((adc_unit_t) voltAdc.unit, ADC_ATTEN_DB_11, ADC_WIDTH_BIT_13, 1100, voltAdcChar);
+                    adc2_config_channel_atten((adc2_channel_t) voltAdc.channel, ADC_ATTEN_DB_11);
+                }
+            }
+        #elif defined(ESP32)
+            getAdcChannel(config->vccPin, voltAdc);
+            if(voltAdc.unit != 0xFF) {
                 if(voltAdc.unit == ADC_UNIT_1) {
                     voltAdcChar = (esp_adc_cal_characteristics_t*) calloc(1, sizeof(esp_adc_cal_characteristics_t));
                     esp_adc_cal_value_t adcVal = esp_adc_cal_characterize((adc_unit_t) voltAdc.unit, ADC_ATTEN_DB_6, ADC_WIDTH_BIT_12, 1100, voltAdcChar);
@@ -27,10 +49,10 @@ void HwTools::setup(GpioConfig* config, AmsConfiguration* amsConf) {
                     esp_adc_cal_value_t adcVal = esp_adc_cal_characterize((adc_unit_t) voltAdc.unit, ADC_ATTEN_DB_6, ADC_WIDTH_BIT_12, 1100, voltAdcChar);
                     adc2_config_channel_atten((adc2_channel_t) voltAdc.channel, ADC_ATTEN_DB_6);
                 }
-            #endif
-        } else {
+            }
+        #else
             pinMode(config->vccPin, INPUT);
-        }
+        #endif
     } else {
         voltAdc.unit = 0xFF;
         voltAdc.channel = 0xFF;
@@ -109,6 +131,16 @@ void HwTools::getAdcChannel(uint8_t pin, AdcConfig& config) {
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_7;
                 break;
+            #if defined(CONFIG_IDF_TARGET_ESP32S2)
+            case ADC1_CHANNEL_8_GPIO_NUM:
+                config.unit = ADC_UNIT_1;
+                config.channel = ADC1_CHANNEL_8;
+                break;
+            case ADC1_CHANNEL_9_GPIO_NUM:
+                config.unit = ADC_UNIT_1;
+                config.channel = ADC1_CHANNEL_9;
+                break;
+            #endif
             case ADC2_CHANNEL_0_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_0;
@@ -156,7 +188,7 @@ void HwTools::getAdcChannel(uint8_t pin, AdcConfig& config) {
 double HwTools::getVcc() {
     double volts = 0.0;
     if(config->vccPin != 0xFF) {
-        #if defined(CONFIG_IDF_TARGET_ESP32)
+        #if defined(ESP32)
             if(voltAdc.unit != 0xFF) {
                 uint32_t x = 0;
                 for (int i = 0; i < 10; i++) {
@@ -164,7 +196,11 @@ double HwTools::getVcc() {
                         x +=  adc1_get_raw((adc1_channel_t) voltAdc.channel);
                     } else if(voltAdc.unit == ADC_UNIT_2) {
                         int v = 0;
+                        #if defined(CONFIG_IDF_TARGET_ESP32S2)
+                        adc2_get_raw((adc2_channel_t) voltAdc.channel, ADC_WIDTH_BIT_13, &v);
+                        #elif defined(CONFIG_IDF_TARGET_ESP32)
                         adc2_get_raw((adc2_channel_t) voltAdc.channel, ADC_WIDTH_BIT_12, &v);
+                        #endif
                         x += v;
                     }
                 }
@@ -176,20 +212,22 @@ double HwTools::getVcc() {
                 for (int i = 0; i < 10; i++) {
                     x += analogRead(config->vccPin);
                 }
-                volts = x / 40950;
+                volts = (x * 3.3) / 10.0 / analogRange;
             }
         #else
             uint32_t x = 0;
             for (int i = 0; i < 10; i++) {
                 x += analogRead(config->vccPin);
             }
-            volts = x / 10240;
+            volts = (x * 3.3) / 10.0 / analogRange;
         #endif
     } else {
         #if defined(ESP8266)
             volts = ESP.getVcc() / 1024.0;
         #endif
     }
+    if(volts == 0.0) return 0.0;
+
     if(config->vccResistorGnd > 0 && config->vccResistorVcc > 0) {
         volts *= ((double) (config->vccResistorGnd + config->vccResistorVcc) / config->vccResistorGnd);
     }
@@ -303,12 +341,7 @@ double HwTools::getTemperature() {
 double HwTools::getTemperatureAnalog() {
     if(config->tempAnalogSensorPin != 0xFF) {
         float adcCalibrationFactor = 1.06587;
-        int volts;
-        #if defined(ESP8266)
-            volts = (analogRead(config->tempAnalogSensorPin) / 1024.0) * 3.3;
-        #elif defined(ESP32)
-            volts = (analogRead(config->tempAnalogSensorPin) / 4095.0) * 3.3;
-        #endif
+        int volts = ((double) analogRead(config->tempAnalogSensorPin) / analogRange) * 3.3;
         return ((volts * adcCalibrationFactor) - 0.4) / 0.0195;
     }
     return DEVICE_DISCONNECTED_C;

src/HwTools.h

@@ -51,6 +51,7 @@ public:
 
     HwTools() {};
 private:
+    uint16_t analogRange = 1024;
     AdcConfig voltAdc, tempAdc;
     #if defined(ESP32)
         esp_adc_cal_characteristics_t* voltAdcChar, tempAdcChar;

src/IEC6205621.cpp

@@ -1,11 +1,20 @@
 #include "IEC6205621.h"
+#include "ams/crc.h"
 
-IEC6205621::IEC6205621(String payload) {
-	if(payload.length() < 16)
+IEC6205621::IEC6205621(const char* p) {
+	if(strlen(p) < 16)
 		return;
 
+	String payload(p+1);
+	int crc_pos = payload.lastIndexOf("!");
+	String crc = payload.substring(crc_pos+1, crc_pos+5);
+	//uint16_t crc_calc = crc16_x25((uint8_t*) (payload.startsWith("/") ? p+1 : p), crc_pos);
+
+	//Serial.printf("CRC %s :: %04X\n", crc.c_str(), crc_calc);
+
 	lastUpdateMillis = millis();
 	listId = payload.substring(payload.startsWith("/") ? 1 : 0, payload.indexOf("\n"));
+
 	if(listId.startsWith("ADN")) {
 		meterType = AmsTypeAidon;
 		listId = listId.substring(0,4);
@@ -21,7 +30,7 @@ IEC6205621::IEC6205621(String payload) {
 	} else if(listId.startsWith("XMX")) {
 		meterType = AmsTypeLandis;
 		listId = listId.substring(0,6);
-	} else if(listId.startsWith("Ene")) {
+	} else if(listId.startsWith("Ene") || listId.startsWith("EST")) {
 		meterType = AmsTypeSagemcom;
 		listId = listId.substring(0,4);
 	} else {
@@ -55,10 +64,10 @@ IEC6205621::IEC6205621(String payload) {
 		meterTimestamp = makeTime(tm); // TODO: Adjust for time zone
 	}
 
-	activeImportPower = (uint16_t) (extractDouble(payload, "1.7.0") * 1000);
-	activeExportPower = (uint16_t) (extractDouble(payload, "2.7.0") * 1000);
-	reactiveImportPower = (uint16_t) (extractDouble(payload, "3.7.0") * 1000);
-	reactiveExportPower = (uint16_t) (extractDouble(payload, "4.7.0") * 1000);
+	activeImportPower = (uint16_t) (extractDouble(payload, "1.7.0"));
+	activeExportPower = (uint16_t) (extractDouble(payload, "2.7.0"));
+	reactiveImportPower = (uint16_t) (extractDouble(payload, "3.7.0"));
+	reactiveExportPower = (uint16_t) (extractDouble(payload, "4.7.0"));
 
 	if(activeImportPower > 0)
 		listType = 1;
@@ -73,11 +82,40 @@ IEC6205621::IEC6205621(String payload) {
 	
 	if(l1voltage > 0 || l2voltage > 0 || l3voltage > 0)
 		listType = 2;
+
+	double val = 0.0;
 	
-	activeImportCounter = extractDouble(payload, "1.8.0");
-	activeExportCounter = extractDouble(payload, "2.8.0");
-	reactiveImportCounter = extractDouble(payload, "3.8.0");
-	reactiveExportCounter = extractDouble(payload, "4.8.0");
+	val = extractDouble(payload, "1.8.0");
+	if(val == 0) {
+		for(int i = 1; i < 9; i++) {
+			val += extractDouble(payload, "1.8." + String(i,10));
+		}
+	}
+	if(val > 0) activeImportCounter = val / 1000;
+
+	val = extractDouble(payload, "2.8.0");
+	if(val == 0) {
+		for(int i = 1; i < 9; i++) {
+			val += extractDouble(payload, "2.8." + String(i,10));
+		}
+	}
+	if(val > 0) activeExportCounter = val / 1000;
+
+	val = extractDouble(payload, "3.8.0");
+	if(val == 0) {
+		for(int i = 1; i < 9; i++) {
+			val += extractDouble(payload, "3.8." + String(i,10));
+		}
+	}
+	if(val > 0) reactiveImportCounter = val / 1000;
+
+	val = extractDouble(payload, "4.8.0");
+	if(val == 0) {
+		for(int i = 1; i < 9; i++) {
+			val += extractDouble(payload, "4.8." + String(i,10));
+		}
+	}
+	if(val > 0) reactiveExportCounter = val / 1000;
 
 	if(activeImportCounter > 0 || activeExportCounter > 0 || reactiveImportCounter > 0 || reactiveExportCounter > 0)
 		listType = 3;
@@ -104,5 +142,14 @@ String IEC6205621::extract(String payload, String obis) {
 }
 
 double IEC6205621::extractDouble(String payload, String obis) {
-	return extract(payload, obis).toDouble();
+	String str = extract(payload, obis);
+	if(str.isEmpty()) {
+		return 0.0;
+	}
+
+	int a = str.indexOf("*");
+	String val = str.substring(0,a);
+	String unit = str.substring(a+1);
+
+	return unit.startsWith("k") ? val.toDouble() * 1000 : val.toDouble();
 }

src/IEC6205621.h

@@ -1,11 +1,12 @@
 #ifndef _IEC62056_21_H
 #define _IEC62056_21_H
 
+#include "Arduino.h"
 #include "AmsData.h"
 
 class IEC6205621 : public AmsData {
 public:
-    IEC6205621(String payload);
+    IEC6205621(const char* payload);
 
 private:
     String extract(String payload, String obis);

src/IEC6205675.cpp

@@ -2,7 +2,7 @@
 #include "lwip/def.h"
 #include "Timezone.h"
 
-IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distributionSystem, CosemDateTime packageTimestamp, HDLCConfig* hc) {
+IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterConfig, CosemDateTime packageTimestamp, HDLCConfig* hc) {
     double val;
     char str[64];
 
@@ -140,11 +140,13 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
 
         meterType = AmsTypeUnknown;
         CosemData* version = findObis(AMS_OBIS_VERSION, sizeof(AMS_OBIS_VERSION), d);
-        if(version != NULL && version->base.type == CosemTypeString) {
+        if(version != NULL && (version->base.type == CosemTypeString || version->base.type == CosemTypeOctetString)) {
             if(memcmp(version->str.data, "AIDON", 5) == 0) {
                 meterType = AmsTypeAidon;
             } else if(memcmp(version->str.data, "Kamstrup", 8) == 0) {
                 meterType = AmsTypeKamstrup;
+            } else if(memcmp(version->str.data, "KFM", 3) == 0) {
+                meterType = AmsTypeKaifa;
             }
         } else {
             version = getCosemDataAt(1, ((char *) (d)));
@@ -156,7 +158,7 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
         }
         // Try system title
         if(meterType == AmsTypeUnknown && hc != NULL) {
-            if(memcmp(hc->system_title, "SAGY", 4)) {
+            if(memcmp(hc->system_title, "SAGY", 4) == 0) {
                 meterType = AmsTypeSagemcom;
             }
         }
@@ -272,18 +274,22 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
 
         val = getNumber(AMS_OBIS_POWER_FACTOR, sizeof(AMS_OBIS_POWER_FACTOR), ((char *) (d)));
         if(val != NOVALUE) {
+            listType = 4;
             powerFactor = val;
         }
         val = getNumber(AMS_OBIS_POWER_FACTOR_L1, sizeof(AMS_OBIS_POWER_FACTOR_L1), ((char *) (d)));
         if(val != NOVALUE) {
+            listType = 4;
             l1PowerFactor = val;
         }
         val = getNumber(AMS_OBIS_POWER_FACTOR_L2, sizeof(AMS_OBIS_POWER_FACTOR_L2), ((char *) (d)));
         if(val != NOVALUE) {
+            listType = 4;
             l2PowerFactor = val;
         }
         val = getNumber(AMS_OBIS_POWER_FACTOR_L3, sizeof(AMS_OBIS_POWER_FACTOR_L3), ((char *) (d)));
         if(val != NOVALUE) {
+            listType = 4;
             l3PowerFactor = val;
         }
 
@@ -308,6 +314,13 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
                 l2PowerFactor /= 100;
             if(l3PowerFactor != 0)
                 l3PowerFactor /= 100;
+
+            int watt = abs((l1voltage * l1current) + (l2voltage * l2current) + (l3voltage * l3current));
+            if(watt / (activeImportPower + activeExportPower  + reactiveImportPower + reactiveExportPower) > 2) {
+                l1current = l1current != 0 ? l1current / 10 : 0;
+                l2current = l2current != 0 ? l2current / 10 : 0;
+                l3current = l3current != 0 ? l3current / 10 : 0;
+            }
         } else if(meterType == AmsTypeSagemcom) {
             CosemData* meterTs = getCosemDataAt(1, ((char *) (d)));
             if(meterTs != NULL) {
@@ -329,17 +342,53 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
                         break;
                 }
             }
+        } else if(meterType == AmsTypeKaifa) {
+            if(l1current != 0)
+                l1current /= 1000;
+            if(l2current != 0)
+                l2current /= 1000;
+            if(l3current != 0)
+                l3current /= 1000;
+            if(l1voltage != 0)
+                l1voltage /= 10;
+            if(l2voltage != 0)
+                l2voltage /= 10;
+            if(l3voltage != 0)
+                l3voltage /= 10;
         }
 
         lastUpdateMillis = millis();
     }
 
+    if(meterConfig->wattageMultiplier > 0) {
+        activeImportPower = activeImportPower > 0 ? activeImportPower * (meterConfig->wattageMultiplier / 1000.0) : 0;
+        activeExportPower = activeExportPower > 0 ? activeExportPower * (meterConfig->wattageMultiplier / 1000.0) : 0;
+        reactiveImportPower = reactiveImportPower > 0 ? reactiveImportPower * (meterConfig->wattageMultiplier / 1000.0) : 0;
+        reactiveExportPower = reactiveExportPower > 0 ? reactiveExportPower * (meterConfig->wattageMultiplier / 1000.0) : 0;
+    }
+    if(meterConfig->voltageMultiplier > 0) {
+        l1voltage = l1voltage > 0 ? l1voltage * (meterConfig->voltageMultiplier / 1000.0) : 0;
+        l2voltage = l2voltage > 0 ? l2voltage * (meterConfig->voltageMultiplier / 1000.0) : 0;
+        l3voltage = l3voltage > 0 ? l3voltage * (meterConfig->voltageMultiplier / 1000.0) : 0;
+    }
+    if(meterConfig->amperageMultiplier > 0) {
+        l1current = l1current > 0 ? l1current * (meterConfig->amperageMultiplier / 1000.0) : 0;
+        l2current = l2current > 0 ? l2current * (meterConfig->amperageMultiplier / 1000.0) : 0;
+        l3current = l3current > 0 ? l3current * (meterConfig->amperageMultiplier / 1000.0) : 0;
+    }
+    if(meterConfig->accumulatedMultiplier > 0) {
+        activeImportCounter = activeImportCounter > 0 ? activeImportCounter * (meterConfig->accumulatedMultiplier / 1000.0) : 0;
+        activeExportCounter = activeExportCounter > 0 ? activeExportCounter * (meterConfig->accumulatedMultiplier / 1000.0) : 0;
+        reactiveImportCounter = reactiveImportCounter > 0 ? reactiveImportCounter * (meterConfig->accumulatedMultiplier / 1000.0) : 0;
+        reactiveExportCounter = reactiveExportCounter > 0 ? reactiveExportCounter * (meterConfig->accumulatedMultiplier / 1000.0) : 0;
+    }
+
     threePhase = l1voltage > 0 && l2voltage > 0 && l3voltage > 0;
     if(!threePhase)
         twoPhase = (l1voltage > 0 && l2voltage > 0) || (l2voltage > 0 && l3voltage > 0) || (l3voltage > 0  && l1voltage > 0);
 
     // Special case for Norwegian IT/TT meters that does not report all values
-    if(distributionSystem == 1) {
+    if(meterConfig->distributionSystem == 1) {
         if(threePhase) {
             if(l2current == 0.0 && l1current > 0.0 && l3current > 0.0) {
                 l2current = (((activeImportPower - activeExportPower) * sqrt(3)) - (l1voltage * l1current) - (l3voltage * l3current)) / l2voltage;
@@ -371,20 +420,25 @@ CosemData* IEC6205675::getCosemDataAt(uint8_t index, const char* ptr) {
                 pos += 2 + item->base.length;
                 break;
             case CosemTypeLongSigned:
-                pos += 5;
-                break;
             case CosemTypeLongUnsigned:
                 pos += 3;
                 break;
+            case CosemTypeDLongSigned:
             case CosemTypeDLongUnsigned:
                 pos += 5;
                 break;
+            case CosemTypeLong64Signed:
+            case CosemTypeLong64Unsigned:
+                pos += 9;
+                break;
             case CosemTypeNull:
-                return NULL;
+                pos += 1;
+                break;
             default:
                 pos += 2;
         }
         i++;
+        if(pos-ptr > 900) break; 
     } while(item->base.type != HDLC_FLAG);
     return NULL;
 }
@@ -414,19 +468,24 @@ CosemData* IEC6205675::findObis(uint8_t* obis, int matchlength, const char* ptr)
                 break;
             }
             case CosemTypeLongSigned:
-                pos += 5;
-                break;
             case CosemTypeLongUnsigned:
                 pos += 3;
                 break;
+            case CosemTypeDLongSigned:
             case CosemTypeDLongUnsigned:
                 pos += 5;
                 break;
+            case CosemTypeLong64Signed:
+            case CosemTypeLong64Unsigned:
+                pos += 9;
+                break;
             case CosemTypeNull:
-                return NULL;
+                pos += 1;
+                break;
             default:
                 pos += 2;
         }
+        if(pos-ptr > 900) break; 
     } while(item->base.type != HDLC_FLAG);
     return NULL;
 }
@@ -458,22 +517,40 @@ double IEC6205675::getNumber(CosemData* item) {
         double ret = 0.0;
         char* pos = ((char*) item);
         switch(item->base.type) {
+            case CosemTypeLongSigned: {
+                int16_t i16 = ntohs(item->ls.data);
+                ret = i16;
+                pos += 3;
+                break;
+            }
             case CosemTypeLongUnsigned: {
                 uint16_t u16 = ntohs(item->lu.data);
                 ret = u16;
                 pos += 3;
                 break;
             }
+            case CosemTypeDLongSigned: {
+                int32_t i32 = ntohl(item->dlu.data);
+                ret = i32;
+                pos += 5;
+                break;
+            }
             case CosemTypeDLongUnsigned: {
                 uint32_t u32 = ntohl(item->dlu.data);
                 ret = u32;
                 pos += 5;
                 break;
             }
-            case CosemTypeLongSigned: {
-                int16_t i16 = ntohs(item->ls.data);
-                ret = i16;
-                pos += 3;
+            case CosemTypeLong64Signed: {
+                int64_t i64 = ntohll(item->l64s.data);
+                ret = i64;
+                pos += 9;
+                break;
+            }
+            case CosemTypeLong64Unsigned: {
+                uint64_t u64 = ntohll(item->l64u.data);
+                ret = u64;
+                pos += 9;
                 break;
             }
         }

src/IEC6205675.h

@@ -3,6 +3,7 @@
 
 #include "AmsData.h"
 #include "ams/hdlc.h"
+#include "AmsConfiguration.h"
 
 #define NOVALUE 0xFFFFFFFF
 
@@ -13,7 +14,7 @@ struct AmsOctetTimestamp {
 
 class IEC6205675 : public AmsData {
 public:
-    IEC6205675(const char* payload, uint8_t useMeterType, uint8_t distributionSystem, CosemDateTime packageTimestamp, HDLCConfig* hc);
+    IEC6205675(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, CosemDateTime packageTimestamp, HDLCConfig* hc);
 
 private:
     CosemData* getCosemDataAt(uint8_t index, const char* ptr);
@@ -24,33 +25,19 @@ private:
     time_t getTimestamp(uint8_t* obis, int matchlength, const char* ptr);
     time_t getTimestamp(CosemDateTime timestamp);
 
-    uint8_t AMS_OBIS_VERSION[6]                 = { 1, 1,  0, 2, 129, 255 };
+    uint8_t AMS_OBIS_VERSION[4]                 = {  0, 2, 129, 255 };
     uint8_t AMS_OBIS_METER_MODEL[4]             = { 96, 1, 1, 255 };
     uint8_t AMS_OBIS_METER_MODEL_2[4]           = { 96, 1, 7, 255 };
     uint8_t AMS_OBIS_METER_ID[4]                = { 96, 1, 0, 255 };
     uint8_t AMS_OBIS_METER_ID_2[4]              = {  0, 0, 5, 255 };
     uint8_t AMS_OBIS_METER_TIMESTAMP[4]         = {  1, 0, 0, 255 };
     uint8_t AMS_OBIS_ACTIVE_IMPORT[4]           = {  1, 7, 0, 255 };
-    uint8_t AMS_OBIS_ACTIVE_IMPORT_L1[4]        = { 21, 7, 0, 255 };
-    uint8_t AMS_OBIS_ACTIVE_IMPORT_L2[4]        = { 41, 7, 0, 255 };
-    uint8_t AMS_OBIS_ACTIVE_IMPORT_L3[4]        = { 61, 7, 0, 255 };
     uint8_t AMS_OBIS_ACTIVE_EXPORT[4]           = {  2, 7, 0, 255 };
-    uint8_t AMS_OBIS_ACTIVE_EXPORT_L1[4]        = { 22, 7, 0, 255 };
-    uint8_t AMS_OBIS_ACTIVE_EXPORT_L2[4]        = { 42, 7, 0, 255 };
-    uint8_t AMS_OBIS_ACTIVE_EXPORT_L3[4]        = { 62, 7, 0, 255 };
     uint8_t AMS_OBIS_REACTIVE_IMPORT[4]         = {  3, 7, 0, 255 };
-    uint8_t AMS_OBIS_REACTIVE_IMPORT_L1[4]      = { 23, 7, 0, 255 };
-    uint8_t AMS_OBIS_REACTIVE_IMPORT_L2[4]      = { 43, 7, 0, 255 };
-    uint8_t AMS_OBIS_REACTIVE_IMPORT_L3[4]      = { 63, 7, 0, 255 };
     uint8_t AMS_OBIS_REACTIVE_EXPORT[4]         = {  4, 7, 0, 255 };
-    uint8_t AMS_OBIS_REACTIVE_EXPORT_L1[4]      = { 24, 7, 0, 255 };
-    uint8_t AMS_OBIS_REACTIVE_EXPORT_L2[4]      = { 44, 7, 0, 255 };
-    uint8_t AMS_OBIS_REACTIVE_EXPORT_L3[4]      = { 64, 7, 0, 255 };
-    uint8_t AMS_OBIS_CURRENT[4]                 = { 11, 7, 0, 255 };
     uint8_t AMS_OBIS_CURRENT_L1[4]              = { 31, 7, 0, 255 };
     uint8_t AMS_OBIS_CURRENT_L2[4]              = { 51, 7, 0, 255 };
     uint8_t AMS_OBIS_CURRENT_L3[4]              = { 71, 7, 0, 255 };
-    uint8_t AMS_OBIS_VOLTAGE[4]                 = { 12, 7, 0, 255 };
     uint8_t AMS_OBIS_VOLTAGE_L1[4]              = { 32, 7, 0, 255 };
     uint8_t AMS_OBIS_VOLTAGE_L2[4]              = { 52, 7, 0, 255 };
     uint8_t AMS_OBIS_VOLTAGE_L3[4]              = { 72, 7, 0, 255 };

src/ams/hdlc.cpp

@@ -15,7 +15,7 @@ void mbus_hexdump(const uint8_t* buf, int len) {
     printf("]\n");
 }
 
-int HDLC_validate(const uint8_t* d, int length, HDLCConfig* config, CosemDateTime* timestamp) {
+int HDLC_validate(const uint8_t* d, int length, HDLCConfig* config, CosemDateTime* timestamp, HDLCContext* context) {
     int len;
     int headersize = 3;
     int footersize = 1;
@@ -64,6 +64,8 @@ int HDLC_validate(const uint8_t* d, int length, HDLCConfig* config, CosemDateTim
             headersize++;
             ptr++;
 
+            context->headersize = headersize + 1; // Include control byte in reported header size
+
             HDLC3CtrlHcs* t3 = (HDLC3CtrlHcs*) (ptr);
             headersize += 3;
 
@@ -73,10 +75,12 @@ int HDLC_validate(const uint8_t* d, int length, HDLCConfig* config, CosemDateTim
 
             ptr += sizeof *t3;
 
-            // Extract LLC
-            HDLCLLC* llc = (HDLCLLC*) ptr;
-            ptr += sizeof *llc;
-            headersize += sizeof *llc;
+            // Extract LLC if present
+            if(((*ptr) & 0xFF) == 0xE6) {
+                HDLCLLC* llc = (HDLCLLC*) ptr;
+                ptr += sizeof *llc;
+                headersize += sizeof *llc;
+            }
         } else {
             return HDLC_UNKNOWN_DATA;
         }
@@ -133,152 +137,172 @@ int HDLC_validate(const uint8_t* d, int length, HDLCConfig* config, CosemDateTim
         return HDLC_UNKNOWN_DATA;
     }
 
-    if(((*ptr) & 0xFF) == 0x0F) {
-        // Unencrypted APDU
-        HDLCADPU* adpu = (HDLCADPU*) (ptr);
-        ptr += sizeof *adpu;
+    context->apdu = *ptr;
+    context->apduStart = ptr-d;
 
-        // ADPU timestamp
-        CosemData* dateTime = (CosemData*) ptr;
-        if(dateTime->base.type == CosemTypeOctetString) {
-            if(dateTime->base.length == 0x0C) {
-                memcpy(timestamp, ptr+1, dateTime->base.length+1);
-            }
-            ptr += 2 + dateTime->base.length;
-        } else if(dateTime->base.type == CosemTypeNull) {
-            timestamp = 0;
-            ptr++;
-        } else if(dateTime->base.type == CosemTypeDateTime) {
-            memcpy(timestamp, ptr, dateTime->base.length);
-        } else if(dateTime->base.type == 0x0C) { // Kamstrup bug...
-            memcpy(timestamp, ptr, 13);
-            ptr += 13;
-        } else {
-            return HDLC_TIMESTAMP_UNKNOWN;
-        }
-
-        return ptr-d;
-    } else if(((*ptr) & 0xFF) == 0xDB) {
+    // Encrypted
+    if(((*ptr) & 0xFF) == 0xDB) {
         if(length < headersize + 18)
             return HDLC_FRAME_INCOMPLETE;
 
-        ptr++;
-        // Encrypted APDU
-        // http://www.weigu.lu/tutorials/sensors2bus/04_encryption/index.html
-        if(config == NULL)
-            return HDLC_ENCRYPTION_CONFIG_MISSING;
+        int ret = mbus_decrypt(ptr, length - headersize - footersize, config);
+        if(ret < 0) return ret;
+        ptr += ret;
+    }
 
-        uint8_t systemTitleLength = *ptr;
-        ptr++;
-        memcpy(config->system_title, ptr, systemTitleLength);
-        memcpy(config->initialization_vector, config->system_title, systemTitleLength);
-
-        headersize += 2 + systemTitleLength;
-        ptr += systemTitleLength;
-        if(((*ptr) & 0xFF) == 0x81) {
-            ptr++;
-            len = *ptr;
-            // 1-byte payload length
-            ptr++;
-            headersize += 2;
-        } else if(((*ptr) & 0xFF) == 0x82) {
-            HDLCHeader* h = (HDLCHeader*) ptr;
-
-            // 2-byte payload length
-            len = (ntohs(h->format) & 0xFFFF);
-
-            ptr += 3;
-            headersize += 3;
+    // GBT (General Block Transfer)
+    if(((*ptr) & 0xFF) == 0xE0) {
+        uint8_t control = *(ptr+1); // 1100 0000, 1=last frame, 1=streaming, remainig=window
+        // TODO GBT data from ptr-d
+        if((control & 0x80) == 0x00) {
+            return HDLC_GBT_INTERMEDIATE;
+        } else {
+            return HDLC_GBT_LAST;
         }
-        if(len + headersize + footersize > length)
-            return HDLC_FRAME_INCOMPLETE;
+    }
 
-        //Serial.printf("\nL: %d : %d, %d : %d\n", length, len, headersize, footersize);
+    // Yes, we are doing this again, after potential decryption
+    context->apdu = *ptr;
+    context->apduStart = ptr-d;
+    ptr++;
+    ptr += 4; // Skip invoke ID and priority
 
-        memcpy(config->additional_authenticated_data, ptr, 1);
-
-        // Security tag
-        uint8_t sec = *ptr;
-        ptr++;
-        headersize++;
-
-        // Frame counter
-        memcpy(config->initialization_vector + 8, ptr, 4);
-        ptr += 4;
-        headersize += 4;
-
-        // Authentication enabled
-        uint8_t authkeylen = 0, aadlen = 0;
-        if((sec & 0x10) == 0x10) {
-            authkeylen = 12;
-            aadlen = 17;
-            footersize += authkeylen;
-            memcpy(config->additional_authenticated_data + 1, config->authentication_key, 16);
-            memcpy(config->authentication_tag, ptr + len - footersize - 2, authkeylen);
+    // ADPU timestamp
+    CosemData* dateTime = (CosemData*) ptr;
+    if(dateTime->base.type == CosemTypeOctetString) {
+        if(dateTime->base.length == 0x0C) {
+            memcpy(timestamp, ptr+1, dateTime->base.length+1);
         }
+        ptr += 2 + dateTime->base.length;
+    } else if(dateTime->base.type == CosemTypeNull) {
+        timestamp = 0;
+        ptr++;
+    } else if(dateTime->base.type == CosemTypeDateTime) {
+        memcpy(timestamp, ptr, dateTime->base.length);
+    } else if(dateTime->base.type == 0x0C) { // Kamstrup bug...
+        memcpy(timestamp, ptr, 13);
+        ptr += 13;
+    } else {
+        return HDLC_TIMESTAMP_UNKNOWN;
+    }
 
-        #if defined(ESP8266)
-            br_gcm_context gcmCtx;
-            br_aes_ct_ctr_keys bc;
-            br_aes_ct_ctr_init(&bc, config->encryption_key, 16);
-            br_gcm_init(&gcmCtx, &bc.vtable, br_ghash_ctmul32);
-            br_gcm_reset(&gcmCtx, config->initialization_vector, sizeof(config->initialization_vector));
-            if(authkeylen > 0) {
-                br_gcm_aad_inject(&gcmCtx, config->additional_authenticated_data, aadlen);
-            }
-            br_gcm_flip(&gcmCtx);
-            br_gcm_run(&gcmCtx, 0, (void*) (ptr), len - authkeylen - 5); // 5 == security tag and frame counter
-            if(authkeylen > 0 && br_gcm_check_tag_trunc(&gcmCtx, config->authentication_tag, authkeylen) != 1) {
-                return HDLC_ENCRYPTION_AUTH_FAILED;
-            }
-        #elif defined(ESP32)
-            uint8_t cipher_text[len - authkeylen - 5];
-            memcpy(cipher_text, ptr, len - authkeylen - 5);
+    return ptr-d;
+}
 
-            mbedtls_gcm_context m_ctx;
-            mbedtls_gcm_init(&m_ctx);
-            int success = mbedtls_gcm_setkey(&m_ctx, MBEDTLS_CIPHER_ID_AES, config->encryption_key, 128);
-            if (0 != success) {
-                return HDLC_ENCRYPTION_KEY_FAILED;
-            }
+int mbus_decrypt(const uint8_t* d, int length, HDLCConfig* config) {
+    if(length < 12) return HDLC_FRAME_INCOMPLETE;
+
+    uint8_t* ptr = (uint8_t*) d;
+    if(*ptr != 0xDB) return HDLC_ENCRYPTION_INVALID;
+    ptr++;
+    // Encrypted APDU
+    // http://www.weigu.lu/tutorials/sensors2bus/04_encryption/index.html
+    if(config == NULL)
+        return HDLC_ENCRYPTION_CONFIG_MISSING;
+
+    uint8_t systemTitleLength = *ptr;
+    ptr++;
+    memcpy(config->system_title, ptr, systemTitleLength);
+    memcpy(config->initialization_vector, config->system_title, systemTitleLength);
+
+    int len;
+    int headersize = 2 + systemTitleLength;
+    ptr += systemTitleLength;
+    if(((*ptr) & 0xFF) == 0x81) {
+        ptr++;
+        len = *ptr;
+        // 1-byte payload length
+        ptr++;
+        headersize += 2;
+    } else if(((*ptr) & 0xFF) == 0x82) {
+        HDLCHeader* h = (HDLCHeader*) ptr;
+
+        // 2-byte payload length
+        len = (ntohs(h->format) & 0xFFFF);
+
+        ptr += 3;
+        headersize += 3;
+    }
+    if(len + headersize > length)
+        return HDLC_FRAME_INCOMPLETE;
+
+    //Serial.printf("\nL: %d : %d, %d\n", length, len, headersize);
+
+    memcpy(config->additional_authenticated_data, ptr, 1);
+
+    // Security tag
+    uint8_t sec = *ptr;
+    ptr++;
+    headersize++;
+
+    // Frame counter
+    memcpy(config->initialization_vector + 8, ptr, 4);
+    ptr += 4;
+    headersize += 4;
+
+    int footersize = 0;
+
+    // Authentication enabled
+    uint8_t authkeylen = 0, aadlen = 0;
+    if((sec & 0x10) == 0x10) {
+        authkeylen = 12;
+        aadlen = 17;
+        footersize += authkeylen;
+        memcpy(config->additional_authenticated_data + 1, config->authentication_key, 16);
+        memcpy(config->authentication_tag, ptr + len - footersize - 5, authkeylen);
+    }
+
+    #if defined(ESP8266)
+        br_gcm_context gcmCtx;
+        br_aes_ct_ctr_keys bc;
+        br_aes_ct_ctr_init(&bc, config->encryption_key, 16);
+        br_gcm_init(&gcmCtx, &bc.vtable, br_ghash_ctmul32);
+        br_gcm_reset(&gcmCtx, config->initialization_vector, sizeof(config->initialization_vector));
+        if(authkeylen > 0) {
+            br_gcm_aad_inject(&gcmCtx, config->additional_authenticated_data, aadlen);
+        }
+        br_gcm_flip(&gcmCtx);
+        br_gcm_run(&gcmCtx, 0, (void*) (ptr), len - authkeylen - 5); // 5 == security tag and frame counter
+        if(authkeylen > 0 && br_gcm_check_tag_trunc(&gcmCtx, config->authentication_tag, authkeylen) != 1) {
+            return HDLC_ENCRYPTION_AUTH_FAILED;
+        }
+    #elif defined(ESP32)
+        uint8_t cipher_text[len - authkeylen - 5];
+        memcpy(cipher_text, ptr, len - authkeylen - 5);
+
+        mbedtls_gcm_context m_ctx;
+        mbedtls_gcm_init(&m_ctx);
+        int success = mbedtls_gcm_setkey(&m_ctx, MBEDTLS_CIPHER_ID_AES, config->encryption_key, 128);
+        if (0 != success) {
+            return HDLC_ENCRYPTION_KEY_FAILED;
+        }
+        if (0 < authkeylen) {
             success = mbedtls_gcm_auth_decrypt(&m_ctx, sizeof(cipher_text), config->initialization_vector, sizeof(config->initialization_vector),
                 config->additional_authenticated_data, aadlen, config->authentication_tag, authkeylen,
                 cipher_text, (unsigned char*)(ptr));
             if (authkeylen > 0 && success == MBEDTLS_ERR_GCM_AUTH_FAILED) {
+                mbedtls_gcm_free(&m_ctx);
                 return HDLC_ENCRYPTION_AUTH_FAILED;
             } else if(success == MBEDTLS_ERR_GCM_BAD_INPUT) {
+                mbedtls_gcm_free(&m_ctx);
                 return HDLC_ENCRYPTION_DECRYPT_FAILED;
             }
-            mbedtls_gcm_free(&m_ctx);
-        #endif
-
-        HDLCADPU* adpu = (HDLCADPU*) (ptr);
-        ptr += sizeof *adpu;
-
-        // ADPU timestamp
-        CosemData* dateTime = (CosemData*) ptr;
-        if(dateTime->base.type == CosemTypeOctetString) {
-            if(dateTime->base.length == 0x0C) {
-                memcpy(timestamp, ptr+1, dateTime->base.length);
-            }
-            ptr += 2 + dateTime->base.length;
-        } else if(dateTime->base.type == CosemTypeNull) {
-            timestamp = 0;
-            ptr++;
-        } else if(dateTime->base.type == CosemTypeDateTime) {
-            memcpy(timestamp, ptr, dateTime->base.length);
-        } else if(dateTime->base.type == 0x0C) { // Kamstrup bug...
-            memcpy(timestamp, ptr, 0x0C);
-            ptr += 13;
         } else {
-            return HDLC_TIMESTAMP_UNKNOWN;
+            success = mbedtls_gcm_starts(&m_ctx, MBEDTLS_GCM_DECRYPT, config->initialization_vector, sizeof(config->initialization_vector),NULL, 0);
+            if (0 != success) {
+                mbedtls_gcm_free(&m_ctx);
+                return HDLC_ENCRYPTION_DECRYPT_FAILED;
+            }
+            success = mbedtls_gcm_update(&m_ctx, sizeof(cipher_text), cipher_text, (unsigned char*)(ptr));
+            if (0 != success) {
+                mbedtls_gcm_free(&m_ctx);
+                return HDLC_ENCRYPTION_DECRYPT_FAILED;
+            }
         }
+        mbedtls_gcm_free(&m_ctx);
+    #endif
 
-        return ptr-d;
-    }    
-
-    // Unknown payload
-	return HDLC_UNKNOWN_DATA;
+    return ptr-d;
 }
 
 uint8_t mbusChecksum(const uint8_t* p, int len) {
@@ -287,3 +311,7 @@ uint8_t mbusChecksum(const uint8_t* p, int len) {
         ret += *p++;
     return ret;
 }
+
+uint64_t ntohll(uint64_t x) {
+    return (((uint64_t)ntohl((uint32_t)x)) << 32) + ntohl(x >> 32);
+}

src/ams/hdlc.h

@@ -3,6 +3,7 @@
 
 #include "Arduino.h"
 #include <stdint.h>
+#include "lwip/def.h"
 
 #define HDLC_FLAG 0x7E
 #define HDLC_BOUNDRY_FLAG_MISSING -1
@@ -10,10 +11,13 @@
 #define HDLC_HCS_ERROR -3
 #define HDLC_FRAME_INCOMPLETE -4
 #define HDLC_UNKNOWN_DATA -9
+#define HDLC_GBT_INTERMEDIATE -21
+#define HDLC_GBT_LAST -22
 #define HDLC_ENCRYPTION_CONFIG_MISSING -90
 #define HDLC_ENCRYPTION_AUTH_FAILED -91
 #define HDLC_ENCRYPTION_KEY_FAILED -92
 #define HDLC_ENCRYPTION_DECRYPT_FAILED -93
+#define HDLC_ENCRYPTION_INVALID -98
 #define HDLC_TIMESTAMP_UNKNOWN -99
 
 #define MBUS_START 0x68
@@ -33,6 +37,12 @@ struct HDLCConfig {
     uint8_t authentication_tag[12];
 };
 
+struct HDLCContext {
+    uint8_t apdu;
+    uint8_t apduStart;
+    uint8_t headersize;
+};
+
 typedef struct HDLCHeader {
 	uint8_t  flag;
 	uint16_t format;
@@ -54,11 +64,6 @@ typedef struct HDLCLLC {
     uint8_t control;
 } __attribute__((packed)) HDLCLLC;
 
-typedef struct HDLCADPU {
-    uint8_t flag;
-    uint32_t id;
-} __attribute__((packed)) HDLCADPU;
-
 typedef struct MbusHeader {
 	uint8_t flag1;
 	uint8_t len1;
@@ -79,9 +84,12 @@ enum CosemType {
     CosemTypeStructure = 0x02,
     CosemTypeOctetString = 0x09,
     CosemTypeString = 0x0A,
+    CosemTypeDLongSigned = 0x05,
     CosemTypeDLongUnsigned = 0x06,
     CosemTypeLongSigned = 0x10,
     CosemTypeLongUnsigned = 0x12,
+    CosemTypeLong64Signed = 0x14,
+    CosemTypeLong64Unsigned = 0x15,
     CosemTypeDateTime = 0x19
 };
 
@@ -96,19 +104,34 @@ struct CosemString {
     uint8_t data[];
 } __attribute__((packed));
 
+struct CosemLongSigned {
+    uint8_t type;
+	int16_t data;
+} __attribute__((packed));
+
 struct CosemLongUnsigned {
     uint8_t type;
     uint16_t data;
 } __attribute__((packed));
 
+struct CosemDLongSigned {
+    uint8_t type;
+    int32_t data;
+} __attribute__((packed));
+
 struct CosemDLongUnsigned {
     uint8_t type;
     uint32_t data;
 } __attribute__((packed));
 
-struct CosemLongSigned {
+struct CosemLong64Signed {
     uint8_t type;
-	int16_t data;
+    int64_t data;
+} __attribute__((packed));
+
+struct CosemLong64Unsigned {
+    uint8_t type;
+    uint64_t data;
 } __attribute__((packed));
 
 struct CosemDateTime {
@@ -129,15 +152,21 @@ typedef union {
     struct CosemBasic base;
 	struct CosemString str;
 	struct CosemString oct;
-	struct CosemLongUnsigned lu;
-    struct CosemDLongUnsigned dlu;
     struct CosemLongSigned ls;
+	struct CosemLongUnsigned lu;
+    struct CosemDLongSigned dls;
+    struct CosemDLongUnsigned dlu;
+    struct CosemLong64Signed l64s;
+    struct CosemLong64Unsigned l64u;
     struct CosemDateTime dt;
 } CosemData; 
 
 void mbus_hexdump(const uint8_t* buf, int len);
-int HDLC_validate(const uint8_t* d, int len, HDLCConfig* config, CosemDateTime* timestamp);
+int HDLC_validate(const uint8_t* d, int length, HDLCConfig* config, CosemDateTime* timestamp, HDLCContext* context);
+int mbus_decrypt(const uint8_t* d, int length, HDLCConfig* config);
 
 uint8_t mbusChecksum(const uint8_t* p, int len);
 
+uint64_t ntohll(uint64_t x);
+
 #endif

src/entsoe/DnbCurrParser.cpp

@@ -1,6 +1,5 @@
 #include "DnbCurrParser.h"
 #include "Arduino.h"
-#include "HardwareSerial.h"
 
 float DnbCurrParser::getValue() {
     return value;
@@ -30,13 +29,14 @@ size_t DnbCurrParser::write(const uint8_t *buffer, size_t size) {
 }
 
 size_t DnbCurrParser::write(uint8_t byte) {
-    if(pos >= 64) pos = 0;
+    if(pos >= 128) pos = 0;
     if(pos == 0) {
         if(byte == '<') {
             buf[pos++] = byte;
         }
     } else if(byte == '>') {
         buf[pos++] = byte;
+        buf[pos++] = '\0';
         if(strncmp(buf, "<Series", 7) == 0) {
             for(int i = 0; i < pos; i++) {
                 if(strncmp(buf+i, "UNIT_MULT=\"", 11) == 0) {

src/entsoe/DnbCurrParser.h

@@ -18,7 +18,7 @@ private:
     uint8_t scale = 0;
     float value = 1.0;
 
-    char buf[64];
+    char buf[128];
     uint8_t pos = 0;
     uint8_t mode = 0;
 };

src/entsoe/EntsoeApi.cpp

@@ -3,17 +3,16 @@
 #include "Uptime.h"
 #include "TimeLib.h"
 #include "DnbCurrParser.h"
+#include "version.h"
 
 #if defined(ESP32)
 #include <esp_task_wdt.h>
 #endif
 
 EntsoeApi::EntsoeApi(RemoteDebug* Debug) {
-    debugger = Debug;
+    this->buf = (char*) malloc(BufferSize);
 
-    client.setInsecure();
-    https.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-    https.setTimeout(20000);
+    debugger = Debug;
 
     // Entso-E uses CET/CEST
     TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120};
@@ -28,7 +27,10 @@ void EntsoeApi::setup(EntsoeConfig& config) {
         this->config = new EntsoeConfig();
     }
     memcpy(this->config, &config, sizeof(config));
-    lastCurrencyFetch = 0;
+    lastTodayFetch = lastTomorrowFetch = lastCurrencyFetch = 0;
+    if(today != NULL) delete today;
+    if(tomorrow != NULL) delete tomorrow;
+    today = tomorrow = NULL;
 }
 
 char* EntsoeApi::getToken() {
@@ -39,12 +41,12 @@ char* EntsoeApi::getCurrency() {
     return this->config->currency;
 }
 
-float EntsoeApi::getValueForHour(uint8_t hour) {
+float EntsoeApi::getValueForHour(int8_t hour) {
     time_t cur = time(nullptr);
     return getValueForHour(cur, hour);
 }
 
-float EntsoeApi::getValueForHour(time_t cur, uint8_t hour) {
+float EntsoeApi::getValueForHour(time_t cur, int8_t hour) {
     tmElements_t tm;
     if(tz != NULL)
         cur = tz->toLocal(cur);
@@ -59,7 +61,7 @@ float EntsoeApi::getValueForHour(time_t cur, uint8_t hour) {
         if(tomorrow == NULL)
             return ENTSOE_NO_VALUE;
         value = tomorrow->getPoint(pos-24);
-        if(strcmp(tomorrow->getMeasurementUnit(), "MWH") == 0) {
+        if(value != ENTSOE_NO_VALUE && strcmp(tomorrow->getMeasurementUnit(), "MWH") == 0) {
             multiplier *= 0.001;
         } else {
             return ENTSOE_NO_VALUE;
@@ -71,7 +73,7 @@ float EntsoeApi::getValueForHour(time_t cur, uint8_t hour) {
         if(today == NULL)
             return ENTSOE_NO_VALUE;
         value = today->getPoint(pos);
-        if(strcmp(today->getMeasurementUnit(), "MWH") == 0) {
+        if(value != ENTSOE_NO_VALUE && strcmp(today->getMeasurementUnit(), "MWH") == 0) {
             multiplier *= 0.001;
         } else {
             return ENTSOE_NO_VALUE;
@@ -90,41 +92,47 @@ bool EntsoeApi::loop() {
     uint64_t now = millis64();
     if(now < 10000) return false; // Grace period
 
+    time_t t = time(nullptr);
+    if(t < BUILD_EPOCH) return false;
+
+    bool ret = false;
+    tmElements_t tm;
+    breakTime(tz->toLocal(t), tm);
+    if(currentHour != tm.Hour) {
+        currentHour = tm.Hour;
+        ret = today != NULL; // Only trigger MQTT publish if we have todays prices.
+    }
+
     if(midnightMillis == 0) {
-        time_t t = time(nullptr);
-        if(t <= 0) return false; // NTP not ready
-
-        time_t epoch = tz->toLocal(t);
-        
-        tmElements_t tm;
-        breakTime(epoch, tm);
-        if(tm.Year > 50) { // Make sure we are in 2021 or later (years after 1970)
-            uint32_t curDayMillis = (((((tm.Hour * 60) + tm.Minute) * 60) + tm.Second) * 1000);
-
-            midnightMillis = now + (SECS_PER_DAY * 1000) - curDayMillis + 1000; // Adding 1s to ensure we have passed midnight
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Setting midnight millis %lu\n", midnightMillis);
-        }
-    } else if(now > midnightMillis) {
-        time_t t = time(nullptr);
+        uint32_t curDayMillis = (((((tm.Hour * 60) + tm.Minute) * 60) + tm.Second) * 1000);
+        midnightMillis = now + (SECS_PER_DAY * 1000) - curDayMillis;
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Setting midnight millis %lu\n", midnightMillis);
+        currentDay = tm.Day;
+        return false;
+    } else if(now > midnightMillis && currentDay != tm.Day) {
         if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Rotating price objects at %lu\n", t);
-        delete today;
-        today = tomorrow;
-        tomorrow = NULL;
+        if(today != NULL) delete today;
+        if(tomorrow != NULL) {
+            today = tomorrow;
+            tomorrow = NULL;
+        }
+        currentDay = tm.Day;
         midnightMillis = 0; // Force new midnight millis calculation
+        return true;
     } else {
+        breakTime(t, tm); // Break UTC to find UTC midnight
         if(today == NULL && (lastTodayFetch == 0 || now - lastTodayFetch > 60000)) {
             lastTodayFetch = now;
-            time_t e1 = time(nullptr) - (SECS_PER_DAY * 1);
+            time_t e1 = t - (tm.Hour * 3600) - (tm.Minute * 60) - tm.Second; // UTC midnight
             time_t e2 = e1 + SECS_PER_DAY;
             tmElements_t d1, d2;
-            breakTime(e1, d1);
-            breakTime(e2, d2);
+            breakTime(tz->toUTC(e1), d1); // To get day and hour for CET/CEST at UTC midnight
+            breakTime(tz->toUTC(e2), d2);
 
-            char url[256];
-            snprintf(url, sizeof(url), "%s?securityToken=%s&documentType=A44&periodStart=%04d%02d%02d%02d%02d&periodEnd=%04d%02d%02d%02d%02d&in_Domain=%s&out_Domain=%s", 
+            snprintf(buf, BufferSize, "%s?securityToken=%s&documentType=A44&periodStart=%04d%02d%02d%02d%02d&periodEnd=%04d%02d%02d%02d%02d&in_Domain=%s&out_Domain=%s", 
             "https://transparency.entsoe.eu/api", getToken(), 
-            d1.Year+1970, d1.Month, d1.Day, 23, 00,
-            d2.Year+1970, d2.Month, d2.Day, 23, 00,
+            d1.Year+1970, d1.Month, d1.Day, d1.Hour, 00,
+            d2.Year+1970, d2.Month, d2.Day, d2.Hour, 00,
             config->area, config->area);
 
             #if defined(ESP32)
@@ -135,9 +143,9 @@ bool EntsoeApi::loop() {
 
 
             if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Fetching prices for today\n");
-            if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  url: %s\n", url);
+            if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  url: %s\n", buf);
             EntsoeA44Parser* a44 = new EntsoeA44Parser();
-            if(retrieve(url, a44) && a44->getPoint(0) != ENTSOE_NO_VALUE) {
+            if(retrieve(buf, a44) && a44->getPoint(0) != ENTSOE_NO_VALUE) {
                 today = a44;
                 return true;
             } else if(a44 != NULL) {
@@ -154,17 +162,16 @@ bool EntsoeApi::loop() {
             && (lastTomorrowFetch == 0 || now - lastTomorrowFetch > 900000)
         ) {
             lastTomorrowFetch = now;
-            time_t e1 = time(nullptr);
+            time_t e1 = t - (tm.Hour * 3600) - (tm.Minute * 60) - tm.Second + (SECS_PER_DAY);
             time_t e2 = e1 + SECS_PER_DAY;
             tmElements_t d1, d2;
-            breakTime(e1, d1);
-            breakTime(e2, d2);
+            breakTime(tz->toUTC(e1), d1);
+            breakTime(tz->toUTC(e2), d2);
 
-            char url[256];
-            snprintf(url, sizeof(url), "%s?securityToken=%s&documentType=A44&periodStart=%04d%02d%02d%02d%02d&periodEnd=%04d%02d%02d%02d%02d&in_Domain=%s&out_Domain=%s", 
+            snprintf(buf, BufferSize, "%s?securityToken=%s&documentType=A44&periodStart=%04d%02d%02d%02d%02d&periodEnd=%04d%02d%02d%02d%02d&in_Domain=%s&out_Domain=%s", 
             "https://transparency.entsoe.eu/api", getToken(), 
-            d1.Year+1970, d1.Month, d1.Day, 23, 00,
-            d2.Year+1970, d2.Month, d2.Day, 23, 00,
+            d1.Year+1970, d1.Month, d1.Day, d1.Hour, 00,
+            d2.Year+1970, d2.Month, d2.Day, d2.Hour, 00,
             config->area, config->area);
 
             #if defined(ESP32)
@@ -174,9 +181,9 @@ bool EntsoeApi::loop() {
             #endif
 
             if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Fetching prices for tomorrow\n");
-            if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  url: %s\n", url);
+            if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  url: %s\n", buf);
             EntsoeA44Parser* a44 = new EntsoeA44Parser();
-            if(retrieve(url, a44) && a44->getPoint(0) != ENTSOE_NO_VALUE) {
+            if(retrieve(buf, a44) && a44->getPoint(0) != ENTSOE_NO_VALUE) {
                 tomorrow = a44;
                 return true;
             } else if(a44 != NULL) {
@@ -186,83 +193,51 @@ bool EntsoeApi::loop() {
             }
         }
     }
-    return false;
+    return ret;
 }
 
 bool EntsoeApi::retrieve(const char* url, Stream* doc) {
-    #if defined(ESP8266)
-        // https://arduino-esp8266.readthedocs.io/en/latest/esp8266wifi/bearssl-client-secure-class.html#mfln-or-maximum-fragment-length-negotiation-saving-ram
-        /* Rumor has it that a client cannot request a lower max_fragment_length, so I guess thats why the following does not work.
-           And there is currently not enough heap space to go around in this project to do a full HTTPS request on ESP8266
+    HTTPClient https;
+    https.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+    https.setReuse(false);
+    https.setTimeout(50000);
+    https.setUserAgent("ams2mqtt/" + String(VERSION));
+    #if defined(ESP32)
+        if(https.begin(url)) {
+            printD("Connection established");
 
-        int bufSize = 512;
-        while(!client.probeMaxFragmentLength("transparency.entsoe.eu", 443, bufSize) && bufSize <= 4096) {
-            bufSize += 512;
-        }
-        if(client.probeMaxFragmentLength("transparency.entsoe.eu", 443, bufSize)) {
-            printD("Negotiated MFLN size");
-            printD(String(bufSize));
-            client.setBufferSizes(bufSize, bufSize);
-        }
-        */
-    #endif
-
-    if(https.begin(client, url)) {
-        printD("Connection established");
-
-        #if defined(ESP32)
-            esp_task_wdt_reset();
-        #elif defined(ESP8266)
-            ESP.wdtFeed();
-        #endif
-
-        /*
-        #if defined(ESP8266)
-            if(!client.getMFLNStatus()) {
-                printE("Negotiated MFLN was not respected");
-                https.end();
-                client.stop();
-                return false;
-            }
-        #endif
-        */
-
-        int status = https.GET();
-
-        #if defined(ESP32)
-            esp_task_wdt_reset();
-        #elif defined(ESP8266)
-            ESP.wdtFeed();
-        #endif
-
-        if(status == HTTP_CODE_OK) {
-            printD("Receiving data");
-            https.writeToStream(doc);
-            https.end();
-            return true;
-        } else {
-            printE("Communication error: ");
-            printE(https.errorToString(status));
-            printD(https.getString());
-
-            #if defined(ESP8266)
-            char buf[64];
-            client.getLastSSLError(buf,64);
-            printE(buf);
+            #if defined(ESP32)
+                esp_task_wdt_reset();
+            #elif defined(ESP8266)
+                ESP.wdtFeed();
             #endif
 
-            https.end();
+            int status = https.GET();
+
+            #if defined(ESP32)
+                esp_task_wdt_reset();
+            #elif defined(ESP8266)
+                ESP.wdtFeed();
+            #endif
+
+            if(status == HTTP_CODE_OK) {
+                printD("Receiving data");
+                https.writeToStream(doc);
+                https.end();
+                return true;
+            } else {
+                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf("(EntsoeApi) Communication error, returned status: %d\n", status);
+                printE(https.errorToString(status));
+                printD(https.getString());
+
+                https.end();
+                return false;
+            }
+        } else {
             return false;
         }
-    } else {
-        #if defined(ESP8266)
-        char buf[64];
-        client.getLastSSLError(buf,64);
-        printE(buf);
-        #endif
-        return false;
-    }
-    client.stop();
+    #endif
+    return false;
 }
 
 float EntsoeApi::getCurrencyMultiplier(const char* from, const char* to) {
@@ -270,10 +245,9 @@ float EntsoeApi::getCurrencyMultiplier(const char* from, const char* to) {
         return 1.00;
 
     uint64_t now = millis64();
-    if(now > lastCurrencyFetch && (now - lastCurrencyFetch) < 900000) {
+    if(now > lastCurrencyFetch && (lastCurrencyFetch == 0 || (now - lastCurrencyFetch) > 60000)) {
         lastCurrencyFetch = now;
         
-        char url[256];
         DnbCurrParser p;
 
         #if defined(ESP32)
@@ -282,17 +256,17 @@ float EntsoeApi::getCurrencyMultiplier(const char* from, const char* to) {
             ESP.wdtFeed();
         #endif
 
-        snprintf(url, sizeof(url), "https://data.norges-bank.no/api/data/EXR/M.%s.NOK.SP?lastNObservations=1", from);
+        snprintf(buf, BufferSize, "https://data.norges-bank.no/api/data/EXR/M.%s.NOK.SP?lastNObservations=1", from);
         if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Retrieving %s to NOK conversion\n", from);
-        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  url: %s\n", url);
-        if(retrieve(url, &p)) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  url: %s\n", buf);
+        if(retrieve(buf, &p)) {
             if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  got exchange rate %.4f\n", p.getValue());
             currencyMultiplier = p.getValue();
             if(strncmp(to, "NOK", 3) != 0) {
-                snprintf(url, sizeof(url), "https://data.norges-bank.no/api/data/EXR/M.%s.NOK.SP?lastNObservations=1", to);
+                snprintf(buf, BufferSize, "https://data.norges-bank.no/api/data/EXR/M.%s.NOK.SP?lastNObservations=1", to);
                 if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Retrieving %s to NOK conversion\n", to);
-                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  url: %s\n", url);
-                if(retrieve(url, &p)) {
+                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  url: %s\n", buf);
+                if(retrieve(buf, &p)) {
                     if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  got exchange rate %.4f\n", p.getValue());
                     currencyMultiplier /= p.getValue();
                 } else {

src/entsoe/EntsoeApi.h

@@ -15,7 +15,6 @@
 	#warning "Unsupported board type"
 #endif
 
-#define ENTSOE_DEFAULT_MULTIPLIER 1.00
 #define SSL_BUF_SIZE 512
 
 class EntsoeApi {
@@ -26,15 +25,14 @@ public:
 
     char* getToken();
     char* getCurrency();
-    float getValueForHour(uint8_t);
-    float getValueForHour(time_t, uint8_t);
+    float getValueForHour(int8_t);
+    float getValueForHour(time_t, int8_t);
 
 private:
     RemoteDebug* debugger;
     EntsoeConfig* config = NULL;
-    WiFiClientSecure client;
-    HTTPClient https;
 
+    uint8_t currentDay = 0, currentHour = 0;
     uint32_t tomorrowFetchMillis = 36000000; // Number of ms before midnight. Default fetch 10hrs before midnight (14:00 CE(S)T)
     uint64_t midnightMillis = 0;
     uint64_t lastTodayFetch = 0;
@@ -45,7 +43,10 @@ private:
 
     Timezone* tz = NULL;
 
-    float currencyMultiplier = ENTSOE_DEFAULT_MULTIPLIER;
+    static const uint16_t BufferSize = 256;
+    char* buf;
+
+    float currencyMultiplier = 0;
 
     bool retrieve(const char* url, Stream* doc);
     float getCurrencyMultiplier(const char* from, const char* to);

src/hexutils.cpp

@@ -4,7 +4,7 @@ String toHex(uint8_t* in) {
 	return toHex(in, sizeof(in)*2);
 }
 
-String toHex(uint8_t* in, uint8_t size) {
+String toHex(uint8_t* in, uint16_t size) {
 	String hex;
 	for(int i = 0; i < size; i++) {
 		if(in[i] < 0x10) {
@@ -16,7 +16,7 @@ String toHex(uint8_t* in, uint8_t size) {
 	return hex;
 }
 
-void fromHex(uint8_t *out, String in, uint8_t size) {
+void fromHex(uint8_t *out, String in, uint16_t size) {
 	for(int i = 0; i < size*2; i += 2) {
 		out[i/2] = strtol(in.substring(i, i+2).c_str(), 0, 16);
 	}

src/hexutils.h

@@ -5,7 +5,7 @@
 #include "Arduino.h"
 
 String toHex(uint8_t* in);
-String toHex(uint8_t* in, uint8_t size);
-void fromHex(uint8_t *out, String in, uint8_t size);
+String toHex(uint8_t* in, uint16_t size);
+void fromHex(uint8_t *out, String in, uint16_t size);
 
 #endif

src/mqtt/AmsMqttHandler.h

@@ -5,22 +5,26 @@
 #include <MQTT.h>
 #include "AmsData.h"
 #include "AmsConfiguration.h"
+#include "EnergyAccounting.h"
 #include "HwTools.h"
 #include "entsoe/EntsoeApi.h"
 
 class AmsMqttHandler {
 public:
-    AmsMqttHandler(MQTTClient* mqtt) {
+    AmsMqttHandler(MQTTClient* mqtt, char* buf) {
         this->mqtt = mqtt;
+        this->json = buf;
     };
 
-    virtual bool publish(AmsData* data, AmsData* previousState);
+    virtual bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
     virtual bool publishTemperatures(AmsConfiguration*, HwTools*);
     virtual bool publishPrices(EntsoeApi* eapi);
     virtual bool publishSystem(HwTools*);
 
 protected:
     MQTTClient* mqtt;
+    char* json;
+    uint16_t BufferSize = 1024;
 };
 
 #endif

src/mqtt/DomoticzMqttHandler.cpp

@@ -1,7 +1,7 @@
 #include "DomoticzMqttHandler.h"
 #include "web/root/domoticz_json.h"
 
-bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState) {
+bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
     bool ret = false;
     if (config.elidx > 0) {
         if(data->getActiveImportCounter() > 1.0) {
@@ -10,8 +10,7 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState) {
         if(energy > 0.0) {
             char val[16];
             snprintf(val, 16, "%.1f;%.1f", (data->getActiveImportPower()/1.0), energy*1000.0);
-            char json[192];
-            snprintf_P(json, sizeof(json), DOMOTICZ_JSON,
+            snprintf_P(json, BufferSize, DOMOTICZ_JSON,
                 config.elidx,
                 val
             );
@@ -25,8 +24,7 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState) {
     if (config.vl1idx > 0){				
         char val[16];
         snprintf(val, 16, "%.2f", data->getL1Voltage());
-        char json[192];
-        snprintf_P(json, sizeof(json), DOMOTICZ_JSON,
+        snprintf_P(json, BufferSize, DOMOTICZ_JSON,
             config.vl1idx,
             val
         );
@@ -36,8 +34,7 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState) {
     if (config.vl2idx > 0){				
         char val[16];
         snprintf(val, 16, "%.2f", data->getL2Voltage());
-        char json[192];
-        snprintf_P(json, sizeof(json), DOMOTICZ_JSON,
+        snprintf_P(json, BufferSize, DOMOTICZ_JSON,
             config.vl2idx,
             val
         );
@@ -47,8 +44,7 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState) {
     if (config.vl3idx > 0){				
         char val[16];
         snprintf(val, 16, "%.2f", data->getL3Voltage());
-        char json[192];
-        snprintf_P(json, sizeof(json), DOMOTICZ_JSON,
+        snprintf_P(json, BufferSize, DOMOTICZ_JSON,
             config.vl3idx,
             val
         );
@@ -58,8 +54,7 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState) {
     if (config.cl1idx > 0){				
         char val[16];
         snprintf(val, 16, "%.1f;%.1f;%.1f", data->getL1Current(), data->getL2Current(), data->getL3Current());
-        char json[192];
-        snprintf_P(json, sizeof(json), DOMOTICZ_JSON,
+        snprintf_P(json, BufferSize, DOMOTICZ_JSON,
             config.cl1idx,
             val
         );

src/mqtt/DomoticzMqttHandler.h

@@ -6,10 +6,10 @@
 
 class DomoticzMqttHandler : public AmsMqttHandler {
 public:
-    DomoticzMqttHandler(MQTTClient* mqtt, DomoticzConfig config) : AmsMqttHandler(mqtt) {
+    DomoticzMqttHandler(MQTTClient* mqtt, char* buf, DomoticzConfig config) : AmsMqttHandler(mqtt, buf) {
         this->config = config;
     };
-    bool publish(AmsData* data, AmsData* previousState);
+    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
     bool publishTemperatures(AmsConfiguration*, HwTools*);
     bool publishPrices(EntsoeApi*);
     bool publishSystem(HwTools*);
@@ -18,4 +18,5 @@ private:
     DomoticzConfig config;
     int energy = 0.0;
 };
+
 #endif

src/mqtt/HomeAssistantMqttHandler.cpp

@@ -0,0 +1,243 @@
+#include "HomeAssistantMqttHandler.h"
+#include "HomeAssistantStatic.h"
+#include "hexutils.h"
+#include "Uptime.h"
+#include "version.h"
+#include "web/root/ha1_json.h"
+#include "web/root/ha2_json.h"
+#include "web/root/ha3_json.h"
+#include "web/root/jsonsys_json.h"
+#include "web/root/jsonprices_json.h"
+#include "web/root/hadiscover_json.h"
+
+bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
+	if(topic.isEmpty() || !mqtt->connected())
+		return false;
+
+    listType = data->getListType(); // for discovery stuff in publishSystem()
+    if(data->getListType() >= 3) { // publish energy counts
+        snprintf_P(json, BufferSize, HA2_JSON,
+            data->getActiveImportCounter(),
+            data->getActiveExportCounter(),
+            data->getReactiveImportCounter(),
+            data->getReactiveExportCounter(),
+            data->getMeterTimestamp()
+        );
+        mqtt->publish(topic + "/energy", json);
+    }
+    String meterModel = data->getMeterModel();
+    meterModel.replace("\\", "\\\\");
+    if(data->getListType() == 1) { // publish power counts
+        snprintf_P(json, BufferSize, HA1_JSON,
+            data->getActiveImportPower()
+        );
+        return mqtt->publish(topic + "/power", json);
+    } else if(data->getListType() >= 2) { // publish power counts and volts/amps
+        snprintf_P(json, BufferSize, HA3_JSON,
+            data->getListId().c_str(),
+            data->getMeterId().c_str(),
+            meterModel.c_str(),
+            data->getActiveImportPower(),
+            data->getReactiveImportPower(),
+            data->getActiveExportPower(),
+            data->getReactiveExportPower(),
+            data->getL1Current(),
+            data->getL2Current(),
+            data->getL3Current(),
+            data->getL1Voltage(),
+            data->getL2Voltage(),
+            data->getL3Voltage(),
+            data->getPowerFactor() == 0 ? 1 : data->getPowerFactor(),
+            data->getPowerFactor() == 0 ? 1 : data->getL1PowerFactor(),
+            data->getPowerFactor() == 0 ? 1 : data->getL2PowerFactor(),
+            data->getPowerFactor() == 0 ? 1 : data->getL3PowerFactor()
+        );
+        return mqtt->publish(topic + "/power", json);
+    }
+    return false;
+}
+
+bool HomeAssistantMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) {
+	int count = hw->getTempSensorCount();
+    if(count == 0) return false;
+
+	int size = 32 + (count * 26);
+
+	char buf[size];
+	snprintf(buf, 24, "{\"temperatures\":{");
+
+	for(int i = 0; i < count; i++) {
+		TempSensorData* data = hw->getTempSensorData(i);
+        if(data != NULL) {
+            char* pos = buf+strlen(buf);
+            snprintf(pos, 26, "\"%s\":%.2f,", 
+                toHex(data->address, 8).c_str(),
+                data->lastRead
+            );
+            data->changed = false;
+            delay(1);
+        }
+	}
+	char* pos = buf+strlen(buf);
+	snprintf(count == 0 ? pos : pos-1, 8, "}}");
+    return mqtt->publish(topic + "/temperatures", buf);
+}
+
+bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
+	if(topic.isEmpty() || !mqtt->connected())
+		return false;
+	if(strlen(eapi->getToken()) == 0)
+		return false;
+
+	time_t now = time(nullptr);
+
+	float min1hr, min3hr, min6hr;
+	int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1;
+	float min = INT16_MAX, max = INT16_MIN;
+	float values[24];
+    for(int i = 0;i < 24; i++) values[i] = ENTSOE_NO_VALUE;
+	for(uint8_t i = 0; i < 24; i++) {
+		float val = eapi->getValueForHour(now, i);
+		values[i] = val;
+
+		if(val == ENTSOE_NO_VALUE) break;
+		
+		if(val < min) min = val;
+		if(val > max) max = val;
+
+		if(min1hrIdx == -1 || min1hr > val) {
+			min1hr = val;
+			min1hrIdx = i;
+		}
+
+		if(i >= 2) {
+			i -= 2;
+			float val1 = values[i++];
+			float val2 = values[i++];
+			float val3 = val;
+			if(val1 == ENTSOE_NO_VALUE || val2 == ENTSOE_NO_VALUE || val3 == ENTSOE_NO_VALUE) continue;
+			float val3hr = val1+val2+val3;
+			if(min3hrIdx == -1 || min3hr > val3hr) {
+				min3hr = val3hr;
+				min3hrIdx = i-2;
+			}
+		}
+
+		if(i >= 5) {
+			i -= 5;
+			float val1 = values[i++];
+			float val2 = values[i++];
+			float val3 = values[i++];
+			float val4 = values[i++];
+			float val5 = values[i++];
+			float val6 = val;
+			if(val1 == ENTSOE_NO_VALUE || val2 == ENTSOE_NO_VALUE || val3 == ENTSOE_NO_VALUE || val4 == ENTSOE_NO_VALUE || val5 == ENTSOE_NO_VALUE || val6 == ENTSOE_NO_VALUE) continue;
+			float val6hr = val1+val2+val3+val4+val5+val6;
+			if(min6hrIdx == -1 || min6hr > val6hr) {
+				min6hr = val6hr;
+				min6hrIdx = i-5;
+			}
+		}
+
+	}
+
+	char ts1hr[21];
+	if(min1hrIdx > -1) {
+        time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
+        //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts);
+		tmElements_t tm;
+        breakTime(ts, tm);
+		sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+	}
+	char ts3hr[21];
+	if(min3hrIdx > -1) {
+        time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
+        //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts);
+		tmElements_t tm;
+        breakTime(ts, tm);
+		sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+	}
+	char ts6hr[21];
+	if(min6hrIdx > -1) {
+        time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
+        //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts);
+		tmElements_t tm;
+        breakTime(ts, tm);
+		sprintf(ts6hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+	}
+
+    snprintf_P(json, BufferSize, JSONPRICES_JSON,
+        WiFi.macAddress().c_str(),
+        values[0],
+        values[1],
+        values[2],
+        values[3],
+        values[4],
+        values[5],
+        values[6],
+        values[7],
+        values[8],
+        values[9],
+        values[10],
+        values[11],
+        min == INT16_MAX ? 0.0 : min,
+        max == INT16_MIN ? 0.0 : max,
+        ts1hr,
+        ts3hr,
+        ts6hr
+    );
+    return mqtt->publish(topic + "/prices", json);
+}
+
+bool HomeAssistantMqttHandler::publishSystem(HwTools* hw) {
+	if(topic.isEmpty() || !mqtt->connected()){
+        sequence = 0;
+		return false;
+    }
+
+    if(sequence % 3 == 0){
+        snprintf_P(json, BufferSize, JSONSYS_JSON,
+            WiFi.macAddress().c_str(),
+            clientId.c_str(),
+            (uint32_t) (millis64()/1000),
+            hw->getVcc(),
+            hw->getWifiRssi(),
+            hw->getTemperature()
+        );
+        mqtt->publish(topic + "/state", json);
+    }
+
+    if(!autodiscoverInit) {
+        #if defined(ESP8266)
+			String haUID = WiFi.hostname();
+        #elif defined(ESP32)
+			String haUID = WiFi.getHostname();
+        #endif
+        String haUrl = "http://" + haUID + ".local/";
+        // Could this be necessary? haUID.replace("-", "_");
+
+        for(int i=0;i<sensors;i++){
+            snprintf_P(json, BufferSize, HADISCOVER_JSON,
+                FPSTR(HA_NAMES[i]),
+                topic.c_str(), FPSTR(HA_TOPICS[i]),
+                haUID.c_str(), FPSTR(HA_PARAMS[i]),
+                haUID.c_str(), FPSTR(HA_PARAMS[i]),
+                FPSTR(HA_UOM[i]),
+                FPSTR(HA_PARAMS[i]),
+                FPSTR(HA_DEVCL[i]),
+                haUID.c_str(),
+                haName.c_str(),
+                haModel.c_str(),
+                VERSION,
+                haManuf.c_str(),
+                haUrl.c_str(),
+                strlen_P(HA_STACL[i]) > 0 ? ", \"stat_cla\" :" : "",
+                strlen_P(HA_STACL[i]) > 0 ? (char *) FPSTR(HA_STACL[i]) : ""
+            );
+            mqtt->publish(haTopic + haUID + "_" + FPSTR(HA_PARAMS[i]) + "/config", json, true, 0);
+        }
+        autodiscoverInit = true;
+    }
+    if(listType>0) sequence++;
+    return true;
+}

src/mqtt/HomeAssistantMqttHandler.h

@@ -0,0 +1,38 @@
+#ifndef _HOMEASSISTANTMQTTHANDLER_H
+#define _HOMEASSISTANTMQTTHANDLER_H
+
+#include "AmsMqttHandler.h"
+
+class HomeAssistantMqttHandler : public AmsMqttHandler {
+public:
+    HomeAssistantMqttHandler(MQTTClient* mqtt, char* buf, const char* clientId, const char* topic, HwTools* hw) : AmsMqttHandler(mqtt, buf) {
+        this->clientId = clientId;
+        this->topic = String(topic);
+        this->hw = hw;
+    };
+    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
+    bool publishTemperatures(AmsConfiguration*, HwTools*);
+    bool publishPrices(EntsoeApi*);
+    bool publishSystem(HwTools*);
+
+private:
+    static const uint8_t sensors = 17;
+
+    String haTopic = "homeassistant/sensor/";
+
+    String haName = "AMS reader";
+    #if defined(ESP32)
+        String haModel = "ESP32";
+    #elif defined(ESP8266)
+        String haModel = "ESP8266";
+    #endif
+    String haManuf = "AmsToMqttBridge";
+
+    bool autodiscoverInit = false;
+
+    String clientId;
+    String topic;
+    HwTools* hw;
+    uint8_t sequence = 0, listType = 0;
+};
+#endif

src/mqtt/HomeAssistantStatic.h

@@ -0,0 +1,14 @@
+#ifndef _HOMEASSISTANTSTATIC_H
+#define _HOMEASSISTANTSTATIC_H
+
+#include "Arduino.h"
+
+const char* HA_TOPICS[17] PROGMEM = {"/state", "/state", "/state", "/power", "/power", "/power", "/power", "/power", "/power", "/power", "/power", "/power", "/power", "/energy", "/energy", "/energy", "/energy"};
+const char* HA_NAMES[17] PROGMEM = {"Status", "Supply volt", "Temperature", "Active import", "Reactive import", "Active export", "Reactive export", "L1 current", "L2 current", "L3 current",
+                            "L1 voltage", "L2 voltage", "L3 voltage", "Accumulated active import", "Accumulated active export", "Accumulated reactive import", "Accumulated reactive export"};
+const char* HA_PARAMS[17] PROGMEM = {"rssi", "vcc", "temp", "P", "Q", "PO", "QO", "I1", "I2", "I3", "U1", "U2", "U3", "tPI", "tPO", "tQI", "tQO"};
+const char* HA_UOM[17] PROGMEM = {"dBm", "V", "C", "W", "W", "W", "W", "A", "A", "A", "V", "V", "V", "kWh", "kWh", "kWh", "kWh"};
+const char* HA_DEVCL[17] PROGMEM = {"signal_strength", "voltage", "temperature", "power", "power", "power", "power", "current", "current", "current", "voltage", "voltage", "voltage", "energy", "energy", "energy", "energy"};
+const char* HA_STACL[17] PROGMEM = {"", "", "", "\"measurement\"", "\"measurement\"", "\"measurement\"", "\"measurement\"", "", "", "", "", "", "", "\"total_increasing\"", "\"total_increasing\"", "\"total_increasing\"", "\"total_increasing\""};
+
+#endif

src/mqtt/JsonMqttHandler.cpp

@@ -4,17 +4,18 @@
 #include "web/root/json1_json.h"
 #include "web/root/json2_json.h"
 #include "web/root/json3_json.h"
-#include "web/root/json3pf_json.h"
+#include "web/root/json4_json.h"
 #include "web/root/jsonsys_json.h"
 #include "web/root/jsonprices_json.h"
 
-bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
+bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
 	if(topic.isEmpty() || !mqtt->connected())
 		return false;
 
+    String meterModel = data->getMeterModel();
+    meterModel.replace("\\", "\\\\");
     if(data->getListType() == 1) {
-        char json[192];
-        snprintf_P(json, sizeof(json), JSON1_JSON,
+        snprintf_P(json, BufferSize, JSON1_JSON,
             WiFi.macAddress().c_str(),
             clientId.c_str(),
             (uint32_t) (millis64()/1000),
@@ -22,12 +23,15 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
             hw->getVcc(),
             hw->getWifiRssi(),
             hw->getTemperature(),
-            data->getActiveImportPower()
+            data->getActiveImportPower(),
+            ea->getUseThisHour(),
+            ea->getUseToday(),
+            ea->getCurrentThreshold(),
+            ea->getMonthMax()
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 2) {
-        char json[384];
-        snprintf_P(json, sizeof(json), JSON2_JSON,
+        snprintf_P(json, BufferSize, JSON2_JSON,
             WiFi.macAddress().c_str(),
             clientId.c_str(),
             (uint32_t) (millis64()/1000),
@@ -37,7 +41,7 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
             hw->getTemperature(),
             data->getListId().c_str(),
             data->getMeterId().c_str(),
-            data->getMeterModel().c_str(),
+            meterModel.c_str(),
             data->getActiveImportPower(),
             data->getReactiveImportPower(),
             data->getActiveExportPower(),
@@ -47,93 +51,98 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
             data->getL3Current(),
             data->getL1Voltage(),
             data->getL2Voltage(),
-            data->getL3Voltage()
+            data->getL3Voltage(),
+            ea->getUseThisHour(),
+            ea->getUseToday(),
+            ea->getCurrentThreshold(),
+            ea->getMonthMax()
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 3) {
-        if(data->getPowerFactor() == 0) {
-            char json[512];
-            snprintf_P(json, sizeof(json), JSON3_JSON,
-                WiFi.macAddress().c_str(),
-                clientId.c_str(),
-                (uint32_t) (millis64()/1000),
-                data->getPackageTimestamp(),
-                hw->getVcc(),
-                hw->getWifiRssi(),
-                hw->getTemperature(),
-                data->getListId().c_str(),
-                data->getMeterId().c_str(),
-                data->getMeterModel().c_str(),
-                data->getActiveImportPower(),
-                data->getReactiveImportPower(),
-                data->getActiveExportPower(),
-                data->getReactiveExportPower(),
-                data->getL1Current(),
-                data->getL2Current(),
-                data->getL3Current(),
-                data->getL1Voltage(),
-                data->getL2Voltage(),
-                data->getL3Voltage(),
-                data->getActiveImportCounter(),
-                data->getActiveExportCounter(),
-                data->getReactiveImportCounter(),
-                data->getReactiveExportCounter(),
-                data->getMeterTimestamp()
-            );
-            return mqtt->publish(topic, json);
-        } else {
-            char json[768];
-            snprintf_P(json, sizeof(json), JSON3PF_JSON,
-                WiFi.macAddress().c_str(),
-                clientId.c_str(),
-                (uint32_t) (millis64()/1000),
-                data->getPackageTimestamp(),
-                hw->getVcc(),
-                hw->getWifiRssi(),
-                hw->getTemperature(),
-                data->getListId().c_str(),
-                data->getMeterId().c_str(),
-                data->getMeterModel().c_str(),
-                data->getActiveImportPower(),
-                data->getReactiveImportPower(),
-                data->getActiveExportPower(),
-                data->getReactiveExportPower(),
-                data->getL1Current(),
-                data->getL2Current(),
-                data->getL3Current(),
-                data->getL1Voltage(),
-                data->getL2Voltage(),
-                data->getL3Voltage(),
-                data->getPowerFactor(),
-                data->getL1PowerFactor(),
-                data->getL2PowerFactor(),
-                data->getL3PowerFactor(),
-                data->getActiveImportCounter(),
-                data->getActiveExportCounter(),
-                data->getReactiveImportCounter(),
-                data->getReactiveExportCounter(),
-                data->getMeterTimestamp()
-            );
-            return mqtt->publish(topic, json);
-        }
+        snprintf_P(json, BufferSize, JSON3_JSON,
+            WiFi.macAddress().c_str(),
+            clientId.c_str(),
+            (uint32_t) (millis64()/1000),
+            data->getPackageTimestamp(),
+            hw->getVcc(),
+            hw->getWifiRssi(),
+            hw->getTemperature(),
+            data->getListId().c_str(),
+            data->getMeterId().c_str(),
+            meterModel.c_str(),
+            data->getActiveImportPower(),
+            data->getReactiveImportPower(),
+            data->getActiveExportPower(),
+            data->getReactiveExportPower(),
+            data->getL1Current(),
+            data->getL2Current(),
+            data->getL3Current(),
+            data->getL1Voltage(),
+            data->getL2Voltage(),
+            data->getL3Voltage(),
+            data->getActiveImportCounter(),
+            data->getActiveExportCounter(),
+            data->getReactiveImportCounter(),
+            data->getReactiveExportCounter(),
+            data->getMeterTimestamp(),
+            ea->getUseThisHour(),
+            ea->getUseToday(),
+            ea->getCurrentThreshold(),
+            ea->getMonthMax()
+        );
+        return mqtt->publish(topic, json);
+    } else if(data->getListType() == 4) {
+        snprintf_P(json, BufferSize, JSON4_JSON,
+            WiFi.macAddress().c_str(),
+            clientId.c_str(),
+            (uint32_t) (millis64()/1000),
+            data->getPackageTimestamp(),
+            hw->getVcc(),
+            hw->getWifiRssi(),
+            hw->getTemperature(),
+            data->getListId().c_str(),
+            data->getMeterId().c_str(),
+            meterModel.c_str(),
+            data->getActiveImportPower(),
+            data->getReactiveImportPower(),
+            data->getActiveExportPower(),
+            data->getReactiveExportPower(),
+            data->getL1Current(),
+            data->getL2Current(),
+            data->getL3Current(),
+            data->getL1Voltage(),
+            data->getL2Voltage(),
+            data->getL3Voltage(),
+            data->getPowerFactor(),
+            data->getL1PowerFactor(),
+            data->getL2PowerFactor(),
+            data->getL3PowerFactor(),
+            data->getActiveImportCounter(),
+            data->getActiveExportCounter(),
+            data->getReactiveImportCounter(),
+            data->getReactiveExportCounter(),
+            data->getMeterTimestamp(),
+            ea->getUseThisHour(),
+            ea->getUseToday(),
+            ea->getCurrentThreshold(),
+            ea->getMonthMax()
+        );
+        return mqtt->publish(topic, json);
     }
     return false;
 }
 
 bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) {
 	int count = hw->getTempSensorCount();
-    if(count == 0)
+    if(count < 2)
         return false;
 
-	int size = 32 + (count * 26);
-
-	char buf[size];
-	snprintf(buf, 24, "{\"temperatures\":{");
+	snprintf(json, 24, "{\"temperatures\":{");
 
 	for(int i = 0; i < count; i++) {
 		TempSensorData* data = hw->getTempSensorData(i);
         if(data != NULL) {
-            char* pos = buf+strlen(buf);
+            char* pos = json+strlen(json);
             snprintf(pos, 26, "\"%s\":%.2f,", 
                 toHex(data->address, 8).c_str(),
                 data->lastRead
@@ -142,9 +151,9 @@ bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw)
             delay(1);
         }
 	}
-	char* pos = buf+strlen(buf);
+	char* pos = json+strlen(json);
 	snprintf(count == 0 ? pos : pos-1, 8, "}}");
-    return mqtt->publish(topic, buf);
+    return mqtt->publish(topic, json);
 }
 
 bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
@@ -158,7 +167,8 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
 	float min1hr, min3hr, min6hr;
 	int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1;
 	float min = INT16_MAX, max = INT16_MIN;
-	float values[24] = {0};
+	float values[24];
+    for(int i = 0;i < 24; i++) values[i] = ENTSOE_NO_VALUE;
 	for(uint8_t i = 0; i < 24; i++) {
 		float val = eapi->getValueForHour(now, i);
 		values[i] = val;
@@ -229,8 +239,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
 		sprintf(ts6hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
 
-    char json[384];
-    snprintf_P(json, sizeof(json), JSONPRICES_JSON,
+    snprintf_P(json, BufferSize, JSONPRICES_JSON,
         WiFi.macAddress().c_str(),
         values[0],
         values[1],
@@ -257,8 +266,7 @@ bool JsonMqttHandler::publishSystem(HwTools* hw) {
 	if(init || topic.isEmpty() || !mqtt->connected())
 		return false;
 
-    char json[192];
-    snprintf_P(json, sizeof(json), JSONSYS_JSON,
+    snprintf_P(json, BufferSize, JSONSYS_JSON,
         WiFi.macAddress().c_str(),
         clientId.c_str(),
         (uint32_t) (millis64()/1000),

src/mqtt/JsonMqttHandler.h

@@ -5,12 +5,12 @@
 
 class JsonMqttHandler : public AmsMqttHandler {
 public:
-    JsonMqttHandler(MQTTClient* mqtt, const char* clientId, const char* topic, HwTools* hw) : AmsMqttHandler(mqtt) {
+    JsonMqttHandler(MQTTClient* mqtt, char* buf, const char* clientId, const char* topic, HwTools* hw) : AmsMqttHandler(mqtt, buf) {
         this->clientId = clientId;
         this->topic = String(topic);
         this->hw = hw;
     };
-    bool publish(AmsData* data, AmsData* previousState);
+    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
     bool publishTemperatures(AmsConfiguration*, HwTools*);
     bool publishPrices(EntsoeApi*);
     bool publishSystem(HwTools*);

src/mqtt/RawMqttHandler.cpp

@@ -2,7 +2,7 @@
 #include "hexutils.h"
 #include "Uptime.h"
 
-bool RawMqttHandler::publish(AmsData* data, AmsData* meterState) {
+bool RawMqttHandler::publish(AmsData* data, AmsData* meterState, EnergyAccounting* ea) {
 	if(topic.isEmpty() || !mqtt->connected())
 		return false;
         
@@ -10,15 +10,7 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState) {
         mqtt->publish(topic + "/meter/dlms/timestamp", String(data->getPackageTimestamp()));
     }
     switch(data->getListType()) {
-        case 3:
-            // ID and type belongs to List 2, but I see no need to send that every 10s
-            mqtt->publish(topic + "/meter/id", data->getMeterId(), true, 0);
-            mqtt->publish(topic + "/meter/type", data->getMeterModel(), true, 0);
-            mqtt->publish(topic + "/meter/clock", String(data->getMeterTimestamp()));
-            mqtt->publish(topic + "/meter/import/reactive/accumulated", String(data->getReactiveImportCounter(), 3), true, 0);
-            mqtt->publish(topic + "/meter/import/active/accumulated", String(data->getActiveImportCounter(), 3), true, 0);
-            mqtt->publish(topic + "/meter/export/reactive/accumulated", String(data->getReactiveExportCounter(), 3), true, 0);
-            mqtt->publish(topic + "/meter/export/active/accumulated", String(data->getActiveExportCounter(), 3), true, 0);
+        case 4:
             if(full || meterState->getPowerFactor() != data->getPowerFactor()) {
                 mqtt->publish(topic + "/meter/powerfactor", String(data->getPowerFactor(), 2));
             }
@@ -31,6 +23,15 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState) {
             if(full || meterState->getL3PowerFactor() != data->getL3PowerFactor()) {
                 mqtt->publish(topic + "/meter/l3/powerfactor", String(data->getL3PowerFactor(), 2));
             }
+        case 3:
+            // ID and type belongs to List 2, but I see no need to send that every 10s
+            mqtt->publish(topic + "/meter/id", data->getMeterId(), true, 0);
+            mqtt->publish(topic + "/meter/type", data->getMeterModel(), true, 0);
+            mqtt->publish(topic + "/meter/clock", String(data->getMeterTimestamp()));
+            mqtt->publish(topic + "/meter/import/reactive/accumulated", String(data->getReactiveImportCounter(), 3), true, 0);
+            mqtt->publish(topic + "/meter/import/active/accumulated", String(data->getActiveImportCounter(), 3), true, 0);
+            mqtt->publish(topic + "/meter/export/reactive/accumulated", String(data->getReactiveExportCounter(), 3), true, 0);
+            mqtt->publish(topic + "/meter/export/active/accumulated", String(data->getActiveExportCounter(), 3), true, 0);
         case 2:
             // Only send data if changed. ID and Type is sent on the 10s interval only if changed
             if(full || meterState->getMeterId() != data->getMeterId()) {
@@ -71,6 +72,10 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState) {
                 mqtt->publish(topic + "/meter/import/active", String(data->getActiveImportPower()));
             }
     }
+    mqtt->publish(topic + "/realtime/import/hour", String(ea->getUseThisHour(), 3));
+    mqtt->publish(topic + "/realtime/import/day", String(ea->getUseToday(), 2));
+    mqtt->publish(topic + "/realtime/import/threshold", String(ea->getCurrentThreshold(), 10), true, 0);
+    mqtt->publish(topic + "/realtime/import/monthmax", String(ea->getMonthMax(), 3), true, 0);
     return true;
 }
 
@@ -99,7 +104,8 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) {
 	float min1hr, min3hr, min6hr;
 	int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1;
 	float min = INT16_MAX, max = INT16_MIN;
-	float values[34] = {0};
+	float values[34];
+    for(int i = 0;i < 34; i++) values[i] = ENTSOE_NO_VALUE;
 	for(uint8_t i = 0; i < 34; i++) {
 		float val = eapi->getValueForHour(now, i);
 		values[i] = val;
@@ -175,7 +181,6 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) {
         float val = values[i];
         if(val == ENTSOE_NO_VALUE) {
             mqtt->publish(topic + "/price/" + String(i), "", true, 0);
-            break;
         } else {
             mqtt->publish(topic + "/price/" + String(i), String(val, 4), true, 0);
         }
@@ -211,6 +216,7 @@ bool RawMqttHandler::publishSystem(HwTools* hw) {
 	if(vcc > 0) {
 		mqtt->publish(topic + "/vcc", String(vcc, 2));
 	}
+	mqtt->publish(topic + "/mem", String(ESP.getFreeHeap()));
 	mqtt->publish(topic + "/rssi", String(hw->getWifiRssi()));
     if(hw->getTemperature() > -85) {
 		mqtt->publish(topic + "/temperature", String(hw->getTemperature(), 2));

src/mqtt/RawMqttHandler.h

@@ -5,11 +5,11 @@
 
 class RawMqttHandler : public AmsMqttHandler {
 public:
-    RawMqttHandler(MQTTClient* mqtt, const char* topic, bool full) : AmsMqttHandler(mqtt) {
+    RawMqttHandler(MQTTClient* mqtt, char* buf, const char* topic, bool full) : AmsMqttHandler(mqtt, buf) {
         this->topic = String(topic);
         this->full = full;
     };
-    bool publish(AmsData* data, AmsData* previousState);
+    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
     bool publishTemperatures(AmsConfiguration*, HwTools*);
     bool publishPrices(EntsoeApi*);
     bool publishSystem(HwTools*);

src/web/AmsWebHeaders.h

@@ -0,0 +1,14 @@
+static const char HEADER_CACHE_CONTROL[] PROGMEM = "Cache-Control";
+static const char HEADER_PRAGMA[] PROGMEM = "Pragma";
+static const char HEADER_EXPIRES[] PROGMEM = "Expires";
+static const char HEADER_AUTHENTICATE[] PROGMEM = "WWW-Authenticate";
+
+static const char CACHE_CONTROL_NO_CACHE[] PROGMEM = "no-cache, no-store, must-revalidate";
+static const char CACHE_1HR[] PROGMEM = "public, max-age=3600";
+static const char PRAGMA_NO_CACHE[] PROGMEM = "no-cache";
+static const char EXPIRES_OFF[] PROGMEM = "-1";
+static const char AUTHENTICATE_BASIC[] PROGMEM = "Basic realm=\"Secure Area\"";
+
+static const char MIME_PLAIN[] PROGMEM = "text/plain";
+static const char MIME_HTML[] PROGMEM = "text/html";
+static const char MIME_JSON[] PROGMEM = "application/json";

src/web/AmsWebServer.h

@@ -8,7 +8,9 @@
 #include "AmsConfiguration.h"
 #include "HwTools.h"
 #include "AmsData.h"
+#include "AmsStorage.h"
 #include "AmsDataStorage.h"
+#include "EnergyAccounting.h"
 #include "Uptime.h"
 #include "RemoteDebug.h"
 #include "entsoe/EntsoeApi.h"
@@ -17,6 +19,7 @@
 	#include <ESP8266WiFi.h>
 	#include <ESP8266WebServer.h>
 	#include <ESP8266HTTPClient.h>
+	#include <ESP8266httpUpdate.h>
 #elif defined(ESP32) // ARDUINO_ARCH_ESP32
 	#include <WiFi.h>
 	#include <WebServer.h>
@@ -29,8 +32,8 @@
 
 class AmsWebServer {
 public:
-	AmsWebServer(RemoteDebug* Debug, HwTools* hw);
-    void setup(AmsConfiguration*, GpioConfig*, MeterConfig*, AmsData*, AmsDataStorage*);
+	AmsWebServer(uint8_t* buf, RemoteDebug* Debug, HwTools* hw);
+    void setup(AmsConfiguration*, GpioConfig*, MeterConfig*, AmsData*, AmsDataStorage*, EnergyAccounting*);
     void loop();
 	void setMqtt(MQTTClient* mqtt);
 	void setTimezone(Timezone* tz);
@@ -50,11 +53,15 @@ private:
 	WebConfig webConfig;
 	AmsData* meterState;
 	AmsDataStorage* ds;
+    EnergyAccounting* ea = NULL;
 	MQTTClient* mqtt = NULL;
 	bool uploading = false;
 	File file;
 	bool performRestart = false;
 
+    static const uint16_t BufferSize = 2048;
+    char* buf;
+
 #if defined(ESP8266)
 	ESP8266WebServer server;
 #elif defined(ESP32) // ARDUINO_ARCH_ESP32
@@ -68,8 +75,8 @@ private:
 	void temperature();
 	void temperaturePost();
 	void temperatureJson();
-	void price();
 	void configMeterHtml();
+	void configMeterAdvancedHtml();
 	void configWifiHtml();
 	void configMqttHtml();
 	void configWebHtml();
@@ -78,12 +85,16 @@ private:
 	void configNtpHtml();
 	void configGpioHtml();
 	void configDebugHtml();
+	void configThresholdsHtml();
 	void bootCss();
 	void githubSvg();
     void dataJson();
 	void dayplotJson();
 	void monthplotJson();
 	void energyPriceJson();
+	void configFileHtml();
+	void configFileDownload();
+	void configFileUpload();
 
 	void handleSetup();
 	void handleSave();
@@ -99,7 +110,7 @@ private:
 
 	void uploadHtml(const char* label, const char* action, const char* menu);
 	void deleteHtml(const char* label, const char* action, const char* menu);
-	void uploadFile(const char* path);
+	HTTPUpload& uploadFile(const char* path);
 	void deleteFile(const char* path);
 	void uploadPost();
 	void mqttCa();

web/application.js

@@ -1,6 +1,8 @@
 var nextVersion;
 var im, em;
 var ds = 0;
+var currency = "";
+var swatt = false;
 
 // Price plot
 var pp;
@@ -30,6 +32,7 @@ var eo = {
     titleTextStyle: {
         fontSize: 14
     },
+    colors: ['#6f42c1', '#6f42c1'],
     backgroundColor: { fill:'transparent' },
     bar: { groupWidth: '90%' },
     legend: { position: 'none' },
@@ -39,6 +42,7 @@ var eo = {
     },
     tooltip: { trigger: 'none'},
     enableInteractivity: false,
+    isStacked: true
 };
 
 // Month plot
@@ -49,6 +53,7 @@ var mo = {
     titleTextStyle: {
         fontSize: 14
     },
+    colors: ['#6f42c1', '#6f42c1'],
     backgroundColor: { fill:'transparent' },
     bar: { groupWidth: '90%' },
     legend: { position: 'none' },
@@ -58,6 +63,7 @@ var mo = {
     },
     tooltip: { trigger: 'none'},
     enableInteractivity: false,
+    isStacked: true
 };
 
 // Voltage plot
@@ -263,6 +269,11 @@ $(function() {
     });
     $('#n').trigger('change');
 
+    $('.ipo,.epo').on('click', function() {
+        swatt = !swatt;
+        $('.ipo,.epo').html('wait');
+    });
+
     // Navbar
     switch(window.location.pathname) {
         case '/temperature':
@@ -285,6 +296,7 @@ $(function() {
             break;
         case '/gpio':
         case '/debugging':
+        case '/configfile':
         case '/firmware':
             $('#firmware-warn').show();
         case '/reset':
@@ -432,6 +444,7 @@ var drawPrices = function() {
         timeout: 30000,
         dataType: 'json',
     }).done(function(json) {
+        currency = json.currency;
         data = [['Hour',json.currency + '/kWh', { role: 'style' }, { role: 'annotation' }]];
         var r = 1;
         var hour = moment.utc().hours();
@@ -465,24 +478,27 @@ var drawDay = function() {
         timeout: 30000,
         dataType: 'json',
     }).done(function(json) {
-        data = [['Hour','kWh', { role: 'style' }, { role: 'annotation' }]];
+        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }]];
         var r = 1;
         var hour = moment.utc().hours();
         var offset = moment().utcOffset()/60;
         var min = 0;
         for(var i = hour; i<24; i++) {
-            var val = json["h"+zeropad(i)];
-            data[r++] = [zeropad((i+offset)%24), val, "color: #6f42c1;opacity: 0.9;", val.toFixed(1)];
-            Math.min(0, val);
+            var imp = json["i"+zeropad(i)];
+            var exp = json["e"+zeropad(i)];
+            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(1) : imp.toFixed(1) + '\n' + -exp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            min = Math.min(0, -exp);
         };
         for(var i = 0; i < hour; i++) {
-            var val = json["h"+zeropad(i)];
-            data[r++] = [zeropad((i+offset)%24), val, "color: #6f42c1;opacity: 0.9;", val.toFixed(1)];
-            Math.min(0, val);
+            var imp = json["i"+zeropad(i)];
+            var exp = json["e"+zeropad(i)];
+            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(1) : imp.toFixed(1) + '\n' + -exp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            min = Math.min(0, -exp);
         };
         ea = google.visualization.arrayToDataTable(data);
         if(min == 0)
             eo.vAxis.minValue = 0;
+
         ep.draw(ea, eo);
 
         setTimeout(drawDay, (61-moment().minute())*60000);
@@ -495,20 +511,22 @@ var drawMonth = function() {
         timeout: 30000,
         dataType: 'json',
     }).done(function(json) {
-        data = [['Day','kWh', { role: 'style' }, { role: 'annotation' }]];
+        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }]];
         var r = 1;
         var day = moment().date();
         var eom = moment().subtract(1, 'months').endOf('month').date();
         var min = 0;
         for(var i = day; i<=eom; i++) {
-            var val = json["d"+zeropad(i)];
-            data[r++] = [zeropad((i)), val, "color: #6f42c1;opacity: 0.9;", val.toFixed(0)];
-            Math.min(0, val);
+            var imp = json["i"+zeropad(i)];
+            var exp = json["e"+zeropad(i)];
+            data[r++] = [zeropad(i), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(0) : imp.toFixed(0) + '\n' + -exp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            min = Math.min(0, -exp);
         }
         for(var i = 1; i < day; i++) {
-            var val = json["d"+zeropad(i)];
-            data[r++] = [zeropad((i)), val, "color: #6f42c1;opacity: 0.9;", val.toFixed(0)];
-            Math.min(0, val);
+            var imp = json["i"+zeropad(i)];
+            var exp = json["e"+zeropad(i)];
+            data[r++] = [zeropad(i), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(0) : imp.toFixed(0) + '\n' + -exp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            min = Math.min(0, -exp);
         }
         ma = google.visualization.arrayToDataTable(data);
         if(min == 0)
@@ -582,10 +600,10 @@ var voltcol = function(pct) {
 };
 
 var ampcol = function(pct) {
-    if(pct > 85) return '#d90000';
-    else if(pct > 75) return'#e32100';
-    else if(pct > 70) return '#ffb800';
-    else if(pct > 65) return '#dcd800';
+    if(pct > 90) return '#d90000';
+    else if(pct > 85) return'#e32100';
+    else if(pct > 80) return '#ffb800';
+    else if(pct > 75) return '#dcd800';
     else return '#32d900';
 };
 
@@ -635,7 +653,7 @@ var fetch = function() {
             var v = parseInt(json.i);
             var pct = (v*100)/parseInt(json.im);
             var append = "W";
-            if(v > 1000) {
+            if(v > 1000 && !swatt) {
                 v = (v/1000).toFixed(1);
                 append = "kW";
             }
@@ -652,25 +670,34 @@ var fetch = function() {
             ip.draw(ia, io);
         }
 
-        if(xp) {
-            var v = parseInt(json.e);
-            var pct = (v*100)/(parseInt(json.om)*1000);
-            var append = "W";
-            if(v > 1000) {
-                v = (v/1000).toFixed(1);
-                append = "kW";
+        var om = parseInt(json.om);
+
+        if(om > 0) {
+            $('.rex').show();
+            $('.rim').hide();
+            if(xp) {
+                var v = parseInt(json.e);
+                var pct = (v*100)/(om*1000);
+                var append = "W";
+                if(v > 1000 && !swatt) {
+                    v = (v/1000).toFixed(1);
+                    append = "kW";
+                }
+                $('.epo').html(v);
+                $('.epoa').html(append);
+                var arr = [
+                    ['Slice', 'Value'],
+                    ['', (pct*2.88)],
+                    ['', ((100-pct)*2.88)],
+                    ['', 72],
+                ];
+                xo.slices[0].color = ampcol(pct);
+                xa = google.visualization.arrayToDataTable(arr);
+                xp.draw(xa, xo);
             }
-            $('.epo').html(v);
-            $('.epoa').html(append);
-            var arr = [
-                ['Slice', 'Value'],
-                ['', (pct*2.88)],
-                ['', ((100-pct)*2.88)],
-                ['', 72],
-            ];
-            xo.slices[0].color = ampcol(pct);
-            xa = google.visualization.arrayToDataTable(arr);
-            xp.draw(xa, xo);
+        } else {
+            $('.rex').hide();
+            $('.rim').show();
         }
 
         if(vp) {
@@ -723,33 +750,48 @@ var fetch = function() {
                     ao.title = 'Phase current';
                     break;
             }
-            var a = 0;
+            var dA = false;
             var r = 1;
             var arr = [['Phase', 'Amperage', { role: 'style' }, { role: 'annotation' }]];
-            if(json.i1) {
+            if(json.i1 || json.u1) {
                 var i1 = parseFloat(json.i1);
-                a = Math.max(a, i1);
+                dA = true;
                 var pct = (parseFloat(json.i1)/parseInt(json.mf))*100;
                 arr[r++] = ['L1', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i1 + "A"];
             }
-            if(json.i2) {
+            if(json.i2 || json.u2) {
                 var i2 = parseFloat(json.i2);
-                a = Math.max(a, i2);
+                dA = true;
                 var pct = (parseFloat(json.i2)/parseInt(json.mf))*100;
                 arr[r++] = ['L2', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i2 + "A"];
             }
-            if(json.i3) {
+            if(json.i3 || json.u3) {
                 var i3 = parseFloat(json.i3);
-                a = Math.max(a, i3);
+                dA = true;
                 var pct = (parseFloat(json.i3)/parseInt(json.mf))*100;
                 arr[r++] = ['L3', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i3 + "A"];
             }
-            if(a > 0) {
+            if(dA) {
                 aa = google.visualization.arrayToDataTable(arr);
                 ap.draw(aa, ao);
             }
         }
 
+        if(json.ea) {
+            $('#each').html(json.ea.h.u.toFixed(2));
+            $('#eachc').html(json.ea.h.c.toFixed(2));
+            $('#eacd').html(json.ea.d.u.toFixed(1));
+            $('#eacdc').html(json.ea.d.c.toFixed(1));
+            $('#eacm').html(json.ea.m.u.toFixed(0));
+            $('#eacmc').html(json.ea.m.c.toFixed(0));
+            $('#eax').html(json.ea.x.toFixed(1));
+            $('#eat').html(json.ea.t.toFixed(0));
+            $('.cr').html(currency);
+            if(currency) {
+                $('.sp').show();
+            }
+        }
+
         if(json.me) {
             $('.me').addClass('d-none');
             $('.me'+json.me).removeClass('d-none');
@@ -803,7 +845,7 @@ var fetch = function() {
                 $('.jmt').html("Landis");
                 break;
             case 10:
-                $('.jmt').html("Sagecom");
+                $('.jmt').html("Sagemcom");
                 break;
             default:
                 $('.jmt').html("");

web/configfile.html

@@ -0,0 +1,71 @@
+<form method="get" action="/configfile.cfg">
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <h6>Download configuration</h6>
+        <div class="row">
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="iw" value="true" checked/> WiFi</label>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="im" value="true" checked/> MQTT</label>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="ie" value="true" checked/> Web</label>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="it" value="true" checked/> Meter</label>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="ih" value="true" checked/> Thresholds</label>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="ig" value="true" checked/> GPIO</label>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="id" value="true" checked/> Domoticz</label>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="in" value="true" checked/> NTP</label>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-6">
+                <label><input type="checkbox" name="is" value="true" checked/> ENTSO-E</label>
+            </div>
+            <div class="col-xl-6 col-md-8">
+                <label><input type="checkbox" name="ic" value="true"/> Include Secrets (SSID, PSK, passwords and tokens)</label>
+            </div>
+        </div>    
+        <div class="row">
+            <div class="col-12 text-right">
+                <button class="btn btn-primary">Download</button>
+            </div>
+        </div>
+    </div>
+</form>
+<form method="post" enctype="multipart/form-data" class="upload-form">
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <h6>Upload configuration</h6>
+        <div class="row">
+            <div class="col-lg-6">
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Upload</span>
+                    </div>
+                    <div class="custom-file">
+                        <input name="file" type="file" class="custom-file-input" id="fileUploadField">
+                        <label class="custom-file-label" for="fileUploadField">Choose file</label>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-12 text-right">
+                <button class="btn btn-primary">Upload</button>
+            </div>
+        </div>
+    </div>
+</form>    
+<hr/>
+<div class="row form-group">
+    <div class="col-6">
+        <a href="/" class="btn btn-outline-secondary">Back</a>
+    </div>
+</div>

web/data.json

@@ -33,5 +33,21 @@
     "p" : %s,
     "mt" : %d,
     "ds" : %d,
+    "ea" : {
+        "x" : %.1f,
+        "t" : %d,
+        "h" : {
+            "u" : %.2f,
+            "c" : %.2f
+        },
+        "d" : {
+            "u" : %.2f,
+            "c" : %.2f
+        },
+        "m" : {
+            "u" : %.2f,
+            "c" : %.2f
+        }
+    },
     "c" : %lu
 }

web/dayplot.json

@@ -1,26 +1,50 @@
 {
-    "h00" : %.2f,
-    "h01" : %.2f,
-    "h02" : %.2f,
-    "h03" : %.2f,
-    "h04" : %.2f,
-    "h05" : %.2f,
-    "h06" : %.2f,
-    "h07" : %.2f,
-    "h08" : %.2f,
-    "h09" : %.2f,
-    "h10" : %.2f,
-    "h11" : %.2f,
-    "h12" : %.2f,
-    "h13" : %.2f,
-    "h14" : %.2f,
-    "h15" : %.2f,
-    "h16" : %.2f,
-    "h17" : %.2f,
-    "h18" : %.2f,
-    "h19" : %.2f,
-    "h20" : %.2f,
-    "h21" : %.2f,
-    "h22" : %.2f,
-    "h23" : %.2f
+    "i00" : %.2f,
+    "i01" : %.2f,
+    "i02" : %.2f,
+    "i03" : %.2f,
+    "i04" : %.2f,
+    "i05" : %.2f,
+    "i06" : %.2f,
+    "i07" : %.2f,
+    "i08" : %.2f,
+    "i09" : %.2f,
+    "i10" : %.2f,
+    "i11" : %.2f,
+    "i12" : %.2f,
+    "i13" : %.2f,
+    "i14" : %.2f,
+    "i15" : %.2f,
+    "i16" : %.2f,
+    "i17" : %.2f,
+    "i18" : %.2f,
+    "i19" : %.2f,
+    "i20" : %.2f,
+    "i21" : %.2f,
+    "i22" : %.2f,
+    "i23" : %.2f,
+    "e00" : %.2f,
+    "e01" : %.2f,
+    "e02" : %.2f,
+    "e03" : %.2f,
+    "e04" : %.2f,
+    "e05" : %.2f,
+    "e06" : %.2f,
+    "e07" : %.2f,
+    "e08" : %.2f,
+    "e09" : %.2f,
+    "e10" : %.2f,
+    "e11" : %.2f,
+    "e12" : %.2f,
+    "e13" : %.2f,
+    "e14" : %.2f,
+    "e15" : %.2f,
+    "e16" : %.2f,
+    "e17" : %.2f,
+    "e18" : %.2f,
+    "e19" : %.2f,
+    "e20" : %.2f,
+    "e21" : %.2f,
+    "e22" : %.2f,
+    "e23" : %.2f
 }

web/debugging.html

@@ -11,21 +11,20 @@
         <h6>Debugging</h6>
         <div class="row">
             <div class="col-xl-2 col-md-3">
-                <label><input type="checkbox" name="debugTelnet" value="true" ${config.debugTelnet}/> Telnet debugger</label>
+                <label><input type="checkbox" name="debugTelnet" value="true" %s/> Telnet debugger</label>
             </div>
             <div class="col-xl-2 col-md-3">
-                <label><input type="checkbox" name="debugSerial" value="true" ${config.debugSerial}/> Serial debugger</label>
+                <label><input type="checkbox" name="debugSerial" value="true" %s/> Serial debugger</label>
             </div>
             <div class="col-xl-3 col-md-4">
                 <div class="row form-group">
                     <label class="col-6">Debug level</label>
                     <div class="col-6">
                         <select class="form-control form-control-sm" name="debugLevel">
-                            <option value="1" ${config.debugLevel1}>Verbose</option>
-                            <option value="2" ${config.debugLevel2}>Debug</option>
-                            <option value="3" ${config.debugLevel3}>Info</option>
-                            <option value="4" ${config.debugLevel4}>Warning</option>
-                            <option value="5" ${config.debugLevel5}>Error</option>
+                            <option value="1" %s>Verbose</option>
+                            <option value="2" %s>Debug</option>
+                            <option value="3" %s>Info</option>
+                            <option value="4" %s>Warning</option>
                         </select>
                     </div>
                 </div>

web/domoticz.html

@@ -6,13 +6,13 @@
                 <div class="input-group-prepend">
                     <span class="input-group-text">Electricity IDX</span>
                 </div>
-                <input type="number" class="form-control" name="elidx" value="{elidx}" min="0" max="65535"/> 
+                <input type="number" class="form-control" name="elidx" value="%d" min="0" max="65535"/> 
             </div>
             <div class="m-2 input-group input-group-sm" style="width: 240px;">
                 <div class="input-group-prepend">
                     <span class="input-group-text">Current (3 Phase) IDX</span>
                 </div>
-                <input type="number" class="form-control" name="cl1idx" value="{cl1idx}" min="0" max="65535"/>
+                <input type="number" class="form-control" name="cl1idx" value="%d" min="0" max="65535"/>
             </div>
         </div>
         <div class="d-flex flex-row flex-wrap">
@@ -20,26 +20,26 @@
                 <div class="input-group-prepend">
                     <span class="input-group-text">Voltage L1 IDX</span>
                 </div>
-                <input type="number" class="form-control" name="vl1idx" value="{vl1idx}" min="0" max="65535"/>
+                <input type="number" class="form-control" name="vl1idx" value="%d" min="0" max="65535"/>
             </div>
             <div class="m-2 input-group input-group-sm" style="width: 200px;">
                 <div class="input-group-prepend">
-                    <span class="input-group-text">Voltage L1 IDX</span>
+                    <span class="input-group-text">Voltage L2 IDX</span>
                 </div>
-                <input type="number" class="form-control" name="vl2idx" value="{vl2idx}" min="0" max="65535"/>
+                <input type="number" class="form-control" name="vl2idx" value="%d" min="0" max="65535"/>
             </div>
             <div class="m-2 input-group input-group-sm" style="width: 200px;">
                 <div class="input-group-prepend">
-                    <span class="input-group-text">Voltage L1 IDX</span>
+                    <span class="input-group-text">Voltage L3 IDX</span>
                 </div>
-                <input type="number" class="form-control" name="vl3idx" value="{vl3idx}" min="0" max="65535"/>
+                <input type="number" class="form-control" name="vl3idx" value="%d" min="0" max="65535"/>
             </div>
         </div>
     </div>
     <hr/>
     <div class="row form-group">
         <div class="col-6">
-            <a href="/" class="btn btn-outline-secondary">Back</a>
+            <a href="/mqtt" class="btn btn-outline-secondary">Back</a>
         </div>
         <div class="col-6 text-right">
             <button class="btn btn-primary">Save</button>

web/foot.html

@@ -10,9 +10,9 @@
         </div>
     </div>    
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.1/moment.min.js" integrity="sha512-qTXRIMyZIFb8iQcfjXWCO8+M5Tbc38Qi5WzdPOYZHIlZpzBHG3L3by84BBBOiRGiEb7KKtAOAs5qYdUiZiQNNQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js" integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13" crossorigin="anonymous"></script>
     <script src="https://www.gstatic.com/charts/loader.js"></script>
     <script src="application-${version}.js"></script>
 

web/ha1.json

@@ -0,0 +1,3 @@
+{
+    "P" : %d
+}

web/ha2.json

@@ -0,0 +1,7 @@
+{
+    "tPI" : %.2f,
+    "tPO" : %.2f,
+    "tQI" : %.2f,
+    "tQO" : %.2f,
+    "rtc" : %llu
+}

web/ha3.json

@@ -0,0 +1,19 @@
+{
+    "lv" : "%s",
+    "id" : "%s",
+    "type" : "%s",
+    "P" : %d,
+    "Q" : %d,
+    "PO" : %d,
+    "QO" : %d,
+    "I1" : %.2f,
+    "I2" : %.2f,
+    "I3" : %.2f,
+    "U1" : %.2f,
+    "U2" : %.2f,
+    "U3" : %.2f,
+    "PF" : %.2f,
+    "PF1" : %.2f,
+    "PF2" : %.2f,
+    "PF3" : %.2f
+}

web/hadiscover.json

@@ -0,0 +1,17 @@
+{
+    "name" : "%s",
+    "stat_t" : "%s%s",
+    "uniq_id" : "%s_%s",
+    "obj_id" : "%s_%s",
+    "unit_of_meas" : "%s",
+    "val_tpl" : "{{ value_json.%s | is_defined }}",
+    "dev_cla" : "%s",
+    "dev" : {
+      "ids" : [ "%s" ],
+      "name" : "%s",
+      "mdl" : "%s",
+      "sw" : "%s",
+      "mf" : "%s",
+      "cu" : "%s"
+    }%s %s
+}

web/head32.html

@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>AMS reader</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous" referrerpolicy="no-referrer">
     <style>
         .navbar-expand .navbar-nav .nav-link,.navbar-brand {
             padding-top: 0px;
@@ -30,10 +30,11 @@
             width: 50%;
             text-align: center;
         }
-        .ipo,.xpo {
+        .ipo,.epo {
             font-size: 1.7rem;
+            cursor: pointer;
         }
-        .ipoa,.xpoa {
+        .ipoa,.epoa {
             font-size: 1.0rem;
             color: grey;
         }
@@ -76,6 +77,7 @@
                         <div class="dropdown-menu" aria-labelledby="system-link">
                             <a class="dropdown-item" href="/gpio">GPIO</a>
                             <a class="dropdown-item" href="/debugging">Debugging</a>
+                            <a class="dropdown-item" href="/configfile">Configuration file</a>
                             <a class="dropdown-item" href="/firmware">Firmware</a>
                             <div class="dropdown-divider"></div>
                             <a class="dropdown-item" href="/restart">Restart</a>

web/head8266.html

@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>AMS reader</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous" referrerpolicy="no-referrer">
     <style>
         .navbar-expand .navbar-nav .nav-link,.navbar-brand {
             padding-top: 0px;
@@ -30,10 +30,11 @@
             width: 50%;
             text-align: center;
         }
-        .ipo,.xpo {
+        .ipo,.epo {
             font-size: 1.7rem;
+            cursor: pointer;
         }
-        .ipoa,.xpoa {
+        .ipoa,.epoa {
             font-size: 1.0rem;
             color: grey;
         }
@@ -75,6 +76,7 @@
                         <div class="dropdown-menu" aria-labelledby="system-link">
                             <a class="dropdown-item" href="/gpio">GPIO</a>
                             <a class="dropdown-item" href="/debugging">Debugging</a>
+                            <a class="dropdown-item" href="/configfile">Configuration file</a>
                             <a class="dropdown-item" href="/firmware">Firmware</a>
                             <div class="dropdown-divider"></div>
                             <a class="dropdown-item" href="/restart">Restart</a>

web/index.html

@@ -1,21 +1,21 @@
 <div class="bg-white rounded shadow p-1 mb-3">
     <div class="d-flex flex-wrap">
         <div class="flex-fill">
-            <div class="text-center">Up <span class="ju">{cs}</span></div>
+            <div class="text-center">Up <span class="ju">-</span></div>
         </div>
         <div class="flex-fill rt">
-            <div class="text-center">Temperature: <span class="jt">{temp}</span>&deg;C</div>
+            <div class="text-center">Temperature: <span class="jt">-</span>&deg;C</div>
         </div>
         <div class="flex-fill rv">
-            <div class="text-center">ESP volt: <span class="jv">{vcc}</span>V</div>
+            <div class="text-center">ESP volt: <span class="jv">-</span>V</div>
         </div>
         <div class="flex-fill">
-            <div class="text-center">WiFi RSSI: <span class="jr">{rssi}</span>dBm</div>
+            <div class="text-center">WiFi RSSI: <span class="jr">-</span>dBm</div>
         </div>
         <div class="flex-fill">
-            <div class="text-center">Free mem: <span class="jm">{mem}</span>kb</div>
+            <div class="text-center">Free mem: <span class="jm">-</span>kb</div>
         </div>
-        <div class="flex-fill  rc">
+        <div class="flex-fill rc">
             <div class="text-center"><span class="jc"></span></div>
         </div>
     </div>
@@ -27,31 +27,31 @@
             <div class="text-center overlay-plot">
                 <div id="ip" class="plot1"></div>
                 <span class="plot-overlay">
-                    <span class="ipo">{P}</span> 
+                    <span class="ipo">-</span> 
                     <span class="ipoa">W</span>
                     <br/>
-                    <span class="pol">{ti}</span>
+                    <span class="pol">Import</span>
                 </span>
             </div>
-            <div class="row ric" style="display: {da};">
+            <div class="row ric" style="display: none;">
                 <div class="col-5"><span class="jmt"></span></div>
-                <div class="col-7 text-right"><span class="jic">{tPI}</span> kWh</div>
+                <div class="col-7 text-right"><span class="jic">-</span> kWh</div>
             </div>
         </div>
     </div>
-    <div class="col-lg-3 col-sm-6 mb-3" style="display: {de};">
+    <div class="col-lg-3 col-sm-6 mb-3 rex" style="display: none;">
         <div class="bg-white rounded shadow p-3">
             <div class="text-center overlay-plot">
                 <div id="xp" class="plot1"></div>
                 <span class="plot-overlay">
-                    <span class="xpo">{PO}</span> 
-                    <span class="xpoa">W</span>
+                    <span class="epo">-</span> 
+                    <span class="epoa">W</span>
                     <br/>
                     <span class="pol">Export</span>
                 </span>
             </div>
-            <div class="row rec" style="display: {da};">
-                <div class="col-12 text-right"><span class="jec">{tPO}</span> kWh</div>
+            <div class="row rec" style="display: none;">
+                <div class="col-12 text-right"><span class="jec">-</span> kWh</div>
             </div>
         </div>
     </div>
@@ -69,44 +69,87 @@
             </div>
         </div>
     </div>
-    <div class="col-lg-3 col-sm-6 mb-3" style="display: {dn};">
-        <div class="bg-white rounded shadow p-3" style="display: {da};">
+    <div class="col-lg-3 col-sm-6 mb-3 rim" style="display: none;">
+        <div class="bg-white rounded shadow p-3">
             <h5 class="text-center">Reactive</h5>
             <div class="row rri">
                 <div class="col-12 font-weight-bold">Instant</div>
                 <div class="col-4">In</div>
-                <div class="col-8 text-right"><span class="jri">{Q}</span> VAr</div>
+                <div class="col-8 text-right"><span class="jri">-</span> VAr</div>
                 <div class="col-4">Out</div>
-                <div class="col-8 text-right"><span class="jre">{QO}</span> VAr</div>
+                <div class="col-8 text-right"><span class="jre">-</span> VAr</div>
             </div>
             <div class="row rric">
                 <div class="col-12 font-weight-bold">Total</div>
                 <div class="col-4">In</div>
-                <div class="col-8 text-right"><span class="jric">{tQI}</span> kVArh</div>
+                <div class="col-8 text-right"><span class="jric">-</span> kVArh</div>
                 <div class="col-4">Out</div>
-                <div class="col-8 text-right"><span class="jrec">{tQO}</span> kVArh</div>
+                <div class="col-8 text-right"><span class="jrec">-</span> kVArh</div>
             </div>
         </div>
     </div>
-    <div class="col-lg-6 mb-3" style="display: {de};">
-        <div class="bg-white rounded shadow p-3" style="display: {da};">
+    <div class="col-lg-6 mb-3 rex" style="display: none;">
+        <div class="bg-white rounded shadow p-3">
             <div class="row rrec">
                 <div class="col-sm-4 font-weight-bold">Instant reactive</div>
                 <div class="col-4 col-sm-1">In</div>
-                <div class="col-8 col-sm-3 text-right"><span class="jri">{Q}</span> VAr</div>
+                <div class="col-8 col-sm-3 text-right"><span class="jri">-</span> VAr</div>
                 <div class="col-4 col-sm-1">Out</div>
-                <div class="col-8 col-sm-3 text-right"><span class="jre">{QO}</span> VAr</div>
+                <div class="col-8 col-sm-3 text-right"><span class="jre">-</span> VAr</div>
             </div>
         </div>
     </div>
-    <div class="col-lg-6 mb-3" style="display: {de};">
-        <div class="bg-white rounded shadow p-3" style="display: {da};">
+    <div class="col-lg-6 mb-3 rex" style="display: none;">
+        <div class="bg-white rounded shadow p-3">
             <div class="row rrec">
                 <div class="col-sm-4 font-weight-bold">Total reactive</div>
                 <div class="col-4 col-sm-1">In</div>
-                <div class="col-8 col-sm-3 text-right"><span class="jric">{tQI}</span> kVArh</div>
+                <div class="col-8 col-sm-3 text-right"><span class="jric">-</span> kVArh</div>
                 <div class="col-4 col-sm-1">Out</div>
-                <div class="col-8 col-sm-3 text-right"><span class="jrec">{tQO}</span> kVArh</div>
+                <div class="col-8 col-sm-3 text-right"><span class="jrec">-</span> kVArh</div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-xl-12 mb-3">
+        <div class="bg-white rounded shadow pt-3 pb-3" style="font-size: 14px;">
+            <strong class="mr-3 ml-3">Real time calculation</strong><br/>
+            <div class="row">
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Hour</div>
+                        <div class="flex-fill text-right">
+                            <span id="each"></span> kWh
+                            <span class="sp text-nowrap" style="display: none;">(<span id="eachc"></span> <span class="cr"></span>)</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Day</div>
+                        <div class="flex-fill text-right">
+                            <span id="eacd"></span> kWh
+                            <span class="sp text-nowrap" style="display: none;">(<span id="eacdc"></span> <span class="cr"></span>)</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Month</div>
+                        <div class="flex-fill text-right">
+                            <span id="eacm"></span> kWh
+                            <span class="sp text-nowrap" style="display: none;">(<span id="eacmc"></span> <span class="cr"></span>)</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Max</div>
+                        <div class="flex-fill text-right">
+                            <span id="eax"></span> / <span id="eat"></span> kWh
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

web/json1.json

@@ -8,5 +8,11 @@
     "temp": %.2f,
     "data" : {
         "P" : %d
+    },
+    "realtime" : {
+        "h" : %.2f,
+        "d" : %.1f,
+        "t" : %d,
+        "x" : %.2f
     }
 }

web/json2.json

@@ -20,5 +20,11 @@
         "U1" : %.2f,
         "U2" : %.2f,
         "U3" : %.2f
+    },
+    "realtime" : {
+        "h" : %.2f,
+        "d" : %.1f,
+        "t" : %d,
+        "x" : %.2f
     }
 }

web/json3.json

@@ -25,5 +25,11 @@
         "tQI" : %.3f,
         "tQO" : %.3f,
         "rtc" : %lu
+    },
+    "realtime" : {
+        "h" : %.2f,
+        "d" : %.1f,
+        "t" : %d,
+        "x" : %.2f
     }
 }

web/json4.json

@@ -29,5 +29,11 @@
         "tQI" : %.2f,
         "tQO" : %.2f,
         "rtc" : %lu
+    },
+    "realtime" : {
+        "h" : %.2f,
+        "d" : %.1f,
+        "t" : %d,
+        "x" : %.2f
     }
 }

web/jsonha.json

@@ -0,0 +1,24 @@
+{
+    "lv" : "%s",
+    "id" : "%s",
+    "type" : "%s",
+    "P" : %d,
+    "Q" : %d,
+    "PO" : %d,
+    "QO" : %d,
+    "I1" : %.2f,
+    "I2" : %.2f,
+    "I3" : %.2f,
+    "U1" : %.2f,
+    "U2" : %.2f,
+    "U3" : %.2f,
+    "PF" : %.2f,
+    "PF1" : %.2f,
+    "PF2" : %.2f,
+    "PF3" : %.2f,
+    "tPI" : %.2f,
+    "tPO" : %.2f,
+    "tQI" : %.2f,
+    "tQO" : %.2f,
+    "rtc" : %lu
+}

web/meter.html

@@ -36,7 +36,11 @@
                     </div>
                     <select class="form-control sd" name="b">
                         <option value="2400" {b2400}>2400</option>
+                        <option value="4800" {b4800}>4800</option>
                         <option value="9600" {b9600}>9600</option>
+                        <option value="19200" {b19200}>19200</option>
+                        <option value="38400" {b38400}>38400</option>
+                        <option value="57600" {b57600}>57600</option>
                         <option value="115200" {b115200}>115200</option>
                     </select>
                 </div>
@@ -54,11 +58,14 @@
                     </select>
                 </div>
             </div>
-            <div class="col-lg-3 col-md-4 col-sm-3 col-6">
+            <div class="col-lg-2 col-md-4 col-sm-3 col-6">
                 <div class="m-2">
                     <label class="small"><input type="checkbox" name="i" value="true" {i}/> Invert <span class="d-none d-md-inline">signal</span></label>
                 </div>
             </div>
+            <div class="col-lg-4 col-sm-8">
+                <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Known-hardware-configurations" target="_blank">Known hardware configurations</a>
+            </div>
         </div>
         <div class="row">
             <div class="col-xl-3 col-lg-4 col-md-5 col-sm-7">
@@ -114,6 +121,14 @@
                 </div>
             </div>
         </div>
+        <div class="row mt-3">
+            <div class="col-sm-6">
+                <a href="/thresholds">Configure tariff thresholds</a>
+            </div>
+            <div class="col-sm-6 text-right">
+                <a href="/meteradvanced">Multipliers</a>
+            </div>
+        </div>
     </div>
     <hr/>
     <div class="row form-group">

web/meteradvanced.html

@@ -0,0 +1,49 @@
+<form method="post" action="/save">
+    <input type="hidden" name="ma" value="true"/>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <h6>Multipliers</h6>
+        <div class="row">
+            <div class="col-lg-3 col-md-4 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Instant</span>
+                    </div>
+                    <input type="number" class="form-control text-right" name="wm" value="%.2f" min="0.00" max="655.35" step="0.01"/>
+                </div>
+            </div>
+            <div class="col-lg-3 col-md-4 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Voltage</span>
+                    </div>
+                    <input type="number" class="form-control text-right" name="vm" value="%.2f" min="0.00" max="655.35" step="0.01"/>
+                </div>
+            </div>
+            <div class="col-lg-3 col-md-4 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Amperage</span>
+                    </div>
+                    <input type="number" class="form-control text-right" name="am" value="%.2f" min="0.00" max="655.35" step="0.01"/>
+                </div>
+            </div>
+            <div class="col-lg-3 col-md-4 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Accumulated</span>
+                    </div>
+                    <input type="number" class="form-control text-right" name="cm" value="%.2f" min="0.00" max="655.35" step="0.01"/>
+                </div>
+            </div>
+        </div>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="/meter" class="btn btn-outline-secondary">Back</a>
+        </div>
+        <div class="col-6 text-right">
+            <button class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>

web/monthplot.json

@@ -1,33 +1,64 @@
 {
-    "d01" : %.2f,
-    "d02" : %.2f,
-    "d03" : %.2f,
-    "d04" : %.2f,
-    "d05" : %.2f,
-    "d06" : %.2f,
-    "d07" : %.2f,
-    "d08" : %.2f,
-    "d09" : %.2f,
-    "d10" : %.2f,
-    "d11" : %.2f,
-    "d12" : %.2f,
-    "d13" : %.2f,
-    "d14" : %.2f,
-    "d15" : %.2f,
-    "d16" : %.2f,
-    "d17" : %.2f,
-    "d18" : %.2f,
-    "d19" : %.2f,
-    "d20" : %.2f,
-    "d21" : %.2f,
-    "d22" : %.2f,
-    "d23" : %.2f,
-    "d24" : %.2f,
-    "d25" : %.2f,
-    "d26" : %.2f,
-    "d27" : %.2f,
-    "d28" : %.2f,
-    "d29" : %.2f,
-    "d30" : %.2f,
-    "d31" : %.2f
+    "i01" : %.2f,
+    "i02" : %.2f,
+    "i03" : %.2f,
+    "i04" : %.2f,
+    "i05" : %.2f,
+    "i06" : %.2f,
+    "i07" : %.2f,
+    "i08" : %.2f,
+    "i09" : %.2f,
+    "i10" : %.2f,
+    "i11" : %.2f,
+    "i12" : %.2f,
+    "i13" : %.2f,
+    "i14" : %.2f,
+    "i15" : %.2f,
+    "i16" : %.2f,
+    "i17" : %.2f,
+    "i18" : %.2f,
+    "i19" : %.2f,
+    "i20" : %.2f,
+    "i21" : %.2f,
+    "i22" : %.2f,
+    "i23" : %.2f,
+    "i24" : %.2f,
+    "i25" : %.2f,
+    "i26" : %.2f,
+    "i27" : %.2f,
+    "i28" : %.2f,
+    "i29" : %.2f,
+    "i30" : %.2f,
+    "i31" : %.2f,
+    "e01" : %.2f,
+    "e02" : %.2f,
+    "e03" : %.2f,
+    "e04" : %.2f,
+    "e05" : %.2f,
+    "e06" : %.2f,
+    "e07" : %.2f,
+    "e08" : %.2f,
+    "e09" : %.2f,
+    "e10" : %.2f,
+    "e11" : %.2f,
+    "e12" : %.2f,
+    "e13" : %.2f,
+    "e14" : %.2f,
+    "e15" : %.2f,
+    "e16" : %.2f,
+    "e17" : %.2f,
+    "e18" : %.2f,
+    "e19" : %.2f,
+    "e20" : %.2f,
+    "e21" : %.2f,
+    "e22" : %.2f,
+    "e23" : %.2f,
+    "e24" : %.2f,
+    "e25" : %.2f,
+    "e26" : %.2f,
+    "e27" : %.2f,
+    "e28" : %.2f,
+    "e29" : %.2f,
+    "e30" : %.2f,
+    "e31" : %.2f
 }

web/mqtt.html

@@ -59,9 +59,11 @@
                         </div>
                         <select id="f" class="form-control mc" name="f">
                             <option value="0" {f0}>JSON</option>
-                            <option value="1" {f1}>Raw (minimal)</option>
-                            <option value="2" {f2}>Raw (full)</option>
+                            <option value="1" {f1}>Raw values (minimal)</option>
+                            <option value="2" {f2}>Raw values (full)</option>
                             <option value="3" {f3}>Domoticz</option>
+                            <option value="4" {f4}>Home-Assistant</option>
+                            <option value="255" {f255}>Raw data (bytes)</option>
                         </select>
                     </div>
                 </div>