Fixed power saving

Populate Active Import and Export per phase and export to HA

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,16 +24,20 @@ A clear description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Hardware information:**
+ - Country: [e.g. Norway]
  - Meter: [e.g. Aidon]
+ - Encryption enabled [yes/no]
  - AMS reader: [e.g. Pow-U, ESP32 etc]
  - M-bus adapter (if applicable):
 
 **Relevant firmware information:**
- - Version: [e.g. 1.5.0]
+ - Version: [e.g. 2.1.0]
  - MQTT: [yes/no]
+ - MQTT payload type: [e.g. JSON]
  - HAN GPIO: [e.g. GPIO5]
  - HAN baud and parity: [e.g. 2400 8E1]
  - Temperature sensors [e.g. 3xDS18B20]
+ - ENTSO-E API enabled: [yes/no]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/support.md

@@ -11,12 +11,17 @@ assignees: ''
 A clear and concise description of what the problem is.
 
 **Hardware information:**
+ - Country: [e.g. Norway]
  - Meter: [e.g. Aidon]
+ - Encryption enabled [yes/no]
  - AMS reader: [e.g. Pow-U, ESP32 etc]
  - M-bus adapter (if applicable):
 
 **Relevant firmware information:**
- - Version: [e.g. 1.5.0]
+ - Version: [e.g. 2.1.0]
  - MQTT: [yes/no]
+ - MQTT payload type: [e.g. JSON]
  - HAN GPIO: [e.g. GPIO5]
+ - HAN baud and parity: [e.g. 2400 8E1]
  - Temperature sensors [e.g. 3xDS18B20]
+ - ENTSO-E API enabled: [yes/no]

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

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,79 @@
+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
+
+
+
+
+7E A1 23 CE FF 03 13 21 55 E6 E7 00 
+
+0F 00 00 08 E2 
+0C 07 E5 07 13 01 0C 1A 0A FF 80 00 00 
+
+02 0B // 11
+  01 0B // 11
+    02 04 12 00 28 09 06 00 08 19 09 00 FF 0F 02 12 00 00 
+    02 04 12 00 28 09 06 00 08 19 09 00 FF 0F 01 12 00 00 
+    02 04 12 00 01 09 06 00 00 60 01 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 00 01 07 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 00 02 07 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 01 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 02 08 00 FF 0F 02 12 00 00
+    02 04 12 00 03 09 06 01 01 05 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 06 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 07 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 08 08 00 FF 0F 02 12 00 00 
+  09 06 00 08 19 09 00 FF
+  09 08 34 33 30 39 34 33 35 31 
+  06 00 00 00 0B 
+  06 00 00 00 00 
+  06 00 00 00 10 
+  06 00 00 00 04 
+  06 00 00 00 00 
+  06 00 00 00 08 
+  06 00 00 00 00 
+  06 00 00 00 01 
+7C 8B
+7E

hardware/wemos_mbus_shield/README.md

@@ -0,0 +1,34 @@
+## Wemos shield
+
+Fits D1 mini and S2 mini.
+
+<img src="img1.jpg"/>
+<img src="img2.jpg"/>
+
+**WARNING** Not properly tested
+
+**Resistors**
+- R1:  470 (for U1)
+- R2:  220 (for U1)
+- R3:  82k (for U1)
+- R4:  220 (for U1)
+- R5: 100k (for U1)
+- R6:  10k (for AP button)
+- R7: 4.7k (for DS18B20)
+- R8-R10: 1k (for RGB LED)
+
+**Capacitors**
+- C1: 100n (for U1)
+- C2: 1u (for U1)
+- C3: 100n (for U1)
+
+**Other components**
+- U1: TSS521 or TSS721
+- U2: DS18B20 (Digital temperature sensor)
+- D1: RGB LED
+- J1: RJ45
+- SW1: AP button (to D3 GPIO0)
+
+**Jumper**
+- JP1 & JP4: Jump these to receive power (5V) via RJ45 on pin 7 (GND) and 8 (+5)
+- JP2 & JP3: Jump these to attach DS18B20 sensors via RJ45 on pin 4 (Data) and pin 5 (GND)

hardware/wemos_mbus_shield/kicad/.gitignore

@@ -0,0 +1,3 @@
+gerber
+rescue-backup
+*-bak

hardware/wemos_mbus_shield/kicad/d1_mini_shield-cache.lib

@@ -0,0 +1,326 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# Connector_RJ45
+#
+DEF Connector_RJ45 J 0 40 Y Y 1 F N
+F0 "J" -200 550 50 H V R CNN
+F1 "Connector_RJ45" 100 550 50 H V L CNN
+F2 "" 0 25 50 V I C CNN
+F3 "" 0 25 50 V I C CNN
+ALIAS RJ31 RJ32 RJ33 RJ34 RJ35 RJ41 RJ45 RJ49 RJ61
+$FPLIST
+ 8P8C*
+ RJ31*
+ RJ32*
+ RJ33*
+ RJ34*
+ RJ35*
+ RJ41*
+ RJ45*
+ RJ49*
+ RJ61*
+$ENDFPLIST
+DRAW
+S 300 500 -300 -400 0 1 10 f
+P 2 0 1 0 -200 175 -250 175 N
+P 2 0 1 0 -200 225 -250 225 N
+P 3 0 1 0 -250 -125 -200 -125 -200 -125 N
+P 3 0 1 0 -250 -75 -200 -75 -200 -75 N
+P 3 0 1 0 -250 -25 -200 -25 -200 -25 N
+P 3 0 1 0 -250 25 -200 25 -200 25 N
+P 3 0 1 0 -250 75 -200 75 -200 75 N
+P 3 0 1 0 -200 125 -250 125 -250 125 N
+P 14 0 1 0 -250 -175 -250 275 150 275 150 175 200 175 200 125 250 125 250 -25 200 -25 200 -75 150 -75 150 -175 -250 -175 -250 -175 N
+X ~ 1 400 -300 100 L 50 50 1 1 P
+X ~ 2 400 -200 100 L 50 50 1 1 P
+X ~ 3 400 -100 100 L 50 50 1 1 P
+X ~ 4 400 0 100 L 50 50 1 1 P
+X ~ 5 400 100 100 L 50 50 1 1 P
+X ~ 6 400 200 100 L 50 50 1 1 P
+X ~ 7 400 300 100 L 50 50 1 1 P
+X ~ 8 400 400 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_C
+#
+DEF Device_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "Device_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_Jumper
+#
+DEF Device_Jumper JP 0 30 Y N 1 F N
+F0 "JP" 0 150 50 H V C CNN
+F1 "Device_Jumper" 0 -80 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SolderJumper*
+$ENDFPLIST
+DRAW
+A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
+C -100 0 35 0 1 0 N
+C 100 0 35 0 1 0 N
+X 1 1 -300 0 165 R 50 50 0 1 P
+X 2 2 300 0 165 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_LED_RGB
+#
+DEF Device_LED_RGB D 0 0 Y N 1 F N
+F0 "D" 0 370 50 H V C CNN
+F1 "Device_LED_RGB" 0 -350 50 H V C CNN
+F2 "" 0 -50 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
+S 50 -50 50 50 0 1 0 N
+S 50 50 50 50 0 1 0 N
+S 50 150 50 250 0 1 0 N
+S 50 250 50 250 0 1 0 N
+S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
+P 2 0 1 0 -50 -200 50 -200 N
+P 2 0 1 0 -50 -150 -50 -250 N
+P 2 0 1 8 -50 -150 -50 -250 N
+P 2 0 1 0 -50 0 -100 0 N
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
+P 2 0 1 0 -50 200 50 200 N
+P 2 0 1 8 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
+P 2 0 1 0 50 0 -50 0 N
+P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
+P 3 0 1 0 -50 50 -50 -50 -50 -50 N
+P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 8 50 -150 50 -250 -50 -200 50 -150 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 8 50 250 50 150 -50 200 50 250 N
+P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
+P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
+P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
+P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
+P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
+P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
+X RK 1 -200 200 100 R 50 50 1 1 P
+X GK 2 -200 0 100 R 50 50 1 1 P
+X BK 3 -200 -200 100 R 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
+X GA 5 200 0 100 L 50 50 1 1 P
+X RA 6 200 200 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_R
+#
+DEF Device_R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "Device_R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Sensor_Temperature_DS18B20
+#
+DEF Sensor_Temperature_DS18B20 U 0 40 Y Y 1 F N
+F0 "U" -150 250 50 H V C CNN
+F1 "Sensor_Temperature_DS18B20" 250 250 50 H V C CNN
+F2 "Package_TO_SOT_THT:TO-92_Inline" -1000 -250 50 H I C CNN
+F3 "" -150 250 50 H I C CNN
+ALIAS DS1822 DS18B20 DS18S20 DS1821C
+$FPLIST
+ TO*92*
+$ENDFPLIST
+DRAW
+A -130 125 25 1 1799 0 1 10 N -105 125 -155 125
+C -130 -100 50 0 1 10 F
+S -200 200 200 -200 0 1 10 f
+S -105 -75 -155 0 0 1 10 F
+P 2 0 1 10 -155 25 -130 25 N
+P 2 0 1 10 -155 50 -130 50 N
+P 2 0 1 10 -155 75 -130 75 N
+P 2 0 1 10 -155 100 -130 100 N
+P 2 0 1 10 -155 125 -155 0 N
+P 2 0 1 10 -155 125 -130 125 N
+P 2 0 1 10 -105 125 -105 0 N
+X GND 1 0 -300 100 U 50 50 1 1 W
+X DQ 2 300 0 100 L 50 50 1 1 B
+X VDD 3 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# Switch_SW_Push
+#
+DEF Switch_SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "Switch_SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# d1_mini_shield-rescue_CONN_01X08
+#
+DEF d1_mini_shield-rescue_CONN_01X08 P 0 40 Y N 1 F N
+F0 "P" 0 450 50 H V C CNN
+F1 "d1_mini_shield-rescue_CONN_01X08" 100 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X08
+ Pin_Header_Angled_1X08
+ Socket_Strip_Straight_1X08
+ Socket_Strip_Angled_1X08
+$ENDFPLIST
+DRAW
+S -50 -400 50 400 0 1 0 N
+S -50 -345 10 -355 0 1 0 N
+S -50 -245 10 -255 0 1 0 N
+S -50 -145 10 -155 0 1 0 N
+S -50 -45 10 -55 0 1 0 N
+S -50 55 10 45 0 1 0 N
+S -50 155 10 145 0 1 0 N
+S -50 255 10 245 0 1 0 N
+S -50 355 10 345 0 1 0 N
+X P1 1 -200 350 150 R 50 50 1 1 P
+X P2 2 -200 250 150 R 50 50 1 1 P
+X P3 3 -200 150 150 R 50 50 1 1 P
+X P4 4 -200 50 150 R 50 50 1 1 P
+X P5 5 -200 -50 150 R 50 50 1 1 P
+X P6 6 -200 -150 150 R 50 50 1 1 P
+X P7 7 -200 -250 150 R 50 50 1 1 P
+X P8 8 -200 -350 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# power_+3.3V
+#
+DEF power_+3.3V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+3.3V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_+3V3
+#
+DEF power_+3V3 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+3V3" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_+5V
+#
+DEF power_+5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+5V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_GND
+#
+DEF power_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# tss721_TSS721
+#
+DEF tss721_TSS721 U 0 40 Y Y 1 F N
+F0 "U" 200 850 50 H V L CNN
+F1 "tss721_TSS721" 200 750 50 H V L CNN
+F2 "" 0 -850 50 H V C CIN
+F3 "" -200 -800 50 H V C CNN
+ALIAS TSS721A
+$FPLIST
+ SOIC*3.9x9.9mm*Pitch1.27mm*
+ TSSOP*4.4x5mm*Pitch0.65mm*
+$ENDFPLIST
+DRAW
+S -500 -700 500 700 0 1 10 f
+X BUSL2 1 -600 400 100 R 50 50 1 1 I
+X VS 10 -600 0 100 R 50 50 1 1 P
+X VDD 11 0 800 100 D 50 50 1 1 W
+X RX 12 600 500 100 L 50 50 1 1 I
+X RXI 13 600 400 100 L 50 50 1 1 I I
+X RIS 14 300 -800 100 U 50 50 1 1 I
+X GND 15 0 -800 100 U 50 50 1 1 W
+X BUSL1 16 -600 500 100 R 50 50 1 1 I
+X VB 2 -600 -150 100 R 50 50 1 1 P
+X STC 3 -600 -500 100 R 50 50 1 1 P
+X RIDD 4 200 -800 100 U 50 50 1 1 O
+X PF 5 -600 100 100 R 50 50 1 1 I
+X SC 6 400 -800 100 U 50 50 1 1 P
+X TXI 7 600 100 100 L 50 50 1 1 O I
+X TX 8 600 200 100 L 50 50 1 1 O
+X BAT 9 -100 800 100 D 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library

hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.lib

@@ -0,0 +1,38 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# CONN_01X08
+#
+DEF CONN_01X08 P 0 40 Y N 1 F N
+F0 "P" 0 450 50 H V C CNN
+F1 "CONN_01X08" 100 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X08
+ Pin_Header_Angled_1X08
+ Socket_Strip_Straight_1X08
+ Socket_Strip_Angled_1X08
+$ENDFPLIST
+DRAW
+S -50 -400 50 400 0 1 0 N
+S -50 -345 10 -355 0 1 0 N
+S -50 -245 10 -255 0 1 0 N
+S -50 -145 10 -155 0 1 0 N
+S -50 -45 10 -55 0 1 0 N
+S -50 55 10 45 0 1 0 N
+S -50 155 10 145 0 1 0 N
+S -50 255 10 245 0 1 0 N
+S -50 355 10 345 0 1 0 N
+X P1 1 -200 350 150 R 50 50 1 1 P
+X P2 2 -200 250 150 R 50 50 1 1 P
+X P3 3 -200 150 150 R 50 50 1 1 P
+X P4 4 -200 50 150 R 50 50 1 1 P
+X P5 5 -200 -50 150 R 50 50 1 1 P
+X P6 6 -200 -150 150 R 50 50 1 1 P
+X P7 7 -200 -250 150 R 50 50 1 1 P
+X P8 8 -200 -350 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library

hardware/wemos_mbus_shield/kicad/d1_mini_shield.net

