diff --git a/public/_images/MUX_00.jpg b/public/_images/MUX_00.jpg
index 686a35fc45a6a18ace8edd339a876e14a9bef592..0a5693bcc500692a81554ddc9f37f2c5270e0a8f 100644
Binary files a/public/_images/MUX_00.jpg and b/public/_images/MUX_00.jpg differ
diff --git a/public/_images/MUX_01.jpg b/public/_images/MUX_01.jpg
index 19348c4f4611c767291be53d783ea25143e830be..8a3f3ff8806635a69f2aef3d64f1e6a5c59d4025 100644
Binary files a/public/_images/MUX_01.jpg and b/public/_images/MUX_01.jpg differ
diff --git a/public/_images/MUX_02.jpg b/public/_images/MUX_02.jpg
index 7601e8b721e6f47ed75a245bd2625d2d07e3950c..aeeb7a5681f18b078f89b7f6423259076582918a 100644
Binary files a/public/_images/MUX_02.jpg and b/public/_images/MUX_02.jpg differ
diff --git a/public/_images/MUX_03.jpg b/public/_images/MUX_03.jpg
index e87437e4f187bbc3aaf1a2186c19ab6827d8c2ea..d20627d2ee23299f8f61b1138b5a0b0448fcded7 100644
Binary files a/public/_images/MUX_03.jpg and b/public/_images/MUX_03.jpg differ
diff --git a/public/_images/MUX_04.jpg b/public/_images/MUX_04.jpg
index b80c7e30b84649d3b684266ffa7a8a528a98d5df..b7671fb67a0d09d0fde559d03382cdf3e29d2d07 100644
Binary files a/public/_images/MUX_04.jpg and b/public/_images/MUX_04.jpg differ
diff --git a/public/_images/MUX_06.jpg b/public/_images/MUX_06.jpg
index 368e24b93596315a0dfb5a443d03cde196fc1d75..e43c7561aee67c51b59261de15e7ef8aae6cc5da 100644
Binary files a/public/_images/MUX_06.jpg and b/public/_images/MUX_06.jpg differ
diff --git a/public/_images/MUX_07.jpg b/public/_images/MUX_07.jpg
index 1086d5ab36c451047701fb728d9e5f1fc37f7af8..da0f5e400e412bdcf37180a491a2091339683645 100644
Binary files a/public/_images/MUX_07.jpg and b/public/_images/MUX_07.jpg differ
diff --git a/public/_images/MUX_08.jpg b/public/_images/MUX_08.jpg
index af86ba353fed5b6d9231ca13771ea9556c149907..3665c426cfba8effb8534f3589b681787d889d13 100644
Binary files a/public/_images/MUX_08.jpg and b/public/_images/MUX_08.jpg differ
diff --git a/public/_images/MUX_09.jpg b/public/_images/MUX_09.jpg
index 0f3247cc8858201b4919d45a6ec450e099dd6480..8a37fb0d30c833c8de117c607be0ca157b0a5073 100644
Binary files a/public/_images/MUX_09.jpg and b/public/_images/MUX_09.jpg differ
diff --git a/sphinx/build/doctrees/Ohmpi.doctree b/sphinx/build/doctrees/Ohmpi.doctree
deleted file mode 100644
index c424fc16ba32d7bb3c46e4e84459d9752b106309..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/Ohmpi.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_01.doctree b/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_01.doctree
deleted file mode 100644
index 8cf9c8329ac59a4ab9b429f75379ce752e5216cf..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_01.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_02 - Copie.doctree b/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_02 - Copie.doctree
deleted file mode 100644
index 7b959e7d79bf7257e9173cf0666058d54e55b2fd..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_02 - Copie.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_02.doctree b/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_02.doctree
deleted file mode 100644
index 6a515549c156845d8be92309b434dcfa1ebf9d69..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_02.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_03.doctree b/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_03.doctree
deleted file mode 100644
index 927e75746e31f2d07f21d1c63f95f9406be3a7f5..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/Ohmpi_V2_00/V2_00_step_03.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/V1_01.doctree b/sphinx/build/doctrees/V1_01.doctree
deleted file mode 100644
index b5caea72c89b5c227f088c6170d3b74e7007f75f..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/V1_01.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/V1_02.doctree b/sphinx/build/doctrees/V1_02.doctree
deleted file mode 100644
index fe5cf932bd8281ae103d88bfcefa08f972369992..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/V1_02.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/V2_00.doctree b/sphinx/build/doctrees/V2_00.doctree
deleted file mode 100644
index 27be1440d1791f9dd17d3532f1dcfd2eb63f31fb..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/V2_00.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/V2_00_step_01.doctree b/sphinx/build/doctrees/V2_00_step_01.doctree
deleted file mode 100644
index 42aebaf9f88608adbe372cf7cd5e851ab731a6af..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/V2_00_step_01.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/V2_00_stpe_01.doctree b/sphinx/build/doctrees/V2_00_stpe_01.doctree
deleted file mode 100644
index 2b432c43c2f0e15e2b47e60f3151dc89fa64b108..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/V2_00_stpe_01.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/environment.pickle b/sphinx/build/doctrees/environment.pickle
deleted file mode 100644
index 98afb73e7902686a96b01d070ccb6edff9a1de4c..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/environment.pickle and /dev/null differ
diff --git a/sphinx/build/doctrees/index.doctree b/sphinx/build/doctrees/index.doctree
deleted file mode 100644
index 4dcaf4d6ca37d7e7c7f7f771b8f6172c3c2bae16..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/index.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/old/page2.doctree b/sphinx/build/doctrees/old/page2.doctree
deleted file mode 100644
index 96f015a524fbdbbc9a0ba20bf96435fdaeb0bb96..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/old/page2.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/page0.doctree b/sphinx/build/doctrees/page0.doctree
deleted file mode 100644
index 16aaded7cbf2dc04b90a80a4ec46956ab771c94d..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/page0.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/page1.doctree b/sphinx/build/doctrees/page1.doctree
deleted file mode 100644
index 8cf0edecb8e47b70d345b76eefaa91307f2807b8..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/page1.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/page2.doctree b/sphinx/build/doctrees/page2.doctree
deleted file mode 100644
index 92d23f7e7efd59e3c0459f5bd27ac5b24d25e0f5..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/page2.doctree and /dev/null differ
diff --git a/sphinx/build/doctrees/test.doctree b/sphinx/build/doctrees/test.doctree
deleted file mode 100644
index 0eceec5892c84057ab2e267e6921fa19920bc267..0000000000000000000000000000000000000000
Binary files a/sphinx/build/doctrees/test.doctree and /dev/null differ
diff --git a/sphinx/build/html/.buildinfo b/sphinx/build/html/.buildinfo
index a28443296dfd2901fe7a8b5eefc5e5e858257358..6118c998223c9c1632d1040d35e03f0ca214929d 100644
--- a/sphinx/build/html/.buildinfo
+++ b/sphinx/build/html/.buildinfo
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 85882ff0ddf883585509119f73a6ac8e
+config: 4ac17d5203f4fed9801b331b002090ea
tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/sphinx/build/html/Ohmpi.html b/sphinx/build/html/Ohmpi.html
index 2fca021c02e78844afa25bcc637fba48e1d1ae8f..0df4c2caabc028b19a44b1786d2e94ea2cd9287c 100644
--- a/sphinx/build/html/Ohmpi.html
+++ b/sphinx/build/html/Ohmpi.html
@@ -1,19 +1,20 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>OhmPi project — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <title>OhmPi project — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
+
+ <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/jquery.js"></script>
<script src="_static/underscore.js"></script>
<script src="_static/doctools.js"></script>
- <script src="_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="_static/js/theme.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
@@ -74,10 +75,10 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="ohmpi-project">
-<h1>OhmPi project<a class="headerlink" href="#ohmpi-project" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="partenaires">
-<h2><strong>Partenaires</strong><a class="headerlink" href="#partenaires" title="Permalink to this headline">¶</a></h2>
+ <section id="ohmpi-project">
+<h1>OhmPi project<a class="headerlink" href="#ohmpi-project" title="Permalink to this headline">ïƒ</a></h1>
+<section id="partenaires">
+<h2><strong>Partenaires</strong><a class="headerlink" href="#partenaires" title="Permalink to this headline">ïƒ</a></h2>
<a class="reference internal image-reference" href="_images/logo_ohmpi.JPG"><img alt="Logo OhmPi" class="align-center" src="_images/logo_ohmpi.JPG" style="width: 350px; height: 250px;" /></a>
<p>Authors:</p>
<div class="line-block">
@@ -110,23 +111,23 @@
<p>Creation date : Juillet 2020.</p>
<p>Update : 04 août 2021.</p>
<p>Status of document: In progress.</p>
-<div class="section" id="citing-ohmpi">
-<h3><strong>Citing OhmPi</strong><a class="headerlink" href="#citing-ohmpi" title="Permalink to this headline">¶</a></h3>
+<section id="citing-ohmpi">
+<h3><strong>Citing OhmPi</strong><a class="headerlink" href="#citing-ohmpi" title="Permalink to this headline">ïƒ</a></h3>
<p><em>Rémi Clement, Yannick Fargier, Vivien Dubois, Julien Gance, Emile Gros, et al.. OhmPi: An open</em>
<em>source data logger for dedicated applications of electrical resistivity imaging at the small and laboratory</em>
<em>scale. HardwareX, Elsevier, 2020, 8, 24 p. ff10.1016/j.ohx.2020.e00122ff.</em></p>
-</div>
-<div class="section" id="introduction-to-ohmpi">
-<h3><strong>Introduction to OhmPi</strong><a class="headerlink" href="#introduction-to-ohmpi" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="introduction-to-ohmpi">
+<h3><strong>Introduction to OhmPi</strong><a class="headerlink" href="#introduction-to-ohmpi" title="Permalink to this headline">ïƒ</a></h3>
<p>This documentation presents the development of a low-cost, open hardware resistivity meter to provide the scientific community with a robust and flexible tool for small-scale experiments. Called OhmPi, this basic resistivity meterfeatures current injection and measurement functions associated with a multiplexer that allows performing automatic measurements with up to 32 electrodes.OhmPi’s philosophy is to provide a fully open source and open hardware tool /
to the near surface scientific community.</p>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>Everyone willing to get involved is welcome in OhmPi Project!.</p>
</div>
-</div>
-</div>
-</div>
+</section>
+</section>
+</section>
</div>
diff --git a/sphinx/build/html/Ohmpi_V2_00/V2_00_step_01.html b/sphinx/build/html/Ohmpi_V2_00/V2_00_step_01.html
index 5ac23f2ae4def4663826454fb9ad9eb197667ce5..7429e88bf4a73ca20fcdc1868812f19cb9d6819d 100644
--- a/sphinx/build/html/Ohmpi_V2_00/V2_00_step_01.html
+++ b/sphinx/build/html/Ohmpi_V2_00/V2_00_step_01.html
@@ -1,19 +1,20 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>STEP n°1 : Raspberry Pi configuration — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <title>STEP n°1 : Raspberry Pi configuration — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="../_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
+
+ <script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
<script src="../_static/jquery.js"></script>
<script src="../_static/underscore.js"></script>
<script src="../_static/doctools.js"></script>
- <script src="../_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="../_static/js/theme.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
@@ -83,10 +84,10 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="step-n1-raspberry-pi-configuration">
-<h1><strong>STEP n°1</strong> : Raspberry Pi configuration<a class="headerlink" href="#step-n1-raspberry-pi-configuration" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="part-a-os-installation">
-<h2><strong>PART A</strong> OS installation<a class="headerlink" href="#part-a-os-installation" title="Permalink to this headline">¶</a></h2>
+ <section id="step-n1-raspberry-pi-configuration">
+<h1><strong>STEP n°1</strong> : Raspberry Pi configuration<a class="headerlink" href="#step-n1-raspberry-pi-configuration" title="Permalink to this headline">ïƒ</a></h1>
+<section id="part-a-os-installation">
+<h2><strong>PART A</strong> OS installation<a class="headerlink" href="#part-a-os-installation" title="Permalink to this headline">ïƒ</a></h2>
<table class="docutils align-default">
<colgroup>
<col style="width: 78%" />
@@ -117,19 +118,19 @@
For this step, the installation instructions are well described on the Raspberry website</p>
<ol class="arabic simple">
<li><p>Watch the vidéo “how to set up your raspberry Pi†(<a class="reference external" href="https://www.youtube.com/watch?v=wjWZhV1v3Pk">https://www.youtube.com/watch?v=wjWZhV1v3Pk</a>)</p></li>
-<li><p>The authors recommend installing the latest stable and complete version of Raspbian by using NOOBS (a simple-to-use operating system installer).</p></li>
+<li><p>The authors recommend installing the latest stable and complete version of Raspberry Pi OS (Previously called Raspbian) by using Raspberry Pi Imager.</p></li>
<li><p>or you can visit this website : (<a class="reference external" href="https://projects.raspberrypi.org/en/projects/raspberry-pi-setting-up">https://projects.raspberrypi.org/en/projects/raspberry-pi-setting-up</a>)</p></li>
</ol>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>All the development tests were performed on Raspberry Pi 3 Model B, we used the following version of Raspbian:</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="../_images/raspbian_version.jpg"><img alt="alternate text" src="../_images/raspbian_version.jpg" style="width: 800px; height: 400px;" /></a>
-</div>
+</figure>
</div>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
-<p>Once the OS has been installed, <strong>1-wire, spi and GPIO remote option</strong> must be deactivated via the Raspbian GUI settings menu. Failure to carry out this task may cause damage to the relay shield cards during measurements.</p>
+<p>Once the OS has been installed, <strong>1-wire, spi and GPIO remote option</strong> must be deactivated and <strong>I2C option</strong> must be activated via the Raspbian GUI settings menu. Failure to carry out this task may cause damage to the relay shield cards during measurements.</p>
</div>
<p>3. When the relays are connected to the GPIO, make sure that all the GPIOs are in the low position when the raspberry starts up. If not, the relays will activate unexpectedly.
To ensure that the GPIOs are in Low position, you will need to modify the /boot/config.txt file.</p>
@@ -161,9 +162,9 @@ To ensure that the GPIOs are in Low position, you will need to modify the /boot/
<li><p>Press Ctrl +x to escap and return to the terminal</p></li>
<li><p>Close the terminal</p></li>
</ol>
-</div>
-<div class="section" id="part-b-virtual-environnement-and-packages">
-<h2><strong>PART B</strong> Virtual Environnement and packages<a class="headerlink" href="#part-b-virtual-environnement-and-packages" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="part-b-virtual-environnement-and-packages">
+<h2><strong>PART B</strong> Virtual Environnement and packages<a class="headerlink" href="#part-b-virtual-environnement-and-packages" title="Permalink to this headline">ïƒ</a></h2>
<p>A virtual environment is a way to have multiple, parallel instances of the Python interpreter, each with different package sets and different configurations.
Each virtual environment contains a discrete copy of the Python interpreter, including copies of its support utilities. It also protects your system in case of problems with the packages.</p>
<p>All dependencies are specified in requirements.txt</p>
@@ -185,7 +186,8 @@ Each virtual environment contains a discrete copy of the Python interpreter, inc
</pre></div>
</div>
<p>Install packages within the virtual environment. Installing the following package should be sufficient to meet dependencies:</p>
-<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="n">pip</span> <span class="n">install</span> <span class="n">RPi</span><span class="o">.</span><span class="n">GPIO</span> <span class="n">adafruit</span><span class="o">-</span><span class="n">blinka</span> <span class="n">numpy</span> <span class="n">adafruit</span><span class="o">-</span><span class="n">circuitpython</span><span class="o">-</span><span class="n">ads1x15</span> <span class="n">pandas</span>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="n">export</span> <span class="n">CFLAGS</span><span class="o">=-</span><span class="n">fcommon</span>
+ <span class="n">sudo</span> <span class="n">pip</span> <span class="n">install</span> <span class="n">RPi</span><span class="o">.</span><span class="n">GPIO</span> <span class="n">adafruit</span><span class="o">-</span><span class="n">blinka</span> <span class="n">numpy</span> <span class="n">pandas</span> <span class="n">adafruit</span><span class="o">-</span><span class="n">circuitpython</span><span class="o">-</span><span class="n">ads1x15</span> <span class="n">adafruit</span><span class="o">-</span><span class="n">circuitpython</span><span class="o">-</span><span class="n">tca9548a</span> <span class="n">adafruit</span><span class="o">-</span><span class="n">circuitpython</span><span class="o">-</span><span class="n">mcp230xx</span> <span class="n">gpiozero</span>
</pre></div>
</div>
<p>Check that requirements are met using</p>
@@ -197,33 +199,33 @@ to leave the virtual environment simply type:</p>
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="n">deactivate</span>
</pre></div>
</div>
-</div>
-<div class="section" id="part-c-activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi">
-<h2><strong>PART C</strong> Activate virtual environnement on Thonny (Python IDE) (on Rapberry Pi)<a class="headerlink" href="#part-c-activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="part-c-activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi">
+<h2><strong>PART C</strong> Activate virtual environnement on Thonny (Python IDE) (on Rapberry Pi)<a class="headerlink" href="#part-c-activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi" title="Permalink to this headline">ïƒ</a></h2>
<p>If you decided to use a virtual environment, it is necessary to setup Thonny Python IDE the first time you use it.</p>
<p>1- Run the Thonny Python IDE software, Click on raspebrry acces <strong>menu > programming> Thonny pythonIDE</strong></p>
<p>2- Thonny’s interface opens, Python runs on the Root (Python 3.7.3 (/usr/bin/python3))</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="../_images/thonny_first_interface.jpg"><img alt="alternate text" src="../_images/thonny_first_interface.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>3-Click on <strong>Run>select interpreter</strong>, a new window opens click on interpret</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="../_images/thonny_option.jpg"><img alt="alternate text" src="../_images/thonny_option.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>4-On the new open windows select <strong>alternative Pyhton3 or virtual environnement</strong></p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="../_images/thonny_interpreter.jpg"><img alt="alternate text" src="../_images/thonny_interpreter.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>5- New buttons appeared, selected <strong>“locate another python executable “</strong></p>
<p>6- A new window opens, find the folder where there is the python 3 file in the virtual environment folder previously created <strong>/home/pi/ohmpi/bin/python3</strong>.</p>
<p>7- In the <strong>known interpreter</strong> tab the path of the virtual environnementshould appear</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="../_images/thonny_interpreter_folder.jpg"><img alt="alternate text" src="../_images/thonny_interpreter_folder.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>8- Close the window by clicking on <strong>ok</strong>.</p>
<p>9- Close thonny to save modifications</p>
-</div>
-</div>
+</section>
+</section>
</div>
diff --git a/sphinx/build/html/Ohmpi_V2_00/V2_00_step_02.html b/sphinx/build/html/Ohmpi_V2_00/V2_00_step_02.html
index b60e1f9b7a49131e682ba9d25eb691abc54074c4..4b89e1ca047bb7a2910c0c6db2e5be05bbfeb7df 100644
--- a/sphinx/build/html/Ohmpi_V2_00/V2_00_step_02.html
+++ b/sphinx/build/html/Ohmpi_V2_00/V2_00_step_02.html
@@ -1,19 +1,20 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>STEP n°2: Measurement board — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <title>STEP n°2: Measurement board — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="../_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
+
+ <script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
<script src="../_static/jquery.js"></script>
<script src="../_static/underscore.js"></script>
<script src="../_static/doctools.js"></script>
- <script src="../_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="../_static/js/theme.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
@@ -83,17 +84,17 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="step-n2-measurement-board">
-<h1><strong>STEP n°2</strong>: Measurement board<a class="headerlink" href="#step-n2-measurement-board" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="part-a-assembly-of-measurement-board">
-<h2><strong>PART A</strong> Assembly of measurement board<a class="headerlink" href="#part-a-assembly-of-measurement-board" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="required-components">
-<h3>Required components<a class="headerlink" href="#required-components" title="Permalink to this headline">¶</a></h3>
-<div class="align-center figure">
+ <section id="step-n2-measurement-board">
+<h1><strong>STEP n°2</strong>: Measurement board<a class="headerlink" href="#step-n2-measurement-board" title="Permalink to this headline">ïƒ</a></h1>
+<section id="part-a-assembly-of-measurement-board">
+<h2><strong>PART A</strong> Assembly of measurement board<a class="headerlink" href="#part-a-assembly-of-measurement-board" title="Permalink to this headline">ïƒ</a></h2>
+<section id="required-components">
+<h3>Required components<a class="headerlink" href="#required-components" title="Permalink to this headline">ïƒ</a></h3>
+<figure class="align-center">
<a class="reference internal image-reference" href="../_images/00_mes_board_components.jpg"><img alt="alternate text" src="../_images/00_mes_board_components.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<table class="colwidths-given docutils align-default" id="id1">
-<caption><span class="caption-text">List of components</span><a class="headerlink" href="#id1" title="Permalink to this table">¶</a></caption>
+<caption><span class="caption-text">List of components</span><a class="headerlink" href="#id1" title="Permalink to this table">ïƒ</a></caption>
<colgroup>
<col style="width: 8%" />
<col style="width: 18%" />
@@ -116,15 +117,15 @@
<tbody>
<tr class="row-even"><td><p>Raspberry Pi 4 Model B</p></td>
<td><p>1</p></td>
-<td><p>58.75</p></td>
-<td><p>58.75</p></td>
+<td><p>58,75</p></td>
+<td><p>58,75</p></td>
<td><p>Raspberry</p></td>
<td><p>Raspberry Pi 4 Model B</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Seeed-Studio/102110421?qs=7MVldsJ5UaxeN3LYyh3sqw%3D%3D">https://www.mouser.fr/ProductDetail/Seeed-Studio/102110421?qs=7MVldsJ5UaxeN3LYyh3sqw%3D%3D</a></p></td>
</tr>
<tr class="row-odd"><td><p>LM158N AMP-o</p></td>
-<td><p>4</p></td>
-<td><p>14.5</p></td>
+<td><p>2</p></td>
+<td><p>14,5</p></td>
<td><p>58</p></td>
<td><p>Texas Instruments</p></td>
<td><p>LM358AN/NOPB</p></td>
@@ -146,180 +147,175 @@
</tr>
<tr class="row-odd"><td><p>ADS1115</p></td>
<td><p>2</p></td>
-<td><p>11.9</p></td>
-<td><p>23.8</p></td>
+<td><p>11,9</p></td>
+<td><p>23,8</p></td>
<td><p>Adafruit</p></td>
<td><p>1085</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Adafruit/1085?qs=%2Fha2pyFaduhE%2FOGzuTWIQ9Iz5VjaqFOYugqAlGxpEcKiGrQvF4hn%252Bg%3D%3D">https://www.mouser.fr/ProductDetail/Adafruit/1085?qs=%2Fha2pyFaduhE%2FOGzuTWIQ9Iz5VjaqFOYugqAlGxpEcKiGrQvF4hn%252Bg%3D%3D</a></p></td>
</tr>
<tr class="row-even"><td><p>Capacitor 100nF 50Vdc 10% Ceramic</p></td>
-<td><p>4</p></td>
-<td><p>0.2</p></td>
-<td><p>0.8</p></td>
+<td><p>3</p></td>
+<td><p>0,2</p></td>
+<td><p>0,8</p></td>
<td><p>KEMET</p></td>
-<td><p>C320C104K1</p></td>
+<td><blockquote>
+<div><p>C320C104K1</p>
+</div></blockquote>
+</td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/KEMET/C320C104K1R5TA7303?qs=c4UyoTs%2FLq1th4mcyOeTmA%3D%3D">https://www.mouser.fr/ProductDetail/KEMET/C320C104K1R5TA7303?qs=c4UyoTs%2FLq1th4mcyOeTmA%3D%3D</a></p></td>
</tr>
<tr class="row-odd"><td><p>Resistor 1 Kohm 0.5W +- 0.1%</p></td>
<td><p>2</p></td>
-<td><p>1.3</p></td>
-<td><p>2.6</p></td>
+<td><p>1,3</p></td>
+<td><p>2,6</p></td>
<td><p>TE Connectivity</p></td>
<td><p>H81K0BYA</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/TE-Connectivity-Holsworthy/H81K0BYA?qs=%2Fha2pyFaduhUylh7Az%2FmjFH2XjOUms6wZtUX4sOM%252BII%3D">https://www.mouser.fr/ProductDetail/TE-Connectivity-Holsworthy/H81K0BYA?qs=%2Fha2pyFaduhUylh7Az%2FmjFH2XjOUms6wZtUX4sOM%252BII%3D</a></p></td>
</tr>
<tr class="row-even"><td><p>Resistor 1.5 Kohms +- 0.1%</p></td>
<td><p>2</p></td>
-<td><p>1.3</p></td>
-<td><p>2.6</p></td>
+<td><p>1,3</p></td>
+<td><p>2,6</p></td>
<td><p>TE Connectivity</p></td>
<td><p>H81K5BYA</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/TE-Connectivity-Holsworthy/H81K5BYA?qs=%2Fha2pyFadugy9tWham3rU9HmIJOhyWhBIN95kNm%252BX%2FM%3D">https://www.mouser.fr/ProductDetail/TE-Connectivity-Holsworthy/H81K5BYA?qs=%2Fha2pyFadugy9tWham3rU9HmIJOhyWhBIN95kNm%252BX%2FM%3D</a></p></td>
</tr>
<tr class="row-odd"><td><p>Resistor 1.5 Kohms +- 5%</p></td>
<td><p>2</p></td>
-<td><p>1.3</p></td>
-<td><p>2.6</p></td>
+<td><p>1,3</p></td>
+<td><p>2,6</p></td>
<td><p>Vishay</p></td>
<td><p>CCF071K50GKE36</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Vishay-Dale/CCF071K50GKE36?qs=QKEOZdL6EQpA6LZRLQFVOw%3D%3D">https://www.mouser.fr/ProductDetail/Vishay-Dale/CCF071K50GKE36?qs=QKEOZdL6EQpA6LZRLQFVOw%3D%3D</a></p></td>
</tr>
<tr class="row-even"><td><p>Resistor 10 Mohms +-5%</p></td>
<td><p>2</p></td>
-<td><p>0.762</p></td>
-<td><p>1.524</p></td>
+<td><p>0,762</p></td>
+<td><p>1,524</p></td>
<td><p>VISHAY</p></td>
<td><p>CMF651M0000FKEK143</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Vishay-Dale/CMF651M0000FKEK143?qs=CiayqK2gdcKzIA2LEVaLkg%3D%3D">https://www.mouser.fr/ProductDetail/Vishay-Dale/CMF651M0000FKEK143?qs=CiayqK2gdcKzIA2LEVaLkg%3D%3D</a></p></td>
</tr>
<tr class="row-odd"><td><p>2 ohm shunt resistor+- 1%</p></td>
<td><p>1</p></td>
-<td><p>2.42</p></td>
-<td><p>2.42</p></td>
+<td><p>2,42</p></td>
+<td><p>2,42</p></td>
<td><p>Ohmite</p></td>
<td><p>41F2R0E</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Ohmite/41F2R0E?qs=IM6ToxQzGOAuEDprb19mHA%3D%3D">https://www.mouser.fr/ProductDetail/Ohmite/41F2R0E?qs=IM6ToxQzGOAuEDprb19mHA%3D%3D</a></p></td>
</tr>
<tr class="row-even"><td><p>Dual screw terminal (5.08-mm pitch)</p></td>
<td><p>5</p></td>
-<td><p>0.648</p></td>
-<td><p>3.24</p></td>
+<td><p>0,648</p></td>
+<td><p>3,24</p></td>
<td><p>CUI Devices</p></td>
<td><p>TB009-508-02BE</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/CUI-Devices/TB009-508-02BE?qs=vLWxofP3U2wCFk5uCkWTkA%3D%3D">https://www.mouser.fr/ProductDetail/CUI-Devices/TB009-508-02BE?qs=vLWxofP3U2wCFk5uCkWTkA%3D%3D</a></p></td>
</tr>
<tr class="row-odd"><td><p>DC/DC converter 12 to 24V</p></td>
-<td><p>2</p></td>
-<td><p>15.58</p></td>
-<td><p>31.16</p></td>
+<td><p>1</p></td>
+<td><p>15,58</p></td>
+<td><p>31,16</p></td>
<td><p>TracoPower</p></td>
<td><p>TRN 3-1215</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/TRACO-Power/TRN-3-1215?qs=YCa%2FAAYMW02gqUicGQj0tA%3D%3D">https://www.mouser.fr/ProductDetail/TRACO-Power/TRN-3-1215?qs=YCa%2FAAYMW02gqUicGQj0tA%3D%3D</a></p></td>
</tr>
<tr class="row-even"><td><p>DIP Dual In Line Socket 2*4</p></td>
<td><p>3</p></td>
-<td><p>0.72</p></td>
-<td><p>2.16</p></td>
+<td><p>0,72</p></td>
+<td><p>2,16</p></td>
<td><p>Mill-Max</p></td>
<td><p>110-43-308-41-001000</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Mill-Max/110-43-308-41-001000?qs=IGgAdOvCTsTu%2FqaUr8NArg%3D%3D&mgh=1&vip=1&gclid=EAIaIQobChMIn_TAxbCx8wIVQ5nVCh2QaQFpEAYYCCABEgJk1_D_BwE">https://www.mouser.fr/ProductDetail/Mill-Max/110-43-308-41-001000?qs=IGgAdOvCTsTu%2FqaUr8NArg%3D%3D&mgh=1&vip=1&gclid=EAIaIQobChMIn_TAxbCx8wIVQ5nVCh2QaQFpEAYYCCABEgJk1_D_BwE</a></p></td>
</tr>
<tr class="row-odd"><td><p>AQY211EH</p></td>
<td><p>4</p></td>
-<td><p>3.84</p></td>
-<td><p>15.36</p></td>
+<td><p>3,84</p></td>
+<td><p>15,36</p></td>
<td><p>Panasonic Industrial Devices</p></td>
<td><p>AQY211EH</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Panasonic-Industrial-Devices/AQY211EH?qs=wKtUvITRialGIU8hcM7DvQ%3D%3D">https://www.mouser.fr/ProductDetail/Panasonic-Industrial-Devices/AQY211EH?qs=wKtUvITRialGIU8hcM7DvQ%3D%3D</a></p></td>
</tr>
<tr class="row-even"><td><p>DIP Dual In Line Socket 2*2</p></td>
<td><p>4</p></td>
-<td><p>0.449</p></td>
-<td><p>1.796</p></td>
+<td><p>0,449</p></td>
+<td><p>1,796</p></td>
<td><p>Preci-dip</p></td>
<td><p>110-83-304-41-001101</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Preci-dip/110-83-304-41-001101?qs=%2Fha2pyFadujQKqx4wAuiG%2FMGNdxMCNv%2F33Nj0gBxRocuLUcYnpyONg%3D%3D">https://www.mouser.fr/ProductDetail/Preci-dip/110-83-304-41-001101?qs=%2Fha2pyFadujQKqx4wAuiG%2FMGNdxMCNv%2F33Nj0gBxRocuLUcYnpyONg%3D%3D</a></p></td>
</tr>
-<tr class="row-odd"><td><p>SSQ-103-03-G-D</p></td>
+<tr class="row-odd"><td><p>MCP23008</p></td>
<td><p>1</p></td>
-<td><p>2.06</p></td>
-<td><p>2.06</p></td>
-<td><p>Samtec</p></td>
-<td><p>SSQ-103-03-G-D</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Samtec/SSQ-103-03-G-D?qs=rU5fayqh%252BE2Z%252BZTchcPoHQ%3D%3D">https://www.mouser.fr/ProductDetail/Samtec/SSQ-103-03-G-D?qs=rU5fayqh%252BE2Z%252BZTchcPoHQ%3D%3D</a></p></td>
-</tr>
-<tr class="row-even"><td><p>MCP23008</p></td>
-<td><p>1</p></td>
-<td><p>1.72</p></td>
-<td><p>1.72</p></td>
+<td><p>1,72</p></td>
+<td><p>1,72</p></td>
<td><p>Adafruit</p></td>
<td><p>593</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Adafruit/593?qs=sGAEpiMZZMsKEdP9slC0YYV4kPdpMD1Hts4SLctIVmw%3D">https://www.mouser.fr/ProductDetail/Adafruit/593?qs=sGAEpiMZZMsKEdP9slC0YYV4kPdpMD1Hts4SLctIVmw%3D</a></p></td>
</tr>
-<tr class="row-odd"><td><p>Header sets 1x10</p></td>
+<tr class="row-even"><td><p>Header sets 1x10</p></td>
<td><p>2</p></td>
-<td><p>2.12</p></td>
-<td><p>4.24</p></td>
+<td><p>2,12</p></td>
+<td><p>4,24</p></td>
<td><p>Samtec</p></td>
<td><p>SSW-110-02-G-S</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Samtec/SSW-110-02-G-S?qs=rU5fayqh%252BE0w1ORXZiBQpw%3D%3D">https://www.mouser.fr/ProductDetail/Samtec/SSW-110-02-G-S?qs=rU5fayqh%252BE0w1ORXZiBQpw%3D%3D</a></p></td>
</tr>
-<tr class="row-even"><td><p>SMT Breakout PCB for SOIC-8</p></td>
+<tr class="row-odd"><td><p>SMT Breakout PCB for SOIC-8</p></td>
<td><p>1</p></td>
-<td><p>2.5</p></td>
-<td><p>2.5</p></td>
+<td><p>2,5</p></td>
+<td><p>2,5</p></td>
<td><p>Adafruit</p></td>
<td><p>1212</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Adafruit/1212?qs=GURawfaeGuCAqqfvnVtyeg%3D%3D&mgh=1&vip=1&gclid=EAIaIQobChMIt8zJzr6x8wIVGdnVCh2vBwVsEAQYAyABEgJqG_D_BwE">https://www.mouser.fr/ProductDetail/Adafruit/1212?qs=GURawfaeGuCAqqfvnVtyeg%3D%3D&mgh=1&vip=1&gclid=EAIaIQobChMIt8zJzr6x8wIVGdnVCh2vBwVsEAQYAyABEgJqG_D_BwE</a></p></td>
</tr>
-<tr class="row-odd"><td><p>INA282AID</p></td>
+<tr class="row-even"><td><p>INA282AID</p></td>
<td><p>1</p></td>
-<td><p>4.11</p></td>
-<td><p>4.11</p></td>
+<td><p>4,11</p></td>
+<td><p>4,11</p></td>
<td><p>Texas Instruments</p></td>
<td><p>INA282AID</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Texas-Instruments/INA282AID?qs=Ze4%2FuFuz19ILFayZXOCfrA%3D%3D">https://www.mouser.fr/ProductDetail/Texas-Instruments/INA282AID?qs=Ze4%2FuFuz19ILFayZXOCfrA%3D%3D</a></p></td>
</tr>
-<tr class="row-even"><td><p>THD 15-1211N</p></td>
+<tr class="row-odd"><td><p>THD 15-1211N</p></td>
<td><p>1</p></td>
-<td><p>39.72</p></td>
-<td><p>39.72</p></td>
+<td><p>39,72</p></td>
+<td><p>39,72</p></td>
<td><p>TracoPower</p></td>
<td><p>THD 15-1211N</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/TRACO-Power/THD-15-1211N?qs=%2Fha2pyFadugpyEG4IDvm%2FMSR%252B7aN%2F0T3rUIs9PCAqJlT4%252BnRpUOOeQ%3D%3D">https://www.mouser.fr/ProductDetail/TRACO-Power/THD-15-1211N?qs=%2Fha2pyFadugpyEG4IDvm%2FMSR%252B7aN%2F0T3rUIs9PCAqJlT4%252BnRpUOOeQ%3D%3D</a></p></td>
</tr>
-<tr class="row-odd"><td><p>DIP Dual In Line Socket 2*20</p></td>
+<tr class="row-even"><td><p>DIP Dual In Line Socket 2*20</p></td>
<td><p>1</p></td>
-<td><p>8.53</p></td>
-<td><p>8.53</p></td>
+<td><p>8,53</p></td>
+<td><p>8,53</p></td>
<td><p>Samtec</p></td>
<td><p>SSQ-120-23-G-D</p></td>
<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Samtec/SSQ-120-23-G-D?qs=rU5fayqh%252BE1BMVd%252BDZONqg%3D%3D">https://www.mouser.fr/ProductDetail/Samtec/SSQ-120-23-G-D?qs=rU5fayqh%252BE1BMVd%252BDZONqg%3D%3D</a></p></td>
</tr>
-<tr class="row-even"><td><p>Pin strip no ejector</p></td>
+<tr class="row-odd"><td><p>Pin strip no ejector</p></td>
<td><p>1</p></td>
-<td><p>0.35</p></td>
-<td><p>0.35</p></td>
+<td><p>0,35</p></td>
+<td><p>0,35</p></td>
<td><p>BLK electronic</p></td>
<td><p>10120550</p></td>
<td><p><a class="reference external" href="https://www.conrad.com/p/bkl-electronic-10120550-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-6-no-of-rows-2-1-pcs-741435?searchTerm=741435&searchType=suggest&searchSuggest=product">https://www.conrad.com/p/bkl-electronic-10120550-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-6-no-of-rows-2-1-pcs-741435?searchTerm=741435&searchType=suggest&searchSuggest=product</a></p></td>
</tr>
-<tr class="row-odd"><td><p>Male Female spacer 2.5M HEXAGONALE</p></td>
-<td><p> 4</p></td>
-<td><p> 0.87</p></td>
-<td><p> 3.48</p></td>
-<td><p> HARWIN</p></td>
-<td><p> R25-3002002</p></td>
-<td><p> <a class="reference external" href="https://www.mouser.fr/ProductDetail/Harwin/R25-3002002?qs=W0yvOO0ixfENUv0hsdC4%2FQ%3D%3D">https://www.mouser.fr/ProductDetail/Harwin/R25-3002002?qs=W0yvOO0ixfENUv0hsdC4%2FQ%3D%3D</a></p></td>
+<tr class="row-even"><td><p>Male Female spacer 2.5M HEXAGONALE</p></td>
+<td><p>4</p></td>
+<td><p>0,87</p></td>
+<td><p>3,48</p></td>
+<td><p>HARWIN</p></td>
+<td><p>R25-3002002</p></td>
+<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Harwin/R25-3002002?qs=W0yvOO0ixfENUv0hsdC4%2FQ%3D%3D">https://www.mouser.fr/ProductDetail/Harwin/R25-3002002?qs=W0yvOO0ixfENUv0hsdC4%2FQ%3D%3D</a></p></td>
</tr>
</tbody>
</table>
-</div>
-<div class="section" id="description">
-<h3>Description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h3>
-<div class="align-center figure">
+</section>
+<section id="description">
+<h3>Description<a class="headerlink" href="#description" title="Permalink to this headline">ïƒ</a></h3>
+<figure class="align-center">
<a class="reference internal image-reference" href="../_images/schema_measurement_board.jpg"><img alt="alternate text" src="../_images/schema_measurement_board.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>Figure shows the general schematics for the electronic measurement board developed.
We have developed a complete “plug and play†measurement board. To measure electrical resistivity with Raspberry Pi.
two ADS1115 were used,one for the voltage measurement one for the current measurement, as proposed by Florsch [7]. The ADS1115
@@ -610,7 +606,7 @@ for Raspberry Pi connection</p></td>
<td><img alt="../_images/20_mes_board.jpg" src="../_images/20_mes_board.jpg" />
</td>
</tr>
-<tr class="row-even"><td><p>Fixing MCP23008 component</p></td>
+<tr class="row-even"><td><p>Fixing MCP23008 component (Dot mark on the top left corner)</p></td>
</tr>
</tbody>
</table>
@@ -624,7 +620,8 @@ for Raspberry Pi connection</p></td>
<td><img alt="../_images/21_mes_board.jpg" src="../_images/21_mes_board.jpg" />
</td>
</tr>
-<tr class="row-even"><td><p>Mounting optical relay, AQY211EH</p></td>
+<tr class="row-even"><td><p>Mounting optical relay, AQY211EH (Dot mark in the top left
+corners)</p></td>
</tr>
</tbody>
</table>
@@ -666,14 +663,14 @@ for Raspberry Pi connection</p></td>
<td><img alt="../_images/24_mes_board.jpg" src="../_images/24_mes_board.jpg" />
</td>
</tr>
-<tr class="row-even"><td><p>Fixing the INA282</p></td>
+<tr class="row-even"><td><p>Fixing the INA282 (Dot mark in the top right corner)</p></td>
</tr>
</tbody>
</table>
-</div>
-</div>
-<div class="section" id="part-b-start-up-of-the-measurement-board">
-<h2><strong>PART B</strong> Start-up of the measurement board<a class="headerlink" href="#part-b-start-up-of-the-measurement-board" title="Permalink to this headline">¶</a></h2>
+</section>
+</section>
+<section id="part-b-start-up-of-the-measurement-board">
+<h2><strong>PART B</strong> Start-up of the measurement board<a class="headerlink" href="#part-b-start-up-of-the-measurement-board" title="Permalink to this headline">ïƒ</a></h2>
<table class="docutils align-default">
<colgroup>
<col style="width: 100%" />
@@ -684,7 +681,7 @@ for Raspberry Pi connection</p></td>
</tbody>
</table>
<table class="colwidths-given docutils align-default" id="id2">
-<caption><span class="caption-text">List of components</span><a class="headerlink" href="#id2" title="Permalink to this table">¶</a></caption>
+<caption><span class="caption-text">List of components</span><a class="headerlink" href="#id2" title="Permalink to this table">ïƒ</a></caption>
<colgroup>
<col style="width: 8%" />
<col style="width: 18%" />
@@ -808,9 +805,9 @@ Raspberry Pi’s power port.</p></td>
</tr>
</tbody>
</table>
-</div>
-<div class="section" id="part-c-check-the-measurement-board">
-<h2><strong>PART C</strong> Check the measurement board<a class="headerlink" href="#part-c-check-the-measurement-board" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="part-c-check-the-measurement-board">
+<h2><strong>PART C</strong> Check the measurement board<a class="headerlink" href="#part-c-check-the-measurement-board" title="Permalink to this headline">ïƒ</a></h2>
<blockquote>
<div><p>Run the terminal, and write</p>
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="n">i2cdetect</span> <span class="o">-</span><span class="n">y</span> <span class="mi">1</span>
@@ -934,7 +931,7 @@ batteries</p></td>
</colgroup>
<tbody>
<tr class="row-odd"><td rowspan="2"><p>7</p></td>
-<td><img alt="../_images/thonny_first_interface2.jpg" src="../_images/thonny_first_interface2.jpg" />
+<td><img alt="../_images/thonny_first_interface1.jpg" src="../_images/thonny_first_interface1.jpg" />
</td>
</tr>
<tr class="row-even"><td><p>Run Tonny Interpreter</p></td>
@@ -956,8 +953,8 @@ get the following result (220 ohm)</p></td>
</tr>
</tbody>
</table>
-</div>
-</div>
+</section>
+</section>
</div>
diff --git a/sphinx/build/html/Ohmpi_V2_00/V2_00_step_03.html b/sphinx/build/html/Ohmpi_V2_00/V2_00_step_03.html
deleted file mode 100644
index de9ead380fe010cc8bed7040bf331ffd27ec807d..0000000000000000000000000000000000000000
--- a/sphinx/build/html/Ohmpi_V2_00/V2_00_step_03.html
+++ /dev/null
@@ -1,438 +0,0 @@
-<!DOCTYPE html>
-<html class="writer-html5" lang="en" >
-<head>
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>STEP n°3: MUX board — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
- <!--[if lt IE 9]>
- <script src="../_static/js/html5shiv.min.js"></script>
- <![endif]-->
- <script id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
- <script src="../_static/jquery.js"></script>
- <script src="../_static/underscore.js"></script>
- <script src="../_static/doctools.js"></script>
- <script src="../_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
- <script src="../_static/js/theme.js"></script>
- <link rel="index" title="Index" href="../genindex.html" />
- <link rel="search" title="Search" href="../search.html" />
- <link rel="prev" title="STEP n°2: Measurement board" href="V2_00_step_02.html" />
-</head>
-
-<body class="wy-body-for-nav">
- <div class="wy-grid-for-nav">
- <nav data-toggle="wy-nav-shift" class="wy-nav-side">
- <div class="wy-side-scroll">
- <div class="wy-side-nav-search" >
- <a href="../index.html" class="icon icon-home"> Ohmpi:
- </a>
-<div role="search">
- <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
- <input type="text" name="q" placeholder="Search docs" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
-</div>
- </div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
- <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../Ohmpi.html">OhmPi project</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../V1_01.html">OhmPi V 1.01 (limited to 32 electrodes)</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../V1_02.html">OhmPi V 1.02 (limited to 32 electrodes)</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../V2_00.html">OhmPi V 2.xx (64 or 128 electrodes and 12V)</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../V2_00.html#the-philosophy-of-ohmpi">The philosophy of Ohmpi</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../V2_00.html#technical-data">Technical data</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="../V2_00.html#ohmpi-2-step-by-step">Ohmpi 2 step by step</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="V2_00_step_01.html"><strong>STEP n°1</strong> : Raspberry Pi configuration</a></li>
-<li class="toctree-l3"><a class="reference internal" href="V2_00_step_02.html"><strong>STEP n°2</strong>: Measurement board</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#"><strong>STEP n°3</strong>: MUX board</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="#part-a-assembly-of-mux-board"><strong>PART A</strong> Assembly of MUX board</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-
- </div>
- </div>
- </nav>
-
- <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
- <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
- <a href="../index.html">Ohmpi:</a>
- </nav>
-
- <div class="wy-nav-content">
- <div class="rst-content">
- <div role="navigation" aria-label="Page navigation">
- <ul class="wy-breadcrumbs">
- <li><a href="../index.html" class="icon icon-home"></a> »</li>
- <li><a href="../V2_00.html">OhmPi V 2.xx (64 or 128 electrodes and 12V)</a> »</li>
- <li><strong>STEP n°3</strong>: MUX board</li>
- <li class="wy-breadcrumbs-aside">
- <a href="../_sources/Ohmpi_V2_00/V2_00_step_03.rst.txt" rel="nofollow"> View page source</a>
- </li>
- </ul>
- <hr/>
-</div>
- <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
- <div itemprop="articleBody">
-
- <div class="section" id="step-n3-mux-board">
-<h1><strong>STEP n°3</strong>: MUX board<a class="headerlink" href="#step-n3-mux-board" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="part-a-assembly-of-mux-board">
-<h2><strong>PART A</strong> Assembly of MUX board<a class="headerlink" href="#part-a-assembly-of-mux-board" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="required-components">
-<h3>Required components<a class="headerlink" href="#required-components" title="Permalink to this headline">¶</a></h3>
-<div class="align-center figure">
-<a class="reference internal image-reference" href="../_images/MUX_board_componement.jpg"><img alt="alternate text" src="../_images/MUX_board_componement.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
-<table class="colwidths-given docutils align-default" id="id1">
-<caption><span class="caption-text">List of components</span><a class="headerlink" href="#id1" title="Permalink to this table">¶</a></caption>
-<colgroup>
-<col style="width: 8%" />
-<col style="width: 18%" />
-<col style="width: 18%" />
-<col style="width: 18%" />
-<col style="width: 18%" />
-<col style="width: 9%" />
-<col style="width: 9%" />
-</colgroup>
-<thead>
-<tr class="row-odd"><th class="head"><p>Component</p></th>
-<th class="head"><p>Number</p></th>
-<th class="head"><p>Cost per unit €</p></th>
-<th class="head"><p>Total cost €</p></th>
-<th class="head"><p>Manufacturer</p></th>
-<th class="head"><p>Manufacturer s reference</p></th>
-<th class="head"><p>Web reference</p></th>
-</tr>
-</thead>
-<tbody>
-<tr class="row-even"><td><p>Printed circuit board</p></td>
-<td><p>4</p></td>
-<td><p>140</p></td>
-<td><p>560</p></td>
-<td><p>Asler</p></td>
-<td><ul class="simple">
-<li></li>
-</ul>
-</td>
-<td><ul class="simple">
-<li></li>
-</ul>
-</td>
-</tr>
-<tr class="row-odd"><td><p>Pin strip no ejector 16 pins</p></td>
-<td><p>16</p></td>
-<td><p>0.62</p></td>
-<td><p>9.92</p></td>
-<td><p>BLK electronic</p></td>
-<td><p>10120550</p></td>
-<td><p><a class="reference external" href="https://www.conrad.com/p/tru-components-1580994-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-16-no-of-rows-2-1-pcs-1580994">https://www.conrad.com/p/tru-components-1580994-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-16-no-of-rows-2-1-pcs-1580994</a></p></td>
-</tr>
-<tr class="row-even"><td><p>diode-1n4007</p></td>
-<td><p>256</p></td>
-<td><p>0.091</p></td>
-<td><p>23.296</p></td>
-<td><p>Diodes Incorporated</p></td>
-<td><p>1N4007-T</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Diodes-Incorporated/1N4007-T?qs=sGAEpiMZZMueQxo7L%2FBPyAkbORUUMREn">https://www.mouser.fr/ProductDetail/Diodes-Incorporated/1N4007-T?qs=sGAEpiMZZMueQxo7L%2FBPyAkbORUUMREn</a></p></td>
-</tr>
-<tr class="row-odd"><td><p>Pin strip no ejector 6 pins</p></td>
-<td><p>4</p></td>
-<td><p>0.39</p></td>
-<td><p>1.56</p></td>
-<td><p>BLK electronic</p></td>
-<td><p>10120550</p></td>
-<td><p><a class="reference external" href="https://www.conrad.com/p/tru-components-1580994-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-16-no-of-rows-2-1-pcs-1580994">https://www.conrad.com/p/tru-components-1580994-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-16-no-of-rows-2-1-pcs-1580994</a></p></td>
-</tr>
-<tr class="row-even"><td><p>Dual screw terminal (5.08-mm pitch)</p></td>
-<td><p>12</p></td>
-<td><p>0.648</p></td>
-<td><p>7.776</p></td>
-<td><p>CUI Devices</p></td>
-<td><p>TB009-508-02BE</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/CUI-Devices/TB009-508-02BE?qs=vLWxofP3U2wCFk5uCkWTkA%3D%3D">https://www.mouser.fr/ProductDetail/CUI-Devices/TB009-508-02BE?qs=vLWxofP3U2wCFk5uCkWTkA%3D%3D</a></p></td>
-</tr>
-<tr class="row-odd"><td><p>Generic male header - 3 pins</p></td>
-<td><p>12</p></td>
-<td><p>0.205</p></td>
-<td><p>2.46</p></td>
-<td><p>TE Connectivity</p></td>
-<td><p>4-103321-5</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/TE-Connectivity/4-103321-5?qs=5TwgZeq9E7HSYLqaljJYrw%3D%3D">https://www.mouser.fr/ProductDetail/TE-Connectivity/4-103321-5?qs=5TwgZeq9E7HSYLqaljJYrw%3D%3D</a></p></td>
-</tr>
-<tr class="row-even"><td><p>MCP23017 I2C I/O Expander</p></td>
-<td><p>16</p></td>
-<td><p>2.5</p></td>
-<td><p>40</p></td>
-<td><p>Adafruit</p></td>
-<td><p>732</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Adafruit/732?qs=sGAEpiMZZMsKEdP9slC0Yfx16nYdMpXJueeOGoLBlDI%3D">https://www.mouser.fr/ProductDetail/Adafruit/732?qs=sGAEpiMZZMsKEdP9slC0Yfx16nYdMpXJueeOGoLBlDI%3D</a></p></td>
-</tr>
-<tr class="row-odd"><td><p>Omron G5LE-1-VD 12 VDC PCB relay 12 V DC 8 A 1</p></td>
-<td><p>256</p></td>
-<td><p>1.27</p></td>
-<td><p>325.12</p></td>
-<td><p>Omron</p></td>
-<td><p>G5LE-1-VD 12 VDC</p></td>
-<td><p><a class="reference external" href="https://www.conrad.com/p/omron-g5le-1-vd-12-vdc-pcb-relay-12-v-dc-8-a-1-change-over-1-pcs-503811">https://www.conrad.com/p/omron-g5le-1-vd-12-vdc-pcb-relay-12-v-dc-8-a-1-change-over-1-pcs-503811</a></p></td>
-</tr>
-<tr class="row-even"><td><p>ZVN4206A MOSFET-NCHANNEL</p></td>
-<td><p>256</p></td>
-<td><p>0.471</p></td>
-<td><p>120.576</p></td>
-<td><p>Diodes Incorporated</p></td>
-<td><p>ZVN4206A</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Diodes-Incorporated/ZVN4206A?qs=vHuUswq2%252Bsz9b%2Ff6fcXt7g%3D%3D">https://www.mouser.fr/ProductDetail/Diodes-Incorporated/ZVN4206A?qs=vHuUswq2%252Bsz9b%2Ff6fcXt7g%3D%3D</a></p></td>
-</tr>
-<tr class="row-odd"><td><p>100k? Resistor</p></td>
-<td><p>256</p></td>
-<td><p>0.061</p></td>
-<td><p>15.616</p></td>
-<td><p>Vishay / Beyschlag</p></td>
-<td><p>MBA02040C1003FRP00</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Vishay-Beyschlag/MBA02040C1003FRP00?qs=mzRxyRlhVdt9crF7Zyf%2F5Q%3D%3D">https://www.mouser.fr/ProductDetail/Vishay-Beyschlag/MBA02040C1003FRP00?qs=mzRxyRlhVdt9crF7Zyf%2F5Q%3D%3D</a></p></td>
-</tr>
-<tr class="row-even"><td><p>Adafruit TCA9548A</p></td>
-<td><p>4</p></td>
-<td><p>5.89</p></td>
-<td><p>23.56</p></td>
-<td><p>Adafruit</p></td>
-<td><p>2717</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Adafruit/2717?qs=sGAEpiMZZMsyYdr3R27aV4EQf73yOH%252Baqg%252BZ3hVktao%3D">https://www.mouser.fr/ProductDetail/Adafruit/2717?qs=sGAEpiMZZMsyYdr3R27aV4EQf73yOH%252Baqg%252BZ3hVktao%3D</a></p></td>
-</tr>
-<tr class="row-odd"><td><p>BKL Electronic 10120558 Pin strip no ejector Contact spacing: 2.54 mm Total number of pins: 16 No. of rows: 2 1 pc(s)</p></td>
-<td><p>16</p></td>
-<td><p>0.51</p></td>
-<td><p>8.16</p></td>
-<td><p>BLK electronic</p></td>
-<td><p>10120558</p></td>
-<td><p><a class="reference external" href="https://www.conrad.com/p/bkl-electronic-10120558-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-16-no-of-rows-2-1-pcs-741727?searchTerm=741727&searchType=suggest&searchSuggest=product">https://www.conrad.com/p/bkl-electronic-10120558-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-16-no-of-rows-2-1-pcs-741727?searchTerm=741727&searchType=suggest&searchSuggest=product</a></p></td>
-</tr>
-<tr class="row-even"><td><p>BKL Electronic 10120862 Pin connector + strain relief Contact spacing: 2.54 mm Total number of pins: 6 No. of rows: 2 1</p></td>
-<td><p>16</p></td>
-<td><p>0.84</p></td>
-<td><p>13.44</p></td>
-<td><p>BLK electronic</p></td>
-<td><p>10120862</p></td>
-<td><p><a class="reference external" href="https://www.conrad.com/p/bkl-electronic-10120862-pin-connector-strain-relief-contact-spacing-254-mm-total-number-of-pins-6-no-of-rows-2-1-742063">https://www.conrad.com/p/bkl-electronic-10120862-pin-connector-strain-relief-contact-spacing-254-mm-total-number-of-pins-6-no-of-rows-2-1-742063</a></p></td>
-</tr>
-<tr class="row-odd"><td><p>BKL Electronic 10120158/10 Ribbon cable Contact spacing: 1.27 mm 16 x 0.08 mm Multi-coloured 10 m</p></td>
-<td><p>1</p></td>
-<td><p>27</p></td>
-<td><p>27</p></td>
-<td><p>BLK electronic</p></td>
-<td><p>10120158/10</p></td>
-<td><p><a class="reference external" href="https://www.conrad.com/p/bkl-electronic-1012015810-ribbon-cable-contact-spacing-127-mm-16-x-008-mm-multi-coloured-10-m-1548658?searchTerm=1548658&searchType=suggest&searchSuggest=product">https://www.conrad.com/p/bkl-electronic-1012015810-ribbon-cable-contact-spacing-127-mm-16-x-008-mm-multi-coloured-10-m-1548658?searchTerm=1548658&searchType=suggest&searchSuggest=product</a></p></td>
-</tr>
-<tr class="row-even"><td><p>spacer 5.5 HEX 25 mm M3 male/female</p></td>
-<td><p>31</p></td>
-<td><p>2.79</p></td>
-<td><p>86.49</p></td>
-<td><p>Keystone Electronics</p></td>
-<td><p>24300</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Keystone-Electronics/24300?qs=UWqYQ%2F2cZWu0ejpOzmZC2A%3D%3D">https://www.mouser.fr/ProductDetail/Keystone-Electronics/24300?qs=UWqYQ%2F2cZWu0ejpOzmZC2A%3D%3D</a></p></td>
-</tr>
-<tr class="row-odd"><td><p>Screw</p></td>
-<td><p>9</p></td>
-<td><p>0.305</p></td>
-<td><p>2.745</p></td>
-<td><p>APM HEXSEAL</p></td>
-<td><p>RM3X8MM-2701</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/APM-HEXSEAL/RM3X8MM-2701?qs=JJSE%2F12mKnS3VxSDrYXUHw%3D%3D">https://www.mouser.fr/ProductDetail/APM-HEXSEAL/RM3X8MM-2701?qs=JJSE%2F12mKnS3VxSDrYXUHw%3D%3D</a></p></td>
-</tr>
-<tr class="row-even"><td><p>spacer 5.5 HEX 25 mm M3 female/female</p></td>
-<td><p>9</p></td>
-<td><p>0.846</p></td>
-<td><p>7.614</p></td>
-<td><p>Keystone Electronics</p></td>
-<td><p>25515</p></td>
-<td><p><a class="reference external" href="https://www.mouser.fr/ProductDetail/Keystone-Electronics/25515?qs=UWqYQ%2F2cZWuxuhUmfr%252BZuQ%3D%3D">https://www.mouser.fr/ProductDetail/Keystone-Electronics/25515?qs=UWqYQ%2F2cZWuxuhUmfr%252BZuQ%3D%3D</a></p></td>
-</tr>
-</tbody>
-</table>
-<p>The multiplexing of the channels is a mechanical multiplexing based on OMRON’s manufacturing relays (G5LE-1-VD 12 VDC). Each relay is combined with
-a ZVN4206A power MOFSET. The raspberry has only 30 GPIOs, which is not enough to activate all the 64 electrodes, which represent 512 GPIOs.
-We used gpio expender I2C (MCP23017). We have associated these components with an I2C muliplexer of type type TCA9548A from adafruit.
-This combination allows to go up to 512 GPIOs and up to 128 electrodes. Each card has its own digital address between 0X70 and 0X77.
-In the following presentation for an Ohmpi 64 electrodes, we will use the addresses 0X70 for channel A, 0X71 for channel B, 0X72 for channel M and 0X73 for channel N.
-0X73 for the N channel. 4 MUX board will be needed to multiplex an Ohmpi 64 electrodes.</p>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>1</p></td>
-<td><img alt="../_images/MUX_00.jpg" src="../_images/MUX_00.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>2</p></td>
-<td><img alt="../_images/MUX_01.jpg" src="../_images/MUX_01.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>3</p></td>
-<td><img alt="../_images/MUX_02.jpg" src="../_images/MUX_02.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>4</p></td>
-<td><img alt="../_images/MUX_03.jpg" src="../_images/MUX_03.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>5</p></td>
-<td><img alt="../_images/MUX_04.jpg" src="../_images/MUX_04.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>6</p></td>
-<td><img alt="../_images/MUX_05.jpg" src="../_images/MUX_05.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>7</p></td>
-<td><img alt="../_images/MUX_06.jpg" src="../_images/MUX_06.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>8</p></td>
-<td><img alt="../_images/MUX_07.jpg" src="../_images/MUX_07.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>9</p></td>
-<td><img alt="../_images/MUX_08.jpg" src="../_images/MUX_08.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-<table class="docutils align-center">
-<colgroup>
-<col style="width: 12%" />
-<col style="width: 88%" />
-</colgroup>
-<tbody>
-<tr class="row-odd"><td rowspan="2"><p>10</p></td>
-<td><img alt="../_images/MUX_09.jpg" src="../_images/MUX_09.jpg" />
-</td>
-</tr>
-<tr class="row-even"><td></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-</div>
-
-
- </div>
- </div>
- <footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
- <a href="V2_00_step_02.html" class="btn btn-neutral float-left" title="STEP n°2: Measurement board" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
- </div>
-
- <hr/>
-
- <div role="contentinfo">
- <p>© Copyright 2020, INRAE, Rémi CLEMENT.</p>
- </div>
-
- Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
- <a href="https://github.com/readthedocs/sphinx_rtd_theme">theme</a>
- provided by <a href="https://readthedocs.org">Read the Docs</a>.
-
-
-</footer>
- </div>
- </div>
- </section>
- </div>
- <script>
- jQuery(function () {
- SphinxRtdTheme.Navigation.enable(true);
- });
- </script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/sphinx/build/html/V1_01.html b/sphinx/build/html/V1_01.html
index 768b87788f9e05441e6aa679a3656b983bab73da..c1e494e0d507caa27c5decec300a1aad75494182 100644
--- a/sphinx/build/html/V1_01.html
+++ b/sphinx/build/html/V1_01.html
@@ -1,19 +1,21 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>OhmPi V 1.01 (limited to 32 electrodes) — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <title>OhmPi V 1.01 (limited to 32 electrodes) — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
+
+ <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/jquery.js"></script>
<script src="_static/underscore.js"></script>
<script src="_static/doctools.js"></script>
- <script src="_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
+ <script async="async" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<script src="_static/js/theme.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
@@ -96,22 +98,22 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="ohmpi-v-1-01-limited-to-32-electrodes">
-<h1>OhmPi V 1.01 (limited to 32 electrodes)<a class="headerlink" href="#ohmpi-v-1-01-limited-to-32-electrodes" title="Permalink to this headline">¶</a></h1>
+ <section id="ohmpi-v-1-01-limited-to-32-electrodes">
+<h1>OhmPi V 1.01 (limited to 32 electrodes)<a class="headerlink" href="#ohmpi-v-1-01-limited-to-32-electrodes" title="Permalink to this headline">ïƒ</a></h1>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>This version corresponds to the version published in the Hardware X journal.
However, we have corrected the bugs that existed on this version and explained the missing mounting points in detail below.
We invite you to refer to this document to assemble Ohmpi V1.01.</p>
</div>
-<div class="section" id="the-philosophy-of-ohmpi">
-<h2>The philosophy of Ohmpi<a class="headerlink" href="#the-philosophy-of-ohmpi" title="Permalink to this headline">¶</a></h2>
+<section id="the-philosophy-of-ohmpi">
+<h2>The philosophy of Ohmpi<a class="headerlink" href="#the-philosophy-of-ohmpi" title="Permalink to this headline">ïƒ</a></h2>
<p>The philosophy of Ohmpi V1.01 is to offer a multi electrode resistivity meter, from a set of commercially available
electronic cards it is a resistivity meter limited to 32 electrodes only. It is limited to low-current injection,
but suitable for small laboratory experiments and small field time monitoring</p>
-</div>
-<div class="section" id="technical-data">
-<h2>Technical data<a class="headerlink" href="#technical-data" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="technical-data">
+<h2>Technical data<a class="headerlink" href="#technical-data" title="Permalink to this headline">ïƒ</a></h2>
<table class="docutils align-default">
<colgroup>
<col style="width: 50%" />
@@ -166,11 +168,11 @@ control system</p></td>
</tr>
</tbody>
</table>
-</div>
-<div class="section" id="raspberry-pi-configuration">
-<h2>Raspberry Pi configuration<a class="headerlink" href="#raspberry-pi-configuration" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="os-installation">
-<h3>OS installation<a class="headerlink" href="#os-installation" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="raspberry-pi-configuration">
+<h2>Raspberry Pi configuration<a class="headerlink" href="#raspberry-pi-configuration" title="Permalink to this headline">ïƒ</a></h2>
+<section id="os-installation">
+<h3>OS installation<a class="headerlink" href="#os-installation" title="Permalink to this headline">ïƒ</a></h3>
<p>The first step is to start up the Raspberry Pi board, including installation of an OS (operating system).
For this step, the installation instructions are well described on the Raspberry website</p>
<ol class="arabic simple">
@@ -180,9 +182,9 @@ For this step, the installation instructions are well described on the Raspberry
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>All the development tests were performed on Raspberry Pi 3 Model B, we used the following version of Raspbian:</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/raspbian_version1.jpg"><img alt="alternate text" src="_images/raspbian_version1.jpg" style="width: 800px; height: 400px;" /></a>
-</div>
+</figure>
</div>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
@@ -218,9 +220,9 @@ To ensure that the GPIOs are in Low position, you will need to modify the /boot/
<li><p>Press Ctrl +x to escap and return to the terminal</p></li>
<li><p>Close the terminal</p></li>
</ol>
-</div>
-<div class="section" id="virtual-environnement-and-packages">
-<h3>Virtual Environnement and packages<a class="headerlink" href="#virtual-environnement-and-packages" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="virtual-environnement-and-packages">
+<h3>Virtual Environnement and packages<a class="headerlink" href="#virtual-environnement-and-packages" title="Permalink to this headline">ïƒ</a></h3>
<p>All dependencies are specified in requirements.txt</p>
<div class="admonition note">
<p class="admonition-title">Note</p>
@@ -252,39 +254,39 @@ to leave the virtual environment simply type:</p>
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="n">deactivate</span>
</pre></div>
</div>
-</div>
-<div class="section" id="activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi">
-<h3>Activate virtual environnement on Thonny (Python IDE) (on Rapberry Pi)<a class="headerlink" href="#activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi">
+<h3>Activate virtual environnement on Thonny (Python IDE) (on Rapberry Pi)<a class="headerlink" href="#activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi" title="Permalink to this headline">ïƒ</a></h3>
<p>If you decided to use a virtual environment, it is necessary to setup Thonny Python IDE the first time you use it.</p>
<p>1- Run the Thonny Python IDE software, Click on raspebrry acces <strong>menu > programming> Thonny pythonIDE</strong></p>
<p>2- Thonny’s interface opens, Python runs on the Root (Python 3.7.3 (/usr/bin/python3))</p>
-<div class="align-center figure">
-<a class="reference internal image-reference" href="_images/thonny_first_interface1.jpg"><img alt="alternate text" src="_images/thonny_first_interface1.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+<figure class="align-center">
+<a class="reference internal image-reference" href="_images/thonny_first_interface2.jpg"><img alt="alternate text" src="_images/thonny_first_interface2.jpg" style="width: 600px; height: 450px;" /></a>
+</figure>
<p>3-Click on <strong>Run>select interpreter</strong>, a new window opens click on interpret</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/thonny_option1.jpg"><img alt="alternate text" src="_images/thonny_option1.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>4-On the new open windows select <strong>alternative Pyhton3 or virtual environnement</strong></p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/thonny_interpreter1.jpg"><img alt="alternate text" src="_images/thonny_interpreter1.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>5- New buttons appeared, selected <strong>“locate another python executable “</strong></p>
<p>6- A new window opens, find the folder where there is the python 3 file in the virtual environment folder previously created <strong>/home/pi/ohmpi/bin/python3</strong>.</p>
<p>7- In the <strong>known interpreter</strong> tab the path of the virtual environnementshould appear</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/thonny_interpreter_folder1.jpg"><img alt="alternate text" src="_images/thonny_interpreter_folder1.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>8- Close the window by clicking on <strong>ok</strong>.</p>
<p>9- Close thonny to save modifications</p>
-</div>
-</div>
-<div class="section" id="assembly-of-the-measuring-current-injection-cards-and-connection-with-the-raspberry-pi">
-<h2>Assembly of the measuring/current injection cards, and connection with the Raspberry Pi<a class="headerlink" href="#assembly-of-the-measuring-current-injection-cards-and-connection-with-the-raspberry-pi" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="electrical-resistivity-measurements-board">
-<h3>Electrical resistivity measurements board<a class="headerlink" href="#electrical-resistivity-measurements-board" title="Permalink to this headline">¶</a></h3>
-<div class="section" id="a-description">
-<h4>a) Description<a class="headerlink" href="#a-description" title="Permalink to this headline">¶</a></h4>
+</section>
+</section>
+<section id="assembly-of-the-measuring-current-injection-cards-and-connection-with-the-raspberry-pi">
+<h2>Assembly of the measuring/current injection cards, and connection with the Raspberry Pi<a class="headerlink" href="#assembly-of-the-measuring-current-injection-cards-and-connection-with-the-raspberry-pi" title="Permalink to this headline">ïƒ</a></h2>
+<section id="electrical-resistivity-measurements-board">
+<h3>Electrical resistivity measurements board<a class="headerlink" href="#electrical-resistivity-measurements-board" title="Permalink to this headline">ïƒ</a></h3>
+<section id="a-description">
+<h4>a) Description<a class="headerlink" href="#a-description" title="Permalink to this headline">ïƒ</a></h4>
<p>To measure electrical resistivity with Raspberry Pi, an ADS1115 was introduced, as proposed by Florsch [7]. The ADS1115
is a 16-bit ADC (Analog-to-Digital Converter), with an adaptable gain. Its value has been set at 2/3 in this study. The
input signal value could lie between - to + 6.114 V. The ADS1115 is mounted on a board adapted from an in-house design.
@@ -316,13 +318,15 @@ electric field in the ground, with the total input impedance value being estimat
A shortcut between Electrodes A and B will generate excessive currents, whose intensities depend on the type of battery used.
A lithium ion battery or automobile-type lead-acid battery can deliver a strong enough current to damage the board and, as such,
constitutes a potential hazard. We therefore recommend adding a 1.5-A fuse between the battery and resistor R9.</p>
-<div class="align-center figure" id="id1">
+<figure class="align-center" id="id1">
<a class="reference internal image-reference" href="_images/schema_measurement_board1.jpg"><img alt="alternate text" src="_images/schema_measurement_board1.jpg" style="width: 800px; height: 400px;" /></a>
-<p class="caption"><span class="caption-text">Measurement board</span><a class="headerlink" href="#id1" title="Permalink to this image">¶</a></p>
-</div>
-</div>
-<div class="section" id="b-implementation">
-<h4>b) Implementation<a class="headerlink" href="#b-implementation" title="Permalink to this headline">¶</a></h4>
+<figcaption>
+<p><span class="caption-text">Measurement board</span><a class="headerlink" href="#id1" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
+</section>
+<section id="b-implementation">
+<h4>b) Implementation<a class="headerlink" href="#b-implementation" title="Permalink to this headline">ïƒ</a></h4>
<p>The measurement board must be printed using the PCB file (Source file repository), with components soldered onto
it by following the steps described below and illustrated in the following figure :</p>
<ul>
@@ -337,23 +341,16 @@ it by following the steps described below and illustrated in the following figur
\[coeff p2 = (R7 + R6) / R7\]</div>
<div class="math notranslate nohighlight">
\[coeff p3 = (R9 + R8) / R9\]</div>
-<div class="highlight-python notranslate"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>36
-37
-38
-39
-40
-41
-42
-43</pre></div></td><td class="code"><div class="highlight"><pre><span></span> <span class="sd">"""</span>
-<span class="sd"> hardware parameters</span>
-<span class="sd"> """</span>
- <span class="n">R_ref</span> <span class="o">=</span> <span class="mi">50</span> <span class="c1"># reference resistance value in ohm</span>
- <span class="n">coef_p0</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P0, measurement in V/V</span>
- <span class="n">coef_p1</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P1, measurement in V/V</span>
- <span class="n">coef_p2</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P2, measurement in V/V</span>
- <span class="n">coef_p3</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P3, measurement in V/V</span>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="linenos">36</span> <span class="sd">"""</span>
+<span class="linenos">37</span><span class="sd"> hardware parameters</span>
+<span class="linenos">38</span><span class="sd"> """</span>
+<span class="linenos">39</span> <span class="n">R_ref</span> <span class="o">=</span> <span class="mi">50</span> <span class="c1"># reference resistance value in ohm</span>
+<span class="linenos">40</span> <span class="n">coef_p0</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P0, measurement in V/V</span>
+<span class="linenos">41</span> <span class="n">coef_p1</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P1, measurement in V/V</span>
+<span class="linenos">42</span> <span class="n">coef_p2</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P2, measurement in V/V</span>
+<span class="linenos">43</span> <span class="n">coef_p3</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P3, measurement in V/V</span>
</pre></div>
-</td></tr></table></div>
+</div>
<p>The coefficient parameters can be adjusted in lines 40 to 43 of the ohmpi.py code.</p>
</div></blockquote>
</dd>
@@ -370,18 +367,22 @@ or stronger power supply, it would be possible to adjust the divider bridge valu
Once all the components have been soldered together, the measurement board can be connected to the Raspberry Pi and the
battery terminal, according to Figure 9. Between the battery and the TX+ terminal of the measurement board, remember to
place a fuse holder with a 1.5-A fuse for safety purposes.</p>
-<div class="align-center figure" id="id2">
+<figure class="align-center" id="id2">
<a class="reference internal image-reference" href="_images/measurement_board.jpg"><img alt="alternate text" src="_images/measurement_board.jpg" style="width: 800px; height: 500px;" /></a>
-<p class="caption"><span class="caption-text">Measurement circuit board assembly: a) printed circuit board, b) adding the 1-Kohm resistors ± 1%, c)adding the 1.5-Kohm resistors ± 1%, d) adding the black female 1 x 10 header and the 7-blue screw terminal block(2 pin, 3.5-mm pitch), e) adding the 50-ohm reference resistor ± 0.1%, and f) adding the ADS1115 and the LM358N low-power dual operational amplifiers</span><a class="headerlink" href="#id2" title="Permalink to this image">¶</a></p>
-</div>
-<div class="align-center figure" id="id3">
+<figcaption>
+<p><span class="caption-text">Measurement circuit board assembly: a) printed circuit board, b) adding the 1-Kohm resistors ± 1%, c)adding the 1.5-Kohm resistors ± 1%, d) adding the black female 1 x 10 header and the 7-blue screw terminal block(2 pin, 3.5-mm pitch), e) adding the 50-ohm reference resistor ± 0.1%, and f) adding the ADS1115 and the LM358N low-power dual operational amplifiers</span><a class="headerlink" href="#id2" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
+<figure class="align-center" id="id3">
<a class="reference internal image-reference" href="_images/measurement_board-2.jpg"><img alt="alternate text" src="_images/measurement_board-2.jpg" style="width: 800px; height: 700px;" /></a>
-<p class="caption"><span class="caption-text">Measurement board installation with Raspberry Pi</span><a class="headerlink" href="#id3" title="Permalink to this image">¶</a></p>
-</div>
-</div>
-</div>
-<div class="section" id="current-injection-board">
-<h3>Current injection board<a class="headerlink" href="#current-injection-board" title="Permalink to this headline">¶</a></h3>
+<figcaption>
+<p><span class="caption-text">Measurement board installation with Raspberry Pi</span><a class="headerlink" href="#id3" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
+</section>
+</section>
+<section id="current-injection-board">
+<h3>Current injection board<a class="headerlink" href="#current-injection-board" title="Permalink to this headline">ïƒ</a></h3>
<p>To carry out the electrical resistivity measurement, the first step consists of injecting current into the ground.
In our case, a simple 9-V lead-acid battery is used to create an electrical potential difference that results
in current circulating into the ground. The current is injected through electrodes A and B (see Fig. 2). This
@@ -393,10 +394,12 @@ to the GPIO 7 on the Raspberry Pi and therefore activate simultaneously. The rol
the polarity at electrodes A and B. Thus, when relays 3 and 4 are energized by the GPIO 8 in the open position,
the positive battery pole is connected to electrode A and the negative pole to electrode B. When not energized,
they remain in the normally closed position. This set-up offers a simple and robust solution to inject current.</p>
-<div class="align-center figure" id="id4">
+<figure class="align-center" id="id4">
<a class="reference internal image-reference" href="_images/current_board.jpg"><img alt="alternate text" src="_images/current_board.jpg" style="width: 800px; height: 400px;" /></a>
-<p class="caption"><span class="caption-text">Wiring of the 4-channel relay module board for current injection management</span><a class="headerlink" href="#id4" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Wiring of the 4-channel relay module board for current injection management</span><a class="headerlink" href="#id4" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<p>The next step consists of featuring the 4-channel relay module used for current injection and its assembly. The wiring
between the relays must be carried out in strict accordance with Fig. 10. This card must then be connected to the Raspberry
Pi and the measurement card. On the Raspberry Pi, it is necessary to connect inputs In1 and In2 to the same GPIO. For this
@@ -404,21 +407,23 @@ purpose, it is necessary to solder together the two pins on the 4-channel relay
the relay card’s 4 channels respectively to the GND pin and 5Vcc of the Raspberry Pi. Now connect relays 1, 2, 3 and 4, as
shown in the diagram, using 1-mm2 cables (red and black in Fig. 10). Lastly, connect the inputs of relay 1 and 2 respectively
to terminals B and A of the measurement board.</p>
-<div class="align-center figure" id="id5">
+<figure class="align-center" id="id5">
<a class="reference internal image-reference" href="_images/installation_current_board.jpg"><img alt="alternate text" src="_images/installation_current_board.jpg" style="width: 800px; height: 700px;" /></a>
-<p class="caption"><span class="caption-text">Current injection board installation with Raspberry Pi</span><a class="headerlink" href="#id5" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Current injection board installation with Raspberry Pi</span><a class="headerlink" href="#id5" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<p>Congratulations, you have build a 4 electrodes resistivity-meter.</p>
-</div>
-<div class="section" id="frist-four-electrodes-resistivity-mesurement">
-<h3>Frist four electrodes resistivity mesurement<a class="headerlink" href="#frist-four-electrodes-resistivity-mesurement" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="frist-four-electrodes-resistivity-mesurement">
+<h3>Frist four electrodes resistivity mesurement<a class="headerlink" href="#frist-four-electrodes-resistivity-mesurement" title="Permalink to this headline">ïƒ</a></h3>
<p>Under construction !</p>
<p>Describe the way to valide the first part of the instruction.
Electrical resistivity measurement on test circuit</p>
-</div>
-</div>
-<div class="section" id="multiplexer-implentation">
-<h2>Multiplexer implentation<a class="headerlink" href="#multiplexer-implentation" title="Permalink to this headline">¶</a></h2>
+</section>
+</section>
+<section id="multiplexer-implentation">
+<h2>Multiplexer implentation<a class="headerlink" href="#multiplexer-implentation" title="Permalink to this headline">ïƒ</a></h2>
<p>The resistivity measurement is conducted on four terminals (A, B, M and N). The user could perform each measurement
by manually plugging four electrodes into the four channel terminals. In practice, ERT requires several tens or thousands
of measurements conducted on different electrode arrays. A multiplexer is therefore used to connect each channel to one of
@@ -428,10 +433,12 @@ modules with 16 channels each. On the first board, on each MUX, 15 relays out of
configuration enables making smaller multiplexers (8 or 16 electrodes only). On the other hand, if you prefer upping to 64 electrodes,
which is entirely possible, a GPIO channel multiplier will have to be used.
To prepare the multiplexer, the channels of the two relay boards must be connected according to the wiring diagram shown below.</p>
-<div class="align-center figure" id="id6">
+<figure class="align-center" id="id6">
<a class="reference internal image-reference" href="_images/multiplexer_implementation.jpg"><img alt="alternate text" src="_images/multiplexer_implementation.jpg" style="width: 800px; height: 500px;" /></a>
-<p class="caption"><span class="caption-text">Schematic diagram of the wiring of two 16-channel relay shields</span><a class="headerlink" href="#id6" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Schematic diagram of the wiring of two 16-channel relay shields</span><a class="headerlink" href="#id6" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<p>For this purpose, 0.5-mm² cables with end caps are used and their length adjusted for each connection in order to produce a clean assembly.
The length was adjusted so that the distance between the two points to be connected could be directly measured on the board once they had
been assembled one above the other, in adding an extra 3 cm. The wires at the ends need to be stripped and the end caps added.
@@ -440,10 +447,12 @@ As a final step, connect the cables to the correct connectors. This operation mu
for activating each relay (Fig. 12). However, we will be activating several relays with a single GPIO (to limit the number of GPIOs used on Raspberry Pi,
see Section 2.4). To execute this step, it will be necessary to follow the protocol presented in Figure.</p>
<blockquote>
-<div><div class="align-center figure" id="id7">
+<div><figure class="align-center" id="id7">
<a class="reference internal image-reference" href="_images/connection.jpg"><img alt="alternate text" src="_images/connection.jpg" style="width: 800px; height: 400px;" /></a>
-<p class="caption"><span class="caption-text">Connection to the 16-channel relay shield</span><a class="headerlink" href="#id7" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Connection to the 16-channel relay shield</span><a class="headerlink" href="#id7" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
</div></blockquote>
<p>For the 16-channel relay shield no. 1, these steps must be followed:
* Position a test circuit with 10 horizontal and 10 vertical holes on the pins of the 16-channel relay shield board.
@@ -505,40 +514,44 @@ The next step consists of connecting the relay card inputs to the Raspberry Pi a
<blockquote>
<div><p>Connection of the GPIOs to each multiplexer</p>
</div></blockquote>
-</div>
-<div class="section" id="electrode-connection">
-<h2>Electrode connection<a class="headerlink" href="#electrode-connection" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="electrode-connection">
+<h2>Electrode connection<a class="headerlink" href="#electrode-connection" title="Permalink to this headline">ïƒ</a></h2>
<p>At this point, all that remains is to connect the electrodes of each multiplexer to a terminal block (Fig. 13). In our set-up, screw terminals assembled on a din rail were used.
According to the chosen multiplexer configuration, all the relays of each multiplexer will be connected to an electrode and, consequently, each electrode will have four incoming
connections. Instead of having four cables connecting an electrode terminal to each multiplexer, we recommend using the cable assembly shown in the following Figure.</p>
-<div class="align-center figure" id="id8">
+<figure class="align-center" id="id8">
<a class="reference internal image-reference" href="_images/cable.jpg"><img alt="alternate text" src="_images/cable.jpg" style="width: 800px; height: 300px;" /></a>
-<p class="caption"><span class="caption-text">Wire cabling for multiplexer and terminal screw connection</span><a class="headerlink" href="#id8" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Wire cabling for multiplexer and terminal screw connection</span><a class="headerlink" href="#id8" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<p>the next figure provides an example of multiplexer relay connections for electrode no. 1: this electrode of multiplexer MUX A must be connected to electrode no. 1 of MUX B. Moreover, electrode no. 1 of MUX B
must be connected to electrode no. 1 of MUX N, which in turn must be connected to electrode no. 1 of MUX M. Lastly, electrode no. 1 of MUX M is connected to the terminal block.
This operation must be repeated for all 32 electrodes.</p>
-<div class="align-center figure" id="id9">
+<figure class="align-center" id="id9">
<a class="reference internal image-reference" href="_images/electrode_cable.jpg"><img alt="alternate text" src="_images/electrode_cable.jpg" style="width: 800px; height: 800px;" /></a>
-<p class="caption"><span class="caption-text">Example of a multiplexer connection to the screw terminal for electrode no. 1.</span><a class="headerlink" href="#id9" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Example of a multiplexer connection to the screw terminal for electrode no. 1.</span><a class="headerlink" href="#id9" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>The 16 channel relay cards exist in 5-V and 12-V , in the bottom figure we have 12-V cards that we will directly connect to the battery.
In case you bought 16 channel relay 5-V cards, you will need to add a DC/DC 12-V/5-V converter. You can use a STEP DOWN MODULE DC-DC (Velleman WPM404) and set the voltage to 5V with the potentiometer.</p>
</div>
-</div>
-<div class="section" id="operating-instruction">
-<h2>Operating instruction<a class="headerlink" href="#operating-instruction" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="preliminary-procedure-only-for-the-initial-operation">
-<h3>Preliminary procedure (Only for the initial operation)<a class="headerlink" href="#preliminary-procedure-only-for-the-initial-operation" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="operating-instruction">
+<h2>Operating instruction<a class="headerlink" href="#operating-instruction" title="Permalink to this headline">ïƒ</a></h2>
+<section id="preliminary-procedure-only-for-the-initial-operation">
+<h3>Preliminary procedure (Only for the initial operation)<a class="headerlink" href="#preliminary-procedure-only-for-the-initial-operation" title="Permalink to this headline">ïƒ</a></h3>
<p>The open source code must be downloaded at the Open Science Framework source file repository for this manuscript (<a class="reference external" href="https://osf.io/dzwb4/">https://osf.io/dzwb4/</a>)
or at the following Gitlab repository address: <a class="reference external" href="https://gitlab.irstea.fr/reversaal/OhmPi">https://gitlab.irstea.fr/reversaal/OhmPi</a>. The code must be then unzipped into a selected folder (e.g. OhmPi-master). A “readme†file
is proposed in the directory to assist with installation of the software and required python packages. It is strongly recommended to create a python virtual environment for installing
the required packages and running the code.</p>
-</div>
-<div class="section" id="startup-procedure">
-<h3>Startup procedure<a class="headerlink" href="#startup-procedure" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="startup-procedure">
+<h3>Startup procedure<a class="headerlink" href="#startup-procedure" title="Permalink to this headline">ïƒ</a></h3>
<p>As an initial operating instruction, all batteries must be disconnected before any hardware handling. Ensure that the battery is charged at full capacity. Plug all the electrodes (32 or fewer)
into the screw terminals. The Raspberry Pi must be plugged into a computer screen, with a mouse and keyboard accessed remotely. The Raspberry Pi must then be plugged into the power supply
(for laboratory measurements) or a power bank (5V - 2A for field measurements). At this point, you’ll need to access the Raspbian operating system. Inside the previously created folder “ohmPiâ€,
@@ -547,37 +560,30 @@ function may be adjusted/optimized depending on the measurement attributes. For
plugged into the hardware; the “ohmpi.py†source code must be run within a python3 environment (or a virtual environment if one has been created) either in the terminal or using Thonny. You should now
hear the characteristic sound of a relay switching as a result of electrode permutation. After each quadrupole measurement, the potential difference as well as the current intensity and resistance
are displayed on the screen. A measurement file is automatically created and named “measure.csvâ€; it will be placed in the same folder.</p>
-</div>
-<div class="section" id="electrical-resistivity-measurement-parameters-description">
-<h3>Electrical resistivity measurement parameters description<a class="headerlink" href="#electrical-resistivity-measurement-parameters-description" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python notranslate"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>27
-28
-29
-30
-31
-32
-33
-34</pre></div></td><td class="code"><div class="highlight"><pre><span></span> <span class="sd">"""</span>
-<span class="sd"> measurement parameters</span>
-<span class="sd"> """</span>
- <span class="n">nb_electrodes</span> <span class="o">=</span> <span class="mi">32</span> <span class="c1"># maximum number of electrodes on the resistivity meter</span>
- <span class="n">injection_duration</span> <span class="o">=</span> <span class="mf">0.5</span> <span class="c1"># Current injection duration in second</span>
- <span class="n">nbr_meas</span><span class="o">=</span> <span class="mi">1</span> <span class="c1"># Number of times the quadripole sequence is repeated</span>
- <span class="n">sequence_delay</span><span class="o">=</span> <span class="mi">30</span> <span class="c1"># Delay in seconds between 2 sequences</span>
- <span class="n">stack</span><span class="o">=</span> <span class="mi">1</span> <span class="c1"># repetition of the current injection for each quadripole</span>
+</section>
+<section id="electrical-resistivity-measurement-parameters-description">
+<h3>Electrical resistivity measurement parameters description<a class="headerlink" href="#electrical-resistivity-measurement-parameters-description" title="Permalink to this headline">ïƒ</a></h3>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="linenos">27</span> <span class="sd">"""</span>
+<span class="linenos">28</span><span class="sd"> measurement parameters</span>
+<span class="linenos">29</span><span class="sd"> """</span>
+<span class="linenos">30</span> <span class="n">nb_electrodes</span> <span class="o">=</span> <span class="mi">32</span> <span class="c1"># maximum number of electrodes on the resistivity meter</span>
+<span class="linenos">31</span> <span class="n">injection_duration</span> <span class="o">=</span> <span class="mf">0.5</span> <span class="c1"># Current injection duration in second</span>
+<span class="linenos">32</span> <span class="n">nbr_meas</span><span class="o">=</span> <span class="mi">1</span> <span class="c1"># Number of times the quadripole sequence is repeated</span>
+<span class="linenos">33</span> <span class="n">sequence_delay</span><span class="o">=</span> <span class="mi">30</span> <span class="c1"># Delay in seconds between 2 sequences</span>
+<span class="linenos">34</span> <span class="n">stack</span><span class="o">=</span> <span class="mi">1</span> <span class="c1"># repetition of the current injection for each quadripole</span>
</pre></div>
-</td></tr></table></div>
-<p>The measurement parameters can be adjusted in lines 27 to 30 of the ohmpi.py code.</p>
</div>
-</div>
-<div class="section" id="complete-list-of-components">
-<h2>Complete list of components<a class="headerlink" href="#complete-list-of-components" title="Permalink to this headline">¶</a></h2>
+<p>The measurement parameters can be adjusted in lines 27 to 30 of the ohmpi.py code.</p>
+</section>
+</section>
+<section id="complete-list-of-components">
+<h2>Complete list of components<a class="headerlink" href="#complete-list-of-components" title="Permalink to this headline">ïƒ</a></h2>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>The list evolve a little bit after the publication of the article, it is necessary to refer to this list, the article is out of date</p>
</div>
<table class="colwidths-given docutils align-default" id="id10">
-<caption><span class="caption-text">Table Title</span><a class="headerlink" href="#id10" title="Permalink to this table">¶</a></caption>
+<caption><span class="caption-text">Table Title</span><a class="headerlink" href="#id10" title="Permalink to this table">ïƒ</a></caption>
<colgroup>
<col style="width: 8%" />
<col style="width: 18%" />
@@ -738,8 +744,8 @@ are displayed on the screen. A measurement file is automatically created and nam
</tr>
</tbody>
</table>
-</div>
-</div>
+</section>
+</section>
</div>
diff --git a/sphinx/build/html/V1_02.html b/sphinx/build/html/V1_02.html
index f286a04154eeac868d53bdac51de90383680598c..e73d5fa543ce9ebf18be882a76640b2effec5841 100644
--- a/sphinx/build/html/V1_02.html
+++ b/sphinx/build/html/V1_02.html
@@ -1,19 +1,21 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>OhmPi V 1.02 (limited to 32 electrodes) — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <title>OhmPi V 1.02 (limited to 32 electrodes) — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
+
+ <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/jquery.js"></script>
<script src="_static/underscore.js"></script>
<script src="_static/doctools.js"></script>
- <script src="_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
+ <script async="async" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<script src="_static/js/theme.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
@@ -96,20 +98,20 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="ohmpi-v-1-02-limited-to-32-electrodes">
-<h1>OhmPi V 1.02 (limited to 32 electrodes)<a class="headerlink" href="#ohmpi-v-1-02-limited-to-32-electrodes" title="Permalink to this headline">¶</a></h1>
+ <section id="ohmpi-v-1-02-limited-to-32-electrodes">
+<h1>OhmPi V 1.02 (limited to 32 electrodes)<a class="headerlink" href="#ohmpi-v-1-02-limited-to-32-electrodes" title="Permalink to this headline">ïƒ</a></h1>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>In this version, we have improved the electronic measurement board. To upgrade from version 1.01 to 1.02, you just have to replace the measurement board by the new one proposed here.</p>
</div>
-<div class="section" id="the-philosophy-of-ohmpi">
-<h2>The philosophy of Ohmpi<a class="headerlink" href="#the-philosophy-of-ohmpi" title="Permalink to this headline">¶</a></h2>
+<section id="the-philosophy-of-ohmpi">
+<h2>The philosophy of Ohmpi<a class="headerlink" href="#the-philosophy-of-ohmpi" title="Permalink to this headline">ïƒ</a></h2>
<p>The philosophy of Ohmpi V1.01 is to offer a multi electrode resistivity meter, from a set of commercially available
electronic cards it is a resistivity meter limited to 32 electrodes only. It is limited to low-current injection,
but suitable for small laboratory experiments and small field time monitoring</p>
-</div>
-<div class="section" id="technical-data">
-<h2>Technical data<a class="headerlink" href="#technical-data" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="technical-data">
+<h2>Technical data<a class="headerlink" href="#technical-data" title="Permalink to this headline">ïƒ</a></h2>
<table class="docutils align-default">
<colgroup>
<col style="width: 50%" />
@@ -164,11 +166,11 @@ control system</p></td>
</tr>
</tbody>
</table>
-</div>
-<div class="section" id="raspberry-pi-configuration">
-<h2>Raspberry Pi configuration<a class="headerlink" href="#raspberry-pi-configuration" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="os-installation">
-<h3>OS installation<a class="headerlink" href="#os-installation" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="raspberry-pi-configuration">
+<h2>Raspberry Pi configuration<a class="headerlink" href="#raspberry-pi-configuration" title="Permalink to this headline">ïƒ</a></h2>
+<section id="os-installation">
+<h3>OS installation<a class="headerlink" href="#os-installation" title="Permalink to this headline">ïƒ</a></h3>
<p>The first step is to start up the Raspberry Pi board, including installation of an OS (operating system).
For this step, the installation instructions are well described on the Raspberry website</p>
<ol class="arabic simple">
@@ -178,9 +180,9 @@ For this step, the installation instructions are well described on the Raspberry
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>All the development tests were performed on Raspberry Pi 3 Model B, we used the following version of Raspbian:</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/raspbian_version1.jpg"><img alt="alternate text" src="_images/raspbian_version1.jpg" style="width: 800px; height: 400px;" /></a>
-</div>
+</figure>
</div>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
@@ -216,9 +218,9 @@ To ensure that the GPIOs are in Low position, you will need to modify the /boot/
<li><p>Press Ctrl +x to escap and return to the terminal</p></li>
<li><p>Close the terminal</p></li>
</ol>
-</div>
-<div class="section" id="virtual-environnement-and-packages">
-<h3>Virtual Environnement and packages<a class="headerlink" href="#virtual-environnement-and-packages" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="virtual-environnement-and-packages">
+<h3>Virtual Environnement and packages<a class="headerlink" href="#virtual-environnement-and-packages" title="Permalink to this headline">ïƒ</a></h3>
<p>All dependencies are specified in requirements.txt</p>
<div class="admonition note">
<p class="admonition-title">Note</p>
@@ -250,39 +252,39 @@ to leave the virtual environment simply type:</p>
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="n">deactivate</span>
</pre></div>
</div>
-</div>
-<div class="section" id="activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi">
-<h3>Activate virtual environnement on Thonny (Python IDE) (on Rapberry Pi)<a class="headerlink" href="#activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi">
+<h3>Activate virtual environnement on Thonny (Python IDE) (on Rapberry Pi)<a class="headerlink" href="#activate-virtual-environnement-on-thonny-python-ide-on-rapberry-pi" title="Permalink to this headline">ïƒ</a></h3>
<p>If you decided to use a virtual environment, it is necessary to setup Thonny Python IDE the first time you use it.</p>
<p>1- Run the Thonny Python IDE software, Click on raspebrry acces <strong>menu > programming> Thonny pythonIDE</strong></p>
<p>2- Thonny’s interface opens, Python runs on the Root (Python 3.7.3 (/usr/bin/python3))</p>
-<div class="align-center figure">
-<a class="reference internal image-reference" href="_images/thonny_first_interface1.jpg"><img alt="alternate text" src="_images/thonny_first_interface1.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+<figure class="align-center">
+<a class="reference internal image-reference" href="_images/thonny_first_interface2.jpg"><img alt="alternate text" src="_images/thonny_first_interface2.jpg" style="width: 600px; height: 450px;" /></a>
+</figure>
<p>3-Click on <strong>Run>select interpreter</strong>, a new window opens click on interpret</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/thonny_option1.jpg"><img alt="alternate text" src="_images/thonny_option1.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>4-On the new open windows select <strong>alternative Pyhton3 or virtual environnement</strong></p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/thonny_interpreter1.jpg"><img alt="alternate text" src="_images/thonny_interpreter1.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>5- New buttons appeared, selected <strong>“locate another python executable “</strong></p>
<p>6- A new window opens, find the folder where there is the python 3 file in the virtual environment folder previously created <strong>/home/pi/ohmpi/bin/python3</strong>.</p>
<p>7- In the <strong>known interpreter</strong> tab the path of the virtual environnementshould appear</p>
-<div class="align-center figure">
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/thonny_interpreter_folder1.jpg"><img alt="alternate text" src="_images/thonny_interpreter_folder1.jpg" style="width: 600px; height: 450px;" /></a>
-</div>
+</figure>
<p>8- Close the window by clicking on <strong>ok</strong>.</p>
<p>9- Close thonny to save modifications</p>
-</div>
-</div>
-<div class="section" id="assembly-of-the-measuring-current-injection-cards-and-connection-with-the-raspberry-pi">
-<h2>Assembly of the measuring/current injection cards, and connection with the Raspberry Pi<a class="headerlink" href="#assembly-of-the-measuring-current-injection-cards-and-connection-with-the-raspberry-pi" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="electrical-resistivity-measurements-board">
-<h3>Electrical resistivity measurements board<a class="headerlink" href="#electrical-resistivity-measurements-board" title="Permalink to this headline">¶</a></h3>
-<div class="section" id="a-description">
-<h4>a) Description<a class="headerlink" href="#a-description" title="Permalink to this headline">¶</a></h4>
+</section>
+</section>
+<section id="assembly-of-the-measuring-current-injection-cards-and-connection-with-the-raspberry-pi">
+<h2>Assembly of the measuring/current injection cards, and connection with the Raspberry Pi<a class="headerlink" href="#assembly-of-the-measuring-current-injection-cards-and-connection-with-the-raspberry-pi" title="Permalink to this headline">ïƒ</a></h2>
+<section id="electrical-resistivity-measurements-board">
+<h3>Electrical resistivity measurements board<a class="headerlink" href="#electrical-resistivity-measurements-board" title="Permalink to this headline">ïƒ</a></h3>
+<section id="a-description">
+<h4>a) Description<a class="headerlink" href="#a-description" title="Permalink to this headline">ïƒ</a></h4>
<p>To measure electrical resistivity with Raspberry Pi, an ADS1115 was introduced, as proposed by Florsch [7]. The ADS1115
is a 16-bit ADC (Analog-to-Digital Converter), with an adaptable gain. Its value has been set at 2/3 in this study. The
input signal value could lie between - to + 6.114 V. The ADS1115 is mounted on a board adapted from an in-house design.
@@ -319,17 +321,19 @@ In version 1.02, we have improved the electronic board of measurement. we have a
We also added 4 capacitors on the +12v inputs of the fast operational amplifiers. These are decoupling capacitors (typically 100nF ceramic)
between each power supply terminal and ground. The last point, we have added a four very high resistances of 10 MOhm, between the ground and
the signal input on the operational amplifiers. This prevents the operational amplifiers from overheating.</p>
-<div class="align-center figure" id="id1">
+<figure class="align-center" id="id1">
<a class="reference internal image-reference" href="_images/schema_measurement_board1_02.png"><img alt="alternate text" src="_images/schema_measurement_board1_02.png" style="width: 800px; height: 400px;" /></a>
-<p class="caption"><span class="caption-text">Measurement board (Ohmpi version 1.02)</span><a class="headerlink" href="#id1" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Measurement board (Ohmpi version 1.02)</span><a class="headerlink" href="#id1" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>If you want to have very accurate measurements you can replace the resistors with a tolerance of 1% by resistors with a tolerance of 0.01% which will improve the measurement, but the cost will be higher.</p>
</div>
-</div>
-<div class="section" id="b-implementation">
-<h4>b) Implementation<a class="headerlink" href="#b-implementation" title="Permalink to this headline">¶</a></h4>
+</section>
+<section id="b-implementation">
+<h4>b) Implementation<a class="headerlink" href="#b-implementation" title="Permalink to this headline">ïƒ</a></h4>
<p>The measurement board must be printed using the PCB file (Source file repository), with components soldered onto
it by following the steps described below and illustrated in the following figure :</p>
<ul>
@@ -344,23 +348,16 @@ it by following the steps described below and illustrated in the following figur
\[coeff p2 = (R7 + R6) / R7\]</div>
<div class="math notranslate nohighlight">
\[coeff p3 = (R9 + R8) / R9\]</div>
-<div class="highlight-python notranslate"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>36
-37
-38
-39
-40
-41
-42
-43</pre></div></td><td class="code"><div class="highlight"><pre><span></span> <span class="sd">"""</span>
-<span class="sd"> hardware parameters</span>
-<span class="sd"> """</span>
- <span class="n">R_ref</span> <span class="o">=</span> <span class="mi">50</span> <span class="c1"># reference resistance value in ohm</span>
- <span class="n">coef_p0</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P0, measurement in V/V</span>
- <span class="n">coef_p1</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P1, measurement in V/V</span>
- <span class="n">coef_p2</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P2, measurement in V/V</span>
- <span class="n">coef_p3</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P3, measurement in V/V</span>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="linenos">36</span> <span class="sd">"""</span>
+<span class="linenos">37</span><span class="sd"> hardware parameters</span>
+<span class="linenos">38</span><span class="sd"> """</span>
+<span class="linenos">39</span> <span class="n">R_ref</span> <span class="o">=</span> <span class="mi">50</span> <span class="c1"># reference resistance value in ohm</span>
+<span class="linenos">40</span> <span class="n">coef_p0</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P0, measurement in V/V</span>
+<span class="linenos">41</span> <span class="n">coef_p1</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P1, measurement in V/V</span>
+<span class="linenos">42</span> <span class="n">coef_p2</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P2, measurement in V/V</span>
+<span class="linenos">43</span> <span class="n">coef_p3</span> <span class="o">=</span> <span class="mf">2.5</span> <span class="c1"># slope for current conversion for ADS.P3, measurement in V/V</span>
</pre></div>
-</td></tr></table></div>
+</div>
<p>The coefficient parameters can be adjusted in lines 40 to 43 of the ohmpi.py code.</p>
</div></blockquote>
</dd>
@@ -379,18 +376,22 @@ it by following the steps described below and illustrated in the following figur
Once all the components have been soldered together, the measurement board can be connected to the Raspberry Pi and the
battery terminal, according to Figure 9. Between the battery and the TX+ terminal of the measurement board, remember to
place a fuse holder with a 1.5-A fuse for safety purposes.</p>
-<div class="align-center figure" id="id2">
+<figure class="align-center" id="id2">
<a class="reference internal image-reference" href="_images/measurement_board1-02.jpg"><img alt="alternate text" src="_images/measurement_board1-02.jpg" style="width: 800px; height: 700px;" /></a>
-<p class="caption"><span class="caption-text">Measurement circuit board assembly: a) printed circuit board, b) adding the 1-Kohm resistors ± 1%, c)adding the 1.5-Kohm resistors ± 1%, d) adding the black female 1 x 10 header and the 7-blue screw terminal block(2 pin, 3.5-mm pitch), e) adding the 50-ohm reference resistor ± 0.1%, and f) adding the ADS1115 and the LM358N low-power dual operational amplifiers</span><a class="headerlink" href="#id2" title="Permalink to this image">¶</a></p>
-</div>
-<div class="align-center figure" id="id3">
+<figcaption>
+<p><span class="caption-text">Measurement circuit board assembly: a) printed circuit board, b) adding the 1-Kohm resistors ± 1%, c)adding the 1.5-Kohm resistors ± 1%, d) adding the black female 1 x 10 header and the 7-blue screw terminal block(2 pin, 3.5-mm pitch), e) adding the 50-ohm reference resistor ± 0.1%, and f) adding the ADS1115 and the LM358N low-power dual operational amplifiers</span><a class="headerlink" href="#id2" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
+<figure class="align-center" id="id3">
<a class="reference internal image-reference" href="_images/measurement_board-2-V1-02.jpg"><img alt="alternate text" src="_images/measurement_board-2-V1-02.jpg" style="width: 800px; height: 700px;" /></a>
-<p class="caption"><span class="caption-text">Measurement board installation with Raspberry Pi</span><a class="headerlink" href="#id3" title="Permalink to this image">¶</a></p>
-</div>
-</div>
-</div>
-<div class="section" id="current-injection-board">
-<h3>Current injection board<a class="headerlink" href="#current-injection-board" title="Permalink to this headline">¶</a></h3>
+<figcaption>
+<p><span class="caption-text">Measurement board installation with Raspberry Pi</span><a class="headerlink" href="#id3" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
+</section>
+</section>
+<section id="current-injection-board">
+<h3>Current injection board<a class="headerlink" href="#current-injection-board" title="Permalink to this headline">ïƒ</a></h3>
<p>To carry out the electrical resistivity measurement, the first step consists of injecting current into the ground.
In our case, a simple 9-V lead-acid battery is used to create an electrical potential difference that results
in current circulating into the ground. The current is injected through electrodes A and B (see Fig. 2). This
@@ -402,10 +403,12 @@ to the GPIO 7 on the Raspberry Pi and therefore activate simultaneously. The rol
the polarity at electrodes A and B. Thus, when relays 3 and 4 are energized by the GPIO 8 in the open position,
the positive battery pole is connected to electrode A and the negative pole to electrode B. When not energized,
they remain in the normally closed position. This set-up offers a simple and robust solution to inject current.</p>
-<div class="align-center figure" id="id4">
+<figure class="align-center" id="id4">
<a class="reference internal image-reference" href="_images/current_board.jpg"><img alt="alternate text" src="_images/current_board.jpg" style="width: 800px; height: 400px;" /></a>
-<p class="caption"><span class="caption-text">Wiring of the 4-channel relay module board for current injection management</span><a class="headerlink" href="#id4" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Wiring of the 4-channel relay module board for current injection management</span><a class="headerlink" href="#id4" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<p>The next step consists of featuring the 4-channel relay module used for current injection and its assembly. The wiring
between the relays must be carried out in strict accordance with Fig. 10. This card must then be connected to the Raspberry
Pi and the measurement card. On the Raspberry Pi, it is necessary to connect inputs In1 and In2 to the same GPIO. For this
@@ -413,21 +416,23 @@ purpose, it is necessary to solder together the two pins on the 4-channel relay
the relay card’s 4 channels respectively to the GND pin and 5Vcc of the Raspberry Pi. Now connect relays 1, 2, 3 and 4, as
shown in the diagram, using 1-mm2 cables (red and black in Fig. 10). Lastly, connect the inputs of relay 1 and 2 respectively
to terminals B and A of the measurement board.</p>
-<div class="align-center figure" id="id5">
+<figure class="align-center" id="id5">
<a class="reference internal image-reference" href="_images/installation_current_board_1_02.jpg"><img alt="alternate text" src="_images/installation_current_board_1_02.jpg" style="width: 800px; height: 700px;" /></a>
-<p class="caption"><span class="caption-text">Current injection board installation with Raspberry Pi</span><a class="headerlink" href="#id5" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Current injection board installation with Raspberry Pi</span><a class="headerlink" href="#id5" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<p>Congratulations, you have build a 4 electrodes resistivity-meter.</p>
-</div>
-<div class="section" id="frist-four-electrodes-resistivity-mesurement">
-<h3>Frist four electrodes resistivity mesurement<a class="headerlink" href="#frist-four-electrodes-resistivity-mesurement" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="frist-four-electrodes-resistivity-mesurement">
+<h3>Frist four electrodes resistivity mesurement<a class="headerlink" href="#frist-four-electrodes-resistivity-mesurement" title="Permalink to this headline">ïƒ</a></h3>
<p>Under construction !</p>
<p>Describe the way to valide the first part of the instruction.
Electrical resistivity measurement on test circuit</p>
-</div>
-</div>
-<div class="section" id="multiplexer-implentation">
-<h2>Multiplexer implentation<a class="headerlink" href="#multiplexer-implentation" title="Permalink to this headline">¶</a></h2>
+</section>
+</section>
+<section id="multiplexer-implentation">
+<h2>Multiplexer implentation<a class="headerlink" href="#multiplexer-implentation" title="Permalink to this headline">ïƒ</a></h2>
<p>The resistivity measurement is conducted on four terminals (A, B, M and N). The user could perform each measurement
by manually plugging four electrodes into the four channel terminals. In practice, ERT requires several tens or thousands
of measurements conducted on different electrode arrays. A multiplexer is therefore used to connect each channel to one of
@@ -437,10 +442,12 @@ modules with 16 channels each. On the first board, on each MUX, 15 relays out of
configuration enables making smaller multiplexers (8 or 16 electrodes only). On the other hand, if you prefer upping to 64 electrodes,
which is entirely possible, a GPIO channel multiplier will have to be used.
To prepare the multiplexer, the channels of the two relay boards must be connected according to the wiring diagram shown below.</p>
-<div class="align-center figure" id="id6">
+<figure class="align-center" id="id6">
<a class="reference internal image-reference" href="_images/multiplexer_implementation.jpg"><img alt="alternate text" src="_images/multiplexer_implementation.jpg" style="width: 800px; height: 500px;" /></a>
-<p class="caption"><span class="caption-text">Schematic diagram of the wiring of two 16-channel relay shields</span><a class="headerlink" href="#id6" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Schematic diagram of the wiring of two 16-channel relay shields</span><a class="headerlink" href="#id6" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<p>For this purpose, 0.5-mm² cables with end caps are used and their length adjusted for each connection in order to produce a clean assembly.
The length was adjusted so that the distance between the two points to be connected could be directly measured on the board once they had
been assembled one above the other, in adding an extra 3 cm. The wires at the ends need to be stripped and the end caps added.
@@ -449,10 +456,12 @@ As a final step, connect the cables to the correct connectors. This operation mu
for activating each relay (Fig. 12). However, we will be activating several relays with a single GPIO (to limit the number of GPIOs used on Raspberry Pi,
see Section 2.4). To execute this step, it will be necessary to follow the protocol presented in Figure.</p>
<blockquote>
-<div><div class="align-center figure" id="id7">
+<div><figure class="align-center" id="id7">
<a class="reference internal image-reference" href="_images/connection.jpg"><img alt="alternate text" src="_images/connection.jpg" style="width: 800px; height: 400px;" /></a>
-<p class="caption"><span class="caption-text">Connection to the 16-channel relay shield</span><a class="headerlink" href="#id7" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Connection to the 16-channel relay shield</span><a class="headerlink" href="#id7" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
</div></blockquote>
<p>For the 16-channel relay shield no. 1, these steps must be followed:
* Position a test circuit with 10 horizontal and 10 vertical holes on the pins of the 16-channel relay shield board.
@@ -514,40 +523,44 @@ The next step consists of connecting the relay card inputs to the Raspberry Pi a
<blockquote>
<div><p>Connection of the GPIOs to each multiplexer</p>
</div></blockquote>
-</div>
-<div class="section" id="electrode-connection">
-<h2>Electrode connection<a class="headerlink" href="#electrode-connection" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="electrode-connection">
+<h2>Electrode connection<a class="headerlink" href="#electrode-connection" title="Permalink to this headline">ïƒ</a></h2>
<p>At this point, all that remains is to connect the electrodes of each multiplexer to a terminal block (Fig. 13). In our set-up, screw terminals assembled on a din rail were used.
According to the chosen multiplexer configuration, all the relays of each multiplexer will be connected to an electrode and, consequently, each electrode will have four incoming
connections. Instead of having four cables connecting an electrode terminal to each multiplexer, we recommend using the cable assembly shown in the following Figure.</p>
-<div class="align-center figure" id="id8">
+<figure class="align-center" id="id8">
<a class="reference internal image-reference" href="_images/cable.jpg"><img alt="alternate text" src="_images/cable.jpg" style="width: 800px; height: 300px;" /></a>
-<p class="caption"><span class="caption-text">Wire cabling for multiplexer and terminal screw connection</span><a class="headerlink" href="#id8" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Wire cabling for multiplexer and terminal screw connection</span><a class="headerlink" href="#id8" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<p>the next figure provides an example of multiplexer relay connections for electrode no. 1: this electrode of multiplexer MUX A must be connected to electrode no. 1 of MUX B. Moreover, electrode no. 1 of MUX B
must be connected to electrode no. 1 of MUX N, which in turn must be connected to electrode no. 1 of MUX M. Lastly, electrode no. 1 of MUX M is connected to the terminal block.
This operation must be repeated for all 32 electrodes.</p>
-<div class="align-center figure" id="id9">
+<figure class="align-center" id="id9">
<a class="reference internal image-reference" href="_images/electrode_cable.jpg"><img alt="alternate text" src="_images/electrode_cable.jpg" style="width: 800px; height: 800px;" /></a>
-<p class="caption"><span class="caption-text">Example of a multiplexer connection to the screw terminal for electrode no. 1.</span><a class="headerlink" href="#id9" title="Permalink to this image">¶</a></p>
-</div>
+<figcaption>
+<p><span class="caption-text">Example of a multiplexer connection to the screw terminal for electrode no. 1.</span><a class="headerlink" href="#id9" title="Permalink to this image">ïƒ</a></p>
+</figcaption>
+</figure>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>The 16 channel relay cards exist in 5-V and 12-V , in the bottom figure we have 12-V cards that we will directly connect to the battery.
In case you bought 16 channel relay 5-V cards, you will need to add a DC/DC 12-V/5-V converter. You can use a STEP DOWN MODULE DC-DC (Velleman WPM404) and set the voltage to 5V with the potentiometer.</p>
</div>
-</div>
-<div class="section" id="operating-instruction">
-<h2>Operating instruction<a class="headerlink" href="#operating-instruction" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="preliminary-procedure-only-for-the-initial-operation">
-<h3>Preliminary procedure (Only for the initial operation)<a class="headerlink" href="#preliminary-procedure-only-for-the-initial-operation" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="operating-instruction">
+<h2>Operating instruction<a class="headerlink" href="#operating-instruction" title="Permalink to this headline">ïƒ</a></h2>
+<section id="preliminary-procedure-only-for-the-initial-operation">
+<h3>Preliminary procedure (Only for the initial operation)<a class="headerlink" href="#preliminary-procedure-only-for-the-initial-operation" title="Permalink to this headline">ïƒ</a></h3>
<p>The open source code must be downloaded at the Open Science Framework source file repository for this manuscript (<a class="reference external" href="https://osf.io/dzwb4/">https://osf.io/dzwb4/</a>)
or at the following Gitlab repository address: <a class="reference external" href="https://gitlab.irstea.fr/reversaal/OhmPi">https://gitlab.irstea.fr/reversaal/OhmPi</a>. The code must be then unzipped into a selected folder (e.g. OhmPi-master). A “readme†file
is proposed in the directory to assist with installation of the software and required python packages. It is strongly recommended to create a python virtual environment for installing
the required packages and running the code.</p>
-</div>
-<div class="section" id="startup-procedure">
-<h3>Startup procedure<a class="headerlink" href="#startup-procedure" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="startup-procedure">
+<h3>Startup procedure<a class="headerlink" href="#startup-procedure" title="Permalink to this headline">ïƒ</a></h3>
<p>As an initial operating instruction, all batteries must be disconnected before any hardware handling. Ensure that the battery is charged at full capacity. Plug all the electrodes (32 or fewer)
into the screw terminals. The Raspberry Pi must be plugged into a computer screen, with a mouse and keyboard accessed remotely. The Raspberry Pi must then be plugged into the power supply
(for laboratory measurements) or a power bank (5V - 2A for field measurements). At this point, you’ll need to access the Raspbian operating system. Inside the previously created folder “ohmPiâ€,
@@ -556,33 +569,28 @@ function may be adjusted/optimized depending on the measurement attributes. For
plugged into the hardware; the “ohmpi.py†source code must be run within a python3 environment (or a virtual environment if one has been created) either in the terminal or using Thonny. You should now
hear the characteristic sound of a relay switching as a result of electrode permutation. After each quadrupole measurement, the potential difference as well as the current intensity and resistance
are displayed on the screen. A measurement file is automatically created and named “measure.csvâ€; it will be placed in the same folder.</p>
-</div>
-<div class="section" id="electrical-resistivity-measurement-parameters-description">
-<h3>Electrical resistivity measurement parameters description<a class="headerlink" href="#electrical-resistivity-measurement-parameters-description" title="Permalink to this headline">¶</a></h3>
+</section>
+<section id="electrical-resistivity-measurement-parameters-description">
+<h3>Electrical resistivity measurement parameters description<a class="headerlink" href="#electrical-resistivity-measurement-parameters-description" title="Permalink to this headline">ïƒ</a></h3>
<p>In the version 1.02, the measurement parameters are in the Jason file (ohmpi_param.json).</p>
-<div class="highlight-python notranslate"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1
-2
-3
-4
-5
-6</pre></div></td><td class="code"><div class="highlight"><pre><span></span> <span class="n">nb_electrodes</span> <span class="o">=</span> <span class="mi">32</span> <span class="c1"># maximum number of electrodes on the resistivity meter</span>
- <span class="n">injection_duration</span> <span class="o">=</span> <span class="mf">0.5</span> <span class="c1"># Current injection duration in second</span>
- <span class="n">nbr_meas</span><span class="o">=</span> <span class="mi">1</span> <span class="c1"># Number of times the quadripole sequence is repeated</span>
- <span class="n">sequence_delay</span><span class="o">=</span> <span class="mi">30</span> <span class="c1"># Delay in seconds between 2 sequences</span>
- <span class="n">stack</span><span class="o">=</span> <span class="mi">1</span> <span class="c1"># repetition of the current injection for each quadripole</span>
- <span class="n">export_path</span><span class="o">=</span> <span class="s2">"home/pi/Desktop/measurement.csv"</span>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="linenos">1</span> <span class="n">nb_electrodes</span> <span class="o">=</span> <span class="mi">32</span> <span class="c1"># maximum number of electrodes on the resistivity meter</span>
+<span class="linenos">2</span> <span class="n">injection_duration</span> <span class="o">=</span> <span class="mf">0.5</span> <span class="c1"># Current injection duration in second</span>
+<span class="linenos">3</span> <span class="n">nbr_meas</span><span class="o">=</span> <span class="mi">1</span> <span class="c1"># Number of times the quadripole sequence is repeated</span>
+<span class="linenos">4</span> <span class="n">sequence_delay</span><span class="o">=</span> <span class="mi">30</span> <span class="c1"># Delay in seconds between 2 sequences</span>
+<span class="linenos">5</span> <span class="n">stack</span><span class="o">=</span> <span class="mi">1</span> <span class="c1"># repetition of the current injection for each quadripole</span>
+<span class="linenos">6</span> <span class="n">export_path</span><span class="o">=</span> <span class="s2">"home/pi/Desktop/measurement.csv"</span>
</pre></div>
-</td></tr></table></div>
-</div>
</div>
-<div class="section" id="complete-list-of-components">
-<h2>Complete list of components<a class="headerlink" href="#complete-list-of-components" title="Permalink to this headline">¶</a></h2>
+</section>
+</section>
+<section id="complete-list-of-components">
+<h2>Complete list of components<a class="headerlink" href="#complete-list-of-components" title="Permalink to this headline">ïƒ</a></h2>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>The list evolve a little bit after the publication of the article, it is necessary to refer to this list, the article is out of date</p>
</div>
<table class="colwidths-given docutils align-default" id="id10">
-<caption><span class="caption-text">List of components</span><a class="headerlink" href="#id10" title="Permalink to this table">¶</a></caption>
+<caption><span class="caption-text">List of components</span><a class="headerlink" href="#id10" title="Permalink to this table">ïƒ</a></caption>
<colgroup>
<col style="width: 8%" />
<col style="width: 18%" />
@@ -750,8 +758,8 @@ are displayed on the screen. A measurement file is automatically created and nam
</tr>
</tbody>
</table>
-</div>
-</div>
+</section>
+</section>
</div>
diff --git a/sphinx/build/html/V2_00.html b/sphinx/build/html/V2_00.html
index e6c583e736844a9a707b0951d334e648b8cb021d..a265337a4fc7fd0c6f8bc749940c4b70729b4f84 100644
--- a/sphinx/build/html/V2_00.html
+++ b/sphinx/build/html/V2_00.html
@@ -1,19 +1,20 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>OhmPi V 2.xx (64 or 128 electrodes and 12V) — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <title>OhmPi V 2.xx (64 or 128 electrodes and 12V) — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
+
+ <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/jquery.js"></script>
<script src="_static/underscore.js"></script>
<script src="_static/doctools.js"></script>
- <script src="_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="_static/js/theme.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
@@ -77,14 +78,14 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="ohmpi-v-2-xx-64-or-128-electrodes-and-12v">
-<h1>OhmPi V 2.xx (64 or 128 electrodes and 12V)<a class="headerlink" href="#ohmpi-v-2-xx-64-or-128-electrodes-and-12v" title="Permalink to this headline">¶</a></h1>
-<div class="align-center figure">
+ <section id="ohmpi-v-2-xx-64-or-128-electrodes-and-12v">
+<h1>OhmPi V 2.xx (64 or 128 electrodes and 12V)<a class="headerlink" href="#ohmpi-v-2-xx-64-or-128-electrodes-and-12v" title="Permalink to this headline">ïƒ</a></h1>
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/Under-Construction.png"><img alt="Ohmpi 2" src="_images/Under-Construction.png" style="width: 500px; height: 250px;" /></a>
-</div>
-<div class="align-center figure">
+</figure>
+<figure class="align-center">
<a class="reference internal image-reference" href="_images/image_ohmpi_2.jpg"><img alt="Ohmpi 2" src="_images/image_ohmpi_2.jpg" style="width: 800px; height: 600px;" /></a>
-</div>
+</figure>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>In this version, we have developed two new board types that allow the assembly of Ohmpi v2.00, a measurement board and a multiplexer board.
@@ -95,15 +96,15 @@ This new version is made up of:</p>
<li><p>A box</p></li>
</ol>
</div>
-<div class="section" id="the-philosophy-of-ohmpi">
-<h2>The philosophy of Ohmpi<a class="headerlink" href="#the-philosophy-of-ohmpi" title="Permalink to this headline">¶</a></h2>
+<section id="the-philosophy-of-ohmpi">
+<h2>The philosophy of Ohmpi<a class="headerlink" href="#the-philosophy-of-ohmpi" title="Permalink to this headline">ïƒ</a></h2>
<p>The philosophy of Ohmpi V2.00 is to offer a new DIY multielectrode resistivity meter. It is a resistivity meter with 64 electrodes , which can be upgraded to 128 electrodes.
It is limited to low-current injection,but suitable for small laboratory experiments and small field time-lapse monitoring.
Ohmpi, is developed by a team that seeks to share all its experience and wishes to improve and offer a more and more robust tool to the community.Ohmpi V2.00 is a completely different version from the previous one.
We will stop the development on the previous version, to dedicate our efforts on this new version.</p>
-</div>
-<div class="section" id="technical-data">
-<h2>Technical data<a class="headerlink" href="#technical-data" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="technical-data">
+<h2>Technical data<a class="headerlink" href="#technical-data" title="Permalink to this headline">ïƒ</a></h2>
<table class="docutils align-default">
<colgroup>
<col style="width: 33%" />
@@ -190,9 +191,9 @@ control system</p></td>
</tr>
</tbody>
</table>
-</div>
-<div class="section" id="ohmpi-2-step-by-step">
-<h2>Ohmpi 2 step by step<a class="headerlink" href="#ohmpi-2-step-by-step" title="Permalink to this headline">¶</a></h2>
+</section>
+<section id="ohmpi-2-step-by-step">
+<h2>Ohmpi 2 step by step<a class="headerlink" href="#ohmpi-2-step-by-step" title="Permalink to this headline">ïƒ</a></h2>
<div class="toctree-wrapper compound">
<ul>
<li class="toctree-l1"><a class="reference internal" href="Ohmpi_V2_00/V2_00_step_01.html"><strong>STEP n°1</strong> : Raspberry Pi configuration</a><ul>
@@ -220,8 +221,8 @@ control system</p></td>
</li>
</ul>
</div>
-</div>
-</div>
+</section>
+</section>
</div>
diff --git a/sphinx/build/html/_images/01_mes_board.jpg b/sphinx/build/html/_images/01_mes_board.jpg
index 2baa894bd38ab71c7a2f03bfca10a382ce93a0b9..237c47dca441248fde4a29fb3abbe983c2b357e4 100644
Binary files a/sphinx/build/html/_images/01_mes_board.jpg and b/sphinx/build/html/_images/01_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/03_mes_board.jpg b/sphinx/build/html/_images/03_mes_board.jpg
index 41381d5341aed8952dab89fa31ed7c0303e50205..e52e56db4257d5076984ea68eb86f8ca2fe23a6d 100644
Binary files a/sphinx/build/html/_images/03_mes_board.jpg and b/sphinx/build/html/_images/03_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/04_mes_board.jpg b/sphinx/build/html/_images/04_mes_board.jpg
index 988d238ad7fc61d9fb594467729879635deec63b..ed42f99b544b41a3dc361d42be429b3e0b47d8c8 100644
Binary files a/sphinx/build/html/_images/04_mes_board.jpg and b/sphinx/build/html/_images/04_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/06_mes_board.jpg b/sphinx/build/html/_images/06_mes_board.jpg
index 94a903f0c942832b86d2f074b95ea5c65a58553b..16894c29798019e2229ada80b6df85b8e4cc69e1 100644
Binary files a/sphinx/build/html/_images/06_mes_board.jpg and b/sphinx/build/html/_images/06_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/07_mes_board.jpg b/sphinx/build/html/_images/07_mes_board.jpg
index 954aabf761288a96221d98914011a337cd6664ad..0327314ce5fa099577d3d9e15e9b1b9570d47bb4 100644
Binary files a/sphinx/build/html/_images/07_mes_board.jpg and b/sphinx/build/html/_images/07_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/08_mes_board.jpg b/sphinx/build/html/_images/08_mes_board.jpg
index 645ed57a8f2c9118f57500a4aa575913770acdad..968e454a8fb4abb3e001d7923a72f47ef6c645bb 100644
Binary files a/sphinx/build/html/_images/08_mes_board.jpg and b/sphinx/build/html/_images/08_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/09_mes_board.jpg b/sphinx/build/html/_images/09_mes_board.jpg
index 28dc97fb5c4c69eec691f6070b7ff79674eae41c..ba7032edab114205c03bf3424866ca75862a49d6 100644
Binary files a/sphinx/build/html/_images/09_mes_board.jpg and b/sphinx/build/html/_images/09_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/11_mes_board.jpg b/sphinx/build/html/_images/11_mes_board.jpg
index b9f76edf4a3fd158a8b3cb36fe8216c5d0f2d70d..0943785ea02a53667d3fd17de1f2d42ef54455c1 100644
Binary files a/sphinx/build/html/_images/11_mes_board.jpg and b/sphinx/build/html/_images/11_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/13_mes_board.jpg b/sphinx/build/html/_images/13_mes_board.jpg
index c954948f8b497ac5a62701a2cbcba8d8133258b4..e2c364ae2f79db84ddedff044e8d30e0380f4741 100644
Binary files a/sphinx/build/html/_images/13_mes_board.jpg and b/sphinx/build/html/_images/13_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/14_mes_board.jpg b/sphinx/build/html/_images/14_mes_board.jpg
index 06db732127be7c32a33d2153f3a58a764466891b..31c7f113e432921c311b3ce4967a2be82f2e3f5e 100644
Binary files a/sphinx/build/html/_images/14_mes_board.jpg and b/sphinx/build/html/_images/14_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/15_mes_board.jpg b/sphinx/build/html/_images/15_mes_board.jpg
index cf98e5c5ce8ffe7373e6aee0bc7e13b880f47db8..43a4682dead6a8ffc87d444f7bfe9daabb577938 100644
Binary files a/sphinx/build/html/_images/15_mes_board.jpg and b/sphinx/build/html/_images/15_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/16_mes_board.jpg b/sphinx/build/html/_images/16_mes_board.jpg
index 930821538195751d3b6be551bbf605711bf394f4..3dfa61ba684f9275e912e3f33f5b42daca0d6dd2 100644
Binary files a/sphinx/build/html/_images/16_mes_board.jpg and b/sphinx/build/html/_images/16_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/17_mes_board.jpg b/sphinx/build/html/_images/17_mes_board.jpg
index a2cdc3b622201e41ee870d3c88dbd7bfe72c4fd1..90a4b6a1f978195d694abefb01a36d427a340365 100644
Binary files a/sphinx/build/html/_images/17_mes_board.jpg and b/sphinx/build/html/_images/17_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/18_mes_board.jpg b/sphinx/build/html/_images/18_mes_board.jpg
index 699b20b0a617d080aa2ddcdbab91960a821ee3f7..7abcf130948510785c57bbcf4b83f3e663c26eeb 100644
Binary files a/sphinx/build/html/_images/18_mes_board.jpg and b/sphinx/build/html/_images/18_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/19_mes_board.jpg b/sphinx/build/html/_images/19_mes_board.jpg
index f191473cb7982f67488e13a62ea6e53bc97e4e26..a3ec0b5f27b71f3ebc71685ca6e24c473324188a 100644
Binary files a/sphinx/build/html/_images/19_mes_board.jpg and b/sphinx/build/html/_images/19_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/20211206_144334.jpg b/sphinx/build/html/_images/20211206_144334.jpg
index 2a0c06b5febef44d48975b274c2a9ea30cf397f9..ce94d8e783f3be1f89190dca989ba570b3d27de5 100644
Binary files a/sphinx/build/html/_images/20211206_144334.jpg and b/sphinx/build/html/_images/20211206_144334.jpg differ
diff --git a/sphinx/build/html/_images/20_mes_board.jpg b/sphinx/build/html/_images/20_mes_board.jpg
index f6780cd498352806e601bd9e77b9e6a9076b47c0..790fa362dc0ba5b00515862e62e2ade622a70d4e 100644
Binary files a/sphinx/build/html/_images/20_mes_board.jpg and b/sphinx/build/html/_images/20_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/21_mes_board.jpg b/sphinx/build/html/_images/21_mes_board.jpg
index faf681109fae1e1a4115b95c3fca1b83608fd550..c8628d9c4aecbbd48215f53c78661baee4b33c5a 100644
Binary files a/sphinx/build/html/_images/21_mes_board.jpg and b/sphinx/build/html/_images/21_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/22_mes_board.jpg b/sphinx/build/html/_images/22_mes_board.jpg
index 6b3e2ad86a98550cc53a2053a1151f67dad2d741..bf1defadf621dfc6053ff47ea933de519157d06b 100644
Binary files a/sphinx/build/html/_images/22_mes_board.jpg and b/sphinx/build/html/_images/22_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/23_mes_board.jpg b/sphinx/build/html/_images/23_mes_board.jpg
index 6fa589f253fea3036bc1363592f803782dcce7b3..e9c8845baac74db8b8d3d218b1b71b57b064d37b 100644
Binary files a/sphinx/build/html/_images/23_mes_board.jpg and b/sphinx/build/html/_images/23_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/24_mes_board.jpg b/sphinx/build/html/_images/24_mes_board.jpg
index 767e901170e31f12a7834931950bce5f3d8ca776..956a8f379a79cb4a49a03d777c98d339effc9b7f 100644
Binary files a/sphinx/build/html/_images/24_mes_board.jpg and b/sphinx/build/html/_images/24_mes_board.jpg differ
diff --git a/sphinx/build/html/_images/Inked20211206_150522_LI.jpg b/sphinx/build/html/_images/Inked20211206_150522_LI.jpg
index 5ec54996e216cb474520c30190b9ff6ac74cbf15..3f8ba9c3978be068fcd902bda5f37b2ba1cb0541 100644
Binary files a/sphinx/build/html/_images/Inked20211206_150522_LI.jpg and b/sphinx/build/html/_images/Inked20211206_150522_LI.jpg differ
diff --git a/sphinx/build/html/_images/Inked20211206_150522_LI2.jpg b/sphinx/build/html/_images/Inked20211206_150522_LI2.jpg
index b688467d89317bb015671419dcbae7a6afbe569b..eeeccbe38189f1ae07e71ab4f99d14a881379871 100644
Binary files a/sphinx/build/html/_images/Inked20211206_150522_LI2.jpg and b/sphinx/build/html/_images/Inked20211206_150522_LI2.jpg differ
diff --git a/sphinx/build/html/_images/connection.jpg b/sphinx/build/html/_images/connection.jpg
index e2b5e01b748d01d8eeed57b2526b83dd00822605..be7b2f429969bf07174631ee63f4d13f47bc9bad 100644
Binary files a/sphinx/build/html/_images/connection.jpg and b/sphinx/build/html/_images/connection.jpg differ
diff --git a/sphinx/build/html/_images/installation_current_board.jpg b/sphinx/build/html/_images/installation_current_board.jpg
index 2674efdd8fbdbc6cd539fad3e16858783f26bfac..669a2724f34c02c0abb14f5cac4649bfef50208a 100644
Binary files a/sphinx/build/html/_images/installation_current_board.jpg and b/sphinx/build/html/_images/installation_current_board.jpg differ
diff --git a/sphinx/build/html/_images/measurement_board1-02.jpg b/sphinx/build/html/_images/measurement_board1-02.jpg
index 559aead766a8549f1ab9c35991a912cb3dfc7be0..561140f366d25901936fc3e6ae2ad9c08f145889 100644
Binary files a/sphinx/build/html/_images/measurement_board1-02.jpg and b/sphinx/build/html/_images/measurement_board1-02.jpg differ
diff --git a/sphinx/build/html/_images/schema_measurement_board.jpg b/sphinx/build/html/_images/schema_measurement_board.jpg
index a4d73a9656272e18ec6a3341eba40956e568ae48..e6a0633b3ab41ad782d7b0d4539119784aefde46 100644
Binary files a/sphinx/build/html/_images/schema_measurement_board.jpg and b/sphinx/build/html/_images/schema_measurement_board.jpg differ
diff --git a/sphinx/build/html/_images/schema_measurement_board1.jpg b/sphinx/build/html/_images/schema_measurement_board1.jpg
index a4d73a9656272e18ec6a3341eba40956e568ae48..da38456330fc28f6a1c562709c6dc4a4b3685922 100644
Binary files a/sphinx/build/html/_images/schema_measurement_board1.jpg and b/sphinx/build/html/_images/schema_measurement_board1.jpg differ
diff --git a/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_01.rst.txt b/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_01.rst.txt
index 51db436b12ff9740083e543f8be4a2ed566be331..1a77460d9e007dcaaf01a2e5a422c48c0967ef8e 100644
--- a/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_01.rst.txt
+++ b/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_01.rst.txt
@@ -1,4 +1,4 @@
-**STEP n°1** : Raspberry Pi configuration
+**STEP n°1** : Raspberry Pi configuration
*******************************************
@@ -24,7 +24,7 @@ For this step, the installation instructions are well described on the Raspberry
1. Watch the vidéo "how to set up your raspberry Pi" (https://www.youtube.com/watch?v=wjWZhV1v3Pk)
-2. The authors recommend installing the latest stable and complete version of Raspbian by using NOOBS (a simple-to-use operating system installer).
+2. The authors recommend installing the latest stable and complete version of Raspberry Pi OS (Previously called Raspbian) by using Raspberry Pi Imager.
3. or you can visit this website : (https://projects.raspberrypi.org/en/projects/raspberry-pi-setting-up)
@@ -41,7 +41,7 @@ For this step, the installation instructions are well described on the Raspberry
.. warning::
- Once the OS has been installed, **1-wire, spi and GPIO remote option** must be deactivated via the Raspbian GUI settings menu. Failure to carry out this task may cause damage to the relay shield cards during measurements.
+ Once the OS has been installed, **1-wire, spi and GPIO remote option** must be deactivated and **I2C option** must be activated via the Raspbian GUI settings menu. Failure to carry out this task may cause damage to the relay shield cards during measurements.
3. When the relays are connected to the GPIO, make sure that all the GPIOs are in the low position when the raspberry starts up. If not, the relays will activate unexpectedly.
To ensure that the GPIOs are in Low position, you will need to modify the /boot/config.txt file.
@@ -104,8 +104,9 @@ Activate it using the following command:
Install packages within the virtual environment. Installing the following package should be sufficient to meet dependencies:
.. code-block:: python
-
- pip install RPi.GPIO adafruit-blinka numpy adafruit-circuitpython-ads1x15 pandas
+
+ export CFLAGS=-fcommon
+ sudo pip install RPi.GPIO adafruit-blinka numpy pandas adafruit-circuitpython-ads1x15 adafruit-circuitpython-tca9548a adafruit-circuitpython-mcp230xx gpiozero
Check that requirements are met using
diff --git a/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_02.rst.txt b/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_02.rst.txt
index 441a23422d0d8703be0f4fddde5f996150e50d00..243ddd8ee3ec11314e9009e55c0dd1a971a379a1 100644
--- a/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_02.rst.txt
+++ b/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_02.rst.txt
@@ -243,7 +243,7 @@ which allows to realize precise current measurement around a shunt resistor. The
+---------+------------------------------------------------------------+
| | .. image:: step_n_2/a/20_mes_board.jpg |
|20 +------------------------------------------------------------+
- | | Fixing MCP23008 component |
+ | | Fixing MCP23008 component (Dot mark on the top left corner)|
| | |
+---------+------------------------------------------------------------+
@@ -253,8 +253,8 @@ which allows to realize precise current measurement around a shunt resistor. The
+---------+------------------------------------------------------------+
| | .. image:: step_n_2/a/21_mes_board.jpg |
|21 +------------------------------------------------------------+
- | |Mounting optical relay, AQY211EH |
- | | |
+ | |Mounting optical relay, AQY211EH (Dot mark in the top left |
+ | |corners) |
+---------+------------------------------------------------------------+
.. table::
@@ -283,7 +283,7 @@ which allows to realize precise current measurement around a shunt resistor. The
+---------+------------------------------------------------------------+
| | .. image:: step_n_2/a/24_mes_board.jpg |
|24 +------------------------------------------------------------+
- | | Fixing the INA282 |
+ | | Fixing the INA282 (Dot mark in the top right corner) |
| | |
+---------+------------------------------------------------------------+
diff --git a/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_03.rst.txt b/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_03.rst.txt
deleted file mode 100644
index 8dc79f557f5f2ec63d3f33577490371ab7733d27..0000000000000000000000000000000000000000
--- a/sphinx/build/html/_sources/Ohmpi_V2_00/V2_00_step_03.rst.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-
-**STEP n°3**: MUX board
-****************************************************
-
-
-**PART A** Assembly of MUX board
-======================================================
-
-
-Required components
-----------------------------------------------------
-
-.. figure:: step_n_3/a/MUX_board_componement.jpg
- :width: 600px
- :align: center
- :height: 450px
- :alt: alternate text
- :figclass: align-center
-
-
-.. csv-table:: List of components
- :file: step_n_3/a/MUX_board_list_2_xx.csv
- :widths: 30, 70, 70, 70, 70, 35, 35
- :header-rows: 1
-
-The multiplexing of the channels is a mechanical multiplexing based on OMRON's manufacturing relays (G5LE-1-VD 12 VDC). Each relay is combined with
-a ZVN4206A power MOFSET. The raspberry has only 30 GPIOs, which is not enough to activate all the 64 electrodes, which represent 512 GPIOs.
-We used gpio expender I2C (MCP23017). We have associated these components with an I2C muliplexer of type type TCA9548A from adafruit.
-This combination allows to go up to 512 GPIOs and up to 128 electrodes. Each card has its own digital address between 0X70 and 0X77.
-In the following presentation for an Ohmpi 64 electrodes, we will use the addresses 0X70 for channel A, 0X71 for channel B, 0X72 for channel M and 0X73 for channel N.
-0X73 for the N channel. 4 MUX board will be needed to multiplex an Ohmpi 64 electrodes.
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_00.jpg |
- | 1 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_01.jpg |
- | 2 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_02.jpg |
- | 3 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_03.jpg |
- | 4 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_04.jpg |
- | 5 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_05.jpg |
- | 6 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_06.jpg |
- | 7 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_07.jpg |
- | 8 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_08.jpg |
- | 9 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
-
-.. table::
- :align: center
-
- +--------+------------------------------------------------------------+
- | | .. image:: step_n_3/a/MUX_09.jpg |
- | 10 +------------------------------------------------------------+
- | | |
- | | |
- +--------+------------------------------------------------------------+
\ No newline at end of file
diff --git a/sphinx/build/html/_sources/V1_01.rst.txt b/sphinx/build/html/_sources/V1_01.rst.txt
index c144a69abe916e33b5df140e5c7dd5f927bc7e0d..f1610bfd3c48cce409df560574f596e77a84ab28 100644
--- a/sphinx/build/html/_sources/V1_01.rst.txt
+++ b/sphinx/build/html/_sources/V1_01.rst.txt
@@ -521,7 +521,7 @@ Complete list of components
.. csv-table:: Table Title
- :file: C:\Users\remi.clement\Documents\28_ohmpi_all_git\master2\sphinx\source\list.csv
+ :file: list.csv
:widths: 30, 70, 70, 70, 70,70
:header-rows: 1
diff --git a/sphinx/build/html/_sources/V1_02.rst.txt b/sphinx/build/html/_sources/V1_02.rst.txt
index facd94d9c002801d153e30985810659c0e46048c..ff4c42ece839b61930eb862d4e9f47edfec01d83 100644
--- a/sphinx/build/html/_sources/V1_02.rst.txt
+++ b/sphinx/build/html/_sources/V1_02.rst.txt
@@ -533,7 +533,7 @@ Complete list of components
.. csv-table:: List of components
- :file: C:\Users\remi.clement\Documents\28_ohmpi_all_git\master2\sphinx\source\list - 1_02.csv
+ :file: list - 1_02.csv
:widths: 30, 70, 70, 70, 70,70
:header-rows: 1
diff --git a/sphinx/build/html/_static/basic.css b/sphinx/build/html/_static/basic.css
index 24bc73e7f51edb00f73d5cf222632c875dce6657..912859b55d96750bff001bb79037a83a6c02332c 100644
--- a/sphinx/build/html/_static/basic.css
+++ b/sphinx/build/html/_static/basic.css
@@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
- * :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -130,7 +130,7 @@ ul.search li a {
font-weight: bold;
}
-ul.search li div.context {
+ul.search li p.context {
color: #888;
margin: 2px 0 0 30px;
text-align: left;
@@ -277,25 +277,25 @@ p.rubric {
font-weight: bold;
}
-img.align-left, .figure.align-left, object.align-left {
+img.align-left, figure.align-left, .figure.align-left, object.align-left {
clear: left;
float: left;
margin-right: 1em;
}
-img.align-right, .figure.align-right, object.align-right {
+img.align-right, figure.align-right, .figure.align-right, object.align-right {
clear: right;
float: right;
margin-left: 1em;
}
-img.align-center, .figure.align-center, object.align-center {
+img.align-center, figure.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
-img.align-default, .figure.align-default {
+img.align-default, figure.align-default, .figure.align-default {
display: block;
margin-left: auto;
margin-right: auto;
@@ -319,7 +319,8 @@ img.align-default, .figure.align-default {
/* -- sidebars -------------------------------------------------------------- */
-div.sidebar {
+div.sidebar,
+aside.sidebar {
margin: 0 0 0.5em 1em;
border: 1px solid #ddb;
padding: 7px;
@@ -377,12 +378,14 @@ div.body p.centered {
/* -- content of sidebars/topics/admonitions -------------------------------- */
div.sidebar > :last-child,
+aside.sidebar > :last-child,
div.topic > :last-child,
div.admonition > :last-child {
margin-bottom: 0;
}
div.sidebar::after,
+aside.sidebar::after,
div.topic::after,
div.admonition::after,
blockquote::after {
@@ -455,20 +458,22 @@ td > :last-child {
/* -- figures --------------------------------------------------------------- */
-div.figure {
+div.figure, figure {
margin: 0.5em;
padding: 0.5em;
}
-div.figure p.caption {
+div.figure p.caption, figcaption {
padding: 0.3em;
}
-div.figure p.caption span.caption-number {
+div.figure p.caption span.caption-number,
+figcaption span.caption-number {
font-style: italic;
}
-div.figure p.caption span.caption-text {
+div.figure p.caption span.caption-text,
+figcaption span.caption-text {
}
/* -- field list styles ----------------------------------------------------- */
@@ -503,6 +508,63 @@ table.hlist td {
vertical-align: top;
}
+/* -- object description styles --------------------------------------------- */
+
+.sig {
+ font-family: 'Consolas', 'Menlo', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+}
+
+.sig-name, code.descname {
+ background-color: transparent;
+ font-weight: bold;
+}
+
+.sig-name {
+ font-size: 1.1em;
+}
+
+code.descname {
+ font-size: 1.2em;
+}
+
+.sig-prename, code.descclassname {
+ background-color: transparent;
+}
+
+.optional {
+ font-size: 1.3em;
+}
+
+.sig-paren {
+ font-size: larger;
+}
+
+.sig-param.n {
+ font-style: italic;
+}
+
+/* C++ specific styling */
+
+.sig-inline.c-texpr,
+.sig-inline.cpp-texpr {
+ font-family: unset;
+}
+
+.sig.c .k, .sig.c .kt,
+.sig.cpp .k, .sig.cpp .kt {
+ color: #0033B3;
+}
+
+.sig.c .m,
+.sig.cpp .m {
+ color: #1750EB;
+}
+
+.sig.c .s, .sig.c .sc,
+.sig.cpp .s, .sig.cpp .sc {
+ color: #067D17;
+}
+
/* -- other body styles ----------------------------------------------------- */
@@ -629,14 +691,6 @@ dl.glossary dt {
font-size: 1.1em;
}
-.optional {
- font-size: 1.3em;
-}
-
-.sig-paren {
- font-size: larger;
-}
-
.versionmodified {
font-style: italic;
}
@@ -764,8 +818,13 @@ div.code-block-caption code {
}
table.highlighttable td.linenos,
-div.doctest > div.highlight span.gp { /* gp: Generic.Prompt */
- user-select: none;
+span.linenos,
+div.highlight span.gp { /* gp: Generic.Prompt */
+ user-select: none;
+ -webkit-user-select: text; /* Safari fallback only */
+ -webkit-user-select: none; /* Chrome/Safari */
+ -moz-user-select: none; /* Firefox */
+ -ms-user-select: none; /* IE10+ */
}
div.code-block-caption span.caption-number {
@@ -780,16 +839,6 @@ div.literal-block-wrapper {
margin: 1em 0;
}
-code.descname {
- background-color: transparent;
- font-weight: bold;
- font-size: 1.2em;
-}
-
-code.descclassname {
- background-color: transparent;
-}
-
code.xref, a code {
background-color: transparent;
font-weight: bold;
diff --git a/sphinx/build/html/_static/doctools.js b/sphinx/build/html/_static/doctools.js
index daccd209dab05a75f5627390e37a6b764e93f547..8cbf1b161a6527c8c6ad1c4f1fdc156e065ab262 100644
--- a/sphinx/build/html/_static/doctools.js
+++ b/sphinx/build/html/_static/doctools.js
@@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
- * :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -29,9 +29,14 @@ if (!window.console || !console.firebug) {
/**
* small helper function to urldecode strings
+ *
+ * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent#Decoding_query_parameters_from_a_URL
*/
jQuery.urldecode = function(x) {
- return decodeURIComponent(x).replace(/\+/g, ' ');
+ if (!x) {
+ return x
+ }
+ return decodeURIComponent(x.replace(/\+/g, ' '));
};
/**
@@ -285,9 +290,10 @@ var Documentation = {
initOnKeyListeners: function() {
$(document).keydown(function(event) {
var activeElementType = document.activeElement.tagName;
- // don't navigate when in search box or textarea
+ // don't navigate when in search box, textarea, dropdown or button
if (activeElementType !== 'TEXTAREA' && activeElementType !== 'INPUT' && activeElementType !== 'SELECT'
- && !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey) {
+ && activeElementType !== 'BUTTON' && !event.altKey && !event.ctrlKey && !event.metaKey
+ && !event.shiftKey) {
switch (event.keyCode) {
case 37: // left
var prevHref = $('link[rel="prev"]').prop('href');
@@ -295,12 +301,14 @@ var Documentation = {
window.location.href = prevHref;
return false;
}
+ break;
case 39: // right
var nextHref = $('link[rel="next"]').prop('href');
if (nextHref) {
window.location.href = nextHref;
return false;
}
+ break;
}
}
});
diff --git a/sphinx/build/html/_static/language_data.js b/sphinx/build/html/_static/language_data.js
index d2b4ee91b0da7308cf5693804779c7b18c26252a..863704b310d1539241ef20e26ccce6af27f0ffce 100644
--- a/sphinx/build/html/_static/language_data.js
+++ b/sphinx/build/html/_static/language_data.js
@@ -5,7 +5,7 @@
* This script contains the language-specific data used by searchtools.js,
* namely the list of stopwords, stemmer, scorer and splitter.
*
- * :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -13,7 +13,8 @@
var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
-/* Non-minified version JS is _stemmer.js if file is provided */
+/* Non-minified version is copied as a separate JS file, is available */
+
/**
* Porter Stemmer
*/
@@ -199,7 +200,6 @@ var Stemmer = function() {
-
var splitChars = (function() {
var result = {};
var singles = [96, 180, 187, 191, 215, 247, 749, 885, 903, 907, 909, 930, 1014, 1648,
diff --git a/sphinx/build/html/_static/pygments.css b/sphinx/build/html/_static/pygments.css
index 96529c7bd0646684a1e820b6c0105d4819cabcf8..582d5c3adaddbab2178a4e1ea270afe51e5437d2 100644
--- a/sphinx/build/html/_static/pygments.css
+++ b/sphinx/build/html/_static/pygments.css
@@ -1,7 +1,7 @@
-pre { line-height: 125%; margin: 0; }
-td.linenos pre { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }
-span.linenos { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }
-td.linenos pre.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+pre { line-height: 125%; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight { background: #f8f8f8; }
diff --git a/sphinx/build/html/_static/searchtools.js b/sphinx/build/html/_static/searchtools.js
index 970d0d9756053bf86fdf85d912de4b9a6398fd7b..58ff35c4345d19830352048b89abc8e7c06e4f20 100644
--- a/sphinx/build/html/_static/searchtools.js
+++ b/sphinx/build/html/_static/searchtools.js
@@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for the full-text search.
*
- * :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -59,10 +59,10 @@ var Search = {
_pulse_status : -1,
htmlToText : function(htmlString) {
- var htmlElement = document.createElement('span');
- htmlElement.innerHTML = htmlString;
- $(htmlElement).find('.headerlink').remove();
- docContent = $(htmlElement).find('[role=main]')[0];
+ var virtualDocument = document.implementation.createHTMLDocument('virtual');
+ var htmlElement = $(htmlString, virtualDocument);
+ htmlElement.find('.headerlink').remove();
+ docContent = htmlElement.find('[role=main]')[0];
if(docContent === undefined) {
console.warn("Content block not found. Sphinx search tries to obtain it " +
"via '[role=main]'. Could you check your theme or template.");
@@ -248,7 +248,7 @@ var Search = {
// results left, load the summary and display it
if (results.length) {
var item = results.pop();
- var listItem = $('<li style="display:none"></li>');
+ var listItem = $('<li></li>');
var requestUrl = "";
var linkUrl = "";
if (DOCUMENTATION_OPTIONS.BUILDER === 'dirhtml') {
@@ -273,28 +273,31 @@ var Search = {
if (item[3]) {
listItem.append($('<span> (' + item[3] + ')</span>'));
Search.output.append(listItem);
- listItem.slideDown(5, function() {
+ setTimeout(function() {
displayNextItem();
- });
+ }, 5);
} else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
$.ajax({url: requestUrl,
dataType: "text",
complete: function(jqxhr, textstatus) {
var data = jqxhr.responseText;
if (data !== '' && data !== undefined) {
- listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
+ var summary = Search.makeSearchSummary(data, searchterms, hlterms);
+ if (summary) {
+ listItem.append(summary);
+ }
}
Search.output.append(listItem);
- listItem.slideDown(5, function() {
+ setTimeout(function() {
displayNextItem();
- });
+ }, 5);
}});
} else {
// no source available, just display title
Search.output.append(listItem);
- listItem.slideDown(5, function() {
+ setTimeout(function() {
displayNextItem();
- });
+ }, 5);
}
}
// search finished, update title and status message
@@ -379,6 +382,13 @@ var Search = {
return results;
},
+ /**
+ * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
+ */
+ escapeRegExp : function(string) {
+ return string.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+ },
+
/**
* search for full-text terms in the index
*/
@@ -402,13 +412,14 @@ var Search = {
];
// add support for partial matches
if (word.length > 2) {
+ var word_regex = this.escapeRegExp(word);
for (var w in terms) {
- if (w.match(word) && !terms[word]) {
+ if (w.match(word_regex) && !terms[word]) {
_o.push({files: terms[w], score: Scorer.partialTerm})
}
}
for (var w in titleterms) {
- if (w.match(word) && !titleterms[word]) {
+ if (w.match(word_regex) && !titleterms[word]) {
_o.push({files: titleterms[w], score: Scorer.partialTitle})
}
}
@@ -490,6 +501,9 @@ var Search = {
*/
makeSearchSummary : function(htmlText, keywords, hlwords) {
var text = Search.htmlToText(htmlText);
+ if (text == "") {
+ return null;
+ }
var textLower = text.toLowerCase();
var start = 0;
$.each(keywords, function() {
@@ -501,7 +515,7 @@ var Search = {
var excerpt = ((start > 0) ? '...' : '') +
$.trim(text.substr(start, 240)) +
((start + 240 - text.length) ? '...' : '');
- var rv = $('<div class="context"></div>').text(excerpt);
+ var rv = $('<p class="context"></p>').text(excerpt);
$.each(hlwords, function() {
rv = rv.highlightText(this, 'highlighted');
});
diff --git a/sphinx/build/html/_static/underscore-1.13.1.js b/sphinx/build/html/_static/underscore-1.13.1.js
new file mode 100644
index 0000000000000000000000000000000000000000..ffd77af9648a47d389f2d6976d4aa1c44d7ce7ce
--- /dev/null
+++ b/sphinx/build/html/_static/underscore-1.13.1.js
@@ -0,0 +1,2042 @@
+(function (global, factory) {
+ typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+ typeof define === 'function' && define.amd ? define('underscore', factory) :
+ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (function () {
+ var current = global._;
+ var exports = global._ = factory();
+ exports.noConflict = function () { global._ = current; return exports; };
+ }()));
+}(this, (function () {
+ // Underscore.js 1.13.1
+ // https://underscorejs.org
+ // (c) 2009-2021 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors
+ // Underscore may be freely distributed under the MIT license.
+
+ // Current version.
+ var VERSION = '1.13.1';
+
+ // Establish the root object, `window` (`self`) in the browser, `global`
+ // on the server, or `this` in some virtual machines. We use `self`
+ // instead of `window` for `WebWorker` support.
+ var root = typeof self == 'object' && self.self === self && self ||
+ typeof global == 'object' && global.global === global && global ||
+ Function('return this')() ||
+ {};
+
+ // Save bytes in the minified (but not gzipped) version:
+ var ArrayProto = Array.prototype, ObjProto = Object.prototype;
+ var SymbolProto = typeof Symbol !== 'undefined' ? Symbol.prototype : null;
+
+ // Create quick reference variables for speed access to core prototypes.
+ var push = ArrayProto.push,
+ slice = ArrayProto.slice,
+ toString = ObjProto.toString,
+ hasOwnProperty = ObjProto.hasOwnProperty;
+
+ // Modern feature detection.
+ var supportsArrayBuffer = typeof ArrayBuffer !== 'undefined',
+ supportsDataView = typeof DataView !== 'undefined';
+
+ // All **ECMAScript 5+** native function implementations that we hope to use
+ // are declared here.
+ var nativeIsArray = Array.isArray,
+ nativeKeys = Object.keys,
+ nativeCreate = Object.create,
+ nativeIsView = supportsArrayBuffer && ArrayBuffer.isView;
+
+ // Create references to these builtin functions because we override them.
+ var _isNaN = isNaN,
+ _isFinite = isFinite;
+
+ // Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed.
+ var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString');
+ var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString',
+ 'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString'];
+
+ // The largest integer that can be represented exactly.
+ var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1;
+
+ // Some functions take a variable number of arguments, or a few expected
+ // arguments at the beginning and then a variable number of values to operate
+ // on. This helper accumulates all remaining arguments past the function’s
+ // argument length (or an explicit `startIndex`), into an array that becomes
+ // the last argument. Similar to ES6’s "rest parameter".
+ function restArguments(func, startIndex) {
+ startIndex = startIndex == null ? func.length - 1 : +startIndex;
+ return function() {
+ var length = Math.max(arguments.length - startIndex, 0),
+ rest = Array(length),
+ index = 0;
+ for (; index < length; index++) {
+ rest[index] = arguments[index + startIndex];
+ }
+ switch (startIndex) {
+ case 0: return func.call(this, rest);
+ case 1: return func.call(this, arguments[0], rest);
+ case 2: return func.call(this, arguments[0], arguments[1], rest);
+ }
+ var args = Array(startIndex + 1);
+ for (index = 0; index < startIndex; index++) {
+ args[index] = arguments[index];
+ }
+ args[startIndex] = rest;
+ return func.apply(this, args);
+ };
+ }
+
+ // Is a given variable an object?
+ function isObject(obj) {
+ var type = typeof obj;
+ return type === 'function' || type === 'object' && !!obj;
+ }
+
+ // Is a given value equal to null?
+ function isNull(obj) {
+ return obj === null;
+ }
+
+ // Is a given variable undefined?
+ function isUndefined(obj) {
+ return obj === void 0;
+ }
+
+ // Is a given value a boolean?
+ function isBoolean(obj) {
+ return obj === true || obj === false || toString.call(obj) === '[object Boolean]';
+ }
+
+ // Is a given value a DOM element?
+ function isElement(obj) {
+ return !!(obj && obj.nodeType === 1);
+ }
+
+ // Internal function for creating a `toString`-based type tester.
+ function tagTester(name) {
+ var tag = '[object ' + name + ']';
+ return function(obj) {
+ return toString.call(obj) === tag;
+ };
+ }
+
+ var isString = tagTester('String');
+
+ var isNumber = tagTester('Number');
+
+ var isDate = tagTester('Date');
+
+ var isRegExp = tagTester('RegExp');
+
+ var isError = tagTester('Error');
+
+ var isSymbol = tagTester('Symbol');
+
+ var isArrayBuffer = tagTester('ArrayBuffer');
+
+ var isFunction = tagTester('Function');
+
+ // Optimize `isFunction` if appropriate. Work around some `typeof` bugs in old
+ // v8, IE 11 (#1621), Safari 8 (#1929), and PhantomJS (#2236).
+ var nodelist = root.document && root.document.childNodes;
+ if (typeof /./ != 'function' && typeof Int8Array != 'object' && typeof nodelist != 'function') {
+ isFunction = function(obj) {
+ return typeof obj == 'function' || false;
+ };
+ }
+
+ var isFunction$1 = isFunction;
+
+ var hasObjectTag = tagTester('Object');
+
+ // In IE 10 - Edge 13, `DataView` has string tag `'[object Object]'`.
+ // In IE 11, the most common among them, this problem also applies to
+ // `Map`, `WeakMap` and `Set`.
+ var hasStringTagBug = (
+ supportsDataView && hasObjectTag(new DataView(new ArrayBuffer(8)))
+ ),
+ isIE11 = (typeof Map !== 'undefined' && hasObjectTag(new Map));
+
+ var isDataView = tagTester('DataView');
+
+ // In IE 10 - Edge 13, we need a different heuristic
+ // to determine whether an object is a `DataView`.
+ function ie10IsDataView(obj) {
+ return obj != null && isFunction$1(obj.getInt8) && isArrayBuffer(obj.buffer);
+ }
+
+ var isDataView$1 = (hasStringTagBug ? ie10IsDataView : isDataView);
+
+ // Is a given value an array?
+ // Delegates to ECMA5's native `Array.isArray`.
+ var isArray = nativeIsArray || tagTester('Array');
+
+ // Internal function to check whether `key` is an own property name of `obj`.
+ function has$1(obj, key) {
+ return obj != null && hasOwnProperty.call(obj, key);
+ }
+
+ var isArguments = tagTester('Arguments');
+
+ // Define a fallback version of the method in browsers (ahem, IE < 9), where
+ // there isn't any inspectable "Arguments" type.
+ (function() {
+ if (!isArguments(arguments)) {
+ isArguments = function(obj) {
+ return has$1(obj, 'callee');
+ };
+ }
+ }());
+
+ var isArguments$1 = isArguments;
+
+ // Is a given object a finite number?
+ function isFinite$1(obj) {
+ return !isSymbol(obj) && _isFinite(obj) && !isNaN(parseFloat(obj));
+ }
+
+ // Is the given value `NaN`?
+ function isNaN$1(obj) {
+ return isNumber(obj) && _isNaN(obj);
+ }
+
+ // Predicate-generating function. Often useful outside of Underscore.
+ function constant(value) {
+ return function() {
+ return value;
+ };
+ }
+
+ // Common internal logic for `isArrayLike` and `isBufferLike`.
+ function createSizePropertyCheck(getSizeProperty) {
+ return function(collection) {
+ var sizeProperty = getSizeProperty(collection);
+ return typeof sizeProperty == 'number' && sizeProperty >= 0 && sizeProperty <= MAX_ARRAY_INDEX;
+ }
+ }
+
+ // Internal helper to generate a function to obtain property `key` from `obj`.
+ function shallowProperty(key) {
+ return function(obj) {
+ return obj == null ? void 0 : obj[key];
+ };
+ }
+
+ // Internal helper to obtain the `byteLength` property of an object.
+ var getByteLength = shallowProperty('byteLength');
+
+ // Internal helper to determine whether we should spend extensive checks against
+ // `ArrayBuffer` et al.
+ var isBufferLike = createSizePropertyCheck(getByteLength);
+
+ // Is a given value a typed array?
+ var typedArrayPattern = /\[object ((I|Ui)nt(8|16|32)|Float(32|64)|Uint8Clamped|Big(I|Ui)nt64)Array\]/;
+ function isTypedArray(obj) {
+ // `ArrayBuffer.isView` is the most future-proof, so use it when available.
+ // Otherwise, fall back on the above regular expression.
+ return nativeIsView ? (nativeIsView(obj) && !isDataView$1(obj)) :
+ isBufferLike(obj) && typedArrayPattern.test(toString.call(obj));
+ }
+
+ var isTypedArray$1 = supportsArrayBuffer ? isTypedArray : constant(false);
+
+ // Internal helper to obtain the `length` property of an object.
+ var getLength = shallowProperty('length');
+
+ // Internal helper to create a simple lookup structure.
+ // `collectNonEnumProps` used to depend on `_.contains`, but this led to
+ // circular imports. `emulatedSet` is a one-off solution that only works for
+ // arrays of strings.
+ function emulatedSet(keys) {
+ var hash = {};
+ for (var l = keys.length, i = 0; i < l; ++i) hash[keys[i]] = true;
+ return {
+ contains: function(key) { return hash[key]; },
+ push: function(key) {
+ hash[key] = true;
+ return keys.push(key);
+ }
+ };
+ }
+
+ // Internal helper. Checks `keys` for the presence of keys in IE < 9 that won't
+ // be iterated by `for key in ...` and thus missed. Extends `keys` in place if
+ // needed.
+ function collectNonEnumProps(obj, keys) {
+ keys = emulatedSet(keys);
+ var nonEnumIdx = nonEnumerableProps.length;
+ var constructor = obj.constructor;
+ var proto = isFunction$1(constructor) && constructor.prototype || ObjProto;
+
+ // Constructor is a special case.
+ var prop = 'constructor';
+ if (has$1(obj, prop) && !keys.contains(prop)) keys.push(prop);
+
+ while (nonEnumIdx--) {
+ prop = nonEnumerableProps[nonEnumIdx];
+ if (prop in obj && obj[prop] !== proto[prop] && !keys.contains(prop)) {
+ keys.push(prop);
+ }
+ }
+ }
+
+ // Retrieve the names of an object's own properties.
+ // Delegates to **ECMAScript 5**'s native `Object.keys`.
+ function keys(obj) {
+ if (!isObject(obj)) return [];
+ if (nativeKeys) return nativeKeys(obj);
+ var keys = [];
+ for (var key in obj) if (has$1(obj, key)) keys.push(key);
+ // Ahem, IE < 9.
+ if (hasEnumBug) collectNonEnumProps(obj, keys);
+ return keys;
+ }
+
+ // Is a given array, string, or object empty?
+ // An "empty" object has no enumerable own-properties.
+ function isEmpty(obj) {
+ if (obj == null) return true;
+ // Skip the more expensive `toString`-based type checks if `obj` has no
+ // `.length`.
+ var length = getLength(obj);
+ if (typeof length == 'number' && (
+ isArray(obj) || isString(obj) || isArguments$1(obj)
+ )) return length === 0;
+ return getLength(keys(obj)) === 0;
+ }
+
+ // Returns whether an object has a given set of `key:value` pairs.
+ function isMatch(object, attrs) {
+ var _keys = keys(attrs), length = _keys.length;
+ if (object == null) return !length;
+ var obj = Object(object);
+ for (var i = 0; i < length; i++) {
+ var key = _keys[i];
+ if (attrs[key] !== obj[key] || !(key in obj)) return false;
+ }
+ return true;
+ }
+
+ // If Underscore is called as a function, it returns a wrapped object that can
+ // be used OO-style. This wrapper holds altered versions of all functions added
+ // through `_.mixin`. Wrapped objects may be chained.
+ function _$1(obj) {
+ if (obj instanceof _$1) return obj;
+ if (!(this instanceof _$1)) return new _$1(obj);
+ this._wrapped = obj;
+ }
+
+ _$1.VERSION = VERSION;
+
+ // Extracts the result from a wrapped and chained object.
+ _$1.prototype.value = function() {
+ return this._wrapped;
+ };
+
+ // Provide unwrapping proxies for some methods used in engine operations
+ // such as arithmetic and JSON stringification.
+ _$1.prototype.valueOf = _$1.prototype.toJSON = _$1.prototype.value;
+
+ _$1.prototype.toString = function() {
+ return String(this._wrapped);
+ };
+
+ // Internal function to wrap or shallow-copy an ArrayBuffer,
+ // typed array or DataView to a new view, reusing the buffer.
+ function toBufferView(bufferSource) {
+ return new Uint8Array(
+ bufferSource.buffer || bufferSource,
+ bufferSource.byteOffset || 0,
+ getByteLength(bufferSource)
+ );
+ }
+
+ // We use this string twice, so give it a name for minification.
+ var tagDataView = '[object DataView]';
+
+ // Internal recursive comparison function for `_.isEqual`.
+ function eq(a, b, aStack, bStack) {
+ // Identical objects are equal. `0 === -0`, but they aren't identical.
+ // See the [Harmony `egal` proposal](https://wiki.ecmascript.org/doku.php?id=harmony:egal).
+ if (a === b) return a !== 0 || 1 / a === 1 / b;
+ // `null` or `undefined` only equal to itself (strict comparison).
+ if (a == null || b == null) return false;
+ // `NaN`s are equivalent, but non-reflexive.
+ if (a !== a) return b !== b;
+ // Exhaust primitive checks
+ var type = typeof a;
+ if (type !== 'function' && type !== 'object' && typeof b != 'object') return false;
+ return deepEq(a, b, aStack, bStack);
+ }
+
+ // Internal recursive comparison function for `_.isEqual`.
+ function deepEq(a, b, aStack, bStack) {
+ // Unwrap any wrapped objects.
+ if (a instanceof _$1) a = a._wrapped;
+ if (b instanceof _$1) b = b._wrapped;
+ // Compare `[[Class]]` names.
+ var className = toString.call(a);
+ if (className !== toString.call(b)) return false;
+ // Work around a bug in IE 10 - Edge 13.
+ if (hasStringTagBug && className == '[object Object]' && isDataView$1(a)) {
+ if (!isDataView$1(b)) return false;
+ className = tagDataView;
+ }
+ switch (className) {
+ // These types are compared by value.
+ case '[object RegExp]':
+ // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')
+ case '[object String]':
+ // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+ // equivalent to `new String("5")`.
+ return '' + a === '' + b;
+ case '[object Number]':
+ // `NaN`s are equivalent, but non-reflexive.
+ // Object(NaN) is equivalent to NaN.
+ if (+a !== +a) return +b !== +b;
+ // An `egal` comparison is performed for other numeric values.
+ return +a === 0 ? 1 / +a === 1 / b : +a === +b;
+ case '[object Date]':
+ case '[object Boolean]':
+ // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+ // millisecond representations. Note that invalid dates with millisecond representations
+ // of `NaN` are not equivalent.
+ return +a === +b;
+ case '[object Symbol]':
+ return SymbolProto.valueOf.call(a) === SymbolProto.valueOf.call(b);
+ case '[object ArrayBuffer]':
+ case tagDataView:
+ // Coerce to typed array so we can fall through.
+ return deepEq(toBufferView(a), toBufferView(b), aStack, bStack);
+ }
+
+ var areArrays = className === '[object Array]';
+ if (!areArrays && isTypedArray$1(a)) {
+ var byteLength = getByteLength(a);
+ if (byteLength !== getByteLength(b)) return false;
+ if (a.buffer === b.buffer && a.byteOffset === b.byteOffset) return true;
+ areArrays = true;
+ }
+ if (!areArrays) {
+ if (typeof a != 'object' || typeof b != 'object') return false;
+
+ // Objects with different constructors are not equivalent, but `Object`s or `Array`s
+ // from different frames are.
+ var aCtor = a.constructor, bCtor = b.constructor;
+ if (aCtor !== bCtor && !(isFunction$1(aCtor) && aCtor instanceof aCtor &&
+ isFunction$1(bCtor) && bCtor instanceof bCtor)
+ && ('constructor' in a && 'constructor' in b)) {
+ return false;
+ }
+ }
+ // Assume equality for cyclic structures. The algorithm for detecting cyclic
+ // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+
+ // Initializing stack of traversed objects.
+ // It's done here since we only need them for objects and arrays comparison.
+ aStack = aStack || [];
+ bStack = bStack || [];
+ var length = aStack.length;
+ while (length--) {
+ // Linear search. Performance is inversely proportional to the number of
+ // unique nested structures.
+ if (aStack[length] === a) return bStack[length] === b;
+ }
+
+ // Add the first object to the stack of traversed objects.
+ aStack.push(a);
+ bStack.push(b);
+
+ // Recursively compare objects and arrays.
+ if (areArrays) {
+ // Compare array lengths to determine if a deep comparison is necessary.
+ length = a.length;
+ if (length !== b.length) return false;
+ // Deep compare the contents, ignoring non-numeric properties.
+ while (length--) {
+ if (!eq(a[length], b[length], aStack, bStack)) return false;
+ }
+ } else {
+ // Deep compare objects.
+ var _keys = keys(a), key;
+ length = _keys.length;
+ // Ensure that both objects contain the same number of properties before comparing deep equality.
+ if (keys(b).length !== length) return false;
+ while (length--) {
+ // Deep compare each member
+ key = _keys[length];
+ if (!(has$1(b, key) && eq(a[key], b[key], aStack, bStack))) return false;
+ }
+ }
+ // Remove the first object from the stack of traversed objects.
+ aStack.pop();
+ bStack.pop();
+ return true;
+ }
+
+ // Perform a deep comparison to check if two objects are equal.
+ function isEqual(a, b) {
+ return eq(a, b);
+ }
+
+ // Retrieve all the enumerable property names of an object.
+ function allKeys(obj) {
+ if (!isObject(obj)) return [];
+ var keys = [];
+ for (var key in obj) keys.push(key);
+ // Ahem, IE < 9.
+ if (hasEnumBug) collectNonEnumProps(obj, keys);
+ return keys;
+ }
+
+ // Since the regular `Object.prototype.toString` type tests don't work for
+ // some types in IE 11, we use a fingerprinting heuristic instead, based
+ // on the methods. It's not great, but it's the best we got.
+ // The fingerprint method lists are defined below.
+ function ie11fingerprint(methods) {
+ var length = getLength(methods);
+ return function(obj) {
+ if (obj == null) return false;
+ // `Map`, `WeakMap` and `Set` have no enumerable keys.
+ var keys = allKeys(obj);
+ if (getLength(keys)) return false;
+ for (var i = 0; i < length; i++) {
+ if (!isFunction$1(obj[methods[i]])) return false;
+ }
+ // If we are testing against `WeakMap`, we need to ensure that
+ // `obj` doesn't have a `forEach` method in order to distinguish
+ // it from a regular `Map`.
+ return methods !== weakMapMethods || !isFunction$1(obj[forEachName]);
+ };
+ }
+
+ // In the interest of compact minification, we write
+ // each string in the fingerprints only once.
+ var forEachName = 'forEach',
+ hasName = 'has',
+ commonInit = ['clear', 'delete'],
+ mapTail = ['get', hasName, 'set'];
+
+ // `Map`, `WeakMap` and `Set` each have slightly different
+ // combinations of the above sublists.
+ var mapMethods = commonInit.concat(forEachName, mapTail),
+ weakMapMethods = commonInit.concat(mapTail),
+ setMethods = ['add'].concat(commonInit, forEachName, hasName);
+
+ var isMap = isIE11 ? ie11fingerprint(mapMethods) : tagTester('Map');
+
+ var isWeakMap = isIE11 ? ie11fingerprint(weakMapMethods) : tagTester('WeakMap');
+
+ var isSet = isIE11 ? ie11fingerprint(setMethods) : tagTester('Set');
+
+ var isWeakSet = tagTester('WeakSet');
+
+ // Retrieve the values of an object's properties.
+ function values(obj) {
+ var _keys = keys(obj);
+ var length = _keys.length;
+ var values = Array(length);
+ for (var i = 0; i < length; i++) {
+ values[i] = obj[_keys[i]];
+ }
+ return values;
+ }
+
+ // Convert an object into a list of `[key, value]` pairs.
+ // The opposite of `_.object` with one argument.
+ function pairs(obj) {
+ var _keys = keys(obj);
+ var length = _keys.length;
+ var pairs = Array(length);
+ for (var i = 0; i < length; i++) {
+ pairs[i] = [_keys[i], obj[_keys[i]]];
+ }
+ return pairs;
+ }
+
+ // Invert the keys and values of an object. The values must be serializable.
+ function invert(obj) {
+ var result = {};
+ var _keys = keys(obj);
+ for (var i = 0, length = _keys.length; i < length; i++) {
+ result[obj[_keys[i]]] = _keys[i];
+ }
+ return result;
+ }
+
+ // Return a sorted list of the function names available on the object.
+ function functions(obj) {
+ var names = [];
+ for (var key in obj) {
+ if (isFunction$1(obj[key])) names.push(key);
+ }
+ return names.sort();
+ }
+
+ // An internal function for creating assigner functions.
+ function createAssigner(keysFunc, defaults) {
+ return function(obj) {
+ var length = arguments.length;
+ if (defaults) obj = Object(obj);
+ if (length < 2 || obj == null) return obj;
+ for (var index = 1; index < length; index++) {
+ var source = arguments[index],
+ keys = keysFunc(source),
+ l = keys.length;
+ for (var i = 0; i < l; i++) {
+ var key = keys[i];
+ if (!defaults || obj[key] === void 0) obj[key] = source[key];
+ }
+ }
+ return obj;
+ };
+ }
+
+ // Extend a given object with all the properties in passed-in object(s).
+ var extend = createAssigner(allKeys);
+
+ // Assigns a given object with all the own properties in the passed-in
+ // object(s).
+ // (https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)
+ var extendOwn = createAssigner(keys);
+
+ // Fill in a given object with default properties.
+ var defaults = createAssigner(allKeys, true);
+
+ // Create a naked function reference for surrogate-prototype-swapping.
+ function ctor() {
+ return function(){};
+ }
+
+ // An internal function for creating a new object that inherits from another.
+ function baseCreate(prototype) {
+ if (!isObject(prototype)) return {};
+ if (nativeCreate) return nativeCreate(prototype);
+ var Ctor = ctor();
+ Ctor.prototype = prototype;
+ var result = new Ctor;
+ Ctor.prototype = null;
+ return result;
+ }
+
+ // Creates an object that inherits from the given prototype object.
+ // If additional properties are provided then they will be added to the
+ // created object.
+ function create(prototype, props) {
+ var result = baseCreate(prototype);
+ if (props) extendOwn(result, props);
+ return result;
+ }
+
+ // Create a (shallow-cloned) duplicate of an object.
+ function clone(obj) {
+ if (!isObject(obj)) return obj;
+ return isArray(obj) ? obj.slice() : extend({}, obj);
+ }
+
+ // Invokes `interceptor` with the `obj` and then returns `obj`.
+ // The primary purpose of this method is to "tap into" a method chain, in
+ // order to perform operations on intermediate results within the chain.
+ function tap(obj, interceptor) {
+ interceptor(obj);
+ return obj;
+ }
+
+ // Normalize a (deep) property `path` to array.
+ // Like `_.iteratee`, this function can be customized.
+ function toPath$1(path) {
+ return isArray(path) ? path : [path];
+ }
+ _$1.toPath = toPath$1;
+
+ // Internal wrapper for `_.toPath` to enable minification.
+ // Similar to `cb` for `_.iteratee`.
+ function toPath(path) {
+ return _$1.toPath(path);
+ }
+
+ // Internal function to obtain a nested property in `obj` along `path`.
+ function deepGet(obj, path) {
+ var length = path.length;
+ for (var i = 0; i < length; i++) {
+ if (obj == null) return void 0;
+ obj = obj[path[i]];
+ }
+ return length ? obj : void 0;
+ }
+
+ // Get the value of the (deep) property on `path` from `object`.
+ // If any property in `path` does not exist or if the value is
+ // `undefined`, return `defaultValue` instead.
+ // The `path` is normalized through `_.toPath`.
+ function get(object, path, defaultValue) {
+ var value = deepGet(object, toPath(path));
+ return isUndefined(value) ? defaultValue : value;
+ }
+
+ // Shortcut function for checking if an object has a given property directly on
+ // itself (in other words, not on a prototype). Unlike the internal `has`
+ // function, this public version can also traverse nested properties.
+ function has(obj, path) {
+ path = toPath(path);
+ var length = path.length;
+ for (var i = 0; i < length; i++) {
+ var key = path[i];
+ if (!has$1(obj, key)) return false;
+ obj = obj[key];
+ }
+ return !!length;
+ }
+
+ // Keep the identity function around for default iteratees.
+ function identity(value) {
+ return value;
+ }
+
+ // Returns a predicate for checking whether an object has a given set of
+ // `key:value` pairs.
+ function matcher(attrs) {
+ attrs = extendOwn({}, attrs);
+ return function(obj) {
+ return isMatch(obj, attrs);
+ };
+ }
+
+ // Creates a function that, when passed an object, will traverse that object’s
+ // properties down the given `path`, specified as an array of keys or indices.
+ function property(path) {
+ path = toPath(path);
+ return function(obj) {
+ return deepGet(obj, path);
+ };
+ }
+
+ // Internal function that returns an efficient (for current engines) version
+ // of the passed-in callback, to be repeatedly applied in other Underscore
+ // functions.
+ function optimizeCb(func, context, argCount) {
+ if (context === void 0) return func;
+ switch (argCount == null ? 3 : argCount) {
+ case 1: return function(value) {
+ return func.call(context, value);
+ };
+ // The 2-argument case is omitted because we’re not using it.
+ case 3: return function(value, index, collection) {
+ return func.call(context, value, index, collection);
+ };
+ case 4: return function(accumulator, value, index, collection) {
+ return func.call(context, accumulator, value, index, collection);
+ };
+ }
+ return function() {
+ return func.apply(context, arguments);
+ };
+ }
+
+ // An internal function to generate callbacks that can be applied to each
+ // element in a collection, returning the desired result — either `_.identity`,
+ // an arbitrary callback, a property matcher, or a property accessor.
+ function baseIteratee(value, context, argCount) {
+ if (value == null) return identity;
+ if (isFunction$1(value)) return optimizeCb(value, context, argCount);
+ if (isObject(value) && !isArray(value)) return matcher(value);
+ return property(value);
+ }
+
+ // External wrapper for our callback generator. Users may customize
+ // `_.iteratee` if they want additional predicate/iteratee shorthand styles.
+ // This abstraction hides the internal-only `argCount` argument.
+ function iteratee(value, context) {
+ return baseIteratee(value, context, Infinity);
+ }
+ _$1.iteratee = iteratee;
+
+ // The function we call internally to generate a callback. It invokes
+ // `_.iteratee` if overridden, otherwise `baseIteratee`.
+ function cb(value, context, argCount) {
+ if (_$1.iteratee !== iteratee) return _$1.iteratee(value, context);
+ return baseIteratee(value, context, argCount);
+ }
+
+ // Returns the results of applying the `iteratee` to each element of `obj`.
+ // In contrast to `_.map` it returns an object.
+ function mapObject(obj, iteratee, context) {
+ iteratee = cb(iteratee, context);
+ var _keys = keys(obj),
+ length = _keys.length,
+ results = {};
+ for (var index = 0; index < length; index++) {
+ var currentKey = _keys[index];
+ results[currentKey] = iteratee(obj[currentKey], currentKey, obj);
+ }
+ return results;
+ }
+
+ // Predicate-generating function. Often useful outside of Underscore.
+ function noop(){}
+
+ // Generates a function for a given object that returns a given property.
+ function propertyOf(obj) {
+ if (obj == null) return noop;
+ return function(path) {
+ return get(obj, path);
+ };
+ }
+
+ // Run a function **n** times.
+ function times(n, iteratee, context) {
+ var accum = Array(Math.max(0, n));
+ iteratee = optimizeCb(iteratee, context, 1);
+ for (var i = 0; i < n; i++) accum[i] = iteratee(i);
+ return accum;
+ }
+
+ // Return a random integer between `min` and `max` (inclusive).
+ function random(min, max) {
+ if (max == null) {
+ max = min;
+ min = 0;
+ }
+ return min + Math.floor(Math.random() * (max - min + 1));
+ }
+
+ // A (possibly faster) way to get the current timestamp as an integer.
+ var now = Date.now || function() {
+ return new Date().getTime();
+ };
+
+ // Internal helper to generate functions for escaping and unescaping strings
+ // to/from HTML interpolation.
+ function createEscaper(map) {
+ var escaper = function(match) {
+ return map[match];
+ };
+ // Regexes for identifying a key that needs to be escaped.
+ var source = '(?:' + keys(map).join('|') + ')';
+ var testRegexp = RegExp(source);
+ var replaceRegexp = RegExp(source, 'g');
+ return function(string) {
+ string = string == null ? '' : '' + string;
+ return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string;
+ };
+ }
+
+ // Internal list of HTML entities for escaping.
+ var escapeMap = {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ "'": ''',
+ '`': '`'
+ };
+
+ // Function for escaping strings to HTML interpolation.
+ var _escape = createEscaper(escapeMap);
+
+ // Internal list of HTML entities for unescaping.
+ var unescapeMap = invert(escapeMap);
+
+ // Function for unescaping strings from HTML interpolation.
+ var _unescape = createEscaper(unescapeMap);
+
+ // By default, Underscore uses ERB-style template delimiters. Change the
+ // following template settings to use alternative delimiters.
+ var templateSettings = _$1.templateSettings = {
+ evaluate: /<%([\s\S]+?)%>/g,
+ interpolate: /<%=([\s\S]+?)%>/g,
+ escape: /<%-([\s\S]+?)%>/g
+ };
+
+ // When customizing `_.templateSettings`, if you don't want to define an
+ // interpolation, evaluation or escaping regex, we need one that is
+ // guaranteed not to match.
+ var noMatch = /(.)^/;
+
+ // Certain characters need to be escaped so that they can be put into a
+ // string literal.
+ var escapes = {
+ "'": "'",
+ '\\': '\\',
+ '\r': 'r',
+ '\n': 'n',
+ '\u2028': 'u2028',
+ '\u2029': 'u2029'
+ };
+
+ var escapeRegExp = /\\|'|\r|\n|\u2028|\u2029/g;
+
+ function escapeChar(match) {
+ return '\\' + escapes[match];
+ }
+
+ // In order to prevent third-party code injection through
+ // `_.templateSettings.variable`, we test it against the following regular
+ // expression. It is intentionally a bit more liberal than just matching valid
+ // identifiers, but still prevents possible loopholes through defaults or
+ // destructuring assignment.
+ var bareIdentifier = /^\s*(\w|\$)+\s*$/;
+
+ // JavaScript micro-templating, similar to John Resig's implementation.
+ // Underscore templating handles arbitrary delimiters, preserves whitespace,
+ // and correctly escapes quotes within interpolated code.
+ // NB: `oldSettings` only exists for backwards compatibility.
+ function template(text, settings, oldSettings) {
+ if (!settings && oldSettings) settings = oldSettings;
+ settings = defaults({}, settings, _$1.templateSettings);
+
+ // Combine delimiters into one regular expression via alternation.
+ var matcher = RegExp([
+ (settings.escape || noMatch).source,
+ (settings.interpolate || noMatch).source,
+ (settings.evaluate || noMatch).source
+ ].join('|') + '|$', 'g');
+
+ // Compile the template source, escaping string literals appropriately.
+ var index = 0;
+ var source = "__p+='";
+ text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+ source += text.slice(index, offset).replace(escapeRegExp, escapeChar);
+ index = offset + match.length;
+
+ if (escape) {
+ source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+ } else if (interpolate) {
+ source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+ } else if (evaluate) {
+ source += "';\n" + evaluate + "\n__p+='";
+ }
+
+ // Adobe VMs need the match returned to produce the correct offset.
+ return match;
+ });
+ source += "';\n";
+
+ var argument = settings.variable;
+ if (argument) {
+ // Insure against third-party code injection. (CVE-2021-23358)
+ if (!bareIdentifier.test(argument)) throw new Error(
+ 'variable is not a bare identifier: ' + argument
+ );
+ } else {
+ // If a variable is not specified, place data values in local scope.
+ source = 'with(obj||{}){\n' + source + '}\n';
+ argument = 'obj';
+ }
+
+ source = "var __t,__p='',__j=Array.prototype.join," +
+ "print=function(){__p+=__j.call(arguments,'');};\n" +
+ source + 'return __p;\n';
+
+ var render;
+ try {
+ render = new Function(argument, '_', source);
+ } catch (e) {
+ e.source = source;
+ throw e;
+ }
+
+ var template = function(data) {
+ return render.call(this, data, _$1);
+ };
+
+ // Provide the compiled source as a convenience for precompilation.
+ template.source = 'function(' + argument + '){\n' + source + '}';
+
+ return template;
+ }
+
+ // Traverses the children of `obj` along `path`. If a child is a function, it
+ // is invoked with its parent as context. Returns the value of the final
+ // child, or `fallback` if any child is undefined.
+ function result(obj, path, fallback) {
+ path = toPath(path);
+ var length = path.length;
+ if (!length) {
+ return isFunction$1(fallback) ? fallback.call(obj) : fallback;
+ }
+ for (var i = 0; i < length; i++) {
+ var prop = obj == null ? void 0 : obj[path[i]];
+ if (prop === void 0) {
+ prop = fallback;
+ i = length; // Ensure we don't continue iterating.
+ }
+ obj = isFunction$1(prop) ? prop.call(obj) : prop;
+ }
+ return obj;
+ }
+
+ // Generate a unique integer id (unique within the entire client session).
+ // Useful for temporary DOM ids.
+ var idCounter = 0;
+ function uniqueId(prefix) {
+ var id = ++idCounter + '';
+ return prefix ? prefix + id : id;
+ }
+
+ // Start chaining a wrapped Underscore object.
+ function chain(obj) {
+ var instance = _$1(obj);
+ instance._chain = true;
+ return instance;
+ }
+
+ // Internal function to execute `sourceFunc` bound to `context` with optional
+ // `args`. Determines whether to execute a function as a constructor or as a
+ // normal function.
+ function executeBound(sourceFunc, boundFunc, context, callingContext, args) {
+ if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args);
+ var self = baseCreate(sourceFunc.prototype);
+ var result = sourceFunc.apply(self, args);
+ if (isObject(result)) return result;
+ return self;
+ }
+
+ // Partially apply a function by creating a version that has had some of its
+ // arguments pre-filled, without changing its dynamic `this` context. `_` acts
+ // as a placeholder by default, allowing any combination of arguments to be
+ // pre-filled. Set `_.partial.placeholder` for a custom placeholder argument.
+ var partial = restArguments(function(func, boundArgs) {
+ var placeholder = partial.placeholder;
+ var bound = function() {
+ var position = 0, length = boundArgs.length;
+ var args = Array(length);
+ for (var i = 0; i < length; i++) {
+ args[i] = boundArgs[i] === placeholder ? arguments[position++] : boundArgs[i];
+ }
+ while (position < arguments.length) args.push(arguments[position++]);
+ return executeBound(func, bound, this, this, args);
+ };
+ return bound;
+ });
+
+ partial.placeholder = _$1;
+
+ // Create a function bound to a given object (assigning `this`, and arguments,
+ // optionally).
+ var bind = restArguments(function(func, context, args) {
+ if (!isFunction$1(func)) throw new TypeError('Bind must be called on a function');
+ var bound = restArguments(function(callArgs) {
+ return executeBound(func, bound, context, this, args.concat(callArgs));
+ });
+ return bound;
+ });
+
+ // Internal helper for collection methods to determine whether a collection
+ // should be iterated as an array or as an object.
+ // Related: https://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength
+ // Avoids a very nasty iOS 8 JIT bug on ARM-64. #2094
+ var isArrayLike = createSizePropertyCheck(getLength);
+
+ // Internal implementation of a recursive `flatten` function.
+ function flatten$1(input, depth, strict, output) {
+ output = output || [];
+ if (!depth && depth !== 0) {
+ depth = Infinity;
+ } else if (depth <= 0) {
+ return output.concat(input);
+ }
+ var idx = output.length;
+ for (var i = 0, length = getLength(input); i < length; i++) {
+ var value = input[i];
+ if (isArrayLike(value) && (isArray(value) || isArguments$1(value))) {
+ // Flatten current level of array or arguments object.
+ if (depth > 1) {
+ flatten$1(value, depth - 1, strict, output);
+ idx = output.length;
+ } else {
+ var j = 0, len = value.length;
+ while (j < len) output[idx++] = value[j++];
+ }
+ } else if (!strict) {
+ output[idx++] = value;
+ }
+ }
+ return output;
+ }
+
+ // Bind a number of an object's methods to that object. Remaining arguments
+ // are the method names to be bound. Useful for ensuring that all callbacks
+ // defined on an object belong to it.
+ var bindAll = restArguments(function(obj, keys) {
+ keys = flatten$1(keys, false, false);
+ var index = keys.length;
+ if (index < 1) throw new Error('bindAll must be passed function names');
+ while (index--) {
+ var key = keys[index];
+ obj[key] = bind(obj[key], obj);
+ }
+ return obj;
+ });
+
+ // Memoize an expensive function by storing its results.
+ function memoize(func, hasher) {
+ var memoize = function(key) {
+ var cache = memoize.cache;
+ var address = '' + (hasher ? hasher.apply(this, arguments) : key);
+ if (!has$1(cache, address)) cache[address] = func.apply(this, arguments);
+ return cache[address];
+ };
+ memoize.cache = {};
+ return memoize;
+ }
+
+ // Delays a function for the given number of milliseconds, and then calls
+ // it with the arguments supplied.
+ var delay = restArguments(function(func, wait, args) {
+ return setTimeout(function() {
+ return func.apply(null, args);
+ }, wait);
+ });
+
+ // Defers a function, scheduling it to run after the current call stack has
+ // cleared.
+ var defer = partial(delay, _$1, 1);
+
+ // Returns a function, that, when invoked, will only be triggered at most once
+ // during a given window of time. Normally, the throttled function will run
+ // as much as it can, without ever going more than once per `wait` duration;
+ // but if you'd like to disable the execution on the leading edge, pass
+ // `{leading: false}`. To disable execution on the trailing edge, ditto.
+ function throttle(func, wait, options) {
+ var timeout, context, args, result;
+ var previous = 0;
+ if (!options) options = {};
+
+ var later = function() {
+ previous = options.leading === false ? 0 : now();
+ timeout = null;
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
+ };
+
+ var throttled = function() {
+ var _now = now();
+ if (!previous && options.leading === false) previous = _now;
+ var remaining = wait - (_now - previous);
+ context = this;
+ args = arguments;
+ if (remaining <= 0 || remaining > wait) {
+ if (timeout) {
+ clearTimeout(timeout);
+ timeout = null;
+ }
+ previous = _now;
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
+ } else if (!timeout && options.trailing !== false) {
+ timeout = setTimeout(later, remaining);
+ }
+ return result;
+ };
+
+ throttled.cancel = function() {
+ clearTimeout(timeout);
+ previous = 0;
+ timeout = context = args = null;
+ };
+
+ return throttled;
+ }
+
+ // When a sequence of calls of the returned function ends, the argument
+ // function is triggered. The end of a sequence is defined by the `wait`
+ // parameter. If `immediate` is passed, the argument function will be
+ // triggered at the beginning of the sequence instead of at the end.
+ function debounce(func, wait, immediate) {
+ var timeout, previous, args, result, context;
+
+ var later = function() {
+ var passed = now() - previous;
+ if (wait > passed) {
+ timeout = setTimeout(later, wait - passed);
+ } else {
+ timeout = null;
+ if (!immediate) result = func.apply(context, args);
+ // This check is needed because `func` can recursively invoke `debounced`.
+ if (!timeout) args = context = null;
+ }
+ };
+
+ var debounced = restArguments(function(_args) {
+ context = this;
+ args = _args;
+ previous = now();
+ if (!timeout) {
+ timeout = setTimeout(later, wait);
+ if (immediate) result = func.apply(context, args);
+ }
+ return result;
+ });
+
+ debounced.cancel = function() {
+ clearTimeout(timeout);
+ timeout = args = context = null;
+ };
+
+ return debounced;
+ }
+
+ // Returns the first function passed as an argument to the second,
+ // allowing you to adjust arguments, run code before and after, and
+ // conditionally execute the original function.
+ function wrap(func, wrapper) {
+ return partial(wrapper, func);
+ }
+
+ // Returns a negated version of the passed-in predicate.
+ function negate(predicate) {
+ return function() {
+ return !predicate.apply(this, arguments);
+ };
+ }
+
+ // Returns a function that is the composition of a list of functions, each
+ // consuming the return value of the function that follows.
+ function compose() {
+ var args = arguments;
+ var start = args.length - 1;
+ return function() {
+ var i = start;
+ var result = args[start].apply(this, arguments);
+ while (i--) result = args[i].call(this, result);
+ return result;
+ };
+ }
+
+ // Returns a function that will only be executed on and after the Nth call.
+ function after(times, func) {
+ return function() {
+ if (--times < 1) {
+ return func.apply(this, arguments);
+ }
+ };
+ }
+
+ // Returns a function that will only be executed up to (but not including) the
+ // Nth call.
+ function before(times, func) {
+ var memo;
+ return function() {
+ if (--times > 0) {
+ memo = func.apply(this, arguments);
+ }
+ if (times <= 1) func = null;
+ return memo;
+ };
+ }
+
+ // Returns a function that will be executed at most one time, no matter how
+ // often you call it. Useful for lazy initialization.
+ var once = partial(before, 2);
+
+ // Returns the first key on an object that passes a truth test.
+ function findKey(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var _keys = keys(obj), key;
+ for (var i = 0, length = _keys.length; i < length; i++) {
+ key = _keys[i];
+ if (predicate(obj[key], key, obj)) return key;
+ }
+ }
+
+ // Internal function to generate `_.findIndex` and `_.findLastIndex`.
+ function createPredicateIndexFinder(dir) {
+ return function(array, predicate, context) {
+ predicate = cb(predicate, context);
+ var length = getLength(array);
+ var index = dir > 0 ? 0 : length - 1;
+ for (; index >= 0 && index < length; index += dir) {
+ if (predicate(array[index], index, array)) return index;
+ }
+ return -1;
+ };
+ }
+
+ // Returns the first index on an array-like that passes a truth test.
+ var findIndex = createPredicateIndexFinder(1);
+
+ // Returns the last index on an array-like that passes a truth test.
+ var findLastIndex = createPredicateIndexFinder(-1);
+
+ // Use a comparator function to figure out the smallest index at which
+ // an object should be inserted so as to maintain order. Uses binary search.
+ function sortedIndex(array, obj, iteratee, context) {
+ iteratee = cb(iteratee, context, 1);
+ var value = iteratee(obj);
+ var low = 0, high = getLength(array);
+ while (low < high) {
+ var mid = Math.floor((low + high) / 2);
+ if (iteratee(array[mid]) < value) low = mid + 1; else high = mid;
+ }
+ return low;
+ }
+
+ // Internal function to generate the `_.indexOf` and `_.lastIndexOf` functions.
+ function createIndexFinder(dir, predicateFind, sortedIndex) {
+ return function(array, item, idx) {
+ var i = 0, length = getLength(array);
+ if (typeof idx == 'number') {
+ if (dir > 0) {
+ i = idx >= 0 ? idx : Math.max(idx + length, i);
+ } else {
+ length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1;
+ }
+ } else if (sortedIndex && idx && length) {
+ idx = sortedIndex(array, item);
+ return array[idx] === item ? idx : -1;
+ }
+ if (item !== item) {
+ idx = predicateFind(slice.call(array, i, length), isNaN$1);
+ return idx >= 0 ? idx + i : -1;
+ }
+ for (idx = dir > 0 ? i : length - 1; idx >= 0 && idx < length; idx += dir) {
+ if (array[idx] === item) return idx;
+ }
+ return -1;
+ };
+ }
+
+ // Return the position of the first occurrence of an item in an array,
+ // or -1 if the item is not included in the array.
+ // If the array is large and already in sort order, pass `true`
+ // for **isSorted** to use binary search.
+ var indexOf = createIndexFinder(1, findIndex, sortedIndex);
+
+ // Return the position of the last occurrence of an item in an array,
+ // or -1 if the item is not included in the array.
+ var lastIndexOf = createIndexFinder(-1, findLastIndex);
+
+ // Return the first value which passes a truth test.
+ function find(obj, predicate, context) {
+ var keyFinder = isArrayLike(obj) ? findIndex : findKey;
+ var key = keyFinder(obj, predicate, context);
+ if (key !== void 0 && key !== -1) return obj[key];
+ }
+
+ // Convenience version of a common use case of `_.find`: getting the first
+ // object containing specific `key:value` pairs.
+ function findWhere(obj, attrs) {
+ return find(obj, matcher(attrs));
+ }
+
+ // The cornerstone for collection functions, an `each`
+ // implementation, aka `forEach`.
+ // Handles raw objects in addition to array-likes. Treats all
+ // sparse array-likes as if they were dense.
+ function each(obj, iteratee, context) {
+ iteratee = optimizeCb(iteratee, context);
+ var i, length;
+ if (isArrayLike(obj)) {
+ for (i = 0, length = obj.length; i < length; i++) {
+ iteratee(obj[i], i, obj);
+ }
+ } else {
+ var _keys = keys(obj);
+ for (i = 0, length = _keys.length; i < length; i++) {
+ iteratee(obj[_keys[i]], _keys[i], obj);
+ }
+ }
+ return obj;
+ }
+
+ // Return the results of applying the iteratee to each element.
+ function map(obj, iteratee, context) {
+ iteratee = cb(iteratee, context);
+ var _keys = !isArrayLike(obj) && keys(obj),
+ length = (_keys || obj).length,
+ results = Array(length);
+ for (var index = 0; index < length; index++) {
+ var currentKey = _keys ? _keys[index] : index;
+ results[index] = iteratee(obj[currentKey], currentKey, obj);
+ }
+ return results;
+ }
+
+ // Internal helper to create a reducing function, iterating left or right.
+ function createReduce(dir) {
+ // Wrap code that reassigns argument variables in a separate function than
+ // the one that accesses `arguments.length` to avoid a perf hit. (#1991)
+ var reducer = function(obj, iteratee, memo, initial) {
+ var _keys = !isArrayLike(obj) && keys(obj),
+ length = (_keys || obj).length,
+ index = dir > 0 ? 0 : length - 1;
+ if (!initial) {
+ memo = obj[_keys ? _keys[index] : index];
+ index += dir;
+ }
+ for (; index >= 0 && index < length; index += dir) {
+ var currentKey = _keys ? _keys[index] : index;
+ memo = iteratee(memo, obj[currentKey], currentKey, obj);
+ }
+ return memo;
+ };
+
+ return function(obj, iteratee, memo, context) {
+ var initial = arguments.length >= 3;
+ return reducer(obj, optimizeCb(iteratee, context, 4), memo, initial);
+ };
+ }
+
+ // **Reduce** builds up a single result from a list of values, aka `inject`,
+ // or `foldl`.
+ var reduce = createReduce(1);
+
+ // The right-associative version of reduce, also known as `foldr`.
+ var reduceRight = createReduce(-1);
+
+ // Return all the elements that pass a truth test.
+ function filter(obj, predicate, context) {
+ var results = [];
+ predicate = cb(predicate, context);
+ each(obj, function(value, index, list) {
+ if (predicate(value, index, list)) results.push(value);
+ });
+ return results;
+ }
+
+ // Return all the elements for which a truth test fails.
+ function reject(obj, predicate, context) {
+ return filter(obj, negate(cb(predicate)), context);
+ }
+
+ // Determine whether all of the elements pass a truth test.
+ function every(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var _keys = !isArrayLike(obj) && keys(obj),
+ length = (_keys || obj).length;
+ for (var index = 0; index < length; index++) {
+ var currentKey = _keys ? _keys[index] : index;
+ if (!predicate(obj[currentKey], currentKey, obj)) return false;
+ }
+ return true;
+ }
+
+ // Determine if at least one element in the object passes a truth test.
+ function some(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var _keys = !isArrayLike(obj) && keys(obj),
+ length = (_keys || obj).length;
+ for (var index = 0; index < length; index++) {
+ var currentKey = _keys ? _keys[index] : index;
+ if (predicate(obj[currentKey], currentKey, obj)) return true;
+ }
+ return false;
+ }
+
+ // Determine if the array or object contains a given item (using `===`).
+ function contains(obj, item, fromIndex, guard) {
+ if (!isArrayLike(obj)) obj = values(obj);
+ if (typeof fromIndex != 'number' || guard) fromIndex = 0;
+ return indexOf(obj, item, fromIndex) >= 0;
+ }
+
+ // Invoke a method (with arguments) on every item in a collection.
+ var invoke = restArguments(function(obj, path, args) {
+ var contextPath, func;
+ if (isFunction$1(path)) {
+ func = path;
+ } else {
+ path = toPath(path);
+ contextPath = path.slice(0, -1);
+ path = path[path.length - 1];
+ }
+ return map(obj, function(context) {
+ var method = func;
+ if (!method) {
+ if (contextPath && contextPath.length) {
+ context = deepGet(context, contextPath);
+ }
+ if (context == null) return void 0;
+ method = context[path];
+ }
+ return method == null ? method : method.apply(context, args);
+ });
+ });
+
+ // Convenience version of a common use case of `_.map`: fetching a property.
+ function pluck(obj, key) {
+ return map(obj, property(key));
+ }
+
+ // Convenience version of a common use case of `_.filter`: selecting only
+ // objects containing specific `key:value` pairs.
+ function where(obj, attrs) {
+ return filter(obj, matcher(attrs));
+ }
+
+ // Return the maximum element (or element-based computation).
+ function max(obj, iteratee, context) {
+ var result = -Infinity, lastComputed = -Infinity,
+ value, computed;
+ if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
+ obj = isArrayLike(obj) ? obj : values(obj);
+ for (var i = 0, length = obj.length; i < length; i++) {
+ value = obj[i];
+ if (value != null && value > result) {
+ result = value;
+ }
+ }
+ } else {
+ iteratee = cb(iteratee, context);
+ each(obj, function(v, index, list) {
+ computed = iteratee(v, index, list);
+ if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
+ result = v;
+ lastComputed = computed;
+ }
+ });
+ }
+ return result;
+ }
+
+ // Return the minimum element (or element-based computation).
+ function min(obj, iteratee, context) {
+ var result = Infinity, lastComputed = Infinity,
+ value, computed;
+ if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
+ obj = isArrayLike(obj) ? obj : values(obj);
+ for (var i = 0, length = obj.length; i < length; i++) {
+ value = obj[i];
+ if (value != null && value < result) {
+ result = value;
+ }
+ }
+ } else {
+ iteratee = cb(iteratee, context);
+ each(obj, function(v, index, list) {
+ computed = iteratee(v, index, list);
+ if (computed < lastComputed || computed === Infinity && result === Infinity) {
+ result = v;
+ lastComputed = computed;
+ }
+ });
+ }
+ return result;
+ }
+
+ // Sample **n** random values from a collection using the modern version of the
+ // [Fisher-Yates shuffle](https://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
+ // If **n** is not specified, returns a single random element.
+ // The internal `guard` argument allows it to work with `_.map`.
+ function sample(obj, n, guard) {
+ if (n == null || guard) {
+ if (!isArrayLike(obj)) obj = values(obj);
+ return obj[random(obj.length - 1)];
+ }
+ var sample = isArrayLike(obj) ? clone(obj) : values(obj);
+ var length = getLength(sample);
+ n = Math.max(Math.min(n, length), 0);
+ var last = length - 1;
+ for (var index = 0; index < n; index++) {
+ var rand = random(index, last);
+ var temp = sample[index];
+ sample[index] = sample[rand];
+ sample[rand] = temp;
+ }
+ return sample.slice(0, n);
+ }
+
+ // Shuffle a collection.
+ function shuffle(obj) {
+ return sample(obj, Infinity);
+ }
+
+ // Sort the object's values by a criterion produced by an iteratee.
+ function sortBy(obj, iteratee, context) {
+ var index = 0;
+ iteratee = cb(iteratee, context);
+ return pluck(map(obj, function(value, key, list) {
+ return {
+ value: value,
+ index: index++,
+ criteria: iteratee(value, key, list)
+ };
+ }).sort(function(left, right) {
+ var a = left.criteria;
+ var b = right.criteria;
+ if (a !== b) {
+ if (a > b || a === void 0) return 1;
+ if (a < b || b === void 0) return -1;
+ }
+ return left.index - right.index;
+ }), 'value');
+ }
+
+ // An internal function used for aggregate "group by" operations.
+ function group(behavior, partition) {
+ return function(obj, iteratee, context) {
+ var result = partition ? [[], []] : {};
+ iteratee = cb(iteratee, context);
+ each(obj, function(value, index) {
+ var key = iteratee(value, index, obj);
+ behavior(result, value, key);
+ });
+ return result;
+ };
+ }
+
+ // Groups the object's values by a criterion. Pass either a string attribute
+ // to group by, or a function that returns the criterion.
+ var groupBy = group(function(result, value, key) {
+ if (has$1(result, key)) result[key].push(value); else result[key] = [value];
+ });
+
+ // Indexes the object's values by a criterion, similar to `_.groupBy`, but for
+ // when you know that your index values will be unique.
+ var indexBy = group(function(result, value, key) {
+ result[key] = value;
+ });
+
+ // Counts instances of an object that group by a certain criterion. Pass
+ // either a string attribute to count by, or a function that returns the
+ // criterion.
+ var countBy = group(function(result, value, key) {
+ if (has$1(result, key)) result[key]++; else result[key] = 1;
+ });
+
+ // Split a collection into two arrays: one whose elements all pass the given
+ // truth test, and one whose elements all do not pass the truth test.
+ var partition = group(function(result, value, pass) {
+ result[pass ? 0 : 1].push(value);
+ }, true);
+
+ // Safely create a real, live array from anything iterable.
+ var reStrSymbol = /[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g;
+ function toArray(obj) {
+ if (!obj) return [];
+ if (isArray(obj)) return slice.call(obj);
+ if (isString(obj)) {
+ // Keep surrogate pair characters together.
+ return obj.match(reStrSymbol);
+ }
+ if (isArrayLike(obj)) return map(obj, identity);
+ return values(obj);
+ }
+
+ // Return the number of elements in a collection.
+ function size(obj) {
+ if (obj == null) return 0;
+ return isArrayLike(obj) ? obj.length : keys(obj).length;
+ }
+
+ // Internal `_.pick` helper function to determine whether `key` is an enumerable
+ // property name of `obj`.
+ function keyInObj(value, key, obj) {
+ return key in obj;
+ }
+
+ // Return a copy of the object only containing the allowed properties.
+ var pick = restArguments(function(obj, keys) {
+ var result = {}, iteratee = keys[0];
+ if (obj == null) return result;
+ if (isFunction$1(iteratee)) {
+ if (keys.length > 1) iteratee = optimizeCb(iteratee, keys[1]);
+ keys = allKeys(obj);
+ } else {
+ iteratee = keyInObj;
+ keys = flatten$1(keys, false, false);
+ obj = Object(obj);
+ }
+ for (var i = 0, length = keys.length; i < length; i++) {
+ var key = keys[i];
+ var value = obj[key];
+ if (iteratee(value, key, obj)) result[key] = value;
+ }
+ return result;
+ });
+
+ // Return a copy of the object without the disallowed properties.
+ var omit = restArguments(function(obj, keys) {
+ var iteratee = keys[0], context;
+ if (isFunction$1(iteratee)) {
+ iteratee = negate(iteratee);
+ if (keys.length > 1) context = keys[1];
+ } else {
+ keys = map(flatten$1(keys, false, false), String);
+ iteratee = function(value, key) {
+ return !contains(keys, key);
+ };
+ }
+ return pick(obj, iteratee, context);
+ });
+
+ // Returns everything but the last entry of the array. Especially useful on
+ // the arguments object. Passing **n** will return all the values in
+ // the array, excluding the last N.
+ function initial(array, n, guard) {
+ return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n)));
+ }
+
+ // Get the first element of an array. Passing **n** will return the first N
+ // values in the array. The **guard** check allows it to work with `_.map`.
+ function first(array, n, guard) {
+ if (array == null || array.length < 1) return n == null || guard ? void 0 : [];
+ if (n == null || guard) return array[0];
+ return initial(array, array.length - n);
+ }
+
+ // Returns everything but the first entry of the `array`. Especially useful on
+ // the `arguments` object. Passing an **n** will return the rest N values in the
+ // `array`.
+ function rest(array, n, guard) {
+ return slice.call(array, n == null || guard ? 1 : n);
+ }
+
+ // Get the last element of an array. Passing **n** will return the last N
+ // values in the array.
+ function last(array, n, guard) {
+ if (array == null || array.length < 1) return n == null || guard ? void 0 : [];
+ if (n == null || guard) return array[array.length - 1];
+ return rest(array, Math.max(0, array.length - n));
+ }
+
+ // Trim out all falsy values from an array.
+ function compact(array) {
+ return filter(array, Boolean);
+ }
+
+ // Flatten out an array, either recursively (by default), or up to `depth`.
+ // Passing `true` or `false` as `depth` means `1` or `Infinity`, respectively.
+ function flatten(array, depth) {
+ return flatten$1(array, depth, false);
+ }
+
+ // Take the difference between one array and a number of other arrays.
+ // Only the elements present in just the first array will remain.
+ var difference = restArguments(function(array, rest) {
+ rest = flatten$1(rest, true, true);
+ return filter(array, function(value){
+ return !contains(rest, value);
+ });
+ });
+
+ // Return a version of the array that does not contain the specified value(s).
+ var without = restArguments(function(array, otherArrays) {
+ return difference(array, otherArrays);
+ });
+
+ // Produce a duplicate-free version of the array. If the array has already
+ // been sorted, you have the option of using a faster algorithm.
+ // The faster algorithm will not work with an iteratee if the iteratee
+ // is not a one-to-one function, so providing an iteratee will disable
+ // the faster algorithm.
+ function uniq(array, isSorted, iteratee, context) {
+ if (!isBoolean(isSorted)) {
+ context = iteratee;
+ iteratee = isSorted;
+ isSorted = false;
+ }
+ if (iteratee != null) iteratee = cb(iteratee, context);
+ var result = [];
+ var seen = [];
+ for (var i = 0, length = getLength(array); i < length; i++) {
+ var value = array[i],
+ computed = iteratee ? iteratee(value, i, array) : value;
+ if (isSorted && !iteratee) {
+ if (!i || seen !== computed) result.push(value);
+ seen = computed;
+ } else if (iteratee) {
+ if (!contains(seen, computed)) {
+ seen.push(computed);
+ result.push(value);
+ }
+ } else if (!contains(result, value)) {
+ result.push(value);
+ }
+ }
+ return result;
+ }
+
+ // Produce an array that contains the union: each distinct element from all of
+ // the passed-in arrays.
+ var union = restArguments(function(arrays) {
+ return uniq(flatten$1(arrays, true, true));
+ });
+
+ // Produce an array that contains every item shared between all the
+ // passed-in arrays.
+ function intersection(array) {
+ var result = [];
+ var argsLength = arguments.length;
+ for (var i = 0, length = getLength(array); i < length; i++) {
+ var item = array[i];
+ if (contains(result, item)) continue;
+ var j;
+ for (j = 1; j < argsLength; j++) {
+ if (!contains(arguments[j], item)) break;
+ }
+ if (j === argsLength) result.push(item);
+ }
+ return result;
+ }
+
+ // Complement of zip. Unzip accepts an array of arrays and groups
+ // each array's elements on shared indices.
+ function unzip(array) {
+ var length = array && max(array, getLength).length || 0;
+ var result = Array(length);
+
+ for (var index = 0; index < length; index++) {
+ result[index] = pluck(array, index);
+ }
+ return result;
+ }
+
+ // Zip together multiple lists into a single array -- elements that share
+ // an index go together.
+ var zip = restArguments(unzip);
+
+ // Converts lists into objects. Pass either a single array of `[key, value]`
+ // pairs, or two parallel arrays of the same length -- one of keys, and one of
+ // the corresponding values. Passing by pairs is the reverse of `_.pairs`.
+ function object(list, values) {
+ var result = {};
+ for (var i = 0, length = getLength(list); i < length; i++) {
+ if (values) {
+ result[list[i]] = values[i];
+ } else {
+ result[list[i][0]] = list[i][1];
+ }
+ }
+ return result;
+ }
+
+ // Generate an integer Array containing an arithmetic progression. A port of
+ // the native Python `range()` function. See
+ // [the Python documentation](https://docs.python.org/library/functions.html#range).
+ function range(start, stop, step) {
+ if (stop == null) {
+ stop = start || 0;
+ start = 0;
+ }
+ if (!step) {
+ step = stop < start ? -1 : 1;
+ }
+
+ var length = Math.max(Math.ceil((stop - start) / step), 0);
+ var range = Array(length);
+
+ for (var idx = 0; idx < length; idx++, start += step) {
+ range[idx] = start;
+ }
+
+ return range;
+ }
+
+ // Chunk a single array into multiple arrays, each containing `count` or fewer
+ // items.
+ function chunk(array, count) {
+ if (count == null || count < 1) return [];
+ var result = [];
+ var i = 0, length = array.length;
+ while (i < length) {
+ result.push(slice.call(array, i, i += count));
+ }
+ return result;
+ }
+
+ // Helper function to continue chaining intermediate results.
+ function chainResult(instance, obj) {
+ return instance._chain ? _$1(obj).chain() : obj;
+ }
+
+ // Add your own custom functions to the Underscore object.
+ function mixin(obj) {
+ each(functions(obj), function(name) {
+ var func = _$1[name] = obj[name];
+ _$1.prototype[name] = function() {
+ var args = [this._wrapped];
+ push.apply(args, arguments);
+ return chainResult(this, func.apply(_$1, args));
+ };
+ });
+ return _$1;
+ }
+
+ // Add all mutator `Array` functions to the wrapper.
+ each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+ var method = ArrayProto[name];
+ _$1.prototype[name] = function() {
+ var obj = this._wrapped;
+ if (obj != null) {
+ method.apply(obj, arguments);
+ if ((name === 'shift' || name === 'splice') && obj.length === 0) {
+ delete obj[0];
+ }
+ }
+ return chainResult(this, obj);
+ };
+ });
+
+ // Add all accessor `Array` functions to the wrapper.
+ each(['concat', 'join', 'slice'], function(name) {
+ var method = ArrayProto[name];
+ _$1.prototype[name] = function() {
+ var obj = this._wrapped;
+ if (obj != null) obj = method.apply(obj, arguments);
+ return chainResult(this, obj);
+ };
+ });
+
+ // Named Exports
+
+ var allExports = {
+ __proto__: null,
+ VERSION: VERSION,
+ restArguments: restArguments,
+ isObject: isObject,
+ isNull: isNull,
+ isUndefined: isUndefined,
+ isBoolean: isBoolean,
+ isElement: isElement,
+ isString: isString,
+ isNumber: isNumber,
+ isDate: isDate,
+ isRegExp: isRegExp,
+ isError: isError,
+ isSymbol: isSymbol,
+ isArrayBuffer: isArrayBuffer,
+ isDataView: isDataView$1,
+ isArray: isArray,
+ isFunction: isFunction$1,
+ isArguments: isArguments$1,
+ isFinite: isFinite$1,
+ isNaN: isNaN$1,
+ isTypedArray: isTypedArray$1,
+ isEmpty: isEmpty,
+ isMatch: isMatch,
+ isEqual: isEqual,
+ isMap: isMap,
+ isWeakMap: isWeakMap,
+ isSet: isSet,
+ isWeakSet: isWeakSet,
+ keys: keys,
+ allKeys: allKeys,
+ values: values,
+ pairs: pairs,
+ invert: invert,
+ functions: functions,
+ methods: functions,
+ extend: extend,
+ extendOwn: extendOwn,
+ assign: extendOwn,
+ defaults: defaults,
+ create: create,
+ clone: clone,
+ tap: tap,
+ get: get,
+ has: has,
+ mapObject: mapObject,
+ identity: identity,
+ constant: constant,
+ noop: noop,
+ toPath: toPath$1,
+ property: property,
+ propertyOf: propertyOf,
+ matcher: matcher,
+ matches: matcher,
+ times: times,
+ random: random,
+ now: now,
+ escape: _escape,
+ unescape: _unescape,
+ templateSettings: templateSettings,
+ template: template,
+ result: result,
+ uniqueId: uniqueId,
+ chain: chain,
+ iteratee: iteratee,
+ partial: partial,
+ bind: bind,
+ bindAll: bindAll,
+ memoize: memoize,
+ delay: delay,
+ defer: defer,
+ throttle: throttle,
+ debounce: debounce,
+ wrap: wrap,
+ negate: negate,
+ compose: compose,
+ after: after,
+ before: before,
+ once: once,
+ findKey: findKey,
+ findIndex: findIndex,
+ findLastIndex: findLastIndex,
+ sortedIndex: sortedIndex,
+ indexOf: indexOf,
+ lastIndexOf: lastIndexOf,
+ find: find,
+ detect: find,
+ findWhere: findWhere,
+ each: each,
+ forEach: each,
+ map: map,
+ collect: map,
+ reduce: reduce,
+ foldl: reduce,
+ inject: reduce,
+ reduceRight: reduceRight,
+ foldr: reduceRight,
+ filter: filter,
+ select: filter,
+ reject: reject,
+ every: every,
+ all: every,
+ some: some,
+ any: some,
+ contains: contains,
+ includes: contains,
+ include: contains,
+ invoke: invoke,
+ pluck: pluck,
+ where: where,
+ max: max,
+ min: min,
+ shuffle: shuffle,
+ sample: sample,
+ sortBy: sortBy,
+ groupBy: groupBy,
+ indexBy: indexBy,
+ countBy: countBy,
+ partition: partition,
+ toArray: toArray,
+ size: size,
+ pick: pick,
+ omit: omit,
+ first: first,
+ head: first,
+ take: first,
+ initial: initial,
+ last: last,
+ rest: rest,
+ tail: rest,
+ drop: rest,
+ compact: compact,
+ flatten: flatten,
+ without: without,
+ uniq: uniq,
+ unique: uniq,
+ union: union,
+ intersection: intersection,
+ difference: difference,
+ unzip: unzip,
+ transpose: unzip,
+ zip: zip,
+ object: object,
+ range: range,
+ chunk: chunk,
+ mixin: mixin,
+ 'default': _$1
+ };
+
+ // Default Export
+
+ // Add all of the Underscore functions to the wrapper object.
+ var _ = mixin(allExports);
+ // Legacy Node.js API.
+ _._ = _;
+
+ return _;
+
+})));
+//# sourceMappingURL=underscore-umd.js.map
diff --git a/sphinx/build/html/_static/underscore.js b/sphinx/build/html/_static/underscore.js
index 5b55f32beaca186f84cca115514f02cddbd1bbd5..cf177d4285ab55fbc16406a5ec827b80e7eecd53 100644
--- a/sphinx/build/html/_static/underscore.js
+++ b/sphinx/build/html/_static/underscore.js
@@ -1,31 +1,6 @@
-// Underscore.js 1.3.1
-// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
-// Oliver Steele's Functional, and John Resig's Micro-Templating.
-// For all details and documentation:
-// http://documentcloud.github.com/underscore
-(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
-c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&q(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&q(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,
-h)&&!f--)break;g=!f}}d.pop();return g}var r=this,G=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,H=k.unshift,l=o.toString,I=o.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,p=k.indexOf,D=k.lastIndexOf,o=Array.isArray,J=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else r._=b;b.VERSION="1.3.1";var j=b.each=
-b.forEach=function(a,c,d){if(a!=null)if(w&&a.forEach===w)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===n)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===n)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(x&&a.map===x)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==
-null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=
-function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(B&&a.every===B)return a.every(c,b);j(a,function(a,g,h){if(!(e=
-e&&c.call(b,a,g,h)))return n});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return n});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return p&&a.indexOf===p?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
-function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&(e={value:a,computed:b})});
-return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){f==0?b[0]=a:(d=Math.floor(Math.random()*(f+1)),b[f]=b[d],b[d]=a)});return b};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,g){return{value:a,criteria:c.call(d,a,b,g)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,
-c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:a.toArray?a.toArray():b.isArray(a)?i.call(a):b.isArguments(a)?i.call(a):b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=
-b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,e=[];b.reduce(d,function(d,g,h){if(0==h||(c===true?b.last(d)!=g:!b.include(d,g)))d[d.length]=g,e[e.length]=a[h];return d},[]);
-return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,
-d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(p&&a.indexOf===p)return a.indexOf(c);for(d=0,e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(D&&a.lastIndexOf===D)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};
-var F=function(){};b.bind=function(a,c){var d,e;if(a.bind===s&&s)return s.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));F.prototype=a.prototype;var b=new F,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,
-c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i=b.debounce(function(){h=g=false},c);return function(){d=this;e=arguments;var b;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);i()},c));g?h=true:
-a.apply(d,e);i();g=true}};b.debounce=function(a,b){var d;return function(){var e=this,f=arguments;clearTimeout(d);d=setTimeout(function(){d=null;a.apply(e,f)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};
-b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=J||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.defaults=function(a){j(i.call(arguments,
-1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};
-b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!b.has(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};
-b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,b){return I.call(a,b)};b.noConflict=function(){r._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.mixin=function(a){j(b.functions(a),
-function(c){K(c,b[c]=a[c])})};var L=0;b.uniqueId=function(a){var b=L++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var t=/.^/,u=function(a){return a.replace(/\\\\/g,"\\").replace(/\\'/g,"'")};b.template=function(a,c){var d=b.templateSettings,d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.escape||t,function(a,b){return"',_.escape("+
-u(b)+"),'"}).replace(d.interpolate||t,function(a,b){return"',"+u(b)+",'"}).replace(d.evaluate||t,function(a,b){return"');"+u(b).replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var v=function(a,c){return c?b(a).chain():a},K=function(a,c){m.prototype[a]=
-function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=
-true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
+!function(n,r){"object"==typeof exports&&"undefined"!=typeof module?module.exports=r():"function"==typeof define&&define.amd?define("underscore",r):(n="undefined"!=typeof globalThis?globalThis:n||self,function(){var t=n._,e=n._=r();e.noConflict=function(){return n._=t,e}}())}(this,(function(){
+// Underscore.js 1.13.1
+// https://underscorejs.org
+// (c) 2009-2021 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors
+// Underscore may be freely distributed under the MIT license.
+var n="1.13.1",r="object"==typeof self&&self.self===self&&self||"object"==typeof global&&global.global===global&&global||Function("return this")()||{},t=Array.prototype,e=Object.prototype,u="undefined"!=typeof Symbol?Symbol.prototype:null,o=t.push,i=t.slice,a=e.toString,f=e.hasOwnProperty,c="undefined"!=typeof ArrayBuffer,l="undefined"!=typeof DataView,s=Array.isArray,p=Object.keys,v=Object.create,h=c&&ArrayBuffer.isView,y=isNaN,d=isFinite,g=!{toString:null}.propertyIsEnumerable("toString"),b=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"],m=Math.pow(2,53)-1;function j(n,r){return r=null==r?n.length-1:+r,function(){for(var t=Math.max(arguments.length-r,0),e=Array(t),u=0;u<t;u++)e[u]=arguments[u+r];switch(r){case 0:return n.call(this,e);case 1:return n.call(this,arguments[0],e);case 2:return n.call(this,arguments[0],arguments[1],e)}var o=Array(r+1);for(u=0;u<r;u++)o[u]=arguments[u];return o[r]=e,n.apply(this,o)}}function _(n){var r=typeof n;return"function"===r||"object"===r&&!!n}function w(n){return void 0===n}function A(n){return!0===n||!1===n||"[object Boolean]"===a.call(n)}function x(n){var r="[object "+n+"]";return function(n){return a.call(n)===r}}var S=x("String"),O=x("Number"),M=x("Date"),E=x("RegExp"),B=x("Error"),N=x("Symbol"),I=x("ArrayBuffer"),T=x("Function"),k=r.document&&r.document.childNodes;"function"!=typeof/./&&"object"!=typeof Int8Array&&"function"!=typeof k&&(T=function(n){return"function"==typeof n||!1});var D=T,R=x("Object"),F=l&&R(new DataView(new ArrayBuffer(8))),V="undefined"!=typeof Map&&R(new Map),P=x("DataView");var q=F?function(n){return null!=n&&D(n.getInt8)&&I(n.buffer)}:P,U=s||x("Array");function W(n,r){return null!=n&&f.call(n,r)}var z=x("Arguments");!function(){z(arguments)||(z=function(n){return W(n,"callee")})}();var L=z;function $(n){return O(n)&&y(n)}function C(n){return function(){return n}}function K(n){return function(r){var t=n(r);return"number"==typeof t&&t>=0&&t<=m}}function J(n){return function(r){return null==r?void 0:r[n]}}var G=J("byteLength"),H=K(G),Q=/\[object ((I|Ui)nt(8|16|32)|Float(32|64)|Uint8Clamped|Big(I|Ui)nt64)Array\]/;var X=c?function(n){return h?h(n)&&!q(n):H(n)&&Q.test(a.call(n))}:C(!1),Y=J("length");function Z(n,r){r=function(n){for(var r={},t=n.length,e=0;e<t;++e)r[n[e]]=!0;return{contains:function(n){return r[n]},push:function(t){return r[t]=!0,n.push(t)}}}(r);var t=b.length,u=n.constructor,o=D(u)&&u.prototype||e,i="constructor";for(W(n,i)&&!r.contains(i)&&r.push(i);t--;)(i=b[t])in n&&n[i]!==o[i]&&!r.contains(i)&&r.push(i)}function nn(n){if(!_(n))return[];if(p)return p(n);var r=[];for(var t in n)W(n,t)&&r.push(t);return g&&Z(n,r),r}function rn(n,r){var t=nn(r),e=t.length;if(null==n)return!e;for(var u=Object(n),o=0;o<e;o++){var i=t[o];if(r[i]!==u[i]||!(i in u))return!1}return!0}function tn(n){return n instanceof tn?n:this instanceof tn?void(this._wrapped=n):new tn(n)}function en(n){return new Uint8Array(n.buffer||n,n.byteOffset||0,G(n))}tn.VERSION=n,tn.prototype.value=function(){return this._wrapped},tn.prototype.valueOf=tn.prototype.toJSON=tn.prototype.value,tn.prototype.toString=function(){return String(this._wrapped)};var un="[object DataView]";function on(n,r,t,e){if(n===r)return 0!==n||1/n==1/r;if(null==n||null==r)return!1;if(n!=n)return r!=r;var o=typeof n;return("function"===o||"object"===o||"object"==typeof r)&&function n(r,t,e,o){r instanceof tn&&(r=r._wrapped);t instanceof tn&&(t=t._wrapped);var i=a.call(r);if(i!==a.call(t))return!1;if(F&&"[object Object]"==i&&q(r)){if(!q(t))return!1;i=un}switch(i){case"[object RegExp]":case"[object String]":return""+r==""+t;case"[object Number]":return+r!=+r?+t!=+t:0==+r?1/+r==1/t:+r==+t;case"[object Date]":case"[object Boolean]":return+r==+t;case"[object Symbol]":return u.valueOf.call(r)===u.valueOf.call(t);case"[object ArrayBuffer]":case un:return n(en(r),en(t),e,o)}var f="[object Array]"===i;if(!f&&X(r)){if(G(r)!==G(t))return!1;if(r.buffer===t.buffer&&r.byteOffset===t.byteOffset)return!0;f=!0}if(!f){if("object"!=typeof r||"object"!=typeof t)return!1;var c=r.constructor,l=t.constructor;if(c!==l&&!(D(c)&&c instanceof c&&D(l)&&l instanceof l)&&"constructor"in r&&"constructor"in t)return!1}o=o||[];var s=(e=e||[]).length;for(;s--;)if(e[s]===r)return o[s]===t;if(e.push(r),o.push(t),f){if((s=r.length)!==t.length)return!1;for(;s--;)if(!on(r[s],t[s],e,o))return!1}else{var p,v=nn(r);if(s=v.length,nn(t).length!==s)return!1;for(;s--;)if(p=v[s],!W(t,p)||!on(r[p],t[p],e,o))return!1}return e.pop(),o.pop(),!0}(n,r,t,e)}function an(n){if(!_(n))return[];var r=[];for(var t in n)r.push(t);return g&&Z(n,r),r}function fn(n){var r=Y(n);return function(t){if(null==t)return!1;var e=an(t);if(Y(e))return!1;for(var u=0;u<r;u++)if(!D(t[n[u]]))return!1;return n!==hn||!D(t[cn])}}var cn="forEach",ln="has",sn=["clear","delete"],pn=["get",ln,"set"],vn=sn.concat(cn,pn),hn=sn.concat(pn),yn=["add"].concat(sn,cn,ln),dn=V?fn(vn):x("Map"),gn=V?fn(hn):x("WeakMap"),bn=V?fn(yn):x("Set"),mn=x("WeakSet");function jn(n){for(var r=nn(n),t=r.length,e=Array(t),u=0;u<t;u++)e[u]=n[r[u]];return e}function _n(n){for(var r={},t=nn(n),e=0,u=t.length;e<u;e++)r[n[t[e]]]=t[e];return r}function wn(n){var r=[];for(var t in n)D(n[t])&&r.push(t);return r.sort()}function An(n,r){return function(t){var e=arguments.length;if(r&&(t=Object(t)),e<2||null==t)return t;for(var u=1;u<e;u++)for(var o=arguments[u],i=n(o),a=i.length,f=0;f<a;f++){var c=i[f];r&&void 0!==t[c]||(t[c]=o[c])}return t}}var xn=An(an),Sn=An(nn),On=An(an,!0);function Mn(n){if(!_(n))return{};if(v)return v(n);var r=function(){};r.prototype=n;var t=new r;return r.prototype=null,t}function En(n){return _(n)?U(n)?n.slice():xn({},n):n}function Bn(n){return U(n)?n:[n]}function Nn(n){return tn.toPath(n)}function In(n,r){for(var t=r.length,e=0;e<t;e++){if(null==n)return;n=n[r[e]]}return t?n:void 0}function Tn(n,r,t){var e=In(n,Nn(r));return w(e)?t:e}function kn(n){return n}function Dn(n){return n=Sn({},n),function(r){return rn(r,n)}}function Rn(n){return n=Nn(n),function(r){return In(r,n)}}function Fn(n,r,t){if(void 0===r)return n;switch(null==t?3:t){case 1:return function(t){return n.call(r,t)};case 3:return function(t,e,u){return n.call(r,t,e,u)};case 4:return function(t,e,u,o){return n.call(r,t,e,u,o)}}return function(){return n.apply(r,arguments)}}function Vn(n,r,t){return null==n?kn:D(n)?Fn(n,r,t):_(n)&&!U(n)?Dn(n):Rn(n)}function Pn(n,r){return Vn(n,r,1/0)}function qn(n,r,t){return tn.iteratee!==Pn?tn.iteratee(n,r):Vn(n,r,t)}function Un(){}function Wn(n,r){return null==r&&(r=n,n=0),n+Math.floor(Math.random()*(r-n+1))}tn.toPath=Bn,tn.iteratee=Pn;var zn=Date.now||function(){return(new Date).getTime()};function Ln(n){var r=function(r){return n[r]},t="(?:"+nn(n).join("|")+")",e=RegExp(t),u=RegExp(t,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,r):n}}var $n={"&":"&","<":"<",">":">",'"':""","'":"'","`":"`"},Cn=Ln($n),Kn=Ln(_n($n)),Jn=tn.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g},Gn=/(.)^/,Hn={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},Qn=/\\|'|\r|\n|\u2028|\u2029/g;function Xn(n){return"\\"+Hn[n]}var Yn=/^\s*(\w|\$)+\s*$/;var Zn=0;function nr(n,r,t,e,u){if(!(e instanceof r))return n.apply(t,u);var o=Mn(n.prototype),i=n.apply(o,u);return _(i)?i:o}var rr=j((function(n,r){var t=rr.placeholder,e=function(){for(var u=0,o=r.length,i=Array(o),a=0;a<o;a++)i[a]=r[a]===t?arguments[u++]:r[a];for(;u<arguments.length;)i.push(arguments[u++]);return nr(n,e,this,this,i)};return e}));rr.placeholder=tn;var tr=j((function(n,r,t){if(!D(n))throw new TypeError("Bind must be called on a function");var e=j((function(u){return nr(n,e,r,this,t.concat(u))}));return e})),er=K(Y);function ur(n,r,t,e){if(e=e||[],r||0===r){if(r<=0)return e.concat(n)}else r=1/0;for(var u=e.length,o=0,i=Y(n);o<i;o++){var a=n[o];if(er(a)&&(U(a)||L(a)))if(r>1)ur(a,r-1,t,e),u=e.length;else for(var f=0,c=a.length;f<c;)e[u++]=a[f++];else t||(e[u++]=a)}return e}var or=j((function(n,r){var t=(r=ur(r,!1,!1)).length;if(t<1)throw new Error("bindAll must be passed function names");for(;t--;){var e=r[t];n[e]=tr(n[e],n)}return n}));var ir=j((function(n,r,t){return setTimeout((function(){return n.apply(null,t)}),r)})),ar=rr(ir,tn,1);function fr(n){return function(){return!n.apply(this,arguments)}}function cr(n,r){var t;return function(){return--n>0&&(t=r.apply(this,arguments)),n<=1&&(r=null),t}}var lr=rr(cr,2);function sr(n,r,t){r=qn(r,t);for(var e,u=nn(n),o=0,i=u.length;o<i;o++)if(r(n[e=u[o]],e,n))return e}function pr(n){return function(r,t,e){t=qn(t,e);for(var u=Y(r),o=n>0?0:u-1;o>=0&&o<u;o+=n)if(t(r[o],o,r))return o;return-1}}var vr=pr(1),hr=pr(-1);function yr(n,r,t,e){for(var u=(t=qn(t,e,1))(r),o=0,i=Y(n);o<i;){var a=Math.floor((o+i)/2);t(n[a])<u?o=a+1:i=a}return o}function dr(n,r,t){return function(e,u,o){var a=0,f=Y(e);if("number"==typeof o)n>0?a=o>=0?o:Math.max(o+f,a):f=o>=0?Math.min(o+1,f):o+f+1;else if(t&&o&&f)return e[o=t(e,u)]===u?o:-1;if(u!=u)return(o=r(i.call(e,a,f),$))>=0?o+a:-1;for(o=n>0?a:f-1;o>=0&&o<f;o+=n)if(e[o]===u)return o;return-1}}var gr=dr(1,vr,yr),br=dr(-1,hr);function mr(n,r,t){var e=(er(n)?vr:sr)(n,r,t);if(void 0!==e&&-1!==e)return n[e]}function jr(n,r,t){var e,u;if(r=Fn(r,t),er(n))for(e=0,u=n.length;e<u;e++)r(n[e],e,n);else{var o=nn(n);for(e=0,u=o.length;e<u;e++)r(n[o[e]],o[e],n)}return n}function _r(n,r,t){r=qn(r,t);for(var e=!er(n)&&nn(n),u=(e||n).length,o=Array(u),i=0;i<u;i++){var a=e?e[i]:i;o[i]=r(n[a],a,n)}return o}function wr(n){var r=function(r,t,e,u){var o=!er(r)&&nn(r),i=(o||r).length,a=n>0?0:i-1;for(u||(e=r[o?o[a]:a],a+=n);a>=0&&a<i;a+=n){var f=o?o[a]:a;e=t(e,r[f],f,r)}return e};return function(n,t,e,u){var o=arguments.length>=3;return r(n,Fn(t,u,4),e,o)}}var Ar=wr(1),xr=wr(-1);function Sr(n,r,t){var e=[];return r=qn(r,t),jr(n,(function(n,t,u){r(n,t,u)&&e.push(n)})),e}function Or(n,r,t){r=qn(r,t);for(var e=!er(n)&&nn(n),u=(e||n).length,o=0;o<u;o++){var i=e?e[o]:o;if(!r(n[i],i,n))return!1}return!0}function Mr(n,r,t){r=qn(r,t);for(var e=!er(n)&&nn(n),u=(e||n).length,o=0;o<u;o++){var i=e?e[o]:o;if(r(n[i],i,n))return!0}return!1}function Er(n,r,t,e){return er(n)||(n=jn(n)),("number"!=typeof t||e)&&(t=0),gr(n,r,t)>=0}var Br=j((function(n,r,t){var e,u;return D(r)?u=r:(r=Nn(r),e=r.slice(0,-1),r=r[r.length-1]),_r(n,(function(n){var o=u;if(!o){if(e&&e.length&&(n=In(n,e)),null==n)return;o=n[r]}return null==o?o:o.apply(n,t)}))}));function Nr(n,r){return _r(n,Rn(r))}function Ir(n,r,t){var e,u,o=-1/0,i=-1/0;if(null==r||"number"==typeof r&&"object"!=typeof n[0]&&null!=n)for(var a=0,f=(n=er(n)?n:jn(n)).length;a<f;a++)null!=(e=n[a])&&e>o&&(o=e);else r=qn(r,t),jr(n,(function(n,t,e){((u=r(n,t,e))>i||u===-1/0&&o===-1/0)&&(o=n,i=u)}));return o}function Tr(n,r,t){if(null==r||t)return er(n)||(n=jn(n)),n[Wn(n.length-1)];var e=er(n)?En(n):jn(n),u=Y(e);r=Math.max(Math.min(r,u),0);for(var o=u-1,i=0;i<r;i++){var a=Wn(i,o),f=e[i];e[i]=e[a],e[a]=f}return e.slice(0,r)}function kr(n,r){return function(t,e,u){var o=r?[[],[]]:{};return e=qn(e,u),jr(t,(function(r,u){var i=e(r,u,t);n(o,r,i)})),o}}var Dr=kr((function(n,r,t){W(n,t)?n[t].push(r):n[t]=[r]})),Rr=kr((function(n,r,t){n[t]=r})),Fr=kr((function(n,r,t){W(n,t)?n[t]++:n[t]=1})),Vr=kr((function(n,r,t){n[t?0:1].push(r)}),!0),Pr=/[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g;function qr(n,r,t){return r in t}var Ur=j((function(n,r){var t={},e=r[0];if(null==n)return t;D(e)?(r.length>1&&(e=Fn(e,r[1])),r=an(n)):(e=qr,r=ur(r,!1,!1),n=Object(n));for(var u=0,o=r.length;u<o;u++){var i=r[u],a=n[i];e(a,i,n)&&(t[i]=a)}return t})),Wr=j((function(n,r){var t,e=r[0];return D(e)?(e=fr(e),r.length>1&&(t=r[1])):(r=_r(ur(r,!1,!1),String),e=function(n,t){return!Er(r,t)}),Ur(n,e,t)}));function zr(n,r,t){return i.call(n,0,Math.max(0,n.length-(null==r||t?1:r)))}function Lr(n,r,t){return null==n||n.length<1?null==r||t?void 0:[]:null==r||t?n[0]:zr(n,n.length-r)}function $r(n,r,t){return i.call(n,null==r||t?1:r)}var Cr=j((function(n,r){return r=ur(r,!0,!0),Sr(n,(function(n){return!Er(r,n)}))})),Kr=j((function(n,r){return Cr(n,r)}));function Jr(n,r,t,e){A(r)||(e=t,t=r,r=!1),null!=t&&(t=qn(t,e));for(var u=[],o=[],i=0,a=Y(n);i<a;i++){var f=n[i],c=t?t(f,i,n):f;r&&!t?(i&&o===c||u.push(f),o=c):t?Er(o,c)||(o.push(c),u.push(f)):Er(u,f)||u.push(f)}return u}var Gr=j((function(n){return Jr(ur(n,!0,!0))}));function Hr(n){for(var r=n&&Ir(n,Y).length||0,t=Array(r),e=0;e<r;e++)t[e]=Nr(n,e);return t}var Qr=j(Hr);function Xr(n,r){return n._chain?tn(r).chain():r}function Yr(n){return jr(wn(n),(function(r){var t=tn[r]=n[r];tn.prototype[r]=function(){var n=[this._wrapped];return o.apply(n,arguments),Xr(this,t.apply(tn,n))}})),tn}jr(["pop","push","reverse","shift","sort","splice","unshift"],(function(n){var r=t[n];tn.prototype[n]=function(){var t=this._wrapped;return null!=t&&(r.apply(t,arguments),"shift"!==n&&"splice"!==n||0!==t.length||delete t[0]),Xr(this,t)}})),jr(["concat","join","slice"],(function(n){var r=t[n];tn.prototype[n]=function(){var n=this._wrapped;return null!=n&&(n=r.apply(n,arguments)),Xr(this,n)}}));var Zr=Yr({__proto__:null,VERSION:n,restArguments:j,isObject:_,isNull:function(n){return null===n},isUndefined:w,isBoolean:A,isElement:function(n){return!(!n||1!==n.nodeType)},isString:S,isNumber:O,isDate:M,isRegExp:E,isError:B,isSymbol:N,isArrayBuffer:I,isDataView:q,isArray:U,isFunction:D,isArguments:L,isFinite:function(n){return!N(n)&&d(n)&&!isNaN(parseFloat(n))},isNaN:$,isTypedArray:X,isEmpty:function(n){if(null==n)return!0;var r=Y(n);return"number"==typeof r&&(U(n)||S(n)||L(n))?0===r:0===Y(nn(n))},isMatch:rn,isEqual:function(n,r){return on(n,r)},isMap:dn,isWeakMap:gn,isSet:bn,isWeakSet:mn,keys:nn,allKeys:an,values:jn,pairs:function(n){for(var r=nn(n),t=r.length,e=Array(t),u=0;u<t;u++)e[u]=[r[u],n[r[u]]];return e},invert:_n,functions:wn,methods:wn,extend:xn,extendOwn:Sn,assign:Sn,defaults:On,create:function(n,r){var t=Mn(n);return r&&Sn(t,r),t},clone:En,tap:function(n,r){return r(n),n},get:Tn,has:function(n,r){for(var t=(r=Nn(r)).length,e=0;e<t;e++){var u=r[e];if(!W(n,u))return!1;n=n[u]}return!!t},mapObject:function(n,r,t){r=qn(r,t);for(var e=nn(n),u=e.length,o={},i=0;i<u;i++){var a=e[i];o[a]=r(n[a],a,n)}return o},identity:kn,constant:C,noop:Un,toPath:Bn,property:Rn,propertyOf:function(n){return null==n?Un:function(r){return Tn(n,r)}},matcher:Dn,matches:Dn,times:function(n,r,t){var e=Array(Math.max(0,n));r=Fn(r,t,1);for(var u=0;u<n;u++)e[u]=r(u);return e},random:Wn,now:zn,escape:Cn,unescape:Kn,templateSettings:Jn,template:function(n,r,t){!r&&t&&(r=t),r=On({},r,tn.templateSettings);var e=RegExp([(r.escape||Gn).source,(r.interpolate||Gn).source,(r.evaluate||Gn).source].join("|")+"|$","g"),u=0,o="__p+='";n.replace(e,(function(r,t,e,i,a){return o+=n.slice(u,a).replace(Qn,Xn),u=a+r.length,t?o+="'+\n((__t=("+t+"))==null?'':_.escape(__t))+\n'":e?o+="'+\n((__t=("+e+"))==null?'':__t)+\n'":i&&(o+="';\n"+i+"\n__p+='"),r})),o+="';\n";var i,a=r.variable;if(a){if(!Yn.test(a))throw new Error("variable is not a bare identifier: "+a)}else o="with(obj||{}){\n"+o+"}\n",a="obj";o="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+o+"return __p;\n";try{i=new Function(a,"_",o)}catch(n){throw n.source=o,n}var f=function(n){return i.call(this,n,tn)};return f.source="function("+a+"){\n"+o+"}",f},result:function(n,r,t){var e=(r=Nn(r)).length;if(!e)return D(t)?t.call(n):t;for(var u=0;u<e;u++){var o=null==n?void 0:n[r[u]];void 0===o&&(o=t,u=e),n=D(o)?o.call(n):o}return n},uniqueId:function(n){var r=++Zn+"";return n?n+r:r},chain:function(n){var r=tn(n);return r._chain=!0,r},iteratee:Pn,partial:rr,bind:tr,bindAll:or,memoize:function(n,r){var t=function(e){var u=t.cache,o=""+(r?r.apply(this,arguments):e);return W(u,o)||(u[o]=n.apply(this,arguments)),u[o]};return t.cache={},t},delay:ir,defer:ar,throttle:function(n,r,t){var e,u,o,i,a=0;t||(t={});var f=function(){a=!1===t.leading?0:zn(),e=null,i=n.apply(u,o),e||(u=o=null)},c=function(){var c=zn();a||!1!==t.leading||(a=c);var l=r-(c-a);return u=this,o=arguments,l<=0||l>r?(e&&(clearTimeout(e),e=null),a=c,i=n.apply(u,o),e||(u=o=null)):e||!1===t.trailing||(e=setTimeout(f,l)),i};return c.cancel=function(){clearTimeout(e),a=0,e=u=o=null},c},debounce:function(n,r,t){var e,u,o,i,a,f=function(){var c=zn()-u;r>c?e=setTimeout(f,r-c):(e=null,t||(i=n.apply(a,o)),e||(o=a=null))},c=j((function(c){return a=this,o=c,u=zn(),e||(e=setTimeout(f,r),t&&(i=n.apply(a,o))),i}));return c.cancel=function(){clearTimeout(e),e=o=a=null},c},wrap:function(n,r){return rr(r,n)},negate:fr,compose:function(){var n=arguments,r=n.length-1;return function(){for(var t=r,e=n[r].apply(this,arguments);t--;)e=n[t].call(this,e);return e}},after:function(n,r){return function(){if(--n<1)return r.apply(this,arguments)}},before:cr,once:lr,findKey:sr,findIndex:vr,findLastIndex:hr,sortedIndex:yr,indexOf:gr,lastIndexOf:br,find:mr,detect:mr,findWhere:function(n,r){return mr(n,Dn(r))},each:jr,forEach:jr,map:_r,collect:_r,reduce:Ar,foldl:Ar,inject:Ar,reduceRight:xr,foldr:xr,filter:Sr,select:Sr,reject:function(n,r,t){return Sr(n,fr(qn(r)),t)},every:Or,all:Or,some:Mr,any:Mr,contains:Er,includes:Er,include:Er,invoke:Br,pluck:Nr,where:function(n,r){return Sr(n,Dn(r))},max:Ir,min:function(n,r,t){var e,u,o=1/0,i=1/0;if(null==r||"number"==typeof r&&"object"!=typeof n[0]&&null!=n)for(var a=0,f=(n=er(n)?n:jn(n)).length;a<f;a++)null!=(e=n[a])&&e<o&&(o=e);else r=qn(r,t),jr(n,(function(n,t,e){((u=r(n,t,e))<i||u===1/0&&o===1/0)&&(o=n,i=u)}));return o},shuffle:function(n){return Tr(n,1/0)},sample:Tr,sortBy:function(n,r,t){var e=0;return r=qn(r,t),Nr(_r(n,(function(n,t,u){return{value:n,index:e++,criteria:r(n,t,u)}})).sort((function(n,r){var t=n.criteria,e=r.criteria;if(t!==e){if(t>e||void 0===t)return 1;if(t<e||void 0===e)return-1}return n.index-r.index})),"value")},groupBy:Dr,indexBy:Rr,countBy:Fr,partition:Vr,toArray:function(n){return n?U(n)?i.call(n):S(n)?n.match(Pr):er(n)?_r(n,kn):jn(n):[]},size:function(n){return null==n?0:er(n)?n.length:nn(n).length},pick:Ur,omit:Wr,first:Lr,head:Lr,take:Lr,initial:zr,last:function(n,r,t){return null==n||n.length<1?null==r||t?void 0:[]:null==r||t?n[n.length-1]:$r(n,Math.max(0,n.length-r))},rest:$r,tail:$r,drop:$r,compact:function(n){return Sr(n,Boolean)},flatten:function(n,r){return ur(n,r,!1)},without:Kr,uniq:Jr,unique:Jr,union:Gr,intersection:function(n){for(var r=[],t=arguments.length,e=0,u=Y(n);e<u;e++){var o=n[e];if(!Er(r,o)){var i;for(i=1;i<t&&Er(arguments[i],o);i++);i===t&&r.push(o)}}return r},difference:Cr,unzip:Hr,transpose:Hr,zip:Qr,object:function(n,r){for(var t={},e=0,u=Y(n);e<u;e++)r?t[n[e]]=r[e]:t[n[e][0]]=n[e][1];return t},range:function(n,r,t){null==r&&(r=n||0,n=0),t||(t=r<n?-1:1);for(var e=Math.max(Math.ceil((r-n)/t),0),u=Array(e),o=0;o<e;o++,n+=t)u[o]=n;return u},chunk:function(n,r){if(null==r||r<1)return[];for(var t=[],e=0,u=n.length;e<u;)t.push(i.call(n,e,e+=r));return t},mixin:Yr,default:tn});return Zr._=Zr,Zr}));
\ No newline at end of file
diff --git a/sphinx/build/html/genindex.html b/sphinx/build/html/genindex.html
index be2042b303e8c7fe1435974da59f574bcd02cb1c..46e796b5a8253e3d52950659f0590d731f78779a 100644
--- a/sphinx/build/html/genindex.html
+++ b/sphinx/build/html/genindex.html
@@ -3,17 +3,17 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>Index — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <title>Index — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
+
+ <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/jquery.js"></script>
<script src="_static/underscore.js"></script>
<script src="_static/doctools.js"></script>
- <script src="_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="_static/js/theme.js"></script>
<link rel="index" title="Index" href="#" />
<link rel="search" title="Search" href="search.html" />
diff --git a/sphinx/build/html/index.html b/sphinx/build/html/index.html
index b3a51168f849a36a8fb3401a1e8af0ec0854e187..c7fd7a0c618756365de6c220ad7721893f591471 100644
--- a/sphinx/build/html/index.html
+++ b/sphinx/build/html/index.html
@@ -1,19 +1,20 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
- <meta charset="utf-8" />
+ <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>OHMPI: Open source and open hardware resitivity-meter — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <title>OHMPI: Open source and open hardware resitivity-meter — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
+
+ <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/jquery.js"></script>
<script src="_static/underscore.js"></script>
<script src="_static/doctools.js"></script>
- <script src="_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="_static/js/theme.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
@@ -66,16 +67,16 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="ohmpi-open-source-and-open-hardware-resitivity-meter">
-<h1>OHMPI: Open source and open hardware resitivity-meter<a class="headerlink" href="#ohmpi-open-source-and-open-hardware-resitivity-meter" title="Permalink to this headline">¶</a></h1>
-<div class="sidebar">
+ <section id="ohmpi-open-source-and-open-hardware-resitivity-meter">
+<h1>OHMPI: Open source and open hardware resitivity-meter<a class="headerlink" href="#ohmpi-open-source-and-open-hardware-resitivity-meter" title="Permalink to this headline">ïƒ</a></h1>
+<aside class="sidebar">
<p class="sidebar-title">Summary</p>
<dl class="field-list simple">
<dt class="field-odd">Release</dt>
<dd class="field-odd"><p>open hardware resistivity-meter</p>
</dd>
<dt class="field-even">Date</dt>
-<dd class="field-even"><p>Dec 05, 2021</p>
+<dd class="field-even"><p>Dec 13, 2021</p>
</dd>
<dt class="field-odd">Date start</dt>
<dd class="field-odd"><p>July 2016</p>
@@ -90,7 +91,7 @@
<dd class="field-even"><p>some mature, some in progress</p>
</dd>
</dl>
-</div>
+</aside>
<div class="topic">
<p class="topic-title">OhmPi Document Center</p>
<ul class="simple">
@@ -176,7 +177,7 @@
</li>
</ul>
</div>
-</div>
+</section>
</div>
diff --git a/sphinx/build/html/search.html b/sphinx/build/html/search.html
index 689efaf19a81c3cc2fd0f1924e0652254b61119a..d659aac06ca56e2261c5385db899921e77ce5574 100644
--- a/sphinx/build/html/search.html
+++ b/sphinx/build/html/search.html
@@ -3,18 +3,18 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>Search — Ohmpi: open hardware resistivity-meter documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <title>Search — Ohmpi: open hardware resistivity-meter documentation</title>
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="_static/js/html5shiv.min.js"></script>
<![endif]-->
- <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
+
+ <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/jquery.js"></script>
<script src="_static/underscore.js"></script>
<script src="_static/doctools.js"></script>
- <script src="_static/language_data.js"></script>
- <script async="async" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="_static/js/theme.js"></script>
<script src="_static/searchtools.js"></script>
<script src="_static/language_data.js"></script>
diff --git a/sphinx/build/html/searchindex.js b/sphinx/build/html/searchindex.js
deleted file mode 100644
index b76f2db21e0b8c5eecb00add3992223039fde32a..0000000000000000000000000000000000000000
--- a/sphinx/build/html/searchindex.js
+++ /dev/null
@@ -1 +0,0 @@
-Search.setIndex({docnames:["Ohmpi","Ohmpi_V2_00/V2_00_step_01","Ohmpi_V2_00/V2_00_step_02","Ohmpi_V2_00/V2_00_step_03","V1_01","V1_02","V2_00","index"],envversion:{"sphinx.domains.c":2,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":3,"sphinx.domains.index":1,"sphinx.domains.javascript":2,"sphinx.domains.math":2,"sphinx.domains.python":2,"sphinx.domains.rst":2,"sphinx.domains.std":1,sphinx:56},filenames:["Ohmpi.rst","Ohmpi_V2_00\\V2_00_step_01.rst","Ohmpi_V2_00\\V2_00_step_02.rst","Ohmpi_V2_00\\V2_00_step_03.rst","V1_01.rst","V1_02.rst","V2_00.rst","index.rst"],objects:{},objnames:{},objtypes:{},terms:{"000":[4,5],"001000":2,"001101":2,"008":3,"018":[4,5],"0251001":5,"02be":[2,3],"061":3,"091":3,"0x70":3,"0x71":3,"0x72":3,"0x73":3,"0x77":3,"100":[4,5],"100k":3,"100nf":[2,5],"101":[4,5],"10120158":3,"1012015810":3,"10120550":[2,3],"10120558":3,"10120862":3,"1016":0,"102110421":2,"103":[2,4,5],"103321":3,"1083":[4,5],"1085":2,"10v":5,"110":[2,4,5],"1115":[4,5],"114":[2,4,5],"11mm":2,"120":[2,3],"1211n":2,"1212":2,"1215":[2,5],"127":3,"128":[3,7],"12v":[2,4,5,7],"1332":[4,5],"140":3,"150":[4,5,6],"1548658":3,"1565235":[4,5],"1568649":[4,5],"1580994":3,"185":[4,5],"199":[4,5],"1kohm":2,"1n4007":3,"1x0":[4,5],"1x1":[4,5],"1x10":[2,4,5],"2016":7,"2020":0,"2021":[0,7],"205":3,"220":2,"24300":3,"24v":[2,5],"252b7an":2,"252baqg":3,"252bdzonqg":2,"252be0w1orxzibqpw":2,"252be1bmvd":2,"252be2z":2,"252bg":2,"252bii":2,"252bnrpuooeq":2,"252bsz9b":3,"252bx":2,"252bz3hvktao":3,"252bztchcpohq":2,"252bzuq":3,"254":[2,3],"25515":3,"256":3,"2701":[2,3],"2717":3,"296":3,"2f0t3ruis9pcaqjlt4":2,"2f12mkns3vxsdryxuhw":[2,3],"2f2czwu0ejpozmzc2a":3,"2f2czwuxuhumfr":3,"2f33nj0gbxroculucynpyong":2,"2f5q":3,"2faaymw02gquicgqj0ta":2,"2fbpyakboruumren":3,"2ff6fcxt7g":3,"2ffq":2,"2fha2pyfadugpyeg4idvm":2,"2fha2pyfadugy9twham3ru9hmijohywhbin95knm":2,"2fha2pyfaduh":2,"2fha2pyfaduhuylh7az":2,"2fha2pyfadujqkqx4wauig":2,"2flq1th4mcyoetma":2,"2fm":2,"2fmgndxmcnv":2,"2fmjfh2xjoums6wztux4som":2,"2fmsr":2,"2fogzutwiq9iz5vjaqfoyugqalgxpeckigrqvf4hn":2,"2fq":2,"2fqaur8narg":2,"2fufuz19ilfayzxocfra":2,"3002002":2,"304":2,"305":[2,3],"308":2,"325":3,"3x11":2,"41f2r0e":2,"449":2,"45100":0,"4686":[4,5],"471":3,"500":[4,5],"503811":3,"508":[2,3],"50vdc":[2,5],"512":3,"524":2,"537":[4,5],"5488":[4,5],"560":3,"576":[3,4],"593":2,"5kohm":2,"5twgzeq9e7hsylqaljjyrw":3,"5vcc":[4,5],"5vdc":[4,5],"614":3,"616":3,"627":[4,5],"648":[2,3,4,5],"69626":0,"69675":0,"732":3,"741435":2,"741727":3,"742063":3,"745":3,"762":2,"776":3,"796":2,"7ah":[4,5],"7mvldsj5uaxen3lyyh3sqw":2,"846":3,"858":[4,5],"897":[4,5],"9004330000":[4,5],"966067":[4,5],"971110321":2,"ao\u00fbt":0,"case":[1,4,5],"final":[4,5],"function":[0,4,5],"h\u00e9l\u00e8ne":[0,7],"mm\u00b2":[4,5],"new":[1,4,5,6],"orl\u00e9an":0,"public":[4,5],"r\u00e9mi":[0,7],"return":[1,4,5],"switch":[4,5],"universit\u00e9":0,"vid\u00e9o":[1,4,5],ADS:[4,5],CMS:[4,5],For:[1,2,4,5],IDE:[6,7],IGE:0,Its:[4,5],The:[1,2,3,7],These:[4,5],With:[4,5],abmn:[4,5],abov:[4,5],acc:[1,4,5],access:[4,5],accord:[4,5],accur:[4,5],accuraci:[4,5],acid:[4,5],activ:[3,6,7],actual:[4,5],adafruit:[1,2,3,4,5],adapt:[2,4,5],adc:[2,4,5],add:[4,5],added:[4,5],adding:[4,5],addit:[4,5],address:[2,3,4,5],adjust:[2,4,5],ads1115:[2,4,5],ads115:[2,4,5],ads1x15:[1,4,5],advantag:2,after:[4,5],all:[1,3,4,5,6],allow:[0,2,3,4,5,6],alp:0,also:[1,4,5],altern:[1,4,5],amp:[2,4,5],amplif:2,amplifi:[4,5],analog:[2,4,5],ani:[4,5],anoth:[1,4,5],apm:[2,3],appear:[1,2,4,5],appli:[0,4,5],applic:0,apt:[1,4,5],aqy211eh:2,arduino:4,arm:4,around:2,arrai:[4,5],articl:[4,5],asler:[2,3,4,5],assembl:[6,7],assist:[4,5],associ:[0,3],attent:[4,5],attribut:[4,5],author:[0,1,4,5,7],automat:[0,4,5],automobil:[4,5],avail:[4,5],avr:4,bank:[4,5],base:[1,3,4,5],basic:0,batteri:[2,4,5,6],been:[1,4,5],befor:[4,5],behavior:[4,5],being:[4,5],below:[1,4,5],between:[2,3,4,5],beyschlag:3,bin:[1,4,5],bit:[2,4,5],bkl:[2,3],black:[2,4,5],blinka:[1,4,5],blk:[2,3],block:[4,5],blue:[4,5],board:[1,6,7],boot:[1,4,5],both:[4,5],bottom:[2,4,5],bought:[4,5],box:6,breakout:2,bridg:[4,5],bug:4,build:[4,5],button:[1,4,5],by10:2,c320c104k1:[2,5],c320c104k1r5ta7303:2,c4uyot:2,cabl:[1,2,3,4,5],calcul:[4,5],calibr:[4,5],call:0,can:[1,4,5,6],canal:4,cap:[4,5],capac:[4,5],capacitor:[2,5],car:4,card:[1,3,6,7],carri:[1,4,5],caus:[1,4,5],ccf071k50gke36:2,cedex:0,ceram:[2,5],chang:[2,3],channel:[3,4,5],characterist:[4,5],charg:[4,5],check:[1,4,5,6],chosen:[4,5],ciayqk2gdckzia2levalkg:2,circuit:[2,3,4,5],circuitpython:[1,4,5],circul:[4,5],cite:7,clean:[4,5],clement:[0,7],click:[1,4,5],close:[1,4,5],cmf651m0000fkek143:2,code:[1,2,4,5],coef_p0:[4,5],coef_p1:[4,5],coef_p2:[4,5],coef_p3:[4,5],coeff:[4,5],coeffici:[4,5],colour:3,com:[1,2,3,4,5],combin:3,command:[1,4,5],commerci:[4,5],common:[4,5],commun:[0,6],complet:[1,2,6,7],compon:[1,6,7],comput:[1,4,5],conduct:[4,5],config:[1,4,5],configur:[6,7],congratul:[4,5],connect:[1,2,3,7],connector:[3,4,5],conrad:[2,3],consequ:[4,5],consist:[4,5],constitut:[4,5],construct:[4,5],consumpt:[4,5,6],contact:[2,3,4,5],contain:[1,4,5],content:7,control:[4,5,6],convers:[4,5],convert:[2,4,5],copi:1,correct:[4,5],correspond:4,cost:[0,2,3,4,5],could:[2,4,5],cpu:[4,5,6],creat:[1,4,5],creation:0,crimp:[4,5],csv:[4,5],ctrl:[1,4,5],cui:[2,3],current:[0,2,6,7],dale:2,damag:[1,4,5],data:[0,7],date:[0,4,5,7],dcconvert:5,deactiv:[1,4,5],dec:7,decid:[1,4,5],decoupl:5,decreas:2,dedic:[0,6],delai:[4,5],deliv:[4,5],depart:0,depend:[1,4,5],describ:[1,2,4,5],descript:[6,7],design:[4,5],desktop:5,despit:[4,5],detail:4,dev:[1,4,5],develop:[0,1,2,4,5,6,7],devic:[2,3],diagram:[4,5],differ:[1,2,4,5,6],digit:[2,3,4,5],dii:6,din:[4,5],diod:3,dip:2,direct:[4,5],directli:[2,4,5],directori:[1,4,5],disconnect:[4,5],discret:1,displai:[4,5],distanc:[4,5],disturb:[4,5],divid:[4,5],document:[0,4],done:[1,4,5],down:[4,5],download:[4,5],dsp:4,dual:[2,3,4,5],duboi:[0,7],durat:[4,5,6],dure:[1,4,5],dzwb4:[4,5],e00122ff:0,each:[1,3,4,5],eaiaiqobchmin_taxbcx8wivq5nvch2qaqfpeayyccabegjk1_d_bw:2,eaiaiqobchmit8zjzr6x8wivgdnvch2vbwvseaqyayabegjqg_d_bw:2,editor:[1,4,5],effort:6,eiffel:0,either:[1,4,5],ejector:[2,3],electr:[0,2,7],electrod:[0,2,3,7],electron:[2,3,4,5],elektronik:2,elsevi:0,emil:0,enabl:[4,5],end:[1,4,5],energ:[4,5],enough:[3,4,5],ensur:[1,4,5],enter:[1,4,5],entir:[4,5],environ:[1,4,5],environn:[6,7],environnementshould:[1,4,5],equal:[4,5],equival:[2,4,5],ert:[4,5],escap:[1,4,5],estim:[4,5],everyon:0,everyth:2,evolv:[4,5],exampl:[4,5],excess:[4,5],execut:[1,4,5],exist:[4,5],expand:3,expend:3,experi:[0,4,5,6],explain:4,export_path:5,extra:[4,5],failur:[1,4,5],fargier:[0,7],fast:5,featur:[4,5],femal:[2,3,4,5],ferrul:[4,5],fewer:[4,5],ff10:0,fhac0002zxj:4,field:[4,5,6],fig:[4,5],figur:[2,4,5],file:[1,4,5],find:[1,4,5],first:[1,4,5],fix:2,flexibl:0,florsch:[2,4,5],flow:[4,5],folder:[1,4,5],follow:[1,2,3,4,5],forquet:[0,7],four:[2,6,7],framework:[4,5],franc:0,frist:7,from:[3,4,5,6],full:[4,5],fulli:0,fuse:[4,5],g5le:3,gain:[2,4,5],ganc:[0,7],gather:[1,4,5],gclid:2,gener:[2,3,4,5,7],geologi:0,ger:0,get:[0,1,2,4,5],gitlab:[4,5],gnd:[4,5],gnu:[1,4,5],gpio:[1,3,4,5],grenobl:0,gro:0,ground:[2,4,5],gui:[1,4,5],guidelin:7,gurawfaegucaqqfvnvtyeg:2,gustav:0,guyard:[0,7],h81k0bya:[2,4,5],h81k5bya:[2,4,5],had:[4,5],hand:[4,5],handl:[4,5],hardwar:[0,4,5],hardwarex:0,harwin:2,has:[1,3,4,5],have:[1,2,3,4,5,6],hazard:[4,5],hdmi:1,header:[2,3,4,5],hear:[4,5],here:5,hex:3,hexagonal:2,hexseal:[2,3],high:[4,5],higher:[2,5],holder:[4,5],hole:[4,5],holsworthi:2,home:[1,4,5],horizont:[4,5],hous:[4,5],how:[1,4,5],howev:[4,5],http:[1,2,3,4,5],i2c:[2,3],i2cdetect:2,ifsttar:0,iggadovctstu:2,illustr:[4,5],im6toxqzgoauedprb19mha:2,imag:0,imped:[4,5,6],implent:7,improv:[5,6],in1:[4,5],in2:[4,5],in3:[4,5],in4:[4,5],ina282:2,ina282aid:2,includ:[1,4,5],incom:[4,5],incorpor:3,increas:[4,5],inde:[4,5],industri:2,initi:7,inject:[0,6,7],injection_dur:[4,5],inpout:2,input:[2,4,5,6],inra:0,insert:[4,5],insid:[4,5],instal:[2,6,7],instanc:1,instead:[4,5],instruct:[1,7],instrument:[0,2,4,5],integr:2,intens:[4,5],interfac:[1,4,5],interpret:[1,2,4,5],introduc:[4,5],introduct:7,invit:4,involv:0,ion:[4,5],iri:0,irstea:[4,5],its:[1,3,4,5,6],jason:5,jjse:[2,3],journal:4,json:5,juillet:0,juli:7,julien:[0,7],just:[2,5],kaufmann:[0,7],kemet:[2,5],keyboard:[1,4,5],keyston:3,known:[1,4,5],kohm:[2,4,5],laboratori:[0,4,5,6],laps:6,last:5,lastli:[4,5],latest:[1,4,5],lead:[4,5],leav:[1,4,5],length:[4,5],less:[4,5],let:[4,5],libatla:[1,4,5],librari:[1,4,5],lie:[2,4,5],limit:[2,6,7],line:[2,4,5],list:[1,7],lithium:[4,5],littelfus:[4,5],littl:[4,5],lm158:2,lm158j:2,lm158n:2,lm358an:[2,4,5],lm358n:[4,5],locat:[1,4,5],logger:[0,4,5],low:[0,1,4,5,6],lr20:[4,5],lying:[4,5],lyon:0,made:[4,5,6],mai:[1,4,5],main:[4,5],make:[1,4,5],male:[2,3],manag:[4,5],manual:[4,5],manufactur:[2,3,4,5],manuscript:[4,5],master:[4,5],matur:7,max:2,maximum:[4,5],mba02040c1003frp00:3,mcp23008:2,mcp23017:3,measur:[0,1,6,7],mechan:[3,4,5],meet:[1,4,5],mega:[4,5],menu:[1,4,5],mesur:7,met:[1,4,5],meter:[0,4,5,6],meterfeatur:0,mgh:2,micro:[1,4,5,6],mill:2,mimic:[4,5],min:[4,5,6],miss:4,mm2:[4,5],model:[1,2,4,5],modif:[1,4,5],modifi:[1,4,5],modul:[4,5],mofset:3,mohm:[2,4,5,6],mon:0,monitor:[4,5,6],more:6,moreov:[4,5],mosfet:3,mount:[2,4,5],mous:[1,4,5],mouser:[2,3],muliplex:3,multi:[3,4,5],multielectrod:6,multipl:1,multiplex:[0,3,6,7],multipli:[4,5],must:[1,4,5],mux:[4,5,6,7],mzrxyrlhvdt9crf7zyf:3,name:[4,5],nano:[1,4,5],nb_electrod:[4,5],nbr_mea:[4,5],nchannel:3,necessari:[1,4,5],need:[1,2,3,4,5],neg:[4,5],next:[4,5],nicola:[0,7],noob:[1,4,5],nopb:[2,4,5],normal:[4,5],note:[4,5],now:[4,5],number:[2,3,4,5],numer:[4,5],numpi:[1,4,5],obtain:[4,5],offcial:7,offer:[4,5,6],ohm:[2,4,5,6],ohmit:2,ohmmet:[4,5],ohmpi:[1,2,3],ohmpi_4elec:2,ohmpi_param:5,ohx:0,olivi:[0,7],omron:3,onc:[1,4,5],one:[2,4,5,6],onli:[3,7],onto:[4,5],open:[0,1,4,5],oper:[1,2,6,7],optic:2,optim:[4,5],option:[1,4,5],order:[4,5],org:1,orient:5,osf:[4,5],other:[4,5],our:[4,5,6],out:[1,4,5],outpout:2,output:[4,5],over:3,overh:5,own:3,packag:[6,7],padboard:2,pai:[4,5],panason:2,panda:[1,4,5],parallel:1,paramet:[6,7],part:[4,5,6],parten:0,partenair:7,pat1l:5,path:[1,4,5],pcb:[2,3,4,5],pcs:[2,3],per:[2,3,4,5],perform:[0,1,4,5],permut:[4,5],philosophi:[0,7],pic:4,piec:[4,5],pin:[2,3,4,5],pip:[1,4,5],pitch:[2,3,4,5],place:[4,5],plai:2,pleas:[4,5],plug:[2,4,5],point:[4,5,6],polar:[4,5],pole:[4,5],port:2,posit:[1,4,5],possibl:[4,5],potenti:[4,5],potentiomet:[4,5],pour:4,power:[2,3,4,5,6],practic:[4,5],pre:2,preci:2,precis:[2,4,5],prefer:[4,5],preliminari:7,prepar:[2,4,5],present:[0,3,4,5],press:[1,4,5],prevent:5,previou:6,previous:[1,4,5],print:[2,3,4,5],pro:[4,5],problem:1,procedur:7,produc:[4,5],product:[2,3],productdetail:[2,3],program:[1,4,5],progress:[0,7],project:[1,7],propos:[2,4,5],protect:1,protocol:[4,5],provid:[0,4,5],publish:4,puls:[4,5,6],purpos:[4,5],pyhton3:[1,4,5],python3:[1,4,5],python:[6,7],pythonid:[1,4,5],qkeozdl6eqpa6lzrlqfvow:2,quadripol:[4,5],quadrupol:[4,5],quantiti:[1,4,5],r10:[4,5],r11:[4,5],r12:[4,5],r25:2,r_ref:[4,5],rail:[4,5],rang:[4,5],rapberri:[6,7],raspberri:[2,3,6,7],raspberrypi:1,raspbian:[1,4,5],raspebrri:[1,4,5],readm:[4,5],realiz:2,recommend:[1,4,5],red:[2,4,5],reduct:[4,5],refer:[2,3,4,5],relai:[1,2,3,4,5],releas:7,relief:3,remain:[4,5],rememb:[4,5],remot:[1,4,5],repeat:[4,5],repetit:[4,5],replac:5,repositori:[4,5],repres:[3,4,5],requir:[1,4,5,6],research:7,resist:[0,2,6,7],resistor:[2,3,4,5],resolut:[4,5,6],respect:[4,5],result:[2,4,5],revers:[4,5],reversa:[0,4,5],ribbon:3,rm3x8mm:[2,3],robust:[0,4,5,6],role:[4,5],root:[1,4,5],row:[2,3],rpi:[1,4,5],rro:0,ru5fayqh:2,run:[1,2,4,5],safeti:[4,5],sain:[4,5],sainsmart:[4,5],same:[4,5],samtec:[2,4,5],save:[1,4,5],scale:0,schemat:[2,4,5],scienc:[4,5],scientif:0,screen:[2,4,5],screw:[2,3,4,5],searchsuggest:[2,3],searchterm:[2,3],searchtyp:[2,3],second:[4,5],section:[4,5],see:[4,5],seeed:2,seek:6,select:[1,4,5],sequenc:[4,5],sequence_delai:[4,5],seri:[4,5],serv:[4,5],set:[1,2,4,5],setp:5,setup:[1,4,5],sever:[4,5],sgaepimzzmskedp9slc0yfx16nydmpxjueeogolbldi:3,sgaepimzzmskedp9slc0yyv4kpdpmd1hts4slctivmw:2,sgaepimzzmsyydr3r27av4eqf73yoh:3,sgaepimzzmueqxo7l:3,share:6,shield:[1,4,5],shortcut:[4,5],should:[1,2,4,5],show:[2,4,5],shown:[4,5],shunt:2,shutdown:2,signal:[2,4,5],simpl:[1,4,5],simpli:[1,4,5],simultan:[4,5],singl:[4,5],slope:[4,5],small:[0,2,4,5,6],smaller:[4,5],smart:[4,5],smt:2,socket:2,softwar:[1,4,5],soic:2,soil:[4,5],solder:[2,4,5],solut:[4,5],some:[4,5,7],sound:[4,5],sourc:[0,1,4,5],space:[2,3],spacer:[2,3],specif:[4,5,6],specifi:[1,4,5],spi:[1,4,5],spool:2,ssq:2,ssw:[2,4,5],stabl:[1,4,5],stack:[4,5],stainless:[4,5],start:[1,4,5,6,7],startup:7,statu:[0,7],steel:[4,5],step:[4,5,7],still:[4,5],stop:6,storag:[4,5,6],strain:3,strict:[4,5],strip:[2,3,4,5],strong:[4,5],stronger:[4,5],strongli:[1,4,5],stuck:[4,5],studi:[4,5],studio:2,subject:[4,5],sudo:[1,4,5],suffici:[1,4,5],suggest:[2,3,4,5],suitabl:[4,5,6],sum:[4,5],suppli:[2,4,5],support:1,suppress:5,sure:[1,4,5],surfac:0,system:[1,4,5,6],tab:[1,4,5],tabl:5,take:[],target:7,task:[1,4,5],tb009:[2,3],tca9548a:3,tdh15:2,team:6,technic:7,temperatur:[4,5,6],ten:[4,5],termin:[1,2,3,4,5],test:[1,2,4,5],texa:[2,4,5],than:[2,4,5],thd:2,the9:[4,5],thei:[4,5],them:[4,5],therefor:[4,5],thi:[0,1,2,3,4,5,6],thonni:[6,7],thousand:[4,5],three:[2,4,5],through:[4,5],thu:[4,5],time:[1,4,5,6],togeth:[4,5],toler:5,tonni:2,tool:[0,6],total:[2,3,4,5],tow:2,track:[4,5],traco:[2,5],tracopow:[2,5],trn3:5,trn:[2,5],tru:[3,4,5],turn:[4,5],tutori:7,two:[2,4,5,6],txt:[1,4,5],type:[1,3,4,5,6],typic:[4,5],under:[4,5],unexpectedli:[1,4,5],unit:[2,3,4,5,6],univ:0,unplug:2,unzip:[4,5],updat:0,upgrad:[5,6],upper:2,upping:[4,5],upw50b50rv:[4,5],use:[1,3,4,5],used:[1,2,3,4,5],user:[1,4,5,7],using:[1,4,5],usr:[1,4,5],util:1,uwqyq:3,valid:[4,5],valu:[2,4,5],variou:[4,5],vdc:3,velleman:[4,5],venv:[1,4,5],veri:5,version:[1,2,4,5,6],vertic:[4,5],vhuuswq2:3,via:[1,4,5],view:2,villeurbann:0,vip:2,virtual:[6,7],vishai:[2,3],visit:1,vivien:[0,7],vlwxofp3u2wcfk5uckwtka:[2,3],voltag:[2,4,5,6],voltmet:[4,5],w0yvoo0ixfenuv0hsdc4:2,wai:[1,4,5],want:5,watch:[1,4,5],weaker:4,web:[2,3],websit:[1,4,5],weidmul:[4,5],welcom:0,well:[1,4,5],were:[1,2,4,5],when:[1,4,5],where:[1,4,5],which:[2,3,4,5,6],whose:[4,5],willing:0,window:[1,4,5],wire:[1,4,5],wish:6,within:[1,4,5],without:[4,5],wjwzhv1v3pk:[1,4,5],wktuvitrialgiu8hcm7dvq:2,work:2,would:[4,5],wpm404:[4,5],write:[1,2,4,5],wurth:2,www:[1,2,3,4,5],x1j7hmvl2zh8vpefml8:2,yannick:[0,7],yca:2,you:[1,2,4,5],your:[1,2,4,5],youtub:[1,4,5],ze4:2,zvn4206a:3},titles:["OhmPi project","<strong>STEP n\u00b01</strong> : Raspberry Pi configuration","<strong>STEP n\u00b02</strong>: Measurement board","<strong>STEP n\u00b03</strong>: MUX board","OhmPi V 1.01 (limited to 32 electrodes)","OhmPi V 1.02 (limited to 32 electrodes)","OhmPi V 2.xx (64 or 128 electrodes and 12V)","OHMPI: Open source and open hardware resitivity-meter"],titleterms:{"128":6,"12v":6,IDE:[1,4,5],The:[4,5,6],activ:[1,4,5],assembl:[2,3,4,5],board:[2,3,4,5],card:[4,5],center:7,check:2,cite:0,complet:[4,5],compon:[2,3,4,5],configur:[1,4,5],connect:[4,5],current:[4,5],data:[4,5,6],descript:[2,4,5],document:7,electr:[4,5],electrod:[4,5,6],environn:[1,4,5],four:[4,5],frist:[4,5],hardwar:7,implement:[4,5],implent:[4,5],initi:[4,5],inject:[4,5],instal:[1,4,5],instruct:[4,5],introduct:0,limit:[4,5],list:[2,3,4,5],measur:[2,4,5],mesur:[4,5],meter:7,multiplex:[4,5],mux:3,ohmpi:[0,4,5,6,7],onli:[4,5],open:7,oper:[4,5],packag:[1,4,5],paramet:[4,5],part:[1,2,3],partenair:0,philosophi:[4,5,6],preliminari:[4,5],procedur:[4,5],project:0,python:[1,4,5],rapberri:[1,4,5],raspberri:[1,4,5],requir:[2,3],resist:[4,5],resit:7,sourc:7,start:2,startup:[4,5],step:[1,2,3,6],summari:7,tabl:4,technic:[4,5,6],thonni:[1,4,5],titl:4,virtual:[1,4,5]}})
\ No newline at end of file
diff --git a/sphinx/source/Ohmpi_V2_00/V2_00_step_01.rst b/sphinx/source/Ohmpi_V2_00/V2_00_step_01.rst
index 1da08b64fe6e18ceda76f1af1fad61f62d128e6d..4aeb76b6093e6d455a8089d0b74c5bdfb69ad11c 100644
--- a/sphinx/source/Ohmpi_V2_00/V2_00_step_01.rst
+++ b/sphinx/source/Ohmpi_V2_00/V2_00_step_01.rst
@@ -1,4 +1,4 @@
-**STEP n°1** : Raspberry Pi configuration
+**STEP n°1** : Raspberry Pi configuration
*******************************************
@@ -25,7 +25,7 @@ For this step, the installation instructions are well described on the Raspberry
1. Watch the vidéo "how to set up your raspberry Pi" (https://www.youtube.com/watch?v=wjWZhV1v3Pk)
-2. The authors recommend installing the latest stable and complete version of Raspbian by using NOOBS (a simple-to-use operating system installer).
+2. The authors recommend installing the latest stable and complete version of Raspberry Pi OS (Previously called Raspbian) by using Raspberry Pi Imager.
3. or you can visit this website : (https://projects.raspberrypi.org/en/projects/raspberry-pi-setting-up)
@@ -42,7 +42,7 @@ For this step, the installation instructions are well described on the Raspberry
.. warning::
- Once the OS has been installed, **1-wire, spi and GPIO remote option** must be deactivated via the Raspbian GUI settings menu. Failure to carry out this task may cause damage to the relay shield cards during measurements.
+ Once the OS has been installed, **1-wire, spi and GPIO remote option** must be deactivated and **I2C option** must be activated via the Raspbian GUI settings menu. Failure to carry out this task may cause damage to the relay shield cards during measurements.
3. When the relays are connected to the GPIO, make sure that all the GPIOs are in the low position when the raspberry starts up. If not, the relays will activate unexpectedly.
To ensure that the GPIOs are in Low position, you will need to modify the /boot/config.txt file.
@@ -105,8 +105,9 @@ Activate it using the following command:
Install packages within the virtual environment. Installing the following package should be sufficient to meet dependencies:
.. code-block:: python
-
- pip install RPi.GPIO adafruit-blinka numpy adafruit-circuitpython-ads1x15 pandas
+
+ export CFLAGS=-fcommon
+ sudo pip install RPi.GPIO adafruit-blinka numpy pandas adafruit-circuitpython-ads1x15 adafruit-circuitpython-tca9548a adafruit-circuitpython-mcp230xx gpiozero
Check that requirements are met using
diff --git a/sphinx/source/Ohmpi_V2_00/V2_00_step_02.rst b/sphinx/source/Ohmpi_V2_00/V2_00_step_02.rst
index 441a23422d0d8703be0f4fddde5f996150e50d00..243ddd8ee3ec11314e9009e55c0dd1a971a379a1 100644
--- a/sphinx/source/Ohmpi_V2_00/V2_00_step_02.rst
+++ b/sphinx/source/Ohmpi_V2_00/V2_00_step_02.rst
@@ -243,7 +243,7 @@ which allows to realize precise current measurement around a shunt resistor. The
+---------+------------------------------------------------------------+
| | .. image:: step_n_2/a/20_mes_board.jpg |
|20 +------------------------------------------------------------+
- | | Fixing MCP23008 component |
+ | | Fixing MCP23008 component (Dot mark on the top left corner)|
| | |
+---------+------------------------------------------------------------+
@@ -253,8 +253,8 @@ which allows to realize precise current measurement around a shunt resistor. The
+---------+------------------------------------------------------------+
| | .. image:: step_n_2/a/21_mes_board.jpg |
|21 +------------------------------------------------------------+
- | |Mounting optical relay, AQY211EH |
- | | |
+ | |Mounting optical relay, AQY211EH (Dot mark in the top left |
+ | |corners) |
+---------+------------------------------------------------------------+
.. table::
@@ -283,7 +283,7 @@ which allows to realize precise current measurement around a shunt resistor. The
+---------+------------------------------------------------------------+
| | .. image:: step_n_2/a/24_mes_board.jpg |
|24 +------------------------------------------------------------+
- | | Fixing the INA282 |
+ | | Fixing the INA282 (Dot mark in the top right corner) |
| | |
+---------+------------------------------------------------------------+
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_1/raspbian_version.JPG b/sphinx/source/Ohmpi_V2_00/step_n_1/raspbian_version.jpg
similarity index 100%
rename from sphinx/source/Ohmpi_V2_00/step_n_1/raspbian_version.JPG
rename to sphinx/source/Ohmpi_V2_00/step_n_1/raspbian_version.jpg
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_1/schema_measurement_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_1/schema_measurement_board.jpg
index a4d73a9656272e18ec6a3341eba40956e568ae48..0d5031fec361276c1309ac48fbb9f996ffb5fb8b 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_1/schema_measurement_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_1/schema_measurement_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_1/thonny_first_interface.JPG b/sphinx/source/Ohmpi_V2_00/step_n_1/thonny_first_interface.jpg
similarity index 100%
rename from sphinx/source/Ohmpi_V2_00/step_n_1/thonny_first_interface.JPG
rename to sphinx/source/Ohmpi_V2_00/step_n_1/thonny_first_interface.jpg
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_1/thonny_interpreter.JPG b/sphinx/source/Ohmpi_V2_00/step_n_1/thonny_interpreter.jpg
similarity index 100%
rename from sphinx/source/Ohmpi_V2_00/step_n_1/thonny_interpreter.JPG
rename to sphinx/source/Ohmpi_V2_00/step_n_1/thonny_interpreter.jpg
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_1/thonny_interpreter_folder.JPG b/sphinx/source/Ohmpi_V2_00/step_n_1/thonny_interpreter_folder.jpg
similarity index 100%
rename from sphinx/source/Ohmpi_V2_00/step_n_1/thonny_interpreter_folder.JPG
rename to sphinx/source/Ohmpi_V2_00/step_n_1/thonny_interpreter_folder.jpg
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_1/thonny_option.JPG b/sphinx/source/Ohmpi_V2_00/step_n_1/thonny_option.jpg
similarity index 100%
rename from sphinx/source/Ohmpi_V2_00/step_n_1/thonny_option.JPG
rename to sphinx/source/Ohmpi_V2_00/step_n_1/thonny_option.jpg
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/01_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/01_mes_board.jpg
index 2baa894bd38ab71c7a2f03bfca10a382ce93a0b9..237c47dca441248fde4a29fb3abbe983c2b357e4 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/01_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/01_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/03_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/03_mes_board.jpg
index 41381d5341aed8952dab89fa31ed7c0303e50205..e52e56db4257d5076984ea68eb86f8ca2fe23a6d 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/03_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/03_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/04_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/04_mes_board.jpg
index 988d238ad7fc61d9fb594467729879635deec63b..ed42f99b544b41a3dc361d42be429b3e0b47d8c8 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/04_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/04_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/06_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/06_mes_board.jpg
index 94a903f0c942832b86d2f074b95ea5c65a58553b..16894c29798019e2229ada80b6df85b8e4cc69e1 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/06_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/06_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/07_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/07_mes_board.jpg
index 954aabf761288a96221d98914011a337cd6664ad..0327314ce5fa099577d3d9e15e9b1b9570d47bb4 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/07_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/07_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/08_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/08_mes_board.jpg
index 645ed57a8f2c9118f57500a4aa575913770acdad..968e454a8fb4abb3e001d7923a72f47ef6c645bb 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/08_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/08_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/09_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/09_mes_board.jpg
index 28dc97fb5c4c69eec691f6070b7ff79674eae41c..ba7032edab114205c03bf3424866ca75862a49d6 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/09_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/09_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/0_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/0_mes_board.jpg
index ffb247a2c8fa1930ceb99c47c4d50f4bd0493985..fe121c5903d428c786d5533ffe430a332427896f 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/0_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/0_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/11_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/11_mes_board.jpg
index b9f76edf4a3fd158a8b3cb36fe8216c5d0f2d70d..0943785ea02a53667d3fd17de1f2d42ef54455c1 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/11_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/11_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/13_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/13_mes_board.jpg
index c954948f8b497ac5a62701a2cbcba8d8133258b4..e2c364ae2f79db84ddedff044e8d30e0380f4741 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/13_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/13_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/14_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/14_mes_board.jpg
index 06db732127be7c32a33d2153f3a58a764466891b..31c7f113e432921c311b3ce4967a2be82f2e3f5e 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/14_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/14_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/15_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/15_mes_board.jpg
index cf98e5c5ce8ffe7373e6aee0bc7e13b880f47db8..43a4682dead6a8ffc87d444f7bfe9daabb577938 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/15_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/15_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/16_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/16_mes_board.jpg
index 930821538195751d3b6be551bbf605711bf394f4..3dfa61ba684f9275e912e3f33f5b42daca0d6dd2 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/16_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/16_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/17_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/17_mes_board.jpg
index a2cdc3b622201e41ee870d3c88dbd7bfe72c4fd1..90a4b6a1f978195d694abefb01a36d427a340365 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/17_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/17_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/18_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/18_mes_board.jpg
index 699b20b0a617d080aa2ddcdbab91960a821ee3f7..7abcf130948510785c57bbcf4b83f3e663c26eeb 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/18_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/18_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/19_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/19_mes_board.jpg
index f191473cb7982f67488e13a62ea6e53bc97e4e26..a3ec0b5f27b71f3ebc71685ca6e24c473324188a 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/19_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/19_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/20_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/20_mes_board.jpg
index f6780cd498352806e601bd9e77b9e6a9076b47c0..790fa362dc0ba5b00515862e62e2ade622a70d4e 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/20_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/20_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/21_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/21_mes_board.jpg
index faf681109fae1e1a4115b95c3fca1b83608fd550..c8628d9c4aecbbd48215f53c78661baee4b33c5a 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/21_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/21_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/22_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/22_mes_board.jpg
index 6b3e2ad86a98550cc53a2053a1151f67dad2d741..bf1defadf621dfc6053ff47ea933de519157d06b 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/22_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/22_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/23_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/23_mes_board.jpg
index 6fa589f253fea3036bc1363592f803782dcce7b3..e9c8845baac74db8b8d3d218b1b71b57b064d37b 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/23_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/23_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/24_mes_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/24_mes_board.jpg
index 767e901170e31f12a7834931950bce5f3d8ca776..956a8f379a79cb4a49a03d777c98d339effc9b7f 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/24_mes_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/24_mes_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/Mesure_board_list_2_xx.csv b/sphinx/source/Ohmpi_V2_00/step_n_2/a/Mesure_board_list_2_xx.csv
index 2b5581dc9f83de0e48e99095433d58809d17b234..ac47980cc24dd2c2ae989098a71e108ce38ac255 100644
--- a/sphinx/source/Ohmpi_V2_00/step_n_2/a/Mesure_board_list_2_xx.csv
+++ b/sphinx/source/Ohmpi_V2_00/step_n_2/a/Mesure_board_list_2_xx.csv
@@ -1,25 +1,24 @@
-Component,Number,Cost per unit € ,Total cost €,Manufacturer,Manufacturer s reference,Web reference
-Raspberry Pi 4 Model B,1,58.75,58.75,Raspberry,Raspberry Pi 4 Model B,https://www.mouser.fr/ProductDetail/Seeed-Studio/102110421?qs=7MVldsJ5UaxeN3LYyh3sqw%3D%3D
-LM158N AMP-o,4,14.5,58,Texas Instruments,LM358AN/NOPB,https://www.mouser.fr/ProductDetail/Texas-Instruments/LM158J?qs=X1J7HmVL2ZH8vpEfMl8%2FFQ%3D%3D
-Printed circuit board ,1,12,12,Asler,-,-
-ADS1115,2,11.9,23.8,Adafruit,1085,https://www.mouser.fr/ProductDetail/Adafruit/1085?qs=%2Fha2pyFaduhE%2FOGzuTWIQ9Iz5VjaqFOYugqAlGxpEcKiGrQvF4hn%252Bg%3D%3D
-Capacitor 100nF 50Vdc 10% Ceramic,4,0.2,0.8,KEMET, C320C104K1,https://www.mouser.fr/ProductDetail/KEMET/C320C104K1R5TA7303?qs=c4UyoTs%2FLq1th4mcyOeTmA%3D%3D
-Resistor 1 Kohm 0.5W +- 0.1%,2,1.3,2.6,TE Connectivity,H81K0BYA,https://www.mouser.fr/ProductDetail/TE-Connectivity-Holsworthy/H81K0BYA?qs=%2Fha2pyFaduhUylh7Az%2FmjFH2XjOUms6wZtUX4sOM%252BII%3D
-Resistor 1.5 Kohms +- 0.1%,2,1.3,2.6,TE Connectivity,H81K5BYA,https://www.mouser.fr/ProductDetail/TE-Connectivity-Holsworthy/H81K5BYA?qs=%2Fha2pyFadugy9tWham3rU9HmIJOhyWhBIN95kNm%252BX%2FM%3D
-Resistor 1.5 Kohms +- 5%,2,1.3,2.6,Vishay,CCF071K50GKE36,https://www.mouser.fr/ProductDetail/Vishay-Dale/CCF071K50GKE36?qs=QKEOZdL6EQpA6LZRLQFVOw%3D%3D
-Resistor 10 Mohms +-5%,2,0.762,1.524,VISHAY,CMF651M0000FKEK143,https://www.mouser.fr/ProductDetail/Vishay-Dale/CMF651M0000FKEK143?qs=CiayqK2gdcKzIA2LEVaLkg%3D%3D
-2 ohm shunt resistor+- 1%,1,2.42,2.42,Ohmite,41F2R0E,https://www.mouser.fr/ProductDetail/Ohmite/41F2R0E?qs=IM6ToxQzGOAuEDprb19mHA%3D%3D
-Dual screw terminal (5.08-mm pitch),5,0.648,3.24,CUI Devices,TB009-508-02BE,https://www.mouser.fr/ProductDetail/CUI-Devices/TB009-508-02BE?qs=vLWxofP3U2wCFk5uCkWTkA%3D%3D
-DC/DC converter 12 to 24V,2,15.58,31.16,TracoPower,TRN 3-1215,https://www.mouser.fr/ProductDetail/TRACO-Power/TRN-3-1215?qs=YCa%2FAAYMW02gqUicGQj0tA%3D%3D
-DIP Dual In Line Socket 2*4,3,0.72,2.16,Mill-Max,110-43-308-41-001000,https://www.mouser.fr/ProductDetail/Mill-Max/110-43-308-41-001000?qs=IGgAdOvCTsTu%2FqaUr8NArg%3D%3D&mgh=1&vip=1&gclid=EAIaIQobChMIn_TAxbCx8wIVQ5nVCh2QaQFpEAYYCCABEgJk1_D_BwE
-AQY211EH,4,3.84,15.36,Panasonic Industrial Devices,AQY211EH,https://www.mouser.fr/ProductDetail/Panasonic-Industrial-Devices/AQY211EH?qs=wKtUvITRialGIU8hcM7DvQ%3D%3D
-DIP Dual In Line Socket 2*2,4,0.449,1.796,Preci-dip,110-83-304-41-001101,https://www.mouser.fr/ProductDetail/Preci-dip/110-83-304-41-001101?qs=%2Fha2pyFadujQKqx4wAuiG%2FMGNdxMCNv%2F33Nj0gBxRocuLUcYnpyONg%3D%3D
-SSQ-103-03-G-D,1,2.06,2.06,Samtec,SSQ-103-03-G-D,https://www.mouser.fr/ProductDetail/Samtec/SSQ-103-03-G-D?qs=rU5fayqh%252BE2Z%252BZTchcPoHQ%3D%3D
-MCP23008,1,1.72,1.72,Adafruit,593,https://www.mouser.fr/ProductDetail/Adafruit/593?qs=sGAEpiMZZMsKEdP9slC0YYV4kPdpMD1Hts4SLctIVmw%3D
-Header sets 1x10,2,2.12,4.24,Samtec,SSW-110-02-G-S,https://www.mouser.fr/ProductDetail/Samtec/SSW-110-02-G-S?qs=rU5fayqh%252BE0w1ORXZiBQpw%3D%3D
-SMT Breakout PCB for SOIC-8,1,2.5,2.5,Adafruit,1212,https://www.mouser.fr/ProductDetail/Adafruit/1212?qs=GURawfaeGuCAqqfvnVtyeg%3D%3D&mgh=1&vip=1&gclid=EAIaIQobChMIt8zJzr6x8wIVGdnVCh2vBwVsEAQYAyABEgJqG_D_BwE
-INA282AID,1,4.11,4.11,Texas Instruments,INA282AID,https://www.mouser.fr/ProductDetail/Texas-Instruments/INA282AID?qs=Ze4%2FuFuz19ILFayZXOCfrA%3D%3D
-THD 15-1211N,1,39.72,39.72,TracoPower,THD 15-1211N,https://www.mouser.fr/ProductDetail/TRACO-Power/THD-15-1211N?qs=%2Fha2pyFadugpyEG4IDvm%2FMSR%252B7aN%2F0T3rUIs9PCAqJlT4%252BnRpUOOeQ%3D%3D
-DIP Dual In Line Socket 2*20,1,8.53,8.53,Samtec,SSQ-120-23-G-D,https://www.mouser.fr/ProductDetail/Samtec/SSQ-120-23-G-D?qs=rU5fayqh%252BE1BMVd%252BDZONqg%3D%3D
-Pin strip no ejector ,1,0.35,0.35,BLK electronic,10120550,https://www.conrad.com/p/bkl-electronic-10120550-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-6-no-of-rows-2-1-pcs-741435?searchTerm=741435&searchType=suggest&searchSuggest=product
-Male Female spacer 2.5M HEXAGONALE, 4, 0.87, 3.48, HARWIN, R25-3002002, https://www.mouser.fr/ProductDetail/Harwin/R25-3002002?qs=W0yvOO0ixfENUv0hsdC4%2FQ%3D%3D
+"Component","Number","Cost per unit € ","Total cost €","Manufacturer","Manufacturer s reference","Web reference"
+"Raspberry Pi 4 Model B",1,"58,75","58,75","Raspberry","Raspberry Pi 4 Model B","https://www.mouser.fr/ProductDetail/Seeed-Studio/102110421?qs=7MVldsJ5UaxeN3LYyh3sqw%3D%3D"
+"LM158N AMP-o",2,"14,5",58,"Texas Instruments","LM358AN/NOPB","https://www.mouser.fr/ProductDetail/Texas-Instruments/LM158J?qs=X1J7HmVL2ZH8vpEfMl8%2FFQ%3D%3D"
+"Printed circuit board ",1,12,12,"Asler","-","-"
+"ADS1115",2,"11,9","23,8","Adafruit",1085,"https://www.mouser.fr/ProductDetail/Adafruit/1085?qs=%2Fha2pyFaduhE%2FOGzuTWIQ9Iz5VjaqFOYugqAlGxpEcKiGrQvF4hn%252Bg%3D%3D"
+"Capacitor 100nF 50Vdc 10% Ceramic",3,"0,2","0,8","KEMET"," C320C104K1","https://www.mouser.fr/ProductDetail/KEMET/C320C104K1R5TA7303?qs=c4UyoTs%2FLq1th4mcyOeTmA%3D%3D"
+"Resistor 1 Kohm 0.5W +- 0.1%",2,"1,3","2,6","TE Connectivity","H81K0BYA","https://www.mouser.fr/ProductDetail/TE-Connectivity-Holsworthy/H81K0BYA?qs=%2Fha2pyFaduhUylh7Az%2FmjFH2XjOUms6wZtUX4sOM%252BII%3D"
+"Resistor 1.5 Kohms +- 0.1%",2,"1,3","2,6","TE Connectivity","H81K5BYA","https://www.mouser.fr/ProductDetail/TE-Connectivity-Holsworthy/H81K5BYA?qs=%2Fha2pyFadugy9tWham3rU9HmIJOhyWhBIN95kNm%252BX%2FM%3D"
+"Resistor 1.5 Kohms +- 5%",2,"1,3","2,6","Vishay","CCF071K50GKE36","https://www.mouser.fr/ProductDetail/Vishay-Dale/CCF071K50GKE36?qs=QKEOZdL6EQpA6LZRLQFVOw%3D%3D"
+"Resistor 10 Mohms +-5%",2,"0,762","1,524","VISHAY","CMF651M0000FKEK143","https://www.mouser.fr/ProductDetail/Vishay-Dale/CMF651M0000FKEK143?qs=CiayqK2gdcKzIA2LEVaLkg%3D%3D"
+"2 ohm shunt resistor+- 1%",1,"2,42","2,42","Ohmite","41F2R0E","https://www.mouser.fr/ProductDetail/Ohmite/41F2R0E?qs=IM6ToxQzGOAuEDprb19mHA%3D%3D"
+"Dual screw terminal (5.08-mm pitch)",5,"0,648","3,24","CUI Devices","TB009-508-02BE","https://www.mouser.fr/ProductDetail/CUI-Devices/TB009-508-02BE?qs=vLWxofP3U2wCFk5uCkWTkA%3D%3D"
+"DC/DC converter 12 to 24V",1,"15,58","31,16","TracoPower","TRN 3-1215","https://www.mouser.fr/ProductDetail/TRACO-Power/TRN-3-1215?qs=YCa%2FAAYMW02gqUicGQj0tA%3D%3D"
+"DIP Dual In Line Socket 2*4",3,"0,72","2,16","Mill-Max","110-43-308-41-001000","https://www.mouser.fr/ProductDetail/Mill-Max/110-43-308-41-001000?qs=IGgAdOvCTsTu%2FqaUr8NArg%3D%3D&mgh=1&vip=1&gclid=EAIaIQobChMIn_TAxbCx8wIVQ5nVCh2QaQFpEAYYCCABEgJk1_D_BwE"
+"AQY211EH",4,"3,84","15,36","Panasonic Industrial Devices","AQY211EH","https://www.mouser.fr/ProductDetail/Panasonic-Industrial-Devices/AQY211EH?qs=wKtUvITRialGIU8hcM7DvQ%3D%3D"
+"DIP Dual In Line Socket 2*2",4,"0,449","1,796","Preci-dip","110-83-304-41-001101","https://www.mouser.fr/ProductDetail/Preci-dip/110-83-304-41-001101?qs=%2Fha2pyFadujQKqx4wAuiG%2FMGNdxMCNv%2F33Nj0gBxRocuLUcYnpyONg%3D%3D"
+"MCP23008",1,"1,72","1,72","Adafruit",593,"https://www.mouser.fr/ProductDetail/Adafruit/593?qs=sGAEpiMZZMsKEdP9slC0YYV4kPdpMD1Hts4SLctIVmw%3D"
+"Header sets 1x10",2,"2,12","4,24","Samtec","SSW-110-02-G-S","https://www.mouser.fr/ProductDetail/Samtec/SSW-110-02-G-S?qs=rU5fayqh%252BE0w1ORXZiBQpw%3D%3D"
+"SMT Breakout PCB for SOIC-8",1,"2,5","2,5","Adafruit",1212,"https://www.mouser.fr/ProductDetail/Adafruit/1212?qs=GURawfaeGuCAqqfvnVtyeg%3D%3D&mgh=1&vip=1&gclid=EAIaIQobChMIt8zJzr6x8wIVGdnVCh2vBwVsEAQYAyABEgJqG_D_BwE"
+"INA282AID",1,"4,11","4,11","Texas Instruments","INA282AID","https://www.mouser.fr/ProductDetail/Texas-Instruments/INA282AID?qs=Ze4%2FuFuz19ILFayZXOCfrA%3D%3D"
+"THD 15-1211N",1,"39,72","39,72","TracoPower","THD 15-1211N","https://www.mouser.fr/ProductDetail/TRACO-Power/THD-15-1211N?qs=%2Fha2pyFadugpyEG4IDvm%2FMSR%252B7aN%2F0T3rUIs9PCAqJlT4%252BnRpUOOeQ%3D%3D"
+"DIP Dual In Line Socket 2*20",1,"8,53","8,53","Samtec","SSQ-120-23-G-D","https://www.mouser.fr/ProductDetail/Samtec/SSQ-120-23-G-D?qs=rU5fayqh%252BE1BMVd%252BDZONqg%3D%3D"
+"Pin strip no ejector ",1,"0,35","0,35","BLK electronic",10120550,"https://www.conrad.com/p/bkl-electronic-10120550-pin-strip-no-ejector-contact-spacing-254-mm-total-number-of-pins-6-no-of-rows-2-1-pcs-741435?searchTerm=741435&searchType=suggest&searchSuggest=product"
+"Male Female spacer 2.5M HEXAGONALE",4,"0,87","3,48","HARWIN","R25-3002002","https://www.mouser.fr/ProductDetail/Harwin/R25-3002002?qs=W0yvOO0ixfENUv0hsdC4%2FQ%3D%3D"
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/a/schema_measurement_board.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/a/schema_measurement_board.jpg
index a4d73a9656272e18ec6a3341eba40956e568ae48..e6a0633b3ab41ad782d7b0d4539119784aefde46 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/a/schema_measurement_board.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/a/schema_measurement_board.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/c/20211206_144334.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/c/20211206_144334.jpg
index 2a0c06b5febef44d48975b274c2a9ea30cf397f9..ce94d8e783f3be1f89190dca989ba570b3d27de5 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/c/20211206_144334.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/c/20211206_144334.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/c/20211206_150522.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/c/20211206_150522.jpg
index 376c9cc1b754a583b3eaf8b9bd63e102f91e3c56..03ecffe6f2b737e32f375d77cc05f9b06ae3789d 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/c/20211206_150522.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/c/20211206_150522.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/c/Inked20211206_150522_LI.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/c/Inked20211206_150522_LI.jpg
index 5ec54996e216cb474520c30190b9ff6ac74cbf15..3f8ba9c3978be068fcd902bda5f37b2ba1cb0541 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/c/Inked20211206_150522_LI.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/c/Inked20211206_150522_LI.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/c/Inked20211206_150522_LI2.jpg b/sphinx/source/Ohmpi_V2_00/step_n_2/c/Inked20211206_150522_LI2.jpg
index b688467d89317bb015671419dcbae7a6afbe569b..eeeccbe38189f1ae07e71ab4f99d14a881379871 100644
Binary files a/sphinx/source/Ohmpi_V2_00/step_n_2/c/Inked20211206_150522_LI2.jpg and b/sphinx/source/Ohmpi_V2_00/step_n_2/c/Inked20211206_150522_LI2.jpg differ
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/c/i2Cdetect.png b/sphinx/source/Ohmpi_V2_00/step_n_2/c/i2cdetect.png
similarity index 100%
rename from sphinx/source/Ohmpi_V2_00/step_n_2/c/i2Cdetect.png
rename to sphinx/source/Ohmpi_V2_00/step_n_2/c/i2cdetect.png
diff --git a/sphinx/source/Ohmpi_V2_00/step_n_2/c/thonny_first_interface.JPG b/sphinx/source/Ohmpi_V2_00/step_n_2/c/thonny_first_interface.jpg
similarity index 100%
rename from sphinx/source/Ohmpi_V2_00/step_n_2/c/thonny_first_interface.JPG
rename to sphinx/source/Ohmpi_V2_00/step_n_2/c/thonny_first_interface.jpg
diff --git a/sphinx/source/V1_01.rst b/sphinx/source/V1_01.rst
index c144a69abe916e33b5df140e5c7dd5f927bc7e0d..f1610bfd3c48cce409df560574f596e77a84ab28 100644
--- a/sphinx/source/V1_01.rst
+++ b/sphinx/source/V1_01.rst
@@ -521,7 +521,7 @@ Complete list of components
.. csv-table:: Table Title
- :file: C:\Users\remi.clement\Documents\28_ohmpi_all_git\master2\sphinx\source\list.csv
+ :file: list.csv
:widths: 30, 70, 70, 70, 70,70
:header-rows: 1
diff --git a/sphinx/source/V1_02.rst b/sphinx/source/V1_02.rst
index facd94d9c002801d153e30985810659c0e46048c..ff4c42ece839b61930eb862d4e9f47edfec01d83 100644
--- a/sphinx/source/V1_02.rst
+++ b/sphinx/source/V1_02.rst
@@ -533,7 +533,7 @@ Complete list of components
.. csv-table:: List of components
- :file: C:\Users\remi.clement\Documents\28_ohmpi_all_git\master2\sphinx\source\list - 1_02.csv
+ :file: list - 1_02.csv
:widths: 30, 70, 70, 70, 70,70
:header-rows: 1
diff --git a/sphinx/source/conf.py b/sphinx/source/conf.py
index ee5c6a363b4654116545c6cb0536080ce14336b0..d4fd7250fcdfa4884ed8a25715c258cc94ed1311 100644
--- a/sphinx/source/conf.py
+++ b/sphinx/source/conf.py
@@ -58,3 +58,5 @@ html_theme = 'sphinx_rtd_theme'
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
+master_doc = 'index'
+
diff --git a/sphinx/source/connection.jpg b/sphinx/source/connection.jpg
index e2b5e01b748d01d8eeed57b2526b83dd00822605..be7b2f429969bf07174631ee63f4d13f47bc9bad 100644
Binary files a/sphinx/source/connection.jpg and b/sphinx/source/connection.jpg differ
diff --git a/sphinx/source/installation_current_board.jpg b/sphinx/source/installation_current_board.jpg
index 2674efdd8fbdbc6cd539fad3e16858783f26bfac..669a2724f34c02c0abb14f5cac4649bfef50208a 100644
Binary files a/sphinx/source/installation_current_board.jpg and b/sphinx/source/installation_current_board.jpg differ
diff --git a/sphinx/source/measurement_board1-02.jpg b/sphinx/source/measurement_board1-02.jpg
index 559aead766a8549f1ab9c35991a912cb3dfc7be0..561140f366d25901936fc3e6ae2ad9c08f145889 100644
Binary files a/sphinx/source/measurement_board1-02.jpg and b/sphinx/source/measurement_board1-02.jpg differ
diff --git a/sphinx/source/raspbian_version.JPG b/sphinx/source/raspbian_version.jpg
similarity index 100%
rename from sphinx/source/raspbian_version.JPG
rename to sphinx/source/raspbian_version.jpg
diff --git a/sphinx/source/schema_measurement_board.jpg b/sphinx/source/schema_measurement_board.jpg
index a4d73a9656272e18ec6a3341eba40956e568ae48..da38456330fc28f6a1c562709c6dc4a4b3685922 100644
Binary files a/sphinx/source/schema_measurement_board.jpg and b/sphinx/source/schema_measurement_board.jpg differ
diff --git a/sphinx/source/thonny_first_interface.JPG b/sphinx/source/thonny_first_interface.jpg
similarity index 100%
rename from sphinx/source/thonny_first_interface.JPG
rename to sphinx/source/thonny_first_interface.jpg
diff --git a/sphinx/source/thonny_interpreter.JPG b/sphinx/source/thonny_interpreter.jpg
similarity index 100%
rename from sphinx/source/thonny_interpreter.JPG
rename to sphinx/source/thonny_interpreter.jpg
diff --git a/sphinx/source/thonny_interpreter_folder.JPG b/sphinx/source/thonny_interpreter_folder.jpg
similarity index 100%
rename from sphinx/source/thonny_interpreter_folder.JPG
rename to sphinx/source/thonny_interpreter_folder.jpg
diff --git a/sphinx/source/thonny_option.JPG b/sphinx/source/thonny_option.jpg
similarity index 100%
rename from sphinx/source/thonny_option.JPG
rename to sphinx/source/thonny_option.jpg
diff --git a/sphinx/source/web_site.JPG b/sphinx/source/web_site.jpg
similarity index 100%
rename from sphinx/source/web_site.JPG
rename to sphinx/source/web_site.jpg