Skip to content

Commit

Permalink
Screenshots relocated
Browse files Browse the repository at this point in the history
  • Loading branch information
dennissiemensma committed Nov 7, 2020
1 parent 69d2df4 commit 3f16c99
Show file tree
Hide file tree
Showing 38 changed files with 52 additions and 52 deletions.
8 changes: 4 additions & 4 deletions docs/admin/backup_dropbox.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ Admin: Backup & Dropbox

The application backs up your data daily. You can change the time the backup will be created every day.

.. image:: ../_static/screenshots/v4.7/admin/backupsettings.png
:target: ../_static/screenshots/v4.7/admin/backupsettings.png
.. image:: ../_static/screenshots/v4/admin/backupsettings.png
:target: ../_static/screenshots/v4/admin/backupsettings.png
:alt: Backup

You can use your Dropbox-account to make sure your backups are safely stored in your account.

.. image:: ../_static/screenshots/v4.7/admin/dropboxsettings.png
:target: ../_static/screenshots/v4.7/admin/dropboxsettings.png
.. image:: ../_static/screenshots/v4/admin/dropboxsettings.png
:target: ../_static/screenshots/v4/admin/dropboxsettings.png
:alt: Dropbox

Make sure you have a Dropbox-account or sign up for one.
Expand Down
4 changes: 2 additions & 2 deletions docs/admin/email.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ Alternatively you can use GMail, but then both the sender and receiver will be t

To do so, use host ``aspmx.l.google.com``, port ``25``, ``Use TLS`` and leave the username and password **blank**.

.. image:: ../_static/screenshots/v4.7/admin/emailsettings.png
:target: ../_static/screenshots/v4.7/admin/emailsettings.png
.. image:: ../_static/screenshots/v4/admin/emailsettings.png
:target: ../_static/screenshots/v4/admin/emailsettings.png
:alt: Email settings
4 changes: 2 additions & 2 deletions docs/admin/email_backup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Before enabling this, make sure you've configured email settings as well, as the
:doc:`Go to email settings here.<email>`


.. image:: ../_static/screenshots/v4.7/admin/emailbackupsettings.png
:target: ../_static/screenshots/v4.7/admin/emailbackupsettings.png
.. image:: ../_static/screenshots/v4/admin/emailbackupsettings.png
:target: ../_static/screenshots/v4/admin/emailbackupsettings.png
:alt: Email backup settings
4 changes: 2 additions & 2 deletions docs/admin/mindergas.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Admin: MinderGas.nl

Link your MinderGas.nl-account to have DSMR-reader upload your gas meter position daily.

.. image:: ../_static/screenshots/v4.7/admin/mindergassettings.png
:target: ../_static/screenshots/v4.7/admin/mindergassettings.png
.. image:: ../_static/screenshots/v4/admin/mindergassettings.png
:target: ../_static/screenshots/v4/admin/mindergassettings.png
:alt: MinderGas


Expand Down
28 changes: 14 additions & 14 deletions docs/admin/mqtt.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ There are options for using different ports, SSL, authentication and even the Qu
More information about MQTT QoS `can be found here <https://www.hivemq.com/blog/mqtt-essentials-part-6-mqtt-quality-of-service-levels>`_.


.. image:: ../_static/screenshots/v4.7/admin/mqttbrokersettings.png
:target: ../_static/screenshots/v4.7/admin/mqttbrokersettings.png
.. image:: ../_static/screenshots/v4/admin/mqttbrokersettings.png
:target: ../_static/screenshots/v4/admin/mqttbrokersettings.png
:alt: MQTT Broker

There are multiple configurations available for sending MQTT messages to your broker.
Expand All @@ -21,42 +21,42 @@ Day totals

This allows you to receive the day totals in JSON format:

.. image:: ../_static/screenshots/v4.7/admin/jsondaytotalsmqttsettings.png
:target: ../_static/screenshots/v4.7/admin/jsondaytotalsmqttsettings.png
.. image:: ../_static/screenshots/v4/admin/jsondaytotalsmqttsettings.png
:target: ../_static/screenshots/v4/admin/jsondaytotalsmqttsettings.png
:alt: MQTT JSON day Totals

The same data, but splitted among topics. This allows you to post a single piece of data on a separate topic:

.. image:: ../_static/screenshots/v4.7/admin/splittopicdaytotalsmqttsettings.png
:target: ../_static/screenshots/v4.7/admin/splittopicdaytotalsmqttsettings.png
.. image:: ../_static/screenshots/v4/admin/splittopicdaytotalsmqttsettings.png
:target: ../_static/screenshots/v4/admin/splittopicdaytotalsmqttsettings.png
:alt: MQTT Split Topic Day Totals

Meter statistics
----------------

Statistics of your meter, splitted among topics:

.. image:: ../_static/screenshots/v4.7/admin/splittopicmeterstatisticsmqttsettings.png
:target: ../_static/screenshots/v4.7/admin/splittopicmeterstatisticsmqttsettings.png
.. image:: ../_static/screenshots/v4/admin/splittopicmeterstatisticsmqttsettings.png
:target: ../_static/screenshots/v4/admin/splittopicmeterstatisticsmqttsettings.png
:alt: MQTT Split Topic Meter Statistics

Telegram
--------

Telegram in JSON format:

.. image:: ../_static/screenshots/v4.7/admin/jsontelegrammqttsettings.png
:target: ../_static/screenshots/v4.7/admin/jsontelegrammqttsettings.png
.. image:: ../_static/screenshots/v4/admin/jsontelegrammqttsettings.png
:target: ../_static/screenshots/v4/admin/jsontelegrammqttsettings.png
:alt: MQTT JSON Telegram

Or splitted among topics:

.. image:: ../_static/screenshots/v4.7/admin/splittopictelegrammqttsettings.png
:target: ../_static/screenshots/v4.7/admin/splittopictelegrammqttsettings.png
.. image:: ../_static/screenshots/v4/admin/splittopictelegrammqttsettings.png
:target: ../_static/screenshots/v4/admin/splittopictelegrammqttsettings.png
:alt: MQTT Split Topic Telegram

Or in raw DSMR protocol format (when available):

.. image:: ../_static/screenshots/v4.7/admin/rawtelegrammqttsettings.png
:target: ../_static/screenshots/v4.7/admin/rawtelegrammqttsettings.png
.. image:: ../_static/screenshots/v4/admin/rawtelegrammqttsettings.png
:target: ../_static/screenshots/v4/admin/rawtelegrammqttsettings.png
:alt: MQTT Raw Telegram
4 changes: 2 additions & 2 deletions docs/admin/notifications.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Admin: Notifications

Notifications on your phone using Prowl, Pushover or Telegram.

.. image:: ../_static/screenshots/v4.7/admin/notificationsetting.png
:target: ../_static/screenshots/v4.7/admin/notificationsetting.png
.. image:: ../_static/screenshots/v4/admin/notificationsetting.png
:target: ../_static/screenshots/v4/admin/notificationsetting.png
:alt: Notifications

Currently, two mobile platforms are supported: Android and iOS.
Expand Down
4 changes: 2 additions & 2 deletions docs/admin/pvoutput.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Now navigate to another settings page in DSMR-reader: "PVOutput: "Add Status" co
* Optionally, you can choose to enter a **processing delay in minutes** for PVOutput. Please note that PVOutput will only allow this when you have a **"Donation" account** on their website. If you do not have one, they will reject each API call you make, until you disable (clear) this option in DSMR-reader.


.. image:: ../_static/screenshots/v4.7/admin/pvoutputaddstatussettings.png
:target: ../_static/screenshots/v4.7/admin/pvoutputaddstatussettings.png
.. image:: ../_static/screenshots/v4/admin/pvoutputaddstatussettings.png
:target: ../_static/screenshots/v4/admin/pvoutputaddstatussettings.png
:alt: PVOutput Add Status

If you configured everything correctly, you should see some addional data in PVOutput listed under "Your Outputs" momentarily.
4 changes: 2 additions & 2 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Enable API

The API is disabled by default in the application. You may enable it :doc:`in the configuration<configuration>`.

.. image:: _static/screenshots/v4.7/admin/apisettings.png
:target: _static/screenshots/v4.7/admin/apisettings.png
.. image:: _static/screenshots/v4/admin/apisettings.png
:target: _static/screenshots/v4/admin/apisettings.png
:alt: API admin settings

API key
Expand Down
4 changes: 2 additions & 2 deletions docs/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ You can type any topic or setting you're searching for, as it should pop up with
Or you can just skip it this page and continue directly to the admin panel.