@@ -0,0 +1,482 @@
+(export (version D)
+  (design
+    (source /home/gunnar/src/AmsToMqttBridge/hardware/wemos_mbus_shield/kicad/d1_mini_shield.sch)
+    (date "sø. 26. juni 2022 kl. 12.19 +0200")
+    (tool "Eeschema 5.1.5+dfsg1-2build2")
+    (sheet (number 1) (name /) (tstamps /)
+      (title_block
+        (title)
+        (company)
+        (rev)
+        (date)
+        (source d1_mini_shield.sch)
+        (comment (number 1) (value ""))
+        (comment (number 2) (value ""))
+        (comment (number 3) (value ""))
+        (comment (number 4) (value "")))))
+  (components
+    (comp (ref P1)
+      (value CONN_01X08)
+      (footprint D1_mini:D1_mini_Pin_Header)
+      (libsource (lib d1_mini_shield-rescue) (part CONN_01X08) (description ""))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5763EB78))
+    (comp (ref P2)
+      (value CONN_01X08)
+      (footprint D1_mini:D1_mini_Pin_Header)
+      (libsource (lib d1_mini_shield-rescue) (part CONN_01X08) (description ""))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5763EBF2))
+    (comp (ref U1)
+      (value TSS721)
+      (footprint Package_SO:SOIC-16_3.9x9.9mm_P1.27mm)
+      (datasheet http://www.ti.com/lit/ds/symlink/tss721a.pdf)
+      (libsource (lib tss721) (part TSS721) (description "TSS721A Meter Bus Transceiver, SOIC-16/TSSOP-16"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62B826D2))
+    (comp (ref J1)
+      (value RJ45)
+      (footprint Connector_RJ:RJ45_Amphenol_54602-x08_Horizontal)
+      (datasheet ~)
+      (libsource (lib Connector) (part RJ45) (description "RJ connector, 8P8C (8 positions 8 connected)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62B8AC34))
+    (comp (ref R4)
+      (value 220)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62B8CAA8))
+    (comp (ref R2)
+      (value 220)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62B8DB92))
+    (comp (ref R3)
+      (value 82k)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62B9F861))
+    (comp (ref R1)
+      (value 470)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62B9FC37))
+    (comp (ref C2)
+      (value 1u)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62BA06BE))
+    (comp (ref C1)
+      (value 100n)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62BA09E7))
+    (comp (ref R5)
+      (value 100k)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62BED413))
+    (comp (ref C3)
+      (value 100n)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62BED9ED))
+    (comp (ref JP1)
+      (value Jumper)
+      (footprint Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm)
+      (datasheet ~)
+      (libsource (lib Device) (part Jumper) (description "Jumper, normally closed"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C331C0))
+    (comp (ref JP2)
+      (value Jumper)
+      (footprint Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm)
+      (datasheet ~)
+      (libsource (lib Device) (part Jumper) (description "Jumper, normally closed"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C365CA))
+    (comp (ref JP3)
+      (value Jumper)
+      (footprint Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm)
+      (datasheet ~)
+      (libsource (lib Device) (part Jumper) (description "Jumper, normally closed"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C36C70))
+    (comp (ref D1)
+      (value LED_RGB)
+      (footprint LED_SMD:LED_RGB_PLCC-6)
+      (datasheet ~)
+      (libsource (lib Device) (part LED_RGB) (description "RGB LED, 6 pin package"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C43A7B))
+    (comp (ref R9)
+      (value 1k)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C495F7))
+    (comp (ref R8)
+      (value 1k)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C4BDE9))
+    (comp (ref R10)
+      (value 1k)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C4C336))
+    (comp (ref U2)
+      (value DS18B20)
+      (footprint Package_TO_SOT_THT:TO-92_Inline)
+      (datasheet http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf)
+      (libsource (lib Sensor_Temperature) (part DS18B20) (description "Programmable Resolution 1-Wire Digital Thermometer TO-92"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C6296F))
+    (comp (ref R7)
+      (value 4k7)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C6405D))
+    (comp (ref SW1)
+      (value SW_Push)
+      (footprint Button_Switch_SMD:SW_SPST_B3U-3000P)
+      (datasheet ~)
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C73229))
+    (comp (ref R6)
+      (value 10k)
+      (footprint Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder)
+      (datasheet ~)
+      (libsource (lib Device) (part R) (description Resistor))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62C73CE8))
+    (comp (ref JP4)
+      (value Jumper)
+      (footprint Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm)
+      (datasheet ~)
+      (libsource (lib Device) (part Jumper) (description "Jumper, normally closed"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 62D1E97A)))
+  (libparts
+    (libpart (lib Connector) (part 8P8C)
+      (aliases
+        (alias RJ31)
+        (alias RJ32)
+        (alias RJ33)
+        (alias RJ34)
+        (alias RJ35)
+        (alias RJ41)
+        (alias RJ45)
+        (alias RJ49)
+        (alias RJ61))
+      (description "RJ connector, 8P8C (8 positions 8 connected), RJ31/RJ32/RJ33/RJ34/RJ35/RJ41/RJ45/RJ49/RJ61")
+      (docs ~)
+      (footprints
+        (fp 8P8C*)
+        (fp RJ31*)
+        (fp RJ32*)
+        (fp RJ33*)
+        (fp RJ34*)
+        (fp RJ35*)
+        (fp RJ41*)
+        (fp RJ45*)
+        (fp RJ49*)
+        (fp RJ61*))
+      (fields
+        (field (name Reference) J)
+        (field (name Value) 8P8C))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))
+        (pin (num 3) (name ~) (type passive))
+        (pin (num 4) (name ~) (type passive))
+        (pin (num 5) (name ~) (type passive))
+        (pin (num 6) (name ~) (type passive))
+        (pin (num 7) (name ~) (type passive))
+        (pin (num 8) (name ~) (type passive))))
+    (libpart (lib Device) (part C)
+      (description "Unpolarized capacitor")
+      (docs ~)
+      (footprints
+        (fp C_*))
+      (fields
+        (field (name Reference) C)
+        (field (name Value) C))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib Device) (part Jumper)
+      (description "Jumper, normally closed")
+      (docs ~)
+      (footprints
+        (fp SolderJumper*))
+      (fields
+        (field (name Reference) JP)
+        (field (name Value) Jumper))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))))
+    (libpart (lib Device) (part LED_RGB)
+      (description "RGB LED, 6 pin package")
+      (docs ~)
+      (footprints
+        (fp LED*)
+        (fp LED_SMD:*)
+        (fp LED_THT:*))
+      (fields
+        (field (name Reference) D)
+        (field (name Value) LED_RGB))
+      (pins
+        (pin (num 1) (name RK) (type passive))
+        (pin (num 2) (name GK) (type passive))
+        (pin (num 3) (name BK) (type passive))
+        (pin (num 4) (name BA) (type passive))
+        (pin (num 5) (name GA) (type passive))
+        (pin (num 6) (name RA) (type passive))))
+    (libpart (lib Device) (part R)
+      (description Resistor)
+      (docs ~)
+      (footprints
+        (fp R_*))
+      (fields
+        (field (name Reference) R)
+        (field (name Value) R))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib Sensor_Temperature) (part MAX31820)
+      (aliases
+        (alias DS1822)
+        (alias DS18B20)
+        (alias DS18S20)
+        (alias DS1821C))
+      (description "1-Wire Ambient Temperature Sensor TO-92")
+      (docs http://datasheets.maximintegrated.com/en/ds/MAX31820.pdf)
+      (footprints
+        (fp TO*92*))
+      (fields
+        (field (name Reference) U)
+        (field (name Value) MAX31820)
+        (field (name Footprint) Package_TO_SOT_THT:TO-92_Inline))
+      (pins
+        (pin (num 1) (name GND) (type power_in))
+        (pin (num 2) (name DQ) (type BiDi))
+        (pin (num 3) (name VDD) (type power_in))))
+    (libpart (lib Switch) (part SW_Push)
+      (description "Push button switch, generic, two pins")
+      (docs ~)
+      (fields
+        (field (name Reference) SW)
+        (field (name Value) SW_Push))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))))
+    (libpart (lib d1_mini_shield-rescue) (part CONN_01X08)
+      (footprints
+        (fp Pin_Header_Straight_1X08)
+        (fp Pin_Header_Angled_1X08)
+        (fp Socket_Strip_Straight_1X08)
+        (fp Socket_Strip_Angled_1X08))
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_01X08))
+      (pins
+        (pin (num 1) (name P1) (type passive))
+        (pin (num 2) (name P2) (type passive))
+        (pin (num 3) (name P3) (type passive))
+        (pin (num 4) (name P4) (type passive))
+        (pin (num 5) (name P5) (type passive))
+        (pin (num 6) (name P6) (type passive))
+        (pin (num 7) (name P7) (type passive))
+        (pin (num 8) (name P8) (type passive))))
+    (libpart (lib tss721) (part TSS721)
+      (aliases
+        (alias TSS721A))
+      (description "TSS721A Meter Bus Transceiver, SOIC-16/TSSOP-16")
+      (docs http://www.ti.com/lit/ds/symlink/tss721a.pdf)
+      (footprints
+        (fp SOIC*3.9x9.9mm*Pitch1.27mm*)
+        (fp TSSOP*4.4x5mm*Pitch0.65mm*))
+      (fields
+        (field (name Reference) U)
+        (field (name Value) TSS721))
+      (pins
+        (pin (num 1) (name BUSL2) (type input))
+        (pin (num 2) (name VB) (type passive))
+        (pin (num 3) (name STC) (type passive))
+        (pin (num 4) (name RIDD) (type output))
+        (pin (num 5) (name PF) (type input))
+        (pin (num 6) (name SC) (type passive))
+        (pin (num 7) (name TXI) (type output))
+        (pin (num 8) (name TX) (type output))
+        (pin (num 9) (name BAT) (type input))
+        (pin (num 10) (name VS) (type passive))
+        (pin (num 11) (name VDD) (type power_in))
+        (pin (num 12) (name RX) (type input))
+        (pin (num 13) (name RXI) (type input))
+        (pin (num 14) (name RIS) (type input))
+        (pin (num 15) (name GND) (type power_in))
+        (pin (num 16) (name BUSL1) (type input)))))
+  (libraries
+    (library (logical Connector)
+      (uri /usr/share/kicad/library/Connector.lib))
+    (library (logical Device)
+      (uri /usr/share/kicad/library/Device.lib))
+    (library (logical Sensor_Temperature)
+      (uri /usr/share/kicad/library/Sensor_Temperature.lib))
+    (library (logical Switch)
+      (uri /usr/share/kicad/library/Switch.lib))
+    (library (logical d1_mini_shield-rescue)
+      (uri /home/gunnar/src/AmsToMqttBridge/hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.lib))
+    (library (logical tss721)
+      (uri /home/gunnar/src/AmsToMqttBridge/hardware/wemos_mbus_shield/kicad/tss721.lib)))
+  (nets
+    (net (code 1) (name TEMP)
+      (node (ref R7) (pin 2))
+      (node (ref U2) (pin 2))
+      (node (ref P1) (pin 5))
+      (node (ref JP3) (pin 2)))
+    (net (code 2) (name +3V3)
+      (node (ref R7) (pin 1))
+      (node (ref U1) (pin 9))
+      (node (ref P2) (pin 1))
+      (node (ref R6) (pin 2))
+      (node (ref D1) (pin 4))
+      (node (ref D1) (pin 5))
+      (node (ref D1) (pin 6))
+      (node (ref U2) (pin 3)))
+    (net (code 3) (name "Net-(D1-Pad1)")
+      (node (ref R9) (pin 2))
+      (node (ref D1) (pin 1)))
+    (net (code 4) (name "Net-(D1-Pad2)")
+      (node (ref D1) (pin 2))
+      (node (ref R8) (pin 2)))
+    (net (code 5) (name "Net-(D1-Pad3)")
+      (node (ref D1) (pin 3))
+      (node (ref R10) (pin 2)))
+    (net (code 6) (name MBUS2)
+      (node (ref J1) (pin 2))
+      (node (ref R4) (pin 1)))
+    (net (code 7) (name BTN_AP)
+      (node (ref P1) (pin 4))
+      (node (ref SW1) (pin 1))
+      (node (ref R6) (pin 1)))
+    (net (code 8) (name "Net-(R4-Pad2)")
+      (node (ref U1) (pin 1))
+      (node (ref R4) (pin 2)))
+    (net (code 9) (name "Net-(R2-Pad2)")
+      (node (ref R2) (pin 2))
+      (node (ref U1) (pin 16)))
+    (net (code 10) (name MBUS1)
+      (node (ref J1) (pin 1))
+      (node (ref R2) (pin 1)))
+    (net (code 11) (name LED_R)
+      (node (ref R9) (pin 1))
+      (node (ref P2) (pin 4)))
+    (net (code 12) (name "Net-(J1-Pad8)")
+      (node (ref J1) (pin 8))
+      (node (ref JP1) (pin 1)))
+    (net (code 13) (name "Net-(J1-Pad5)")
+      (node (ref J1) (pin 5))
+      (node (ref JP2) (pin 1)))
+    (net (code 14) (name "Net-(J1-Pad4)")
+      (node (ref J1) (pin 4))
+      (node (ref JP3) (pin 1)))
+    (net (code 15) (name +5V)
+      (node (ref P1) (pin 1))
+      (node (ref JP1) (pin 2)))
+    (net (code 16) (name "Net-(J1-Pad7)")
+      (node (ref J1) (pin 7))
+      (node (ref JP4) (pin 1)))
+    (net (code 17) (name GND)
+      (node (ref P1) (pin 2))
+      (node (ref C3) (pin 2))
+      (node (ref R3) (pin 1))
+      (node (ref R1) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref C1) (pin 1))
+      (node (ref R5) (pin 2))
+      (node (ref U1) (pin 15))
+      (node (ref U2) (pin 1))
+      (node (ref SW1) (pin 2))
+      (node (ref JP4) (pin 2))
+      (node (ref JP2) (pin 2)))
+    (net (code 18) (name LED_G)
+      (node (ref R8) (pin 1))
+      (node (ref P2) (pin 5)))
+    (net (code 19) (name "Net-(U1-Pad10)")
+      (node (ref U1) (pin 10)))
+    (net (code 20) (name "Net-(U1-Pad12)")
+      (node (ref U1) (pin 12)))
+    (net (code 21) (name "Net-(U1-Pad13)")
+      (node (ref U1) (pin 13)))
+    (net (code 22) (name "Net-(U1-Pad2)")
+      (node (ref U1) (pin 2)))
+    (net (code 23) (name "Net-(U1-Pad5)")
+      (node (ref U1) (pin 5)))
+    (net (code 24) (name "Net-(U1-Pad7)")
+      (node (ref U1) (pin 7)))
+    (net (code 25) (name "Net-(J1-Pad3)")
+      (node (ref J1) (pin 3)))
+    (net (code 26) (name "Net-(J1-Pad6)")
+      (node (ref J1) (pin 6)))
+    (net (code 27) (name /RST)
+      (node (ref P2) (pin 8)))
+    (net (code 28) (name /D4)
+      (node (ref P1) (pin 3)))
+    (net (code 29) (name /D1)
+      (node (ref P1) (pin 6)))
+    (net (code 30) (name /RX)
+      (node (ref P1) (pin 7)))
+    (net (code 31) (name /TX)
+      (node (ref P1) (pin 8)))
+    (net (code 32) (name /D8)
+      (node (ref P2) (pin 2)))
+    (net (code 33) (name /D0)
+      (node (ref P2) (pin 6)))
+    (net (code 34) (name /A0)
+      (node (ref P2) (pin 7)))
+    (net (code 35) (name "Net-(R3-Pad2)")
+      (node (ref R3) (pin 2))
+      (node (ref U1) (pin 4)))
+    (net (code 36) (name HAN_TX)
+      (node (ref R10) (pin 1))
+      (node (ref U1) (pin 8))
+      (node (ref P2) (pin 3)))
+    (net (code 37) (name "Net-(C3-Pad1)")
+      (node (ref U1) (pin 11))
+      (node (ref C3) (pin 1))
+      (node (ref R5) (pin 1)))
+    (net (code 38) (name "Net-(R1-Pad2)")
+      (node (ref R1) (pin 2))
+      (node (ref U1) (pin 14)))
+    (net (code 39) (name "Net-(C2-Pad2)")
+      (node (ref C2) (pin 2))
+      (node (ref U1) (pin 3)))
+    (net (code 40) (name "Net-(C1-Pad2)")
+      (node (ref U1) (pin 6))
+      (node (ref C1) (pin 2)))))

hardware/wemos_mbus_shield/kicad/d1_mini_shield.pro

@@ -0,0 +1,246 @@
+update=sø. 26. juni 2022 kl. 11.55 +0200
+version=1
+last_client=kicad
+[general]
+version=1
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=Pcbnew
+SpiceAjustPassiveValues=0
+LabSize=50
+ERC_TestSimilarLabels=1
+[pcbnew]
+version=1
+PageLayoutDescrFile=
+LastNetListRead=d1_mini_shield.net
+CopperLayerCount=2
+BoardThickness=1.6
+AllowMicroVias=0
+AllowBlindVias=0
+RequireCourtyardDefinitions=0
+ProhibitOverlappingCourtyards=1
+MinTrackWidth=0.2
+MinViaDiameter=0.4
+MinViaDrill=0.3
+MinMicroViaDiameter=0.2
+MinMicroViaDrill=0.09999999999999999
+MinHoleToHole=0.25
+TrackWidth1=0.25
+TrackWidth2=0.5
+ViaDiameter1=0.6
+ViaDrill1=0.4
+dPairWidth1=0.2
+dPairGap1=0.25
+dPairViaGap1=0.25
+SilkLineWidth=0.15
+SilkTextSizeV=1
+SilkTextSizeH=1
+SilkTextSizeThickness=0.15
+SilkTextItalic=0
+SilkTextUpright=1
+CopperLineWidth=0.2
+CopperTextSizeV=1.5
+CopperTextSizeH=1.5
+CopperTextThickness=0.3
+CopperTextItalic=0
+CopperTextUpright=1
+EdgeCutLineWidth=0.15
+CourtyardLineWidth=0.05
+OthersLineWidth=0.15
+OthersTextSizeV=1
+OthersTextSizeH=1
+OthersTextSizeThickness=0.15
+OthersTextItalic=0
+OthersTextUpright=1
+SolderMaskClearance=0.2
+SolderMaskMinWidth=0
+SolderPasteClearance=0
+SolderPasteRatio=-0
+[pcbnew/Layer.F.Cu]
+Name=F.Cu
+Type=0
+Enabled=1
+[pcbnew/Layer.In1.Cu]
+Name=In1.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In2.Cu]
+Name=In2.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In3.Cu]
+Name=In3.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In4.Cu]
+Name=In4.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In5.Cu]
+Name=In5.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In6.Cu]
+Name=In6.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In7.Cu]
+Name=In7.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In8.Cu]
+Name=In8.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In9.Cu]
+Name=In9.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In10.Cu]
+Name=In10.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In11.Cu]
+Name=In11.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In12.Cu]
+Name=In12.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In13.Cu]
+Name=In13.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In14.Cu]
+Name=In14.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In15.Cu]
+Name=In15.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In16.Cu]
+Name=In16.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In17.Cu]
+Name=In17.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In18.Cu]
+Name=In18.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In19.Cu]
+Name=In19.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In20.Cu]
+Name=In20.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In21.Cu]
+Name=In21.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In22.Cu]
+Name=In22.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In23.Cu]
+Name=In23.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In24.Cu]
+Name=In24.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In25.Cu]
+Name=In25.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In26.Cu]
+Name=In26.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In27.Cu]
+Name=In27.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In28.Cu]
+Name=In28.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In29.Cu]
+Name=In29.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In30.Cu]
+Name=In30.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.B.Cu]
+Name=B.Cu
+Type=0
+Enabled=1
+[pcbnew/Layer.B.Adhes]
+Enabled=1
+[pcbnew/Layer.F.Adhes]
+Enabled=1
+[pcbnew/Layer.B.Paste]
+Enabled=1
+[pcbnew/Layer.F.Paste]
+Enabled=1
+[pcbnew/Layer.B.SilkS]
+Enabled=1
+[pcbnew/Layer.F.SilkS]
+Enabled=1
+[pcbnew/Layer.B.Mask]
+Enabled=1
+[pcbnew/Layer.F.Mask]
+Enabled=1
+[pcbnew/Layer.Dwgs.User]
+Enabled=1
+[pcbnew/Layer.Cmts.User]
+Enabled=1
+[pcbnew/Layer.Eco1.User]
+Enabled=1
+[pcbnew/Layer.Eco2.User]
+Enabled=1
+[pcbnew/Layer.Edge.Cuts]
+Enabled=1
+[pcbnew/Layer.Margin]
+Enabled=1
+[pcbnew/Layer.B.CrtYd]
+Enabled=1
+[pcbnew/Layer.F.CrtYd]
+Enabled=1
+[pcbnew/Layer.B.Fab]
+Enabled=1
+[pcbnew/Layer.F.Fab]
+Enabled=1
+[pcbnew/Layer.Rescue]
+Enabled=0
+[pcbnew/Netclasses]
+[pcbnew/Netclasses/Default]
+Name=Default
+Clearance=0.2
+TrackWidth=0.25
+ViaDiameter=0.6
+ViaDrill=0.4
+uViaDiameter=0.3
+uViaDrill=0.1
+dPairWidth=0.2
+dPairGap=0.25
+dPairViaGap=0.25

hardware/wemos_mbus_shield/kicad/d1_mini_shield.sch

