diff --git a/doc/source/source_rst/software/api.rst b/doc/source/source_rst/software/api.rst
index e20d1d5230157179e8e6d1b616d990fd06d04101..0eb77bbb5620f8148a42b46ae2561a90df3676be 100644
--- a/doc/source/source_rst/software/api.rst
+++ b/doc/source/source_rst/software/api.rst
@@ -7,6 +7,5 @@ API reference
.. automodule:: ohmpi.ohmpi
:members:
-
.. automodule:: ohmpi.hardware_system
:members:
diff --git a/doc/source/source_rst/software/config.rst b/doc/source/source_rst/software/config.rst
new file mode 100644
index 0000000000000000000000000000000000000000..de28fc86dec093a0cb0f5176fbc5e706a312a7ca
--- /dev/null
+++ b/doc/source/source_rst/software/config.rst
@@ -0,0 +1,38 @@
+Configuration
+*************
+
+The configuration of the OhmPi file `config.py` allows to configure the OhmPi.
+A default version of `config.py` is provided in the repository.
+This file should be edited to customize the configuration following the user's needs and preferences.
+A series of default configuration files are available in the configs folder. A simple helper command can help you select the appropriate configuration file depending on your version of the meausurement board and type of MUX boards.
+The helper will ask you a few questions and will select the right configuration for your case. It can be called in via the terminal as
+.. code-block:: bash
+
+ $ python setup_config.py
+
+Still, is best practice to open the configuration file and check that the parameters are correctly configured.
+Updating the configuration file manually is mandatory for custom systems combining different versions of the measurement and MUX boards.
+
+The configuration is written in a python file structured in a series of dictionnaries related to:
+1. OHMPI_CONFIG: the OhmPi instrument information (id of the instrument and default settings)
+2. HARDWARE_CONFIG: the hardware system in which the five different modules 'ctl' (controller), 'tx' (transmitter), 'rx' (receiver), 'mux' (multiplexers), 'pwr' (power).
+3. the logging dictionnaries divided in:
+ - EXEC_LOGGING_CONFIG
+ - DATA_LOGGING_CONFIG
+ - SOH_LOGGING_CONFIG
+4. the MQTT dictionnaries divided in:
+ - MQTT_LOGGING_CONFIG
+ - MQTT_CONTROL_CONFIG
+
+.. toctree::
+ :maxdepth: 2
+ :caption: Contents:
+
+.. automodule:: configs.config_default
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
+One should make sure to understand the parameters before altering them. It is also recommended to keep a copy of the default configuration.
+
diff --git a/doc/source/source_rst/software/interfaces.rst b/doc/source/source_rst/software/interfaces.rst
new file mode 100644
index 0000000000000000000000000000000000000000..f20addbf179dd6f9bd0c33740d4f826de402b23d
--- /dev/null
+++ b/doc/source/source_rst/software/interfaces.rst
@@ -0,0 +1,193 @@
+Interfaces
+**********
+
+Different interfaces can be used to interact with the OhmPi.
+
+Available interfaces are:
+- `Web interface`_ (=HTTP interface): run in bash: `bash run_http_interface.sh`
+- Python API: import the OhmPi class from Python script: `from ohmpi import OhmPi` (see `Python interface`_)
+- MQTT: IoT messaging through a broker (see `MQTT interface`_)
+
+
+Web interface
+=============
+
+This is a user friendly graphical interface for new users as well as running quick and easy acquisitions.
+
+The Raspberry Pi of the OhmPi is used as a Wi-Fi Access Point (AP) and runs
+a small webserver to serve the 'index.html' interface. Using a laptop or
+a mobile phone connected to the Wi-Fi of the Raspberry Pi, one can see this
+interface, upload sequences, change parameters, run a sequence and download data.
+
+To configure the Raspberry Pi to act as an access point and run
+the webserver automatically on start, see instructions on `raspap.com <https://raspap.com/>`_ and in 'runOnStart.sh'.
+
+Once configured, the webserver should start by itself on start and once
+connected to the Pi, the user can go to `10.3.141.1:8080 <http://10.3.141.1:8080>`_
+to access the interface.
+
+.. figure:: ../../img/http-interface-pseudo-section.png
+
+ Web interface with its interactive pseudo-section.
+
+
+.. figure:: ../../img/http-interface-evolution.png
+
+ Evolution of quadrupole apparent resistivity with time.
+
+
+.. figure:: ../../img/http-interface-rs.png
+
+ Contact resistance check.
+
+
+Python interface
+================
+
+This interface offers a more direct access to the software components, specifically suited for testing or automating acquisition.
+
+By importing the `OhmPi` class from the ohmpi.py, we can control the OhmPi instrument via a Python script or interactively with IPython.
+It involves using the terminal or a Python IDE such as Thonny on the Raspberry Pi. A connection can also be established via
+SSH (see PuTTY on Windows or ssh command on macOS/Linux).
+
+To access the Python API, make sure that the PYTHONPATH has been correctly configured to export the location of the ohmpi module.
+
+.. code-block:: python
+ :caption: Example of using the Python API to control OhmPi
+
+ from ohmpi.ohmpi import OhmPi
+
+ ### Define object from class OhmPi
+ k = OhmPi() # this loads default parameters from the disk
+
+ ### Default parameters can also be edited manually
+ k.settings['injection_duration'] = 0.5 # injection time in seconds
+ k.settings['nb_stack'] = 1 # one stack is two half-cycles
+ k.settings['nbr_meas'] = 1 # number of time the sequence is repeated
+
+ ### Update settings if needed
+ k.update_settings({"injection_duration":0.2})
+
+ ### Set or load sequence
+ k.sequence = np.array([[1,2,3,4]]) # set numpy array of shape (n,4)
+ # k.set_sequence('1 2 3 4\n2 3 4 5') # call function set_sequence and pass a string
+ # k.load_sequence('ABMN.txt') # load sequence from a local file
+
+ ### Run contact resistance check
+ k.rs_check()
+
+ ### Run sequence (synchronously - it will wait that all
+ # sequence is measured before returning the prompt
+ k.run_sequence()
+ # k.run_sequence_async() # sequence is run in a separate thread and the prompt returns immediately
+ # time.sleep(2)
+ # k.interrupt() # kill the asynchron sequence
+
+ ### Run multiple sequences at given time interval
+ k.settings['nb_meas'] = 3 # run sequence three times
+ k.settings['sequence_delay'] = 100 # every 100 s
+ k.run_multiple_sequences() # asynchron
+ # k.interrupt() # kill the asynchron sequence
+
+ ### Single measurement can also be taken with
+ quadrupole = [1, 4, 2, 3]
+ k.run_measurement(quadrupole) # use default acquisition parameters
+
+ ### Custom or adaptative argument, see help(k.run_measurement)
+ k.run_measurement(quadrupole,
+ nb_stack=4, # do 4 stacks (8 half-cycles)
+ injection_duration=1, # inject for 2 seconds
+ duty_cycle = 0.5) # duty_cycle is
+
+For detailed usage, please see the Python API or look at the examples.
+
+IoT interface
+=============
+
+This is an interface designed for an advanced remote usage of the OhmPi such as remote automation, data consumption by multiple processes and interaction with other sensors in the scope of a monitoring. It is based on the MQTT protocol, designed for the Internet of Things (IoT), to interact with the OhmPi.
+
+This option allows interacting remotely with a single OhmPi, a network of OhmPis, as well as auxiliary instruments and sensors. The communication is based on a publish/subscribe approach and involves a MQTT broker.
+
+An example of MQTT broker that can be used is `Mosquitto <https://mosquitto.org/>`_. Depending on the monitoring needs, an MQTT broker can be set up locally on the Raspberry Pi, on a local network or any remote server reachable through the net. A local Mosquitto broker can be set up and enabled to run as a service on the OhmPi using the bash script install_local_mqtt_broker.sh.
+
+MQTT messages include logging messages from the OhmPi and commands sent to the OhmPi. These messages can be examined easily using a third party software such as `MQTT Explorer <http://mqtt-explorer.com/>`_.
+
+Commands sent on the broker are received by the ohmpi.py script that runs on the OhmPi (make sure ohmpi.py starts on reboot) and further processed.
+MQTT commands are sent in JSON format following the Python API with kwargs as illustrated below:
+
+.. code-block:: json
+ :caption: Updating acquisition settings.
+
+ {
+ "cmd_id": "3fzxv121UITwGjWYgcz4xw",
+ "cmd": "update_settings", Depending on the experiment needs, MQTT brokers can be set up locally on the Raspberry Pi or on a local or remote server.
+ "kwargs": {
+ "config": {
+ "nb_meas": 2,
+ "nb_electrodes": 10,
+ "nb_stack": 2,
+ "injection_duration": 2,
+ "sequence_delay": 100
+ }
+ }
+ }
+
+
+.. code-block:: json
+ :caption: Check contact resistances
+
+ {
+ "cmd_id": "3fzxv121UITwGjWYgcz4xw",
+ "cmd": "rs_check",
+ }
+
+.. code-block:: json
+ :caption: Running a sequence.
+
+ {
+ "cmd_id": "3fzxv121UITwGjWYgcz4Yw",
+ "cmd": "run_sequence",
+ }
+
+.. code-block:: json
+ :caption: Running same sequence multiple times (nb_meas).
+
+ {
+ "cmd_id": "3fzxv121UITwGjWYgcz4Yw",
+ "cmd": "run_multiple_sequences",
+ }
+
+.. code-block:: json
+ :caption: Interrupt current acquisition.
+
+ {
+ "cmd_id": "3fzxv121UITwGjWYgcz4xw",
+ "cmd": "interrupt",
+ }
+
+Custom processing of messages and tailor-made dashboards for monitoring experiments may be designed using a browser-based flow editor such as `Node-red <http://mqtt-explorer.com/>`_.
+This may help designing complex IoT experiments and monitoring systems in which OhmPi is a component.
+
+Examples incorporating execution commands and data outputs from OhmPi can be found in the OhmPi examples. Once Node-RED is installed on the OhmPi, these examples can be accessed separately by running a command in the console such as :
+
+.. code-block:: console
+
+ node-red basic_ohmpi_flows_node-red.json
+
+These examples may require installing some additional node packages in order to work properly. This can be done in the `Palette Manager <https://nodered.org/docs/user-guide/editor/palette/manager>`_ within Node-RED.
+
+.. figure:: ../../img/node-red_flow.png
+
+ Example flow in node-red to interact with an OhmPi.
+
+
+.. figure:: ../../img/node-red_interface_control.png
+
+ Example of a dashboard UI created with node-red to interact with an OhmPi - control tab.
+
+.. figure:: ../../img/node-red_interface_data.png
+
+ Example of a dashboard UI created with node-red to interact with an OhmPi - data visualization tab.
+
+
+For more documentation dedicated to node-red, please refer to the Node-red `cookbooks <https://cookbook.nodered.org/>`_.
diff --git a/doc/source/source_rst/software/loggers.rst b/doc/source/source_rst/software/loggers.rst
new file mode 100644
index 0000000000000000000000000000000000000000..0ee74247a1bd545cdd2faed137171aafc4b4ed03
--- /dev/null
+++ b/doc/source/source_rst/software/loggers.rst
@@ -0,0 +1,11 @@
+Loggers
+*******
+
+Loggers have been introduced in this release. They use the excellent logging python package.
+Specific handlers have been implemented for running with ohmpi.py (one for logging to an mqtt broker (see `MQTT interface`_ for more details) and one for creating zipped rotated logs on disk).
+
+Two loggers have been defined. The first one is dedicated to log operations execution. It is named exec_logger. The second one, named data_logger, is dedicated to log data. A third one is planned to log the state of health (SOH) of the system in a future version.
+
+By default, logs are written to the console (print-like), stored locally in files (a zip is created after some time i.e. every day and/or when the size of the log exceeds a maximum size) and sent to an MQTT broker. Different logging levels may be defined for the different logs and handlers in the `Configuration file`_.
+
+Advanced users may write new handlers and edit the `setup_loggers.py` file to customize the logging mechanisms to their needs.
diff --git a/doc/source/source_rst/software/operations.rst b/doc/source/source_rst/software/operations.rst
index d9729499af4372aca6f541492dca1e37230bac51..cc00e140acee7bb3423489639ec54903a13b6d70 100644
--- a/doc/source/source_rst/software/operations.rst
+++ b/doc/source/source_rst/software/operations.rst
@@ -1,247 +1,16 @@
Operation
#########
-Configuration file
-******************
-
-The configuration of the OhmPi file `config.py` allows to configure the OhmPi.
-A default version of `config.py` is provided in the repository.
-This file should be edited to customize the configuration following the user's needs and preferences.
-A series of default configuration files are available in the configs folder. A simple helper command can help you select the appropriate configuration file depending on your version of the meausurement board and type of MUX boards.
-The helper will ask you a few questions and will select the right configuration for your case. It can be called in via the terminal as
-.. code-block:: bash
-
- $ python setup_config.py
-
-Still, is best practice to open the configuration file and check that the parameters are correctly configured.
-Updating the configuration file manually is mandatory for custom systems combining different versions of the measurement and MUX boards.
-
-The configuration is written in a python file structured in a series of dictionnaries related to:
-1. OHMPI_CONFIG: the OhmPi instrument information (id of the instrument and default settings)
-2. HARDWARE_CONFIG: the hardware system in which the five different modules 'ctl' (controller), 'tx' (transmitter), 'rx' (receiver), 'mux' (multiplexers), 'pwr' (power).
-3. the logging dictionnaries divided in:
- - EXEC_LOGGING_CONFIG
- - DATA_LOGGING_CONFIG
- - SOH_LOGGING_CONFIG
-4. the MQTT dictionnaries divided in:
- - MQTT_LOGGING_CONFIG
- - MQTT_CONTROL_CONFIG
+This section details describes how to operate an OhmPi instrument.
.. toctree::
:maxdepth: 2
- :caption: Contents:
-
-.. automodule:: configs.config_default
- :members:
- :undoc-members:
- :show-inheritance:
-
-
-One should make sure to understand the parameters before altering them. It is also recommended to keep a copy of the default configuration.
-
-Interfaces
-**********
-
-Different interfaces can be used to interact with the OhmPi.
-
-Available interfaces are:
-- `Web interface`_ (=HTTP interface): run in bash: `bash run_http_interface.sh`
-- Python API: import the OhmPi class from Python script: `from ohmpi import OhmPi` (see `Python interface`_)
-- MQTT: IoT messaging through a broker (see `MQTT interface`_)
-
-
-Web interface
-=============
-
-This is a user friendly graphical interface for new users as well as running quick and easy acquisitions.
-
-The Raspberry Pi of the OhmPi is used as a Wi-Fi Access Point (AP) and runs
-a small webserver to serve the 'index.html' interface. Using a laptop or
-a mobile phone connected to the Wi-Fi of the Raspberry Pi, one can see this
-interface, upload sequences, change parameters, run a sequence and download data.
-
-To configure the Raspberry Pi to act as an access point and run
-the webserver automatically on start, see instructions on `raspap.com <https://raspap.com/>`_ and in 'runOnStart.sh'.
-
-Once configured, the webserver should start by itself on start and once
-connected to the Pi, the user can go to `10.3.141.1:8080 <http://10.3.141.1:8080>`_
-to access the interface.
-
-.. figure:: ../../img/http-interface-pseudo-section.png
-
- Web interface with its interactive pseudo-section.
-
-
-.. figure:: ../../img/http-interface-evolution.png
-
- Evolution of quadrupole apparent resistivity with time.
-
-
-.. figure:: ../../img/http-interface-rs.png
-
- Contact resistance check.
-
-
-Python interface
-================
-
-This interface offers a more direct access to the software components, specifically suited for testing or automating acquisition.
-
-By importing the `OhmPi` class from the ohmpi.py, we can control the OhmPi instrument via a Python script or interactively with IPython.
-It involves using the terminal or a Python IDE such as Thonny on the Raspberry Pi. A connection can also be established via
-SSH (see PuTTY on Windows or ssh command on macOS/Linux).
-
-To access the Python API, make sure that the PYTHONPATH has been correctly configured to export the location of the ohmpi module.
-
-.. code-block:: python
- :caption: Example of using the Python API to control OhmPi
-
- from ohmpi.ohmpi import OhmPi
-
- ### Define object from class OhmPi
- k = OhmPi() # this loads default parameters from the disk
-
- ### Default parameters can also be edited manually
- k.settings['injection_duration'] = 0.5 # injection time in seconds
- k.settings['nb_stack'] = 1 # one stack is two half-cycles
- k.settings['nbr_meas'] = 1 # number of time the sequence is repeated
-
- ### Update settings if needed
- k.update_settings({"injection_duration":0.2})
-
- ### Set or load sequence
- k.sequence = np.array([[1,2,3,4]]) # set numpy array of shape (n,4)
- # k.set_sequence('1 2 3 4\n2 3 4 5') # call function set_sequence and pass a string
- # k.load_sequence('ABMN.txt') # load sequence from a local file
-
- ### Run contact resistance check
- k.rs_check()
-
- ### Run sequence (synchronously - it will wait that all
- # sequence is measured before returning the prompt
- k.run_sequence()
- # k.run_sequence_async() # sequence is run in a separate thread and the prompt returns immediately
- # time.sleep(2)
- # k.interrupt() # kill the asynchron sequence
-
- ### Run multiple sequences at given time interval
- k.settings['nb_meas'] = 3 # run sequence three times
- k.settings['sequence_delay'] = 100 # every 100 s
- k.run_multiple_sequences() # asynchron
- # k.interrupt() # kill the asynchron sequence
-
- ### Single measurement can also be taken with
- quadrupole = [1, 4, 2, 3]
- k.run_measurement(quadrupole) # use default acquisition parameters
-
- ### Custom or adaptative argument, see help(k.run_measurement)
- k.run_measurement(quadrupole,
- nb_stack=4, # do 4 stacks (8 half-cycles)
- injection_duration=1, # inject for 2 seconds
- duty_cycle = 0.5) # duty_cycle is
-
-For detailed usage, please see the Python API or look at the examples.
-
-IoT interface
-=============
-
-This is an interface designed for an advanced remote usage of the OhmPi such as remote automation, data consumption by multiple processes and interaction with other sensors in the scope of a monitoring. It is based on the MQTT protocol, designed for the Internet of Things (IoT), to interact with the OhmPi.
-
-This option allows interacting remotely with a single OhmPi, a network of OhmPis, as well as auxiliary instruments and sensors. The communication is based on a publish/subscribe approach and involves a MQTT broker.
-
-An example of MQTT broker that can be used is `Mosquitto <https://mosquitto.org/>`_. Depending on the monitoring needs, an MQTT broker can be set up locally on the Raspberry Pi, on a local network or any remote server reachable through the net. A local Mosquitto broker can be set up and enabled to run as a service on the OhmPi using the bash script install_local_mqtt_broker.sh.
-
-MQTT messages include logging messages from the OhmPi and commands sent to the OhmPi. These messages can be examined easily using a third party software such as `MQTT Explorer <http://mqtt-explorer.com/>`_.
-
-Commands sent on the broker are received by the ohmpi.py script that runs on the OhmPi (make sure ohmpi.py starts on reboot) and further processed.
-MQTT commands are sent in JSON format following the Python API with kwargs as illustrated below:
-
-.. code-block:: json
- :caption: Updating acquisition settings.
-
- {
- "cmd_id": "3fzxv121UITwGjWYgcz4xw",
- "cmd": "update_settings", Depending on the experiment needs, MQTT brokers can be set up locally on the Raspberry Pi or on a local or remote server.
- "kwargs": {
- "config": {
- "nb_meas": 2,
- "nb_electrodes": 10,
- "nb_stack": 2,
- "injection_duration": 2,
- "sequence_delay": 100
- }
- }
- }
-
-
-.. code-block:: json
- :caption: Check contact resistances
-
- {
- "cmd_id": "3fzxv121UITwGjWYgcz4xw",
- "cmd": "rs_check",
- }
-
-.. code-block:: json
- :caption: Running a sequence.
-
- {
- "cmd_id": "3fzxv121UITwGjWYgcz4Yw",
- "cmd": "run_sequence",
- }
-
-.. code-block:: json
- :caption: Running same sequence multiple times (nb_meas).
-
- {
- "cmd_id": "3fzxv121UITwGjWYgcz4Yw",
- "cmd": "run_multiple_sequences",
- }
-
-.. code-block:: json
- :caption: Interrupt current acquisition.
-
- {
- "cmd_id": "3fzxv121UITwGjWYgcz4xw",
- "cmd": "interrupt",
- }
-
-Custom processing of messages and tailor-made dashboards for monitoring experiments may be designed using a browser-based flow editor such as `Node-red <http://mqtt-explorer.com/>`_.
-This may help designing complex IoT experiments and monitoring systems in which OhmPi is a component.
-
-Examples incorporating execution commands and data outputs from OhmPi can be found in the OhmPi examples. Once Node-RED is installed on the OhmPi, these examples can be accessed separately by running a command in the console such as :
-
-.. code-block:: console
-
- node-red basic_ohmpi_flows_node-red.json
-
-These examples may require installing some additional node packages in order to work properly. This can be done in the `Palette Manager <https://nodered.org/docs/user-guide/editor/palette/manager>`_ within Node-RED.
-
-.. figure:: ../../img/node-red_flow.png
-
- Example flow in node-red to interact with an OhmPi.
-
-
-.. figure:: ../../img/node-red_interface_control.png
-
- Example of a dashboard UI created with node-red to interact with an OhmPi - control tab.
-
-.. figure:: ../../img/node-red_interface_data.png
-
- Example of a dashboard UI created with node-red to interact with an OhmPi - data visualization tab.
-
-
-For more documentation dedicated to node-red, please refer to the Node-red `cookbooks <https://cookbook.nodered.org/>`_.
-
-
-Loggers
-*******
-Loggers have been introduced in this release. They use the excellent logging python package.
-Specific handlers have been implemented for running with ohmpi.py (one for logging to an mqtt broker (see `MQTT interface`_ for more details) and one for creating zipped rotated logs on disk).
+ Software architecture <software/architecture>
+ Getting started <software/installation>
+ Operation <software/operations>
+ Monitoring <software/monitoring>
+ API reference <software/api>
-Two loggers have been defined. The first one is dedicated to log operations execution. It is named exec_logger. The second one, named data_logger, is dedicated to log data. A third one is planned to log the state of health (SOH) of the system in a future version.
-By default, logs are written to the console (print-like), stored locally in files (a zip is created after some time i.e. every day and/or when the size of the log exceeds a maximum size) and sent to an MQTT broker. Different logging levels may be defined for the different logs and handlers in the `Configuration file`_.
-Advanced users may write new handlers and edit the `setup_loggers.py` file to customize the logging mechanisms to their needs.