.. image:: _static/screenshots/v4.7/frontend/configuration.png
:target: _static/screenshots/v4.7/frontend/configuration.png
.. image:: _static/screenshots/v4/frontend/configuration.png
:target: _static/screenshots/v4/frontend/configuration.png
:alt: Configuration
40 changes: 20 additions & 20 deletions docs/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ The graphs can be zoomed and display data up to the last 24 hours.
If your meter supports it, you can also see your gas consumption and electricity returned.


.. image:: _static/screenshots/v4.7/frontend/dashboard.png
:target: _static/screenshots/v4.7/frontend/dashboard.png
.. image:: _static/screenshots/v4/frontend/dashboard.png
:target: _static/screenshots/v4/frontend/dashboard.png
:alt: Dashboard


Expand All @@ -89,8 +89,8 @@ Live graphs
The live graphs plots the most recent data available, depending on the capabilities of your smart meter.


.. image:: _static/screenshots/v4.7/frontend/live.png
:target: _static/screenshots/v4.7/frontend/live.png
.. image:: _static/screenshots/v4/frontend/live.png
:target: _static/screenshots/v4/frontend/live.png
:alt: Live graphs


Expand All @@ -101,8 +101,8 @@ The archive allows you to scroll through all historisch data captured by the app
All data can be viewed on different levels: by day, by month and by year.


.. image:: _static/screenshots/v4.7/frontend/archive.png
:target: _static/screenshots/v4.7/frontend/archive.png
.. image:: _static/screenshots/v4/frontend/archive.png
:target: _static/screenshots/v4/frontend/archive.png
:alt: Archive


Expand All @@ -112,8 +112,8 @@ Compare
This page allows you to simply compare two days, months or years with each other.
It will also display the difference between each other as a percentage.

.. image:: _static/screenshots/v4.7/frontend/compare.png
:target: _static/screenshots/v4.7/frontend/compare.png
.. image:: _static/screenshots/v4/frontend/compare.png
:target: _static/screenshots/v4/frontend/compare.png
:alt: Compare


Expand All @@ -122,8 +122,8 @@ Trends

This page displays a summary of your average daily consumption and habits.

.. image:: _static/screenshots/v4.7/frontend/trends.png
:target: _static/screenshots/v4.7/frontend/trends.png
.. image:: _static/screenshots/v4/frontend/trends.png
:target: _static/screenshots/v4/frontend/trends.png
:alt: Trends


Expand All @@ -133,8 +133,8 @@ Statistics
This page displays your meter positions and statistics provided by the DSMR protocol.
You can also find the number of readings stored and any excesses regarding consumption.

.. image:: _static/screenshots/v4.7/frontend/statistics.png
:target: _static/screenshots/v4.7/frontend/statistics.png
.. image:: _static/screenshots/v4/frontend/statistics.png
:target: _static/screenshots/v4/frontend/statistics.png
:alt: Statistics


Expand All @@ -143,8 +143,8 @@ Energy contracts

Summary of all your contracts and the amount of energy consumed/generated.

.. image:: _static/screenshots/v4.7/frontend/energy-contracts.png
:target: _static/screenshots/v4.7/frontend/energy-contracts.png
.. image:: _static/screenshots/v4/frontend/energy-contracts.png
:target: _static/screenshots/v4/frontend/energy-contracts.png
:alt: Energy contracts


Expand All @@ -153,8 +153,8 @@ Export

This pages allows you to export all day or hour statistics to CSV.

.. image:: _static/screenshots/v4.7/frontend/export.png
:target: _static/screenshots/v4.7/frontend/export.png
.. image:: _static/screenshots/v4/frontend/export.png
:target: _static/screenshots/v4/frontend/export.png
:alt: Export


Expand All @@ -165,8 +165,8 @@ Shows the 'health' of the application and provides a lot of background informati

You can also easily check for DSMR-reader updates here.

.. image:: _static/screenshots/v4.7/frontend/about.png
:target: _static/screenshots/v4.7/frontend/about.png
.. image:: _static/screenshots/v4/frontend/about.png
:target: _static/screenshots/v4/frontend/about.png
:alt: Status


Expand All @@ -179,6 +179,6 @@ You can type any topic or setting you're searching for, as it should pop up with
Or you can just skip it this page and continue directly to the admin panel.


.. image:: _static/screenshots/v4.7/frontend/configuration.png
:target: _static/screenshots/v4.7/frontend/configuration.png
.. image:: _static/screenshots/v4/frontend/configuration.png
:target: _static/screenshots/v4/frontend/configuration.png
:alt: Configuration

0 comments on commit 3f16c99

Please sign in to comment.