@@ -0,0 +1,725 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L d1_mini_shield-rescue:CONN_01X08 P1
+U 1 1 5763EB78
+P 8300 1850
+F 0 "P1" H 8300 2300 50  0000 C CNN
+F 1 "CONN_01X08" V 8400 1850 50  0000 C CNN
+F 2 "D1_mini:D1_mini_Pin_Header" H 8300 1850 50  0001 C CNN
+F 3 "" H 8300 1850 50  0000 C CNN
+	1    8300 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L d1_mini_shield-rescue:CONN_01X08 P2
+U 1 1 5763EBF2
+P 9400 1850
+F 0 "P2" H 9400 2300 50  0000 C CNN
+F 1 "CONN_01X08" V 9500 1850 50  0000 C CNN
+F 2 "D1_mini:D1_mini_Pin_Header" H 9400 1850 50  0001 C CNN
+F 3 "" H 9400 1850 50  0000 C CNN
+	1    9400 1850
+	-1   0    0    -1  
+$EndComp
+Text Label 8100 1500 2    60   ~ 0
++5V
+Text Label 8100 1600 2    60   ~ 0
+GND
+Text Label 8100 1700 2    60   ~ 0
+D4
+Text Label 8100 1800 2    60   ~ 0
+D3
+Text Label 8100 1900 2    60   ~ 0
+D2
+Text Label 8100 2000 2    60   ~ 0
+D1
+Text Label 8100 2100 2    60   ~ 0
+RX
+Text Label 8100 2200 2    60   ~ 0
+TX
+Text Label 9600 1500 0    60   ~ 0
++3.3V
+Text Label 9600 1600 0    60   ~ 0
+D8
+Text Label 9600 1700 0    60   ~ 0
+D7
+Text Label 9600 1800 0    60   ~ 0
+D6
+Text Label 9600 1900 0    60   ~ 0
+D5
+Text Label 9600 2000 0    60   ~ 0
+D0
+Text Label 9600 2100 0    60   ~ 0
+A0
+Text Label 9600 2200 0    60   ~ 0
+RST
+Text Notes 8750 1750 2    60   ~ 0
+GPIO2
+Text Notes 8750 1850 2    60   ~ 0
+GPIO0
+Text Notes 8750 1950 2    60   ~ 0
+GPIO4
+Text Notes 8750 2050 2    60   ~ 0
+GPIO5
+Text Notes 8900 1650 0    60   ~ 0
+GPIO15
+Text Notes 8900 1750 0    60   ~ 0
+GPIO13
+Text Notes 8900 1850 0    60   ~ 0
+GPIO12
+Text Notes 8900 1950 0    60   ~ 0
+GPIO14
+Text Notes 8900 2050 0    60   ~ 0
+GPIO16
+Text Notes 7550 1050 0    60   ~ 0
+D1 Mini Shield
+$Comp
+L tss721:TSS721 U1
+U 1 1 62B826D2
+P 3650 5550
+F 0 "U1" H 3650 6621 50  0000 C CNN
+F 1 "TSS721" H 3650 6530 50  0000 C CNN
+F 2 "Package_SO:SOIC-16_3.9x9.9mm_P1.27mm" H 3650 4700 50  0001 C CIN
+F 3 "http://www.ti.com/lit/ds/symlink/tss721a.pdf" H 3650 6439 50  0000 C CNN
+	1    3650 5550
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0101
+U 1 1 62B89C7B
+P 2850 4750
+F 0 "#PWR0101" H 2850 4600 50  0001 C CNN
+F 1 "+3.3V" V 2865 4878 50  0000 L CNN
+F 2 "" H 2850 4750 50  0001 C CNN
+F 3 "" H 2850 4750 50  0001 C CNN
+	1    2850 4750
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Connector:RJ45 J1
+U 1 1 62B8AC34
+P 1950 1850
+F 0 "J1" H 2007 2517 50  0000 C CNN
+F 1 "RJ45" H 2007 2426 50  0000 C CNN
+F 2 "Connector_RJ:RJ45_Amphenol_54602-x08_Horizontal" V 1950 1875 50  0001 C CNN
+F 3 "~" V 1950 1875 50  0001 C CNN
+	1    1950 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R4
+U 1 1 62B8CAA8
+P 2750 5150
+F 0 "R4" V 2957 5150 50  0000 C CNN
+F 1 "220" V 2866 5150 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 2680 5150 50  0001 C CNN
+F 3 "~" H 2750 5150 50  0001 C CNN
+	1    2750 5150
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:R R2
+U 1 1 62B8DB92
+P 2500 5050
+F 0 "R2" V 2707 5050 50  0000 C CNN
+F 1 "220" V 2616 5050 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 2430 5050 50  0001 C CNN
+F 3 "~" H 2500 5050 50  0001 C CNN
+	1    2500 5050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:GND #PWR0102
+U 1 1 62B9F029
+P 1850 6050
+F 0 "#PWR0102" H 1850 5800 50  0001 C CNN
+F 1 "GND" H 1855 5877 50  0000 C CNN
+F 2 "" H 1850 6050 50  0001 C CNN
+F 3 "" H 1850 6050 50  0001 C CNN
+	1    1850 6050
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:R R3
+U 1 1 62B9F861
+P 2500 6300
+F 0 "R3" H 2570 6346 50  0000 L CNN
+F 1 "82k" H 2570 6255 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 2430 6300 50  0001 C CNN
+F 3 "~" H 2500 6300 50  0001 C CNN
+	1    2500 6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R1
+U 1 1 62B9FC37
+P 2250 6300
+F 0 "R1" H 2320 6346 50  0000 L CNN
+F 1 "470" H 2320 6255 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 2180 6300 50  0001 C CNN
+F 3 "~" H 2250 6300 50  0001 C CNN
+	1    2250 6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C2
+U 1 1 62BA06BE
+P 2850 6050
+F 0 "C2" V 3102 6050 50  0000 C CNN
+F 1 "1u" V 3011 6050 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2888 5900 50  0001 C CNN
+F 3 "~" H 2850 6050 50  0001 C CNN
+	1    2850 6050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:C C1
+U 1 1 62BA09E7
+P 1850 6300
+F 0 "C1" H 1965 6346 50  0000 L CNN
+F 1 "100n" H 1965 6255 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 1888 6150 50  0001 C CNN
+F 3 "~" H 1850 6300 50  0001 C CNN
+	1    1850 6300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1850 6050 1850 6150
+Wire Wire Line
+	2250 6050 2250 6150
+Wire Wire Line
+	2500 6050 2500 6150
+Connection ~ 1850 6050
+Connection ~ 2250 6050
+Wire Wire Line
+	2250 6050 2500 6050
+Wire Wire Line
+	1850 6050 2250 6050
+Connection ~ 2500 6050
+Wire Wire Line
+	3850 6450 3850 6350
+Wire Wire Line
+	2250 6450 2250 6550
+Wire Wire Line
+	3950 6550 3950 6350
+Wire Wire Line
+	1850 6450 1850 6650
+Wire Wire Line
+	4050 6650 4050 6350
+Wire Wire Line
+	3050 6050 3000 6050
+Wire Wire Line
+	2500 6050 2700 6050
+Wire Wire Line
+	2700 6050 2700 6350
+Wire Wire Line
+	2700 6350 3650 6350
+Connection ~ 2700 6050
+Wire Wire Line
+	3850 6450 2500 6450
+Wire Wire Line
+	2250 6550 3950 6550
+Wire Wire Line
+	4050 6650 1850 6650
+Text GLabel 4350 5350 2    50   Output ~ 0
+HAN_TX
+Wire Wire Line
+	4350 5350 4300 5350
+Wire Wire Line
+	2850 4750 3550 4750
+$Comp
+L Device:R R5
+U 1 1 62BED413
+P 4650 4550
+F 0 "R5" V 4857 4550 50  0000 C CNN
+F 1 "100k" V 4766 4550 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4580 4550 50  0001 C CNN
+F 3 "~" H 4650 4550 50  0001 C CNN
+	1    4650 4550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:C C3
+U 1 1 62BED9ED
+P 4650 4900
+F 0 "C3" V 4902 4900 50  0000 C CNN
+F 1 "100n" V 4811 4900 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4688 4750 50  0001 C CNN
+F 3 "~" H 4650 4900 50  0001 C CNN
+	1    4650 4900
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:GND #PWR0103
+U 1 1 62BF4151
+P 4800 5050
+F 0 "#PWR0103" H 4800 4800 50  0001 C CNN
+F 1 "GND" H 4805 4877 50  0000 C CNN
+F 2 "" H 4800 5050 50  0001 C CNN
+F 3 "" H 4800 5050 50  0001 C CNN
+	1    4800 5050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4800 4550 4800 4900
+Wire Wire Line
+	4800 4900 4800 5050
+Connection ~ 4800 4900
+Wire Wire Line
+	4500 4900 4500 4550
+Wire Wire Line
+	4500 4550 3650 4550
+Wire Wire Line
+	3650 4550 3650 4750
+Connection ~ 4500 4550
+Wire Notes Line
+	1500 4050 5050 4050
+Wire Notes Line
+	5050 4050 5050 6850
+Wire Notes Line
+	5050 6850 1500 6850
+Wire Notes Line
+	1500 6850 1500 4050
+Wire Notes Line
+	7550 950  10200 950 
+Wire Notes Line
+	10200 950  10200 2750
+Wire Notes Line
+	10200 2750 7550 2750
+Wire Notes Line
+	7550 2750 7550 950 
+Text GLabel 9800 1700 2    50   Input ~ 0
+HAN_TX
+Wire Wire Line
+	9800 1700 9600 1700
+$Comp
+L power:+3V3 #PWR0104
+U 1 1 62C0EBC2
+P 9850 1500
+F 0 "#PWR0104" H 9850 1350 50  0001 C CNN
+F 1 "+3V3" V 9865 1628 50  0000 L CNN
+F 2 "" H 9850 1500 50  0001 C CNN
+F 3 "" H 9850 1500 50  0001 C CNN
+	1    9850 1500
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9850 1500 9600 1500
+Text GLabel 9800 1800 2    50   Output ~ 0
+LED_R
+Text GLabel 9800 1900 2    50   Output ~ 0
+LED_G
+Wire Wire Line
+	9800 1800 9600 1800
+Wire Wire Line
+	9800 1900 9600 1900
+$Comp
+L power:GND #PWR0105
+U 1 1 62C13452
+P 7850 1600
+F 0 "#PWR0105" H 7850 1350 50  0001 C CNN
+F 1 "GND" V 7855 1472 50  0000 R CNN
+F 2 "" H 7850 1600 50  0001 C CNN
+F 3 "" H 7850 1600 50  0001 C CNN
+	1    7850 1600
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	8100 1600 7850 1600
+Text GLabel 7950 1800 0    50   Input ~ 0
+BTN_AP
+Wire Wire Line
+	8100 1800 7950 1800
+Text GLabel 7950 1900 0    50   Input ~ 0
+TEMP
+Wire Wire Line
+	8100 1900 7950 1900
+Wire Wire Line
+	3050 5150 2900 5150
+Wire Wire Line
+	3050 5050 2650 5050
+Text GLabel 2200 5050 0    50   Input ~ 0
+MBUS1
+Text GLabel 2200 5150 0    50   Input ~ 0
+MBUS2
+Wire Wire Line
+	2350 5050 2200 5050
+Wire Wire Line
+	2600 5150 2200 5150
+Text GLabel 2500 2150 2    50   Output ~ 0
+MBUS1
+Text GLabel 2500 2050 2    50   Output ~ 0
+MBUS2
+Wire Wire Line
+	2500 2050 2350 2050
+Wire Wire Line
+	2350 2150 2500 2150
+$Comp
+L Device:Jumper JP1
+U 1 1 62C331C0
+P 3300 1250
+F 0 "JP1" H 3300 1514 50  0000 C CNN
+F 1 "Jumper" H 3300 1423 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3300 1250 50  0001 C CNN
+F 3 "~" H 3300 1250 50  0001 C CNN
+	1    3300 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Jumper JP2
+U 1 1 62C365CA
+P 3300 1850
+F 0 "JP2" H 3300 2114 50  0000 C CNN
+F 1 "Jumper" H 3300 2023 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3300 1850 50  0001 C CNN
+F 3 "~" H 3300 1850 50  0001 C CNN
+	1    3300 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Jumper JP3
+U 1 1 62C36C70
+P 3300 2200
+F 0 "JP3" H 3300 2464 50  0000 C CNN
+F 1 "Jumper" H 3300 2373 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3300 2200 50  0001 C CNN
+F 3 "~" H 3300 2200 50  0001 C CNN
+	1    3300 2200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 1850 2900 1850
+Wire Wire Line
+	2900 1850 2900 1750
+Wire Wire Line
+	2350 1750 2900 1750
+Wire Wire Line
+	2350 1850 2850 1850
+Wire Wire Line
+	2850 1850 2850 2200
+Wire Wire Line
+	2850 2200 3000 2200
+$Comp
+L power:GND #PWR0107
+U 1 1 62C3D94F
+P 3750 1850
+F 0 "#PWR0107" H 3750 1600 50  0001 C CNN
+F 1 "GND" V 3755 1722 50  0000 R CNN
+F 2 "" H 3750 1850 50  0001 C CNN
+F 3 "" H 3750 1850 50  0001 C CNN
+	1    3750 1850
+	0    -1   -1   0   
+$EndComp
+Text GLabel 3750 2200 2    50   Output ~ 0
+TEMP
+Wire Wire Line
+	3750 1850 3600 1850
+Wire Wire Line
+	3750 2200 3600 2200
+Wire Notes Line
+	1450 950  4350 950 
+Wire Notes Line
+	4350 950  4350 2450
+Wire Notes Line
+	4350 2450 1450 2450
+Wire Notes Line
+	1450 2450 1450 950 
+$Comp
+L Device:LED_RGB D1
+U 1 1 62C43A7B
+P 9550 4800
+F 0 "D1" H 9550 5297 50  0000 C CNN
+F 1 "LED_RGB" H 9550 5206 50  0000 C CNN
+F 2 "LED_SMD:LED_RGB_PLCC-6" H 9550 4750 50  0001 C CNN
+F 3 "~" H 9550 4750 50  0001 C CNN
+	1    9550 4800
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0108
+U 1 1 62C44A94
+P 10000 4800
+F 0 "#PWR0108" H 10000 4650 50  0001 C CNN
+F 1 "+3.3V" V 10015 4928 50  0000 L CNN
+F 2 "" H 10000 4800 50  0001 C CNN
+F 3 "" H 10000 4800 50  0001 C CNN
+	1    10000 4800
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9750 4800 9900 4800
+Wire Wire Line
+	9750 4600 9900 4600
+Wire Wire Line
+	9900 4600 9900 4800
+Connection ~ 9900 4800
+Wire Wire Line
+	9900 4800 10000 4800
+Wire Wire Line
+	9900 4800 9900 5000
+Wire Wire Line
+	9900 5000 9750 5000
+$Comp
+L Device:R R9
+U 1 1 62C495F7
+P 9100 4600
+F 0 "R9" V 9307 4600 50  0000 C CNN
+F 1 "1k" V 9216 4600 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9030 4600 50  0001 C CNN
+F 3 "~" H 9100 4600 50  0001 C CNN
+	1    9100 4600
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:R R8
+U 1 1 62C4BDE9
+P 8850 4800
+F 0 "R8" V 9057 4800 50  0000 C CNN
+F 1 "1k" V 8966 4800 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 8780 4800 50  0001 C CNN
+F 3 "~" H 8850 4800 50  0001 C CNN
+	1    8850 4800
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:R R10
+U 1 1 62C4C336
+P 9100 5000
+F 0 "R10" V 9307 5000 50  0000 C CNN
+F 1 "1k" V 9216 5000 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9030 5000 50  0001 C CNN
+F 3 "~" H 9100 5000 50  0001 C CNN
+	1    9100 5000
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	9350 4600 9250 4600
+Wire Wire Line
+	9350 4800 9000 4800
+Wire Wire Line
+	9350 5000 9250 5000
+Text GLabel 8650 4600 0    50   Input ~ 0
+LED_R
+Text GLabel 8650 4800 0    50   Input ~ 0
+LED_G
+Text GLabel 8650 5000 0    50   Input ~ 0
+LED_B
+Wire Wire Line
+	8700 4800 8650 4800
+Wire Wire Line
+	8950 4600 8650 4600
+Wire Wire Line
+	8950 5000 8650 5000
+Wire Notes Line
+	8200 4050 10550 4050
+Wire Notes Line
+	10550 4050 10550 5400
+Wire Notes Line
+	10550 5400 8200 5400
+Wire Notes Line
+	8200 5400 8200 4050
+$Comp
+L Sensor_Temperature:DS18B20 U2
+U 1 1 62C6296F
+P 6600 4900
+F 0 "U2" H 6370 4946 50  0000 R CNN
+F 1 "DS18B20" H 6370 4855 50  0000 R CNN
+F 2 "Package_TO_SOT_THT:TO-92_Inline" H 5600 4650 50  0001 C CNN
+F 3 "http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf" H 6450 5150 50  0001 C CNN
+	1    6600 4900
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0109
+U 1 1 62C6373E
+P 6600 5350
+F 0 "#PWR0109" H 6600 5100 50  0001 C CNN
+F 1 "GND" H 6605 5177 50  0000 C CNN
+F 2 "" H 6600 5350 50  0001 C CNN
+F 3 "" H 6600 5350 50  0001 C CNN
+	1    6600 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0110
+U 1 1 62C63C02
+P 6600 4450
+F 0 "#PWR0110" H 6600 4300 50  0001 C CNN
+F 1 "+3.3V" H 6615 4623 50  0000 C CNN
+F 2 "" H 6600 4450 50  0001 C CNN
+F 3 "" H 6600 4450 50  0001 C CNN
+	1    6600 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R7
+U 1 1 62C6405D
+P 6900 4600
+F 0 "R7" H 6970 4646 50  0000 L CNN
+F 1 "4k7" H 6970 4555 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 6830 4600 50  0001 C CNN
+F 3 "~" H 6900 4600 50  0001 C CNN
+	1    6900 4600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6600 5200 6600 5350
+Wire Wire Line
+	6600 4600 6600 4450
+Wire Wire Line
+	6900 4900 6900 4750
+Wire Wire Line
+	6900 4450 6600 4450
+Connection ~ 6600 4450
+Text GLabel 7050 4900 2    50   Output ~ 0
+TEMP
+Wire Wire Line
+	7050 4900 6900 4900
+Connection ~ 6900 4900
+Wire Notes Line
+	5750 4050 7500 4050
+Wire Notes Line
+	7500 4050 7500 5750
+Wire Notes Line
+	7500 5750 5750 5750
+Wire Notes Line
+	5750 5750 5750 4050
+$Comp
+L Switch:SW_Push SW1
+U 1 1 62C73229
+P 5950 1400
+F 0 "SW1" H 5950 1685 50  0000 C CNN
+F 1 "SW_Push" H 5950 1594 50  0000 C CNN
+F 2 "Button_Switch_SMD:SW_SPST_B3U-3000P" H 5950 1600 50  0001 C CNN
+F 3 "~" H 5950 1600 50  0001 C CNN
+	1    5950 1400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R6
+U 1 1 62C73CE8
+P 5950 1700
+F 0 "R6" V 6157 1700 50  0000 C CNN
+F 1 "10k" V 6066 1700 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 5880 1700 50  0001 C CNN
+F 3 "~" H 5950 1700 50  0001 C CNN
+	1    5950 1700
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:GND #PWR0111
+U 1 1 62C76961
+P 6350 1400
+F 0 "#PWR0111" H 6350 1150 50  0001 C CNN
+F 1 "GND" V 6355 1272 50  0000 R CNN
+F 2 "" H 6350 1400 50  0001 C CNN
+F 3 "" H 6350 1400 50  0001 C CNN
+	1    6350 1400
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:+3.3V #PWR0112
+U 1 1 62C776AD
+P 6350 1700
+F 0 "#PWR0112" H 6350 1550 50  0001 C CNN
+F 1 "+3.3V" V 6365 1828 50  0000 L CNN
+F 2 "" H 6350 1700 50  0001 C CNN
+F 3 "" H 6350 1700 50  0001 C CNN
+	1    6350 1700
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	6350 1400 6150 1400
+Wire Wire Line
+	6350 1700 6100 1700
+Wire Wire Line
+	5750 1400 5550 1400
+Wire Wire Line
+	5550 1400 5550 1550
+Wire Wire Line
+	5550 1700 5800 1700
+Text GLabel 5450 1550 0    50   Output ~ 0
+BTN_AP
+Wire Wire Line
+	5450 1550 5550 1550
+Connection ~ 5550 1550
+Wire Wire Line
+	5550 1550 5550 1700
+Wire Notes Line
+	5000 950  6850 950 
+Wire Notes Line
+	6850 950  6850 1950
+Wire Notes Line
+	6850 1950 5000 1950
+Wire Notes Line
+	5000 1950 5000 950 
+Text GLabel 4350 5450 2    50   Output ~ 0
+LED_B
+Wire Wire Line
+	4350 5450 4300 5450
+Wire Wire Line
+	4300 5450 4300 5350
+Connection ~ 4300 5350
+Wire Wire Line
+	4300 5350 4250 5350
+$Comp
+L power:+5V #PWR0106
+U 1 1 62D05402
+P 7850 1500
+F 0 "#PWR0106" H 7850 1350 50  0001 C CNN
+F 1 "+5V" V 7865 1628 50  0000 L CNN
+F 2 "" H 7850 1500 50  0001 C CNN
+F 3 "" H 7850 1500 50  0001 C CNN
+	1    7850 1500
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	8100 1500 7850 1500
+$Comp
+L power:+5V #PWR0113
+U 1 1 62D0B1E1
+P 3750 1250
+F 0 "#PWR0113" H 3750 1100 50  0001 C CNN
+F 1 "+5V" V 3765 1378 50  0000 L CNN
+F 2 "" H 3750 1250 50  0001 C CNN
+F 3 "" H 3750 1250 50  0001 C CNN
+	1    3750 1250
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:Jumper JP4
+U 1 1 62D1E97A
+P 3300 1550
+F 0 "JP4" H 3300 1814 50  0000 C CNN
+F 1 "Jumper" H 3300 1723 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3300 1550 50  0001 C CNN
+F 3 "~" H 3300 1550 50  0001 C CNN
+	1    3300 1550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 1250 2350 1250
+Wire Wire Line
+	2350 1250 2350 1450
+Wire Wire Line
+	3600 1250 3750 1250
+Wire Wire Line
+	3600 1550 3600 1850
+Connection ~ 3600 1850
+Wire Wire Line
+	2350 1550 3000 1550
+$EndSCHEMATC

hardware/wemos_mbus_shield/kicad/fp-lib-table

@@ -0,0 +1,3 @@
+(fp_lib_table
+  (lib (name D1_mini)(type KiCad)(uri "$(KIPRJMOD)/lib/D1_mini.pretty")(options "")(descr ""))
+)

hardware/wemos_mbus_shield/kicad/lib/D1_mini.pretty/D1_mini_Pin_Header.kicad_mod

@@ -0,0 +1,27 @@
+(module Pin_Headers:Pin_Header_Straight_1x08 (layer F.Cu) (tedit 5766A5B6)
+  (descr "Through hole pin header")
+  (tags "pin header")
+  (fp_text reference P1 (at 0.11176 -2.43586) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value CONN_01X08 (at 0 -3.1) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.75 -1.75) (end -1.75 19.55) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.75 -1.75) (end 1.75 19.55) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.75 19.55) (end 1.75 19.55) (layer F.CrtYd) (width 0.05))
+  (pad 1 thru_hole rect (at 0 0) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.8 1.8) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+  (model Pin_Headers.3dshapes/Pin_Header_Straight_1x08.wrl
+    (at (xyz 0 -0.35 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 90))
+  )
+)

hardware/wemos_mbus_shield/kicad/lib/D1_mini.pretty/OSHW.kicad_mod

@@ -0,0 +1,54 @@
+(module OSHW (layer F.Cu) (tedit 5766B04E)
+  (descr OSHW)
+  (tags "Symbol, OSHW-Logo, Silk Screen,")
+  (fp_text reference "" (at 0.09906 -4.38912) (layer F.SilkS) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value OSHW (at 0 5) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.78054 0.92964) (end -2.03962 1.49098) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.03962 1.49098) (end -1.50114 2.00914) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.50114 2.00914) (end -0.98044 1.7399) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.98044 1.7399) (end -0.70104 1.89992) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.73914 1.8796) (end 1.06934 1.6891) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.06934 1.6891) (end 1.50876 2.0193) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.50876 2.0193) (end 1.9812 1.52908) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.9812 1.52908) (end 1.69926 1.04902) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.69926 1.04902) (end 1.88976 0.57912) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.88976 0.57912) (end 2.49936 0.39116) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.49936 0.39116) (end 2.49936 -0.28956) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.49936 -0.28956) (end 1.94056 -0.42926) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.94056 -0.42926) (end 1.7399 -1.00076) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.7399 -1.00076) (end 2.00914 -1.47066) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.00914 -1.47066) (end 1.53924 -1.9812) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.53924 -1.9812) (end 1.02108 -1.71958) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.02108 -1.71958) (end 0.55118 -1.92024) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.55118 -1.92024) (end 0.381 -2.46126) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.381 -2.46126) (end -0.30988 -2.47904) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.30988 -2.47904) (end -0.5207 -1.9304) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.5207 -1.9304) (end -0.9398 -1.76022) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.9398 -1.76022) (end -1.49098 -2.02946) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.49098 -2.02946) (end -2.00914 -1.50114) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.00914 -1.50114) (end -1.76022 -0.96012) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.76022 -0.96012) (end -1.9304 -0.48006) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.9304 -0.48006) (end -2.47904 -0.381) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.47904 -0.381) (end -2.4892 0.32004) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.4892 0.32004) (end -1.9304 0.5207) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.9304 0.5207) (end -1.7907 0.91948) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.35052 0.89916) (end 0.65024 0.7493) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.65024 0.7493) (end 0.8509 0.55118) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.8509 0.55118) (end 1.00076 0.14986) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.00076 0.14986) (end 1.00076 -0.24892) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.00076 -0.24892) (end 0.8509 -0.59944) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.8509 -0.59944) (end 0.39878 -0.94996) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.39878 -0.94996) (end -0.0508 -1.00076) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.0508 -1.00076) (end -0.44958 -0.89916) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.44958 -0.89916) (end -0.8509 -0.55118) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.8509 -0.55118) (end -1.00076 -0.09906) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.00076 -0.09906) (end -0.94996 0.39878) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.94996 0.39878) (end -0.70104 0.70104) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.70104 0.70104) (end -0.35052 0.89916) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.35052 0.89916) (end -0.70104 1.89992) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.35052 0.89916) (end 0.7493 1.89992) (layer F.SilkS) (width 0.15))
+)

hardware/wemos_mbus_shield/kicad/meta/info.html

@@ -0,0 +1,21 @@
+<HTML>
+<HEAD>
+<title>D1Shield</title>
+</HEAD>
+<BODY>
+<P>This project template is the basis of an expansion board for the
+<A HREF="https://www.wemos.cc/en/latest/d1/d1_mini.html" TARGET="blank">D1 mini board</A>.
+<BR><BR>This base project includes a PCB edge defined
+as the same size as the D1 mini PCB with the connectors placed
+correctly to align the two boards. All IO present on the D1 mini
+board is connected to the project through the expansion
+headers. <BR><BR>The board looks like the following:
+</P>
+<P><IMG SRC="brd.png">
+</P>
+<p><i>Dwgs.User</i> layer show mechanical components of the D1mini board.</p>
+<P>&copy;2016 J&eacute;r&ocirc;me Labidurie<br/>
+Licence: <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC:BY-SA 3.0</a><br/>
+<a href="http://dinask.eu">dinask.eu</a></P>
+</BODY>
+</HTML>

hardware/wemos_mbus_shield/kicad/sym-lib-table

@@ -0,0 +1,4 @@
+(sym_lib_table
+  (lib (name d1_mini_shield-rescue)(type Legacy)(uri ${KIPRJMOD}/d1_mini_shield-rescue.lib)(options "")(descr ""))
+  (lib (name tss721)(type Legacy)(uri ${KIPRJMOD}/tss721.lib)(options "")(descr ""))
+)

hardware/wemos_mbus_shield/kicad/tss721.dcm

@@ -0,0 +1,9 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP TSS721
+D TSS721A Meter Bus Transceiver, SOIC-16/TSSOP-16
+K MBUS Tranciever
+F http://www.ti.com/lit/ds/symlink/tss721a.pdf
+$ENDCMP
+#
+#End Doc Library

hardware/wemos_mbus_shield/kicad/tss721.lib

@@ -0,0 +1,37 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# TSS721
+#
+DEF TSS721 U 0 40 Y Y 1 F N
+F0 "U" 200 850 50 H V L CNN
+F1 "TSS721" 200 750 50 H V L CNN
+F2 "" 0 -850 50 H V C CIN
+F3 "" -200 -800 50 H V C CNN
+ALIAS TSS721A
+$FPLIST
+ SOIC*3.9x9.9mm*Pitch1.27mm*
+ TSSOP*4.4x5mm*Pitch0.65mm*
+$ENDFPLIST
+DRAW
+S -500 -700 500 700 0 1 10 f
+X BUSL2 1 -600 400 100 R 50 50 1 1 I
+X VS 10 -600 0 100 R 50 50 1 1 P
+X VDD 11 0 800 100 D 50 50 1 1 W
+X RX 12 600 500 100 L 50 50 1 1 I
+X RXI 13 600 400 100 L 50 50 1 1 I I
+X RIS 14 300 -800 100 U 50 50 1 1 I
+X GND 15 0 -800 100 U 50 50 1 1 W
+X BUSL1 16 -600 500 100 R 50 50 1 1 I
+X VB 2 -600 -150 100 R 50 50 1 1 P
+X STC 3 -600 -500 100 R 50 50 1 1 P
+X RIDD 4 200 -800 100 U 50 50 1 1 O
+X PF 5 -600 100 100 R 50 50 1 1 I
+X SC 6 400 -800 100 U 50 50 1 1 P
+X TXI 7 600 100 100 L 50 50 1 1 O I
+X TX 8 600 200 100 L 50 50 1 1 O
+X BAT 9 -100 800 100 D 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library

platformio.ini

@@ -7,27 +7,58 @@ 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
 
+# Sticking to v2.0.3 because of #298
 
 [env:esp32]
-platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-board = esp32dev
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.3/platform-espressif32-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
+
+# 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/v2.0.3/platform-espressif32-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

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, round(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

@@ -24,6 +24,7 @@ bool AmsConfiguration::getWiFiConfig(WiFiConfig& config) {
 		EEPROM.begin(EEPROM_SIZE);
 		EEPROM.get(CONFIG_WIFI_START, config);
 		EEPROM.end();
+		if(config.sleep > 2) config.sleep = 1;
 		return true;
 	} else {
 		clearWifi(config);
@@ -33,15 +34,20 @@ bool AmsConfiguration::getWiFiConfig(WiFiConfig& config) {
 
 bool AmsConfiguration::setWiFiConfig(WiFiConfig& config) {
 	WiFiConfig existing;
+	if(config.sleep > 2) config.sleep = 1;
 	if(getWiFiConfig(existing)) {
 		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;
+		wifiChanged |= config.sleep != existing.sleep;
 	} else {
 		wifiChanged = true;
 	}
@@ -60,11 +66,14 @@ void AmsConfiguration::clearWifi(WiFiConfig& config) {
 	uint16_t chipId;
 	#if defined(ESP32)
 		chipId = ESP.getEfuseMac();
+		config.power = 195;
 	#else
 		chipId = ESP.getChipId();
+		config.power = 205;
 	#endif
 	strcpy(config.hostname, (String("ams-") + String(chipId, HEX)).c_str());
 	config.mdns = true;
+	config.sleep = 0xFF;
 }
 
 void AmsConfiguration::clearWifiIp(WiFiConfig& config) {
@@ -209,6 +218,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 +246,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 +505,67 @@ 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);
+		}
+		if(config.hours > 5) config.hours = 5;
+		return true;
+	} else {
+		return false;
+	}
+}
+
+bool AmsConfiguration::setEnergyAccountingConfig(EnergyAccountingConfig& config) {
+	if(config.hours > 5) config.hours = 5;
+	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;
+		energyAccountingChanged |= config.hours != existing.hours;
+	} 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;
+	config.hours = 3;
+}
+
+bool AmsConfiguration::isEnergyAccountingChanged() {
+	return energyAccountingChanged;
+}
+
+void AmsConfiguration::ackEnergyAccountingChange() {
+	energyAccountingChanged = false;
+}
+
+
 void AmsConfiguration::clear() {
 	EEPROM.begin(EEPROM_SIZE);
 	MeterConfig meter;
@@ -522,6 +596,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 +611,76 @@ 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 94:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig94()) {
+					configVersion = 95;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case EEPROM_CHECK_SUM:
+				return true;
+			default:
+				configVersion = 0;
+				return false;
+		}
 	}
 	return configVersion == EEPROM_CHECK_SUM;
 }
@@ -627,116 +727,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;
@@ -759,7 +749,7 @@ bool AmsConfiguration::relocateConfig86() {
 }
 
 bool AmsConfiguration::relocateConfig87() {
-	MeterConfig87 meter87;
+	MeterConfig87 meter87 = {0,0,0,0,0,0,0};
 	MeterConfig meter;
 	EEPROM.begin(EEPROM_SIZE);
     EEPROM.get(CONFIG_METER_START_87, meter87);
@@ -814,6 +804,54 @@ 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::relocateConfig94() {
+	EnergyAccountingConfig eac;
+	EEPROM.begin(EEPROM_SIZE);
+    EEPROM.get(CONFIG_ENERGYACCOUNTING_START, eac);
+	eac.hours = 1;
+	EEPROM.put(CONFIG_ENERGYACCOUNTING_START, eac);
+	EEPROM.put(EEPROM_CONFIG_ADDRESS, 95);
+	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 +917,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 95 // 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,9 @@ struct WiFiConfig {
 	char dns2[16];
 	char hostname[32];
 	bool mdns;
-}; // 209
+	uint8_t power;
+	uint8_t sleep;
+}; // 211
 
 struct MqttConfig86 {
 	char host[128];
@@ -92,7 +96,13 @@ 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;
+	uint8_t source;
+	uint8_t parser;
+}; // 50
 
 struct MeterConfig87 {
 	uint8_t type;
@@ -152,71 +162,10 @@ 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];
+	uint8_t hours;
+}; // 11
 
 struct TempSensorConfig {
 	uint8_t address[8];
@@ -288,6 +237,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 +258,21 @@ 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.0
+	bool relocateConfig94(); // 2.1.4
 
-	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,18 @@ 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();
+            this->l1activeImportPower = other.getL1ActiveImportPower();
+            this->l2activeImportPower = other.getL2ActiveImportPower();
+            this->l3activeImportPower = other.getL3ActiveImportPower();
+            this->l1activeExportPower = other.getL1ActiveExportPower();
+            this->l2activeExportPower = other.getL2ActiveExportPower();
+            this->l3activeExportPower = other.getL3ActiveExportPower();
+        case 3:
             this->meterTimestamp = other.getMeterTimestamp();
             this->activeImportCounter = other.getActiveImportCounter();
             this->activeExportCounter = other.getActiveExportCounter();
@@ -160,19 +167,43 @@ float AmsData::getL3PowerFactor() {
     return this->l3PowerFactor;
 }
 
-float AmsData::getActiveImportCounter() {
+float AmsData::getL1ActiveImportPower() {
+    return this->l1activeImportPower;
+}
+
+float AmsData::getL2ActiveImportPower() {
+    return this->l2activeImportPower;
+}
+
+float AmsData::getL3ActiveImportPower() {
+    return this->l3activeImportPower;
+}
+
+float AmsData::getL1ActiveExportPower() {
+    return this->l1activeExportPower;
+}
+
+float AmsData::getL2ActiveExportPower() {
+    return this->l2activeExportPower;
+}
+
+float AmsData::getL3ActiveExportPower() {
+    return this->l3activeExportPower;
+}
+
+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

@@ -12,6 +12,7 @@ enum AmsType {
     AmsTypeIskra = 0x08,
     AmsTypeLandis = 0x09,
     AmsTypeSagemcom = 0x0A,
+    AmsTypeLng = 0x0B,
     AmsTypeCustom = 0x88,
     AmsTypeUnknown = 0xFF
 };
@@ -53,10 +54,18 @@ public:
     float getL2PowerFactor();
     float getL3PowerFactor();
 
-    float getActiveImportCounter();
-    float getReactiveImportCounter();
-    float getActiveExportCounter();
-    float getReactiveExportCounter();
+    float getL1ActiveImportPower();
+    float getL2ActiveImportPower();
+    float getL3ActiveImportPower();
+
+    float getL1ActiveExportPower();
+    float getL2ActiveExportPower();
+    float getL3ActiveExportPower();
+
+    double getActiveImportCounter();
+    double getReactiveImportCounter();
+    double getActiveExportCounter();
+    double getReactiveExportCounter();
 
     bool isThreePhase();
     bool isTwoPhase();
@@ -70,8 +79,10 @@ protected:
     time_t meterTimestamp = 0;
     uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
     float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
+    float l1activeImportPower = 0, l2activeImportPower = 0, l3activeImportPower = 0;
+    float l1activeExportPower = 0, l2activeExportPower = 0, l3activeExportPower = 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;
 }
 
-int32_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::VERBOSE)) 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::VERBOSE)) 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::VERBOSE)) 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::VERBOSE)) 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::VERBOSE)) 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::VERBOSE)) 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];
+    uint16_t hImport[24];
     time_t lastMeterReadTime;
     uint32_t activeImport;
     uint32_t activeExport;
-}; // 37 bytes
+    uint16_t hExport[24];
+}; // 112 bytes
 
 struct MonthDataPoints {
     uint8_t version;
-    int16_t points[31];
+    uint16_t dImport[31];
     time_t lastMeterReadTime;
     uint32_t activeImport;
     uint32_t activeExport;
-}; // 75 bytes
+    uint16_t dExport[31];
+}; // 141 bytes
 
 class AmsDataStorage {
 public:
     AmsDataStorage(RemoteDebug*);
     void setTimezone(Timezone*);
     bool update(AmsData*);
-    int32_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,12 +1,17 @@
 #ifndef _AMSTOMQTTBRIDGE_H
 #define _AMSTOMQTTBRIDGE_H
 
-#define WIFI_CONNECTION_TIMEOUT 60000;
+#define WIFI_CONNECTION_TIMEOUT 30000
 
 #define INVALID_BUTTON_PIN  0xFFFFFFFF
 
 #define MAX_PEM_SIZE 4096
 
+#define METER_SOURCE_NONE 0
+#define METER_SOURCE_SERIAL 1
+#define METER_SOURCE_MQTT 2
+#define METER_SOURCE_ESPNOW 3
+
 #include <SoftwareSerial.h>
 
 #if defined(ESP8266)

src/EnergyAccounting.cpp

@@ -0,0 +1,433 @@
+#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, EnergyAccountingConfig *config) {
+    this->ds = ds;
+    this->config = config;
+    this->currentThresholdIdx = 0;
+}
+
+void EnergyAccounting::setEapi(EntsoeApi *eapi) {
+    this->eapi = eapi;
+}
+
+EnergyAccountingConfig* EnergyAccounting::getConfig() {
+    return config;
+}
+
+void EnergyAccounting::setTimezone(Timezone* tz) {
+    this->tz = tz;
+}
+
+bool EnergyAccounting::update(AmsData* amsData) {
+    if(config == NULL) return false;
+    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::DEBUG)) 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\n");
+            data = { 4, local.Month, 
+                0, 0, 0,
+                0, 0, // Peak 1
+                0, 0, // Peak 2
+                0, 0, // Peak 3
+                0, 0, // Peak 4
+                0, 0 // Peak 5
+            };
+        } else if(debugger->isActive(RemoteDebug::DEBUG)) {
+            for(uint8_t i = 0; i < 5; i++) {
+                debugger->printf("(EnergyAccounting) Peak hour from day %d: %d\n", data.peaks[i].day, data.peaks[i].value*10);
+            }
+            debugger->printf("(EnergyAccounting) Loaded cost yesterday: %.2f, this month: %d, last month: %d\n", data.costYesterday / 10.0, data.costThisMonth, data.costLastMonth);
+        }
+        init = true;
+    }
+
+    if(!initPrice && eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) 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);
+
+        tmElements_t oneHrAgo;
+        breakTime(now-3600, oneHrAgo);
+        uint16_t val = ds->getHourImport(oneHrAgo.Hour) / 10;
+        ret |= updateMax(val, local.Day);
+
+        if(local.Hour > 0) {
+            calcDayCost();
+        }
+
+        use = 0;
+        produce = 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 * 10;
+            data.costThisMonth += costDay;
+            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;
+            for(uint8_t i = 0; i < 5; i++) {
+                data.peaks[i] = { 0, 0 };
+            }
+            data.month = local.Month;
+            currentThresholdIdx = 0;
+            ret = true;
+        }
+    }
+
+    unsigned long ms = this->lastUpdateMillis > amsData->getLastUpdateMillis() ? 0 : amsData->getLastUpdateMillis() - this->lastUpdateMillis;
+    float kwhi = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    float kwhe = (amsData->getActiveExportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    lastUpdateMillis = amsData->getLastUpdateMillis();
+    if(kwhi > 0) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh import\n", kwhi);
+        use += kwhi;
+        if(eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
+            float price = eapi->getValueForHour(0);
+            float cost = price * kwhi;
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  and %.4f %s\n", cost / 100.0, eapi->getCurrency());
+            costHour += cost;
+            costDay += cost;
+        }
+    }
+    if(kwhe > 0) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh export\n", kwhe);
+        produce += kwhe;
+    }
+
+    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;
+}
+
+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 < currentHour; i++) {
+            float price = eapi->getValueForHour(i - currentHour);
+            if(price == ENTSOE_NO_VALUE) break;
+            breakTime(now - ((currentHour - i) * 3600), utc);
+            int16_t wh = ds->getHourImport(utc.Hour);
+            costDay += price * (wh / 1000.0);
+        }
+        initPrice = true;
+    }
+}
+
+double EnergyAccounting::getUseThisHour() {
+    return use;
+}
+
+double EnergyAccounting::getUseToday() {
+    float ret = 0.0;
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    tmElements_t utc;
+    for(int i = 0; i < currentHour; i++) {
+        breakTime(now - ((currentHour - i) * 3600), utc);
+        ret += ds->getHourImport(utc.Hour) / 1000.0;
+    }
+    return ret + getUseThisHour();
+}
+
+double EnergyAccounting::getUseThisMonth() {
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    float ret = 0;
+    for(int i = 0; i < currentDay; i++) {
+        ret += ds->getDayImport(i) / 1000.0;
+    }
+    return ret + getUseToday();
+}
+
+double EnergyAccounting::getProducedThisHour() {
+    return produce;
+}
+
+double EnergyAccounting::getProducedToday() {
+    float ret = 0.0;
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    tmElements_t utc;
+    for(int i = 0; i < currentHour; i++) {
+        breakTime(now - ((currentHour - i) * 3600), utc);
+        ret += ds->getHourExport(utc.Hour) / 1000.0;
+    }
+    return ret + getProducedThisHour();
+}
+
+double EnergyAccounting::getProducedThisMonth() {
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    float ret = 0;
+    for(int i = 0; i < currentDay; i++) {
+        ret += ds->getDayExport(i) / 1000.0;
+    }
+    return ret + getProducedToday();
+}
+
+
+double EnergyAccounting::getCostThisHour() {
+    return costHour;
+}
+
+double EnergyAccounting::getCostToday() {
+    return costDay;
+}
+
+double EnergyAccounting::getCostYesterday() {
+    return data.costYesterday / 10.0;
+}
+
+double EnergyAccounting::getCostThisMonth() {
+    return data.costThisMonth + getCostToday();
+}
+
+uint16_t EnergyAccounting::getCostLastMonth() {
+    return data.costLastMonth;
+}
+
+uint8_t EnergyAccounting::getCurrentThreshold() {
+    if(config == NULL)
+        return 0;
+    return config->thresholds[currentThresholdIdx];
+}
+
+float EnergyAccounting::getMonthMax() {
+    uint8_t count = 0;
+    uint32_t maxHour = 0.0;
+    bool included[5] = { false, false, false, false, false };
+
+    for(uint8_t x = 0;x < min((uint8_t) 5, config->hours); x++) {
+        uint8_t maxIdx = 0;
+        uint16_t maxVal = 0;
+        for(uint8_t i = 0; i < 5; i++) {
+            if(included[i]) continue;
+            if(data.peaks[i].day == 0) continue;
+            if(data.peaks[i].value > maxVal) {
+                maxVal = data.peaks[i].value;
+                maxIdx = i;
+            }
+        }
+        if(maxVal > 0) {
+            included[maxIdx] = true;
+            count++;
+        }
+    }
+
+    for(uint8_t i = 0; i < 5; i++) {
+        if(!included[i]) continue;
+        maxHour += data.peaks[i].value;
+    }
+    return maxHour > 0 ? maxHour / count / 100.0 : 0.0;
+}
+
+float EnergyAccounting::getPeak(uint8_t num) {
+    if(num < 1 || num > 5) return 0.0;
+
+    uint8_t count = 0;
+    bool included[5] = { false, false, false, false, false };
+
+    for(uint8_t x = 0;x < min((uint8_t) 5, config->hours); x++) {
+        uint8_t maxIdx = 0;
+        uint16_t maxVal = 0;
+        for(uint8_t i = 0; i < 5; i++) {
+            if(included[i]) continue;
+            if(data.peaks[i].value > maxVal) {
+                maxVal = data.peaks[i].value;
+                maxIdx = i;
+            }
+        }
+        if(maxVal > 0) {
+            included[maxIdx] = true;
+            count++;
+        }
+    }
+
+    uint8_t pos = 0;
+    for(uint8_t i = 0; i < 5; i++) {
+        if(!included[i]) continue;
+        pos++;
+        if(pos == num) {
+            return data.peaks[i].value / 100.0;
+        }
+    }
+    return 0.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());
+
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EnergyAccounting) Data version %d\n", buf[0]);
+        if(buf[0] == 4) {
+            EnergyAccountingData* data = (EnergyAccountingData*) buf;
+            memcpy(&this->data, data, sizeof(this->data));
+            ret = true;
+        } else if(buf[0] == 3) {
+            EnergyAccountingData* data = (EnergyAccountingData*) buf;
+            this->data = { 4, data->month, 
+                (uint16_t) (data->costYesterday / 10), (uint16_t) (data->costThisMonth / 100), (uint16_t) (data->costLastMonth / 100),
+                data->peaks[0].day, data->peaks[0].value,
+                data->peaks[1].day, data->peaks[1].value,
+                data->peaks[2].day, data->peaks[2].value,
+                data->peaks[3].day, data->peaks[3].value,
+                data->peaks[4].day, data->peaks[4].value
+            };
+            ret = true;
+        } else {
+            data = { 4, 0, 
+                0, 0, 0,
+                0, 0, // Peak 1
+                0, 0, // Peak 2
+                0, 0, // Peak 3
+                0, 0, // Peak 4
+                0, 0 // Peak 5
+            };
+            if(buf[0] == 2) {
+                EnergyAccountingData1* data = (EnergyAccountingData1*) buf;
+                this->data.month = data->month;
+                this->data.costYesterday = (uint16_t) (data->costYesterday / 10);
+                this->data.costThisMonth = (uint16_t) (data->costThisMonth / 100);
+                this->data.costLastMonth = (uint16_t) (data->costLastMonth / 100);
+                uint8_t b = 0;
+                for(uint8_t i = sizeof(this->data); i < file.size(); i+=2) {
+                    this->data.peaks[b].day = b;
+                    memcpy(&this->data.peaks[b].value, buf+i, 2);
+                    b++;
+                    if(b >= config->hours || b >= 5) break;
+                }
+                ret = true;
+            } else if(buf[0] == 1) {
+                EnergyAccountingData1* data = (EnergyAccountingData1*) buf;
+                this->data.month = data->month;
+                this->data.costYesterday = (uint16_t) (data->costYesterday / 10);
+                this->data.costThisMonth = (uint16_t) (data->costThisMonth / 100);
+                this->data.costLastMonth = (uint16_t) (data->costLastMonth / 100);
+                this->data.peaks[0].day = 1;
+                this->data.peaks[0].value = data->maxHour;
+                ret = true;
+            } else {
+                if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf("(EnergyAccounting) Unknown version\n");
+                ret = false;
+            }
+        }
+
+        file.close();
+    } else {
+        if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf("(EnergyAccounting) File not found\n");
+    }
+
+    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(uint8_t i = 0; i < sizeof(buf); 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;
+}
+
+bool EnergyAccounting::updateMax(uint16_t val, uint8_t day) {
+    for(uint8_t i = 0; i < 5; i++) {
+        if(data.peaks[i].day == day || data.peaks[i].day == 0) {
+            if(val > data.peaks[i].value) {
+                if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) Adding new max %d for day %d which is larger than %d\n", val*10, day, data.peaks[i].value*10);
+                data.peaks[i].day = day;
+                data.peaks[i].value = val;
+                return true;
+            }
+            return false;
+        }
+    }
+    uint16_t test = 0;
+    uint8_t idx = 255;
+    for(uint8_t i = 0; i < 5; i++) {
+        if(val > data.peaks[i].value) {
+            if(test < data.peaks[i].value) {
+                test = data.peaks[i].value;
+                idx = i;
+            }
+        }
+    }
+    if(idx < 5) {
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) Adding new max %d for day %d\n", val*10, day);
+        data.peaks[idx].value = val;
+        data.peaks[idx].day = day;
+        return true;
+    }
+    return false;
+}

src/EnergyAccounting.h

@@ -0,0 +1,82 @@
+#ifndef _ENERGYACCOUNTING_H
+#define _ENERGYACCOUNTING_H
+
+#include "Arduino.h"
+#include "AmsData.h"
+#include "AmsDataStorage.h"
+#include "entsoe/EntsoeApi.h"
+
+struct EnergyAccountingPeak {
+    uint8_t day;
+    uint16_t value;
+};
+
+struct EnergyAccountingData {
+    uint8_t version;
+    uint8_t month;
+    uint16_t costYesterday;
+    uint16_t costThisMonth;
+    uint16_t costLastMonth;
+    EnergyAccountingPeak peaks[5];
+};
+
+struct EnergyAccountingData1 {
+    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, EnergyAccountingConfig *config);
+    void setEapi(EntsoeApi *eapi);
+    void setTimezone(Timezone*);
+    EnergyAccountingConfig* getConfig();
+    bool update(AmsData* amsData);
+    bool load();
+    bool save();
+
+    double getUseThisHour();
+    double getUseToday();
+    double getUseThisMonth();
+
+    double getProducedThisHour();
+    double getProducedToday();
+    double getProducedThisMonth();
+
+    double getCostThisHour();
+    double getCostToday();
+    double getCostYesterday();
+    double getCostThisMonth();
+    uint16_t getCostLastMonth();
+
+    float getMonthMax();
+    uint8_t getCurrentThreshold();
+    float getPeak(uint8_t);
+
+    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;
+    double produce;
+    EnergyAccountingData data = { 0, 0, 0, 0, 0, 0 };
+
+    void calcDayCost();
+    bool updateMax(uint16_t val, uint8_t day);
+};
+
+#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;
@@ -340,8 +373,7 @@ bool HwTools::ledBlink(uint8_t color, uint8_t blink) {
         if(!ledOn(color)) return false;
         delay(50);
         ledOff(color);
-        if(i != blink)
-            delay(50);
+        delay(200);
     }
     return true;
 }

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

@@ -1,8 +1,9 @@
 #include "IEC6205675.h"
 #include "lwip/def.h"
 #include "Timezone.h"
+#include "ams/ntohll.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, DataParserContext &ctx) {
     double val;
     char str[64];
 
@@ -10,7 +11,7 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
     TimeChangeRule CET = {"CET ", Last, Sun, Oct, 3, 60};
     Timezone tz(CEST, CET);
 
-    this->packageTimestamp = getTimestamp(packageTimestamp);
+    this->packageTimestamp = ctx.timestamp;
 
     val = getNumber(AMS_OBIS_ACTIVE_IMPORT, sizeof(AMS_OBIS_ACTIVE_IMPORT), ((char *) (d)));
     if(val == NOVALUE) {
@@ -107,7 +108,7 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
                         case CosemTypeOctetString: {
                             if(data->oct.length == 0x0C) {
                                 AmsOctetTimestamp* amst = (AmsOctetTimestamp*) data;
-                                time_t ts = getTimestamp(amst->dt);
+                                time_t ts = decodeCosemDateTime(amst->dt);
                                 meterTimestamp = tz.toUTC(ts);
                             }
                         }
@@ -140,11 +141,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)));
@@ -155,8 +158,8 @@ 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(meterType == AmsTypeUnknown) {
+            if(memcmp(ctx.system_title, "SAGY", 4) == 0) {
                 meterType = AmsTypeSagemcom;
             }
         }
@@ -262,8 +265,10 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
         CosemData* meterTs = findObis(AMS_OBIS_METER_TIMESTAMP, sizeof(AMS_OBIS_METER_TIMESTAMP), ((char *) (d)));
         if(meterTs != NULL) {
             AmsOctetTimestamp* amst = (AmsOctetTimestamp*) meterTs;
-            time_t ts = getTimestamp(amst->dt);
-            if(meterType == AmsTypeKamstrup || meterType == AmsTypeAidon) {
+            time_t ts = decodeCosemDateTime(amst->dt);
+            if(meterType == AmsTypeAidon) {
+                meterTimestamp = ts - 3600;
+            } else if(meterType == AmsTypeKamstrup) {
                 meterTimestamp = tz.toUTC(ts);
             } else {
                 meterTimestamp = ts;
@@ -272,21 +277,57 @@ 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;
         }
 
+        val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L1, sizeof(AMS_OBIS_ACTIVE_IMPORT_L1), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l1activeImportPower = val;
+        }
+        val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L2, sizeof(AMS_OBIS_ACTIVE_IMPORT_L2), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l2activeImportPower = val;
+        }
+        val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L3, sizeof(AMS_OBIS_ACTIVE_IMPORT_L3), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l3activeImportPower = val;
+        }
+
+        val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L1, sizeof(AMS_OBIS_ACTIVE_EXPORT_L1), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l1activeExportPower = val;
+        }
+        val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L2, sizeof(AMS_OBIS_ACTIVE_EXPORT_L2), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l2activeExportPower = val;
+        }
+        val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L3, sizeof(AMS_OBIS_ACTIVE_EXPORT_L3), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l3activeExportPower = val;
+        }
+
         if(meterType == AmsTypeKamstrup) {
             if(listType >= 3) {
                 activeImportCounter *= 10;
@@ -315,12 +356,11 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
                 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) {
                 AmsOctetTimestamp* amst = (AmsOctetTimestamp*) meterTs;
-                time_t ts = getTimestamp(amst->dt);
+                time_t ts = decodeCosemDateTime(amst->dt);
                 meterTimestamp = ts;
             }
 
@@ -328,26 +368,64 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, uint8_t distribution
             if(mid != NULL) {
                 switch(mid->base.type) {
                     case CosemTypeString:
-                        memcpy(&meterId, mid->str.data, mid->str.length);
-                        meterId[mid->str.length] = 0;
+                        memcpy(str, mid->oct.data, mid->oct.length);
+                        str[mid->oct.length] = 0x00;
+                        meterId = String(str);
                         break;
                     case CosemTypeOctetString:
-                        memcpy(&meterId, mid->oct.data, mid->oct.length);
-                        meterId[mid->oct.length] = 0;
+                        memcpy(str, mid->str.data, mid->str.length);
+                        str[mid->str.length] = 0x00;
+                        meterId = String(str);
                         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;
@@ -366,7 +444,7 @@ CosemData* IEC6205675::getCosemDataAt(uint8_t index, const char* ptr) {
     CosemData* item = (CosemData*) ptr;
     int i = 0;
     char* pos = (char*) ptr;
-    do {
+    while(pos-ptr < 900) {
         item = (CosemData*) pos;
         if(i == index) return item;
         switch(item->base.type) {
@@ -379,14 +457,17 @@ 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:
                 pos += 1;
                 break;
@@ -394,8 +475,7 @@ CosemData* IEC6205675::getCosemDataAt(uint8_t index, const char* ptr) {
                 pos += 2;
         }
         i++;
-        if(pos-ptr > 900) break; 
-    } while(item->base.type != HDLC_FLAG);
+    }
     return NULL;
 }
 
@@ -403,7 +483,7 @@ CosemData* IEC6205675::findObis(uint8_t* obis, int matchlength, const char* ptr)
     CosemData* item = (CosemData*) ptr;
     int ret = 0;
     char* pos = (char*) ptr;
-    do {
+    while(pos-ptr < 900) {
         item = (CosemData*) pos;
         if(ret == 1) return item;
         switch(item->base.type) {
@@ -424,22 +504,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:
                 pos += 1;
                 break;
             default:
                 pos += 2;
         }
-        if(pos-ptr > 900) break; 
-    } while(item->base.type != HDLC_FLAG);
+    }
     return NULL;
 }
 
@@ -470,22 +552,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;
             }
         }
@@ -507,31 +607,10 @@ time_t IEC6205675::getTimestamp(uint8_t* obis, int matchlength, const char* ptr)
             case CosemTypeOctetString: {
                 if(item->oct.length == 0x0C) {
                     AmsOctetTimestamp* ts = (AmsOctetTimestamp*) item;
-                    return getTimestamp(ts->dt);
+                    return decodeCosemDateTime(ts->dt);
                 }
             }
         }
     }
     return 0;
 }
-
-time_t IEC6205675::getTimestamp(CosemDateTime timestamp) {
-    tmElements_t tm;
-    uint16_t year = ntohs(timestamp.year);
-    if(year < 1970) return 0;
-    tm.Year = year - 1970;
-    tm.Month = timestamp.month;
-    tm.Day = timestamp.dayOfMonth;
-    tm.Hour = timestamp.hour;
-    tm.Minute = timestamp.minute;
-    tm.Second = timestamp.second;
-
-    //Serial.printf("\nY: %d, M: %d, D: %d, h: %d, m: %d, s: %d, deviation: 0x%2X, status: 0x%1X\n", tm.Year, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second, timestamp.deviation, timestamp.status);
-
-    time_t time = makeTime(tm);
-    int16_t deviation = ntohs(timestamp.deviation);
-    if(deviation >= -720 && deviation <= 720) {
-        time -= deviation * 60;
-    }
-    return time;
-}

src/IEC6205675.h

@@ -2,7 +2,9 @@
 #define _IEC62056_7_5_H
 
 #include "AmsData.h"
-#include "ams/hdlc.h"
+#include "AmsConfiguration.h"
+#include "ams/DataParser.h"
+#include "ams/Cosem.h"
 
 #define NOVALUE 0xFFFFFFFF
 
@@ -13,7 +15,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, DataParserContext &ctx);
 
 private:
     CosemData* getCosemDataAt(uint8_t index, const char* ptr);
@@ -22,9 +24,8 @@ private:
     double getNumber(uint8_t* obis, int matchlength, const char* ptr);
     double getNumber(CosemData*);
     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 };
@@ -48,6 +49,12 @@ private:
     uint8_t AMS_OBIS_POWER_FACTOR_L1[4]         = { 33, 7, 0, 255 };
     uint8_t AMS_OBIS_POWER_FACTOR_L2[4]         = { 53, 7, 0, 255 };
     uint8_t AMS_OBIS_POWER_FACTOR_L3[4]         = { 73, 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_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 };
 
 };
 #endif

src/LNG.cpp

@@ -0,0 +1,152 @@
+#include "LNG.h"
+#include "lwip/def.h"
+#include "ams/ntohll.h"
+
+LNG::LNG(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, RemoteDebug* debugger) {
+    LngHeader* h = (LngHeader*) payload;
+    if(h->tag == CosemTypeStructure && h->arrayTag == CosemTypeArray) {
+        meterType = AmsTypeLng;
+        this->packageTimestamp = ctx.timestamp;
+
+        uint8_t* ptr = (uint8_t*) &h[1];
+        uint8_t* data = ptr + (18*h->arrayLength); // Skip descriptors
+
+        uint64_t o170 = 0, o270 = 0;
+        uint64_t o180 = 0, o280 = 0;
+        uint64_t o181 = 0, o182 = 0;
+        uint64_t o281 = 0, o282 = 0;
+        LngObisDescriptor* descriptor = (LngObisDescriptor*) ptr;
+        for(uint8_t x = 0;  x < h->arrayLength-1; x++) {
+            ptr = (uint8_t*) &descriptor[1];
+            descriptor = (LngObisDescriptor*) ptr;
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(L&G) OBIS %d.%d.%d with type 0x%02X", descriptor->obis[2], descriptor->obis[3], descriptor->obis[4], *data);
+
+            CosemData* item = (CosemData*) data;
+            if(descriptor->obis[2] == 1) {
+                if(descriptor->obis[3] == 7) {
+                    if(descriptor->obis[4] == 0) {
+                        o170 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o170);
+                    }
+                } else if(descriptor->obis[3] == 8) {
+                    if(descriptor->obis[4] == 0) {
+                        o180 = getNumber(item);
+                        listType = listType >= 3 ? listType : 3;
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o180);
+                        activeImportCounter = o180 / 1000.0;
+                    } else if(descriptor->obis[4] == 1) {
+                        o181 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o181);
+                    } else if(descriptor->obis[4] == 2) {
+                        o182 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o182);
+                    }
+                } 
+            } else if(descriptor->obis[2] == 2) {
+                if(descriptor->obis[3] == 7) {
+                    if(descriptor->obis[4] == 0) {
+                        o270 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o270);
+                    }
+                } else if(descriptor->obis[3] == 8) {
+                    if(descriptor->obis[4] == 0) {
+                        o280 = getNumber(item);
+                        listType = listType >= 3 ? listType : 3;
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o280);
+                        activeExportCounter = o280 / 1000.0;
+                    } else if(descriptor->obis[4] == 1) {
+                        o281 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o281);
+                    } else if(descriptor->obis[4] == 2) {
+                        o282 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o282);
+                    }
+                } 
+            } else if(descriptor->obis[2] == 96) {
+                if(descriptor->obis[3] == 1) {
+                    if(descriptor->obis[4] == 0) {
+                        char str[item->oct.length+1];
+                        memcpy(str, item->oct.data, item->oct.length);
+                        str[item->oct.length] = '\0';
+                        meterId = String(str);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %s (oct)", str);
+                    } else if(descriptor->obis[4] == 1) {
+                        char str[item->oct.length+1];
+                        memcpy(str, item->oct.data, item->oct.length);
+                        str[item->oct.length] = '\0';
+                        meterModel = String(str);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %s (oct)", str);
+                    }
+                }
+            }
+
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("\n");
+
+            if(o170 > 0 || o270 > 0) {
+                int32_t sum = o170-o270;
+                if(sum > 0) {
+                    listType = listType >= 1 ? listType : 1;
+                    activeImportPower = sum;
+                } else {
+                    listType = listType >= 2 ? listType : 2;
+                    activeExportPower = sum * -1;
+                }
+            }
+
+            if(o181 > 0 || o182 > 0) {
+                activeImportCounter = (o181 + o182) / 1000.0;
+                listType = listType >= 3 ? listType : 3;
+            }
+            if(o281 > 0 || o282 > 0) {
+                activeExportCounter = (o281 + o282) / 1000.0;
+                listType = listType >= 3 ? listType : 3;
+            }
+
+            if((*data) == 0x09) {
+                data += (*(data+1))+2;
+            } else if((*data) == 0x15) {
+                data += 9;
+            } else if((*data) == 0x06) {
+                data += 5;
+            } else if((*data) == 0x12) {
+                data += 3;
+            }
+
+            lastUpdateMillis = millis();
+        }
+    }
+}
+
+uint64_t LNG::getNumber(CosemData* item) {
+    if(item != NULL) {
+        uint64_t ret = 0.0;
+        switch(item->base.type) {
+            case CosemTypeLongSigned: {
+                int16_t i16 = ntohs(item->ls.data);
+                return i16;
+            }
+            case CosemTypeLongUnsigned: {
+                uint16_t u16 = ntohs(item->lu.data);
+                return u16;
+            }
+            case CosemTypeDLongSigned: {
+                int32_t i32 = ntohl(item->dlu.data);
+                return i32;
+            }
+            case CosemTypeDLongUnsigned: {
+                uint32_t u32 = ntohl(item->dlu.data);
+                return u32;
+            }
+            case CosemTypeLong64Signed: {
+                int64_t i64 = ntohll(item->l64s.data);
+                return i64;
+            }
+            case CosemTypeLong64Unsigned: {
+                uint64_t u64 = ntohll(item->l64u.data);
+                return u64;
+            }
+        }
+        return ret;
+    }
+    return 0.0;
+}

src/LNG.h

@@ -0,0 +1,32 @@
+#ifndef _LNG_H
+#define _LNG_H
+
+#include "AmsData.h"
+#include "AmsConfiguration.h"
+#include "ams/DataParser.h"
+#include "ams/Cosem.h"
+#include "RemoteDebug.h"
+
+struct LngHeader {
+    uint8_t tag;
+    uint8_t values;
+    uint8_t arrayTag;
+    uint8_t arrayLength;
+} __attribute__((packed));
+
+struct LngObisDescriptor {
+    uint8_t ignore1[5];
+    uint8_t octetTag;
+    uint8_t octetLength;
+    uint8_t obis[6];
+    uint8_t ignore2[5];
+} __attribute__((packed));
+
+
+class LNG : public AmsData {
+public:
+    LNG(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, RemoteDebug* debugger);
+    uint64_t getNumber(CosemData* item);
+};
+
+#endif

src/MbusAssembler.cpp

@@ -1,57 +0,0 @@
-#include "Arduino.h"
-#include "MbusAssembler.h"
-#include "ams/hdlc.h"
-
-MbusAssembler::MbusAssembler() {
-    buf = (uint8_t *)malloc((size_t)1024); // TODO find out from first package ?
-}
-
-uint8_t MbusAssembler::append(const uint8_t* d, int length) {
-    MbusHeader* h = (MbusHeader*) d;
-    uint8_t* ptr = (uint8_t*) &h[1];
-
-    uint8_t len = h->len1;
-    
-    uint8_t control = *ptr;
-    ptr++; len--;
-    
-    uint8_t address = *ptr;
-    ptr++; len--;
-    
-    uint8_t ci = *ptr;
-    ptr++; len--;
-    
-    uint8_t stsap = *ptr;
-    ptr++; len--;
-    
-    uint8_t dtsap = *ptr;
-    ptr++; len--;
-
-    uint8_t sequenceNumber = ci & 0x0F;
-    if(sequenceNumber == 0) {
-        memcpy(buf, d, length - 2); // Do not include FCS and MBUS_STOP
-        buf[6] = 0x10; // Mark that this is a single, complete frame
-        pos = length - 2;
-        lastSequenceNumber = 0;
-        return 0;
-    } else if(pos + len > 1024 || sequenceNumber != (lastSequenceNumber + 1)) { // TODO return error
-        pos = 0;
-        lastSequenceNumber = -1;
-        return -1;
-    } else {
-        if(len > length) return -1;
-        memcpy(buf + pos, ptr, len);
-        pos += len;
-        lastSequenceNumber = sequenceNumber;
-        return 0;
-    }
-    return -2;
-}
-
-uint16_t MbusAssembler::write(const uint8_t* d) {
-    buf[1] = buf[2] = 0x00;
-    buf[pos++] = mbusChecksum(buf+4, pos-4);
-    buf[pos++] = MBUS_END;
-    memcpy((uint8_t *) d, buf, pos);
-    return pos;
-}

src/MbusAssembler.h

@@ -1,18 +0,0 @@
-#ifndef _MBUS_ASSEMBLER_H
-#define _MBUS_ASSEMBLER_H
-
-#include <stdint.h>
-
-class MbusAssembler {
-public:
-    MbusAssembler();
-    uint8_t append(const uint8_t* d, int length);
-    uint16_t write(const uint8_t* d);
-
-private:
-    uint16_t pos = 0;
-    uint8_t *buf;
-    uint8_t lastSequenceNumber = -1;
-};
-
-#endif

src/Uptime.cpp

@@ -1,5 +1,8 @@
 #include "Uptime.h"
 
+uint32_t _uptime_last_value = 0;
+uint32_t _uptime_rollovers = 0;
+
 uint64_t millis64() {
     uint32_t new_low32 = millis();
     if (new_low32 < _uptime_last_value) _uptime_rollovers++;

src/Uptime.h

@@ -3,8 +3,6 @@
 
 #include "Arduino.h"
 
-static uint32_t _uptime_last_value = 0;
-static uint32_t _uptime_rollovers = 0;
 uint64_t millis64();
 
 #endif

src/ams/Cosem.cpp

@@ -0,0 +1,24 @@
+#include "Cosem.h"
+#include "lwip/def.h"
+#include <TimeLib.h>
+
+time_t decodeCosemDateTime(CosemDateTime timestamp) {
+    tmElements_t tm;
+    uint16_t year = ntohs(timestamp.year);
+    if(year < 1970) return 0;
+    tm.Year = year - 1970;
+    tm.Month = timestamp.month;
+    tm.Day = timestamp.dayOfMonth;
+    tm.Hour = timestamp.hour;
+    tm.Minute = timestamp.minute;
+    tm.Second = timestamp.second;
+
+    //Serial.printf("\nY: %d, M: %d, D: %d, h: %d, m: %d, s: %d, deviation: 0x%2X, status: 0x%1X\n", tm.Year, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second, timestamp.deviation, timestamp.status);
+
+    time_t time = makeTime(tm);
+    int16_t deviation = ntohs(timestamp.deviation);
+    if(deviation >= -720 && deviation <= 720) {
+        time -= deviation * 60;
+    }
+    return time;
+}

src/ams/Cosem.h

@@ -0,0 +1,92 @@
+#ifndef _COSEM_H
+#define _COSEM_H
+
+#include "lwip/def.h"
+
+// Blue book, Table 2
+enum CosemType {
+    CosemTypeNull = 0x00,
+    CosemTypeArray = 0x01,
+    CosemTypeStructure = 0x02,
+    CosemTypeOctetString = 0x09,
+    CosemTypeString = 0x0A,
+    CosemTypeDLongSigned = 0x05,
+    CosemTypeDLongUnsigned = 0x06,
+    CosemTypeLongSigned = 0x10,
+    CosemTypeLongUnsigned = 0x12,
+    CosemTypeLong64Signed = 0x14,
+    CosemTypeLong64Unsigned = 0x15,
+    CosemTypeDateTime = 0x19
+};
+
+struct CosemBasic {
+    uint8_t type;
+    uint8_t length;
+} __attribute__((packed));
+
+struct CosemString {
+    uint8_t type;
+    uint8_t length;
+    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 CosemLong64Signed {
+    uint8_t type;
+    int64_t data;
+} __attribute__((packed));
+
+struct CosemLong64Unsigned {
+    uint8_t type;
+    uint64_t data;
+} __attribute__((packed));
+
+struct CosemDateTime {
+    uint8_t type;
+    uint16_t year;
+    uint8_t month;
+    uint8_t dayOfMonth;
+    uint8_t dayOfWeek;
+    uint8_t hour;
+    uint8_t minute;
+    uint8_t second;
+    uint8_t hundredths;
+    int16_t deviation;
+    uint8_t status;
+} __attribute__((packed));
+
+typedef union {
+    struct CosemBasic base;
+	struct CosemString str;
+	struct CosemString oct;
+    struct CosemLongSigned ls;
+	struct CosemLongUnsigned lu;
+    struct CosemDLongSigned dls;
+    struct CosemDLongUnsigned dlu;
+    struct CosemLong64Signed l64s;
+    struct CosemLong64Unsigned l64u;
+    struct CosemDateTime dt;
+} CosemData; 
+
+time_t decodeCosemDateTime(CosemDateTime timestamp);
+
+#endif

src/ams/DataParser.h

@@ -0,0 +1,31 @@
+#ifndef _DATAPASERSER_H
+#define _DATAPASERSER_H
+
+#define DATA_TAG_NONE 0x00
+#define DATA_TAG_AUTO 0x01
+#define DATA_TAG_HDLC 0x7E
+#define DATA_TAG_LLC 0xE6
+#define DATA_TAG_DLMS 0x0F
+#define DATA_TAG_DSMR 0x2F
+#define DATA_TAG_MBUS 0x68
+#define DATA_TAG_GBT 0xE0
+#define DATA_TAG_GCM 0xDB
+
+#define DATA_PARSE_OK 0
+#define DATA_PARSE_FAIL -1
+#define DATA_PARSE_INCOMPLETE -2
+#define DATA_PARSE_BOUNDRY_FLAG_MISSING -3
+#define DATA_PARSE_HEADER_CHECKSUM_ERROR -4
+#define DATA_PARSE_FOOTER_CHECKSUM_ERROR -5
+#define DATA_PARSE_INTERMEDIATE_SEGMENT -6
+#define DATA_PARSE_FINAL_SEGMENT -7
+#define DATA_PARSE_UNKNOWN_DATA -9
+
+struct DataParserContext {
+    uint8_t type;
+    uint16_t length;
+    time_t timestamp;
+    uint8_t system_title[8];
+};
+
+#endif

src/ams/DataParsers.h

@@ -0,0 +1,13 @@
+#ifndef _DATAPASERSERS_H
+#define _DATAPASERSERS_H
+
+#include "HdlcParser.h"
+#include "DlmsParser.h"
+#include "DsmrParser.h"
+#include "MbusParser.h"
+#include "GbtParser.h"
+#include "GcmParser.h"
+#include "LlcParser.h"
+
+#endif
+

src/ams/DlmsParser.cpp

@@ -0,0 +1,38 @@
+#include "DlmsParser.h"
+#include "Cosem.h"
+
+int8_t DLMSParser::parse(uint8_t *buf, DataParserContext &ctx) {
+    if(ctx.length < 6) return DATA_PARSE_INCOMPLETE;
+
+    uint8_t* ptr = buf+1;
+    ptr += 4; // Skip invoke ID and priority
+
+    CosemData* item = (CosemData*) ptr;
+    if(item->base.type == CosemTypeOctetString) {
+        if(item->base.length == 0x0C) {
+            CosemDateTime* dateTime = (CosemDateTime*) (ptr+1);
+            ctx.timestamp = decodeCosemDateTime(*dateTime);
+        }
+        uint8_t len = 5+14;
+        ctx.length -= len;
+        return len;
+    } else if(item->base.type == CosemTypeNull) {
+        ctx.timestamp = 0;
+        uint8_t len = 5+1;
+        ctx.length -= len;
+        return len;
+    } else if(item->base.type == CosemTypeDateTime) {
+        CosemDateTime* dateTime = (CosemDateTime*) (ptr);
+        ctx.timestamp = decodeCosemDateTime(*dateTime);
+        uint8_t len = 5+13;
+        ctx.length -= len;
+        return len;
+    } else if(item->base.type == 0x0C) { // Kamstrup bug...
+        CosemDateTime* dateTime = (CosemDateTime*) (ptr);
+        ctx.timestamp = decodeCosemDateTime(*dateTime);
+        uint8_t len = 5+13;
+        ctx.length -= len;
+        return len;
+    }
+    return DATA_PARSE_UNKNOWN_DATA;
+}

src/ams/DlmsParser.h

@@ -0,0 +1,12 @@
+#ifndef _DLMSPARSER_H
+#define _DLMSPARSER_H
+
+#include "Arduino.h"
+#include "DataParser.h"
+
+class DLMSParser {
+public:
+    int8_t parse(uint8_t *buf, DataParserContext &ctx);
+};
+
+#endif

src/ams/DsmrParser.cpp

@@ -0,0 +1,21 @@
+#include "DsmrParser.h"
+
+int8_t DSMRParser::parse(uint8_t *buf, DataParserContext &ctx, bool verified) {
+    uint16_t crcPos = 0;
+    bool reachedEnd = verified;
+    uint8_t lastByte = 0x00;
+    for(int pos = 0; pos < ctx.length; pos++) {
+        uint8_t b = *(buf+pos);
+        if(pos == 0 && b != '/') return DATA_PARSE_BOUNDRY_FLAG_MISSING;
+        if(pos > 0 && b == '!' && lastByte == '\n') crcPos = pos+1;
+        if(crcPos > 0 && b == '\n') reachedEnd = true;
+        lastByte = b;
+    }
+    if(!reachedEnd) return DATA_PARSE_INCOMPLETE;
+    buf[ctx.length+1] = '\0';
+    if(crcPos > 0) {
+        // TODO: CRC
+        Serial.printf("CRC: %s\n", buf+crcPos);
+    }
+    return DATA_PARSE_OK;
+}

src/ams/DsmrParser.h

@@ -0,0 +1,13 @@
+#ifndef _DSMRPARSER_H
+#define _DSMRPARSER_H
+
+#include "Arduino.h"
+#include "DataParser.h"
+
+class DSMRParser {
+public:
+    int8_t parse(uint8_t *buf, DataParserContext &ctx, bool verified);
+private:
+};
+
+#endif

src/ams/GbtParser.cpp

@@ -0,0 +1,32 @@
+#include "GbtParser.h"
+#include "lwip/def.h"
+
+int8_t GBTParser::parse(uint8_t *d, DataParserContext &ctx) {
+    GBTHeader* h = (GBTHeader*) (d);
+    uint16_t sequence = ntohs(h->sequence);
+
+    if(h->flag != GBT_TAG) return DATA_PARSE_BOUNDRY_FLAG_MISSING;
+
+    if(sequence == 1) {
+        if(buf == NULL) buf = (uint8_t *)malloc((size_t)1024); // TODO find out from first package ?
+        pos = 0;
+    } else if(lastSequenceNumber != sequence-1) {
+        return DATA_PARSE_FAIL;
+    }
+
+    if(buf == NULL) return DATA_PARSE_FAIL;
+
+    uint8_t* ptr = (uint8_t*) &h[1];
+    memcpy(buf + pos, ptr, h->size);
+    pos += h->size;
+    lastSequenceNumber = sequence;
+
+    if((h->control & 0x80) == 0x00) {
+        return DATA_PARSE_INTERMEDIATE_SEGMENT;
+    } else {
+        memcpy((uint8_t *) d, buf, pos);
+    }
+    ctx.length = pos;
+    return DATA_PARSE_OK;
+
+}

src/ams/GbtParser.h

@@ -0,0 +1,26 @@
+#ifndef _GBTPARSER_H
+#define _GBTPARSER_H
+
+#include "Arduino.h"
+#include "DataParser.h"
+
+#define GBT_TAG 0xE0
+
+typedef struct GBTHeader {
+	uint8_t flag;
+	uint8_t control;
+	uint16_t sequence;
+	uint16_t sequenceAck;
+    uint8_t size;
+} __attribute__((packed)) GBTHeader;
+
+class GBTParser {
+public:
+    int8_t parse(uint8_t *buf, DataParserContext &ctx);
+private:
+    uint8_t lastSequenceNumber = 0;
+    uint16_t pos = 0;
+    uint8_t *buf  = NULL;
+};
+
+#endif

src/ams/GcmParser.cpp

@@ -0,0 +1,131 @@
+#include "GcmParser.h"
+#include "lwip/def.h"
+#if defined(ESP8266)
+#include "bearssl/bearssl.h"
+#elif defined(ESP32)
+#include "mbedtls/gcm.h"
+#endif
+
+GCMParser::GCMParser(uint8_t *encryption_key, uint8_t *authentication_key) {
+    memcpy(this->encryption_key, encryption_key, 16);
+    memcpy(this->authentication_key, authentication_key, 16);
+}
+
+int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
+    if(ctx.length < 12) return DATA_PARSE_INCOMPLETE;
+
+    uint8_t* ptr = (uint8_t*) d;
+    if(*ptr != GCM_TAG) return DATA_PARSE_BOUNDRY_FLAG_MISSING;
+    ptr++;
+    // Encrypted APDU
+    // http://www.weigu.lu/tutorials/sensors2bus/04_encryption/index.html
+
+    uint8_t systemTitleLength = *ptr;
+    ptr++;
+
+    uint8_t initialization_vector[12];
+    memcpy(ctx.system_title, ptr, systemTitleLength);
+    memcpy(initialization_vector, ctx.system_title, systemTitleLength);
+
+    int len = 0;
+    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) {
+        GCMSizeDef* h = (GCMSizeDef*) ptr;
+
+        // 2-byte payload length
+        len = (ntohs(h->format) & 0xFFFF);
+
+        ptr += 3;
+        headersize += 3;
+    }
+    if(len + headersize > ctx.length)
+        return DATA_PARSE_INCOMPLETE;
+
+    //Serial.printf("\nL: %d : %d, %d\n", length, len, headersize);
+
+    uint8_t additional_authenticated_data[17];
+    memcpy(additional_authenticated_data, ptr, 1);
+
+    // Security tag
+    uint8_t sec = *ptr;
+    ptr++;
+    headersize++;
+
+    // Frame counter
+    memcpy(initialization_vector + 8, ptr, 4);
+    ptr += 4;
+    headersize += 4;
+
+    int footersize = 0;
+
+    // Authentication enabled
+    uint8_t authentication_tag[12];
+    uint8_t authkeylen = 0, aadlen = 0;
+    if((sec & 0x10) == 0x10) {
+        authkeylen = 12;
+        aadlen = 17;
+        footersize += authkeylen;
+        memcpy(additional_authenticated_data + 1, authentication_key, 16);
+        memcpy(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, encryption_key, 16);
+        br_gcm_init(&gcmCtx, &bc.vtable, br_ghash_ctmul32);
+        br_gcm_reset(&gcmCtx, initialization_vector, sizeof(initialization_vector));
+        if(authkeylen > 0) {
+            br_gcm_aad_inject(&gcmCtx, 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, authentication_tag, authkeylen) != 1) {
+            return GCM_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, encryption_key, 128);
+        if (0 != success) {
+            return GCM_ENCRYPTION_KEY_FAILED;
+        }
+        if (0 < authkeylen) {
+            success = mbedtls_gcm_auth_decrypt(&m_ctx, sizeof(cipher_text), initialization_vector, sizeof(initialization_vector),
+                additional_authenticated_data, aadlen, authentication_tag, authkeylen,
+                cipher_text, (unsigned char*)(ptr));
+            if (authkeylen > 0 && success == MBEDTLS_ERR_GCM_AUTH_FAILED) {
+                mbedtls_gcm_free(&m_ctx);
+                return GCM_AUTH_FAILED;
+            } else if(success == MBEDTLS_ERR_GCM_BAD_INPUT) {
+                mbedtls_gcm_free(&m_ctx);
+                return GCM_DECRYPT_FAILED;
+            }
+        } else {
+            success = mbedtls_gcm_starts(&m_ctx, MBEDTLS_GCM_DECRYPT, initialization_vector, sizeof(initialization_vector),NULL, 0);
+            if (0 != success) {
+                mbedtls_gcm_free(&m_ctx);
+                return GCM_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 GCM_DECRYPT_FAILED;
+            }
+        }
+        mbedtls_gcm_free(&m_ctx);
+    #endif
+
+    ctx.length -= footersize + headersize;
+    return ptr-d;
+}

src/ams/GcmParser.h

@@ -0,0 +1,27 @@
+#ifndef _GCMPARSER_H
+#define _GCMPARSER_H
+
+#include "Arduino.h"
+#include "DataParser.h"
+
+#define GCM_TAG 0xDB
+#define GCM_AUTH_FAILED -51
+#define GCM_DECRYPT_FAILED -52
+#define GCM_ENCRYPTION_KEY_FAILED -53
+
+typedef struct GCMSizeDef {
+	uint8_t  flag;
+	uint16_t format;
+} __attribute__((packed)) GCMSizeDef;
+
+
+class GCMParser {
+public:
+    GCMParser(uint8_t *encryption_key, uint8_t *authentication_key);
+    int8_t parse(uint8_t *buf, DataParserContext &ctx);
+private:
+    uint8_t encryption_key[16];
+    uint8_t authentication_key[16];
+};
+
+#endif

src/ams/HdlcParser.cpp

@@ -0,0 +1,56 @@
+#include "HdlcParser.h"
+#include "lwip/def.h"
+#include "crc.h"
+
+int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) {
+    int len;
+
+    uint8_t* ptr;
+    if(ctx.length < 3)
+        return DATA_PARSE_INCOMPLETE;
+
+    HDLCHeader* h = (HDLCHeader*) d;
+    ptr = (uint8_t*) &h[1];
+
+    // Frame format type 3
+    if((h->format & 0xF0) == 0xA0) {
+        // Length field (11 lsb of format)
+        len = (ntohs(h->format) & 0x7FF) + 2;
+        if(len > ctx.length)
+            return DATA_PARSE_INCOMPLETE;
+
+        HDLCFooter* f = (HDLCFooter*) (d + len - sizeof *f);
+
+        // First and last byte should be HDLC_FLAG
+        if(h->flag != HDLC_FLAG || f->flag != HDLC_FLAG)
+            return DATA_PARSE_BOUNDRY_FLAG_MISSING;
+
+        // Verify FCS
+        if(ntohs(f->fcs) != crc16_x25(d + 1, len - sizeof *f - 1))
+            return DATA_PARSE_FOOTER_CHECKSUM_ERROR;
+
+        // Skip destination address, LSB marks last byte
+        while(((*ptr) & 0x01) == 0x00) {
+            ptr++;
+        }
+        ptr++;
+
+        // Skip source address, LSB marks last byte
+        while(((*ptr) & 0x01) == 0x00) {
+            ptr++;
+        }
+        ptr++;
+
+        HDLC3CtrlHcs* t3 = (HDLC3CtrlHcs*) (ptr);
+
+        // Verify HCS
+        if(ntohs(t3->hcs) != crc16_x25(d + 1, ptr-d))
+            return DATA_PARSE_HEADER_CHECKSUM_ERROR;
+        ptr += 3;
+
+        // Exclude all of header and 3 byte footer
+        ctx.length -= ptr-d+3;
+        return ptr-d;
+    }
+    return DATA_PARSE_UNKNOWN_DATA;
+}

src/ams/HdlcParser.h

@@ -0,0 +1,29 @@
+#ifndef _HDLCPARSER_H
+#define _HDLCPARSER_H
+
+#include "Arduino.h"
+#include "DataParser.h"
+
+#define HDLC_FLAG 0x7E
+
+typedef struct HDLCHeader {
+	uint8_t  flag;
+	uint16_t format;
+} __attribute__((packed)) HDLCHeader;
+
+typedef struct HDLCFooter {
+	uint16_t fcs;
+	uint8_t flag;
+} __attribute__((packed)) HDLCFooter;
+
+typedef struct HDLC3CtrlHcs {
+    uint8_t control;
+    uint16_t hcs;
+} __attribute__((packed)) HDLC3CtrlHcs;
+
+class HDLCParser {
+public:
+    int8_t parse(uint8_t *buf, DataParserContext &ctx);
+};
+
+#endif

src/ams/LlcParser.cpp

@@ -0,0 +1,6 @@
+#include "LlcParser.h"
+
+int8_t LLCParser::parse(uint8_t *buf, DataParserContext &ctx) {
+    ctx.length -= 3;
+    return 3;
+}

src/ams/LlcParser.h

@@ -0,0 +1,18 @@
+#ifndef _LLCPARSER_H
+#define _LLCPARSER_H
+
+#include "Arduino.h"
+#include "DataParser.h"
+
+typedef struct LLCHeader {
+    uint8_t dst;
+    uint8_t src;
+    uint8_t control;
+} __attribute__((packed)) LLCHeader;
+
+class LLCParser {
+public:
+    int8_t parse(uint8_t *buf, DataParserContext &ctx);
+};
+
+#endif

src/ams/MbusParser.cpp

@@ -0,0 +1,87 @@
+#include "MbusParser.h"
+
+int8_t MBUSParser::parse(uint8_t *d, DataParserContext &ctx) {
+    int len;
+    int headersize = 3;
+    int footersize = 1;
+
+    uint8_t* ptr;
+
+    // https://m-bus.com/documentation-wired/06-application-layer
+    if(ctx.length < 4)
+        return DATA_PARSE_INCOMPLETE;
+
+    MbusHeader* mh = (MbusHeader*) d;
+    if(mh->flag1 != MBUS_START || mh->flag2 != MBUS_START)
+        return DATA_PARSE_BOUNDRY_FLAG_MISSING;
+
+    // First two bytes is 1-byte length value repeated. Only used for last segment
+    if(mh->len1 != mh->len2)
+        return MBUS_FRAME_LENGTH_NOT_EQUAL;
+    len = mh->len1;
+    ptr = (uint8_t*) &mh[1];
+    headersize = 4;
+    footersize = 2;
+
+    if(len == 0x00)
+        len = ctx.length - headersize - footersize;
+    // Payload can max be 255 bytes, so I think the following case is only valid for austrian meters
+    if(len < headersize)
+        len += 256;
+
+    if((headersize + footersize + len) > ctx.length)
+        return DATA_PARSE_INCOMPLETE;
+
+    MbusFooter* mf = (MbusFooter*) (d + len + headersize);
+    if(mf->flag != MBUS_END)
+        return DATA_PARSE_BOUNDRY_FLAG_MISSING;
+    if(checksum(d + headersize, len) != mf->fcs)
+        return DATA_PARSE_FOOTER_CHECKSUM_ERROR;
+
+    ptr += 2; len -= 2;
+
+    // Control information field
+    uint8_t ci = *ptr;
+
+    // Skip CI, STSAP and DTSAP
+    ptr += 3; len -= 3;
+
+    // Bits 7 6 5 4         3 2 1 0
+    //      0 0 0 Finished  Sequence number
+    uint8_t sequenceNumber = (ci & 0x0F);
+    if((ci & 0x10) == 0x00) { // Not finished yet
+        if(sequenceNumber == 0) {
+            if(buf == NULL) buf = (uint8_t *)malloc((size_t)1024); // TODO find out from first package ?
+            pos = 0;
+        } else if(buf == NULL || pos + len > 1024 || sequenceNumber != (lastSequenceNumber + 1)) {
+            return DATA_PARSE_FAIL;
+        }
+        memcpy(buf+pos, ptr, len);
+        pos += len;
+        lastSequenceNumber = sequenceNumber;
+        return DATA_PARSE_INTERMEDIATE_SEGMENT;
+    } else if(sequenceNumber > 0) { // This is the last frame of multiple, assembly needed
+        if(buf == NULL || pos + len > 1024 || sequenceNumber != (lastSequenceNumber + 1)) {
+            return DATA_PARSE_FAIL;
+        }
+        memcpy(buf+pos, ptr, len);
+        pos += len;
+        return DATA_PARSE_FINAL_SEGMENT;
+    }
+    return ptr-d;
+}
+
+uint16_t MBUSParser::write(const uint8_t* d, DataParserContext &ctx) {
+    if(buf != NULL) {
+        memcpy((uint8_t *) d, buf, pos);
+        ctx.length = pos;
+    }
+    return 0;
+}
+
+uint8_t MBUSParser::checksum(const uint8_t* p, int len) {
+    uint8_t ret = 0;
+    while(len--)
+        ret += *p++;
+    return ret;
+}

src/ams/MbusParser.h

@@ -0,0 +1,34 @@
+#ifndef _MBUSPARSER_H
+#define _MBUSPARSER_H
+
+#include "Arduino.h"
+#include "DataParser.h"
+
+#define MBUS_START 0x68
+#define MBUS_END 0x16
+#define MBUS_FRAME_LENGTH_NOT_EQUAL -41
+
+typedef struct MbusHeader {
+	uint8_t flag1;
+	uint8_t len1;
+	uint8_t len2;
+	uint8_t flag2;
+} __attribute__((packed)) MbusHeader;
+
+typedef struct MbusFooter {
+	uint8_t fcs;
+	uint8_t flag;
+} __attribute__((packed)) MbusFooter;
+
+class MBUSParser {
+public:
+    int8_t parse(uint8_t *buf, DataParserContext &ctx);
+	uint16_t write(const uint8_t* d, DataParserContext &ctx);
+private:
+    uint8_t lastSequenceNumber = 0;
+    uint16_t pos = 0;
+    uint8_t *buf  = NULL;
+    uint8_t checksum(const uint8_t* p, int len);
+};
+
+#endif

src/ams/hdlc.cpp

@@ -1,289 +0,0 @@
-#include "Arduino.h"
-#include "hdlc.h"
-#include "crc.h"
-#include "lwip/def.h"
-#if defined(ESP8266)
-#include "bearssl/bearssl.h"
-#elif defined(ESP32)
-#include "mbedtls/gcm.h"
-#endif
-
-void mbus_hexdump(const uint8_t* buf, int len) {
-    printf("\nDUMP (%db) [ ", len); 
-    for(const uint8_t* p = buf; p-buf < len; ++p)
-        printf("%02X ", *p);
-    printf("]\n");
-}
-
-int HDLC_validate(const uint8_t* d, int length, HDLCConfig* config, CosemDateTime* timestamp) {
-    int len;
-    int headersize = 3;
-    int footersize = 1;
-
-    uint8_t flag = *d;
-
-    uint8_t* ptr;
-    if(flag == HDLC_FLAG) {
-        if(length < 3)
-            return HDLC_FRAME_INCOMPLETE;
-
-        HDLCHeader* h = (HDLCHeader*) d;
-        ptr = (uint8_t*) &h[1];
-
-        // Frame format type 3
-        if((h->format & 0xF0) == 0xA0) {
-            // Length field (11 lsb of format)
-            len = (ntohs(h->format) & 0x7FF) + 2;
-            if(len > length)
-                return HDLC_FRAME_INCOMPLETE;
-
-            HDLCFooter* f = (HDLCFooter*) (d + len - sizeof *f);
-            footersize = sizeof *f;
-
-            // First and last byte should be MBUS_HAN_TAG
-            if(h->flag != HDLC_FLAG || f->flag != HDLC_FLAG)
-                return HDLC_BOUNDRY_FLAG_MISSING;
-
-            // Verify FCS
-            if(ntohs(f->fcs) != crc16_x25(d + 1, len - sizeof *f - 1))
-                return HDLC_FCS_ERROR;
-
-            // Skip destination address, LSB marks last byte
-            while(((*ptr) & 0x01) == 0x00) {
-                ptr++;
-                headersize++;
-            }
-            headersize++;
-            ptr++;
-
-            // Skip source address, LSB marks last byte
-            while(((*ptr) & 0x01) == 0x00) {
-                ptr++;
-                headersize++;
-            }
-            headersize++;
-            ptr++;
-
-            HDLC3CtrlHcs* t3 = (HDLC3CtrlHcs*) (ptr);
-            headersize += 3;
-
-            // Verify HCS
-            if(ntohs(t3->hcs) != crc16_x25(d + 1, ptr-d))
-                return HDLC_HCS_ERROR;
-
-            ptr += sizeof *t3;
-
-            // Extract LLC
-            HDLCLLC* llc = (HDLCLLC*) ptr;
-            ptr += sizeof *llc;
-            headersize += sizeof *llc;
-        } else {
-            return HDLC_UNKNOWN_DATA;
-        }
-    } else if(flag == MBUS_START) {
-        // https://m-bus.com/documentation-wired/06-application-layer
-        if(length < 4)
-            return HDLC_FRAME_INCOMPLETE;
-
-        MbusHeader* mh = (MbusHeader*) d;
-        if(mh->flag1 != MBUS_START || mh->flag2 != MBUS_START)
-            return MBUS_BOUNDRY_FLAG_MISSING;
-
-        // First two bytes is 1-byte length value repeated. Only used for last segment
-        if(mh->len1 != mh->len2)
-            return MBUS_FRAME_LENGTH_NOT_EQUAL;
-        len = mh->len1;
-        ptr = (uint8_t*) &mh[1];
-        headersize = 4;
-        footersize = 2;
-
-        if(len == 0x00)
-            len = length - headersize - footersize;
-        // Payload can max be 255 bytes, so I think the following case is only valid for austrian meters
-        if(len < headersize)
-            len += 256;
-
-        if((headersize + footersize + len) > length)
-            return HDLC_FRAME_INCOMPLETE;
-
-        MbusFooter* mf = (MbusFooter*) (d + len + headersize);
-        if(mf->flag != MBUS_END)
-            return MBUS_BOUNDRY_FLAG_MISSING;
-        if(mbusChecksum(d + headersize, len) != mf->fcs)
-            return MBUS_CHECKSUM_ERROR;
-
-        ptr += 2;
-
-        // Control information field
-        uint8_t ci = *ptr;
-
-        // Bits 7 6 5 4         3 2 1 0
-        //      0 0 0 Finished  Sequence number
-        uint8_t sequenceNumber = (ci & 0x0F);
-        if((ci & 0x10) == 0x00) { // Not finished yet
-            return MBUS_FRAME_INTERMEDIATE_SEGMENT;
-        } else if(sequenceNumber > 0) { // This is the last frame of multiple, assembly needed
-            return MBUS_FRAME_LAST_SEGMENT;
-        }
-
-        // Skip CI, STSAP and DTSAP
-        ptr += 3;
-        headersize += 5; // And also control and address that we didn't skip earlier, needed these for checksum.
-    } else {
-        return HDLC_UNKNOWN_DATA;
-    }
-
-    if(((*ptr) & 0xFF) == 0x0F) {
-        // Unencrypted APDU
-        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+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) {
-        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;
-
-        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;
-        }
-        if(len + headersize + footersize > length)
-            return HDLC_FRAME_INCOMPLETE;
-
-        //Serial.printf("\nL: %d : %d, %d : %d\n", length, len, headersize, footersize);
-
-        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);
-        }
-
-        #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;
-            }
-            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) {
-                return HDLC_ENCRYPTION_AUTH_FAILED;
-            } else if(success == MBEDTLS_ERR_GCM_BAD_INPUT) {
-                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, 13);
-            ptr += 13;
-        } else {
-            return HDLC_TIMESTAMP_UNKNOWN;
-        }
-
-        return ptr-d;
-    }    
-
-    // Unknown payload
-	return HDLC_UNKNOWN_DATA;
-}
-
-uint8_t mbusChecksum(const uint8_t* p, int len) {
-    uint8_t ret = 0;
-    while(len--)
-        ret += *p++;
-    return ret;
-}

src/ams/hdlc.h

@@ -1,143 +0,0 @@
-#ifndef _HDLC_H
-#define _HDLC_H
-
-#include "Arduino.h"
-#include <stdint.h>
-
-#define HDLC_FLAG 0x7E
-#define HDLC_BOUNDRY_FLAG_MISSING -1
-#define HDLC_FCS_ERROR -2
-#define HDLC_HCS_ERROR -3
-#define HDLC_FRAME_INCOMPLETE -4
-#define HDLC_UNKNOWN_DATA -9
-#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_TIMESTAMP_UNKNOWN -99
-
-#define MBUS_START 0x68
-#define MBUS_END 0x16
-#define MBUS_BOUNDRY_FLAG_MISSING -1
-#define MBUS_FRAME_LENGTH_NOT_EQUAL -40
-#define MBUS_FRAME_INTERMEDIATE_SEGMENT -41
-#define MBUS_FRAME_LAST_SEGMENT -42
-#define MBUS_CHECKSUM_ERROR -2
-
-struct HDLCConfig {
-    uint8_t encryption_key[32];
-	uint8_t authentication_key[32];
-	uint8_t system_title[8];
-	uint8_t initialization_vector[12];
-    uint8_t additional_authenticated_data[17];
-    uint8_t authentication_tag[12];
-};
-
-typedef struct HDLCHeader {
-	uint8_t  flag;
-	uint16_t format;
-} __attribute__((packed)) HDLCHeader;
-
-typedef struct HDLCFooter {
-	uint16_t fcs;
-	uint8_t flag;
-} __attribute__((packed)) HDLCFooter;
-
-typedef struct HDLC3CtrlHcs {
-    uint8_t control;
-    uint16_t hcs;
-} __attribute__((packed)) HDLC3CtrlHcs;
-
-typedef struct HDLCLLC {
-    uint8_t dst;
-    uint8_t src;
-    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;
-	uint8_t len2;
-	uint8_t flag2;
-} __attribute__((packed)) MbusHeader;
-
-typedef struct MbusFooter {
-	uint8_t fcs;
-	uint8_t flag;
-} __attribute__((packed)) MbusFooter;
-
-
-// Blue book, Table 2
-enum CosemType {
-    CosemTypeNull = 0x00,
-    CosemTypeArray = 0x01,
-    CosemTypeStructure = 0x02,
-    CosemTypeOctetString = 0x09,
-    CosemTypeString = 0x0A,
-    CosemTypeDLongUnsigned = 0x06,
-    CosemTypeLongSigned = 0x10,
-    CosemTypeLongUnsigned = 0x12,
-    CosemTypeDateTime = 0x19
-};
-
-struct CosemBasic {
-    uint8_t type;
-    uint8_t length;
-} __attribute__((packed));
-
-struct CosemString {
-    uint8_t type;
-    uint8_t length;
-    uint8_t data[];
-} __attribute__((packed));
-
-struct CosemLongUnsigned {
-    uint8_t type;
-    uint16_t data;
-} __attribute__((packed));
-
-struct CosemDLongUnsigned {
-    uint8_t type;
-    uint32_t data;
-} __attribute__((packed));
-
-struct CosemLongSigned {
-    uint8_t type;
-	int16_t data;
-} __attribute__((packed));
-
-struct CosemDateTime {
-    uint8_t type;
-    uint16_t year;
-    uint8_t month;
-    uint8_t dayOfMonth;
-    uint8_t dayOfWeek;
-    uint8_t hour;
-    uint8_t minute;
-    uint8_t second;
-    uint8_t hundredths;
-    int16_t deviation;
-    uint8_t status;
-} __attribute__((packed));
-
-typedef union {
-    struct CosemBasic base;
-	struct CosemString str;
-	struct CosemString oct;
-	struct CosemLongUnsigned lu;
-    struct CosemDLongUnsigned dlu;
-    struct CosemLongSigned ls;
-    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);
-
-uint8_t mbusChecksum(const uint8_t* p, int len);
-
-#endif

src/ams/ntohll.cpp

@@ -0,0 +1,5 @@
+#include "ntohll.h"
+
+uint64_t ntohll(uint64_t x) {
+    return (((uint64_t)ntohl((uint32_t)x)) << 32) + ntohl(x >> 32);
+}

src/ams/ntohll.h

@@ -0,0 +1,8 @@
+#ifndef _NTOHLL_H
+#define _NTOHLL_H
+
+#include "lwip/def.h"
+
+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;
@@ -23,20 +22,21 @@ void DnbCurrParser::flush() {
 }
 
 size_t DnbCurrParser::write(const uint8_t *buffer, size_t size) {
-    for(int i = 0; i < size; i++) {
+    for(size_t i = 0; i < size; i++) {
         write(buffer[i]);
     }
     return 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/EntsoeA44Parser.cpp

@@ -5,6 +5,10 @@ EntsoeA44Parser::EntsoeA44Parser() {
     for(int i = 0; i < 24; i++) points[i] = ENTSOE_NO_VALUE;
 }
 
+EntsoeA44Parser::~EntsoeA44Parser() {
+
+}
+
 char* EntsoeA44Parser::getCurrency() {
     return currency;
 }
@@ -35,7 +39,7 @@ void EntsoeA44Parser::flush() {
 }
 
 size_t EntsoeA44Parser::write(const uint8_t *buffer, size_t size) {
-    for(int i = 0; i < size; i++) {
+    for(size_t i = 0; i < size; i++) {
         write(buffer[i]);
     }
     return size;

src/entsoe/EntsoeA44Parser.h

@@ -14,6 +14,7 @@
 class EntsoeA44Parser: public Stream {
 public:
     EntsoeA44Parser();
+    virtual ~EntsoeA44Parser();
 
     char* getCurrency();
     char* getMeasurementUnit();

src/entsoe/EntsoeApi.cpp

@@ -3,6 +3,7 @@
 #include "Uptime.h"
 #include "TimeLib.h"
 #include "DnbCurrParser.h"
+#include "version.h"
 
 #if defined(ESP32)
 #include <esp_task_wdt.h>
@@ -13,10 +14,6 @@ EntsoeApi::EntsoeApi(RemoteDebug* Debug) {
 
     debugger = Debug;
 
-    client.setInsecure();
-    https.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-    https.setTimeout(50000);
-
     // Entso-E uses CET/CEST
     TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120};
 	TimeChangeRule CET = {"CET ", Last, Sun, Oct, 3, 60};
@@ -30,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() {
@@ -41,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);
@@ -61,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;
@@ -73,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;
@@ -92,40 +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);
+        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 %llu\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 %lld\n", t);
+        if(today != NULL) delete today;
+        if(tomorrow != NULL) {
+            today = tomorrow;
+            tomorrow = NULL;
         }
-    } else if(now > midnightMillis) {
-        time_t t = time(nullptr);
-        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Rotating price objects at %lu\n", t);
-        delete today;
-        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);
 
             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)
@@ -155,16 +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);
 
             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)
@@ -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,7 +245,7 @@ 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;
         
         DnbCurrParser p;

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;
@@ -48,7 +46,7 @@ private:
     static const uint16_t BufferSize = 256;
     char* buf;
 
-    float currencyMultiplier = ENTSOE_DEFAULT_MULTIPLIER;
+    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,27 @@
 #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 ~AmsMqttHandler() {};
 
-    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*);
+    virtual bool publishSystem(HwTools*, EntsoeApi*, EnergyAccounting*);
 
 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) {
@@ -71,6 +71,6 @@ bool DomoticzMqttHandler::publishPrices(EntsoeApi* eapi) {
     return false;
 }
 
-bool DomoticzMqttHandler::publishSystem(HwTools* hw) {
+bool DomoticzMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
     return false;
 }

src/mqtt/DomoticzMqttHandler.h

@@ -6,21 +6,17 @@
 
 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;
-        this->json = (char*) malloc(BufferSize);
     };
-    bool publish(AmsData* data, AmsData* previousState);
+    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
     bool publishTemperatures(AmsConfiguration*, HwTools*);
     bool publishPrices(EntsoeApi*);
-    bool publishSystem(HwTools*);
-
-    static const uint16_t BufferSize = 192;
+    bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);
 
 private:
     DomoticzConfig config;
     int energy = 0.0;
-    char* json;
 };
 
 #endif

src/mqtt/HomeAssistantMqttHandler.cpp

@@ -0,0 +1,313 @@
+#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/ha4_json.h"
+#include "web/root/jsonsys_json.h"
+#include "web/root/jsonprices_json.h"
+#include "web/root/hadiscover_json.h"
+#include "web/root/realtime_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);
+        mqtt->loop();
+    }
+    String meterModel = data->getMeterModel();
+    meterModel.replace("\\", "\\\\");
+    if(data->getListType() == 1) { // publish power counts
+        snprintf_P(json, BufferSize, HA1_JSON,
+            data->getActiveImportPower()
+        );
+        mqtt->publish(topic + "/power", json);
+    } else if(data->getListType() <= 3) { // 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()
+        );
+        mqtt->publish(topic + "/power", json);
+    } else if(data->getListType() == 4) { // publish power counts and volts/amps/phase power and PF
+        snprintf_P(json, BufferSize, HA4_JSON,
+            data->getListId().c_str(),
+            data->getMeterId().c_str(),
+            meterModel.c_str(),
+            data->getActiveImportPower(),
+            data->getL1ActiveImportPower(),
+            data->getL2ActiveImportPower(),
+            data->getL3ActiveImportPower(),
+            data->getReactiveImportPower(),
+            data->getActiveExportPower(),
+            data->getL1ActiveExportPower(),
+            data->getL2ActiveExportPower(),
+            data->getL3ActiveExportPower(),
+            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()
+        );
+        mqtt->publish(topic + "/power", json);
+    }
+
+	String peaks = "";
+    uint8_t peakCount = ea->getConfig()->hours;
+    if(peakCount > 5) peakCount = 5;
+	for(uint8_t i = 1; i <= peakCount; i++) {
+		if(!peaks.isEmpty()) peaks += ",";
+		peaks += String(ea->getPeak(i), 2);
+	}
+    snprintf_P(json, BufferSize, REALTIME_JSON,
+		ea->getMonthMax(),
+		peaks.c_str(),
+		ea->getCurrentThreshold(),
+		ea->getUseThisHour(),
+		ea->getCostThisHour(),
+		ea->getProducedThisHour(),
+		ea->getUseToday(),
+		ea->getCostToday(),
+		ea->getProducedToday(),
+		ea->getUseThisMonth(),
+		ea->getCostThisMonth(),
+		ea->getProducedThisMonth()
+    );
+    mqtt->publish(topic + "/realtime", json);
+
+    return true;
+}
+
+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 = 0.0, min3hr = 0.0, min6hr = 0.0;
+	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[24];
+	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[24];
+	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[24];
+	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, true, 0);
+}
+
+bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
+	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(),
+            VERSION
+        );
+        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("-", "_");
+        uint8_t peakCount = ea->getConfig()->hours;
+        if(peakCount > 5) peakCount = 5;
+
+        uint8_t peaks = 0;
+        for(int i=0;i<HA_SENSOR_COUNT;i++) {
+            HomeAssistantSensor sensor = HA_SENSORS[i];
+            String uid = String(sensor.path);
+            uid.replace(".", "");
+            uid.replace("[", "");
+            uid.replace("]", "");
+            uid.replace("'", "");
+            String uom = String(sensor.uom);
+            if(strncmp(sensor.devcl, "monetary", 8) == 0) {
+                if(eapi == NULL) continue;
+                uom = String(eapi->getCurrency());
+            }
+            if(strncmp(sensor.path, "peaks[", 6) == 0) {
+                if(peaks >= peakCount) continue;
+                peaks++;
+            }
+            snprintf_P(json, BufferSize, HADISCOVER_JSON,
+                sensor.name,
+                topic.c_str(), sensor.topic,
+                haUID.c_str(), uid.c_str(),
+                haUID.c_str(), uid.c_str(),
+                uom.c_str(),
+                sensor.path,
+                sensor.devcl,
+                haUID.c_str(),
+                haName.c_str(),
+                haModel.c_str(),
+                VERSION,
+                haManuf.c_str(),
+                haUrl.c_str(),
+                strlen_P(sensor.stacl) > 0 ? ", \"stat_cla\" :" : "",
+                strlen_P(sensor.stacl) > 0 ? (char *) FPSTR(sensor.stacl) : ""
+            );
+            mqtt->publish(haTopic + haUID + "_" + uid.c_str() + "/config", json, true, 0);
+        }
+
+        autodiscoverInit = true;
+    }
+    if(listType>0) sequence++;
+    return true;
+}