Merge branch 'mega' into feature/MQTT_TLS

letscontrolit · Sep 6, 2023 · c2ffcfb · c2ffcfb
2 parents 8bf0d82 + b7ec19b
commit c2ffcfb
Show file tree

Hide file tree

Showing 38 changed files with 666 additions and 175 deletions.
diff --git a/docs/source/Plugin/P025.rst b/docs/source/Plugin/P025.rst
@@ -41,19 +41,23 @@ Supported hardware
 Change log
 ----------
 
-.. versionchanged:: 2.0
+.. versionchanged:: 2023/03/31
   ...
 
   |added|
-  Major overhaul for 2.0 release.
+  Added option to output in Volt
 
-.. versionadded:: 1.0
+.. versionchanged:: 2023/09/05
   ...
 
   |added|
-  Initial release version.
+  Detect ADS1015 or ADS1115
 
+  |added|
+  Select Sample Rate
 
+  |added|
+  Select Multiple Output Values
 
 
 
diff --git a/docs/source/Plugin/P025_ADS1015_PCB_ADS1115_chip.jpg b/docs/source/Plugin/P025_ADS1015_PCB_ADS1115_chip.jpg
diff --git a/docs/source/Plugin/P025_ADS101x_blockdiagram.png b/docs/source/Plugin/P025_ADS101x_blockdiagram.png
diff --git a/docs/source/Plugin/P025_ADS1115.rst b/docs/source/Plugin/P025_ADS1115.rst
@@ -1,7 +1,7 @@
 .. include:: ../Plugin/_plugin_substitutions_p02x.repl
 .. _P025_ADS1115_page:
 
-ADS1115
+ADS1x15
 =======
 
 |P025_typename|

diff --git a/docs/source/Plugin/P025_ADS111x_blockdiagram.png b/docs/source/Plugin/P025_ADS111x_blockdiagram.png
diff --git a/docs/source/Plugin/P025_ADS1x15_mux_block_diagram.png b/docs/source/Plugin/P025_ADS1x15_mux_block_diagram.png
diff --git a/docs/source/Plugin/P025_Fake_ADS1115_chip.jpg b/docs/source/Plugin/P025_Fake_ADS1115_chip.jpg
diff --git a/docs/source/Plugin/P025_output_configuration.png b/docs/source/Plugin/P025_output_configuration.png
diff --git a/docs/source/Plugin/P025_page.rst b/docs/source/Plugin/P025_page.rst
@@ -1,47 +1,194 @@
 Introduction
 ------------
 
-The ADS1113, ADS1114 and ADS1115 are 16 bit ADC chips from Texas Instruments.
+Texas Instruments has a number of affordable I2C ADC chips:
 
-These can be used to measure upto 4 single-ended or upto 2 differential inputs.
+* ADS1013, ADS1014 and ADS1015: 12 bit @ 128 - 3300 SPS
+* ADS1113, ADS1114 and ADS1115: 16 bit @ 8 - 860 SPS
 
-ADS1114 and ADS1115 support a programmable gain to set a range for the analog voltage to be measured.
+.. figure:: P025_ADS101x_blockdiagram.png
+   :alt: ADS101x 12-bit ADC Block Diagram
+   :width: 50 %
+   :align: center
+
+   ADS101x 12-bit ADC Block Diagram
+
+.. figure:: P025_ADS111x_blockdiagram.png
+   :alt: ADS111x 16-bit ADC Block Diagram
+   :width: 50 %
+   :align: center
+
+   ADS111x 16-bit ADC Block Diagram
+
+
+Number of inputs:
+
+* ADS1x13 and ADS1x14: 1 differential input. (Single ended when one input is connected to GND)
+* ADS1x15: 4 single-ended or 2 differential inputs.
+
+ADS1x14 and ADS1x15 support a programmable gain to set a range for the analog voltage to be measured.
 
 .. note::
 
   The analog input should never exceed VDD + 0.3V.
 
-ADS1115 can select which analog input to measure. This can also be a differential voltage between 2 pins.
+Datasheets: 
 
+* `ADS1015 datasheet <https://www.ti.com/lit/ds/symlink/ads1015.pdf>`_
+* `ADS1115 datasheet <https://www.ti.com/lit/ds/symlink/ads1115.pdf>`_
 
 Device Settings
 ---------------
 
+Detected Sensor Type
+^^^^^^^^^^^^^^^^^^^^
+
+(Added: 2023/09/05)
+
+Lots of boards sold online may not have the expected chip model soldered on the PCB.
+
+It is very well possible you may receive a board with "ADS1015" marked on the silk screen, but with an ADS1115 chip mounted.
+Or vice verse.
+
+.. figure:: P025_ADS1015_PCB_ADS1115_chip.jpg
+   :alt: ADS1015 PCB with ADS1115 chip
+   :width: 50 %
+   :align: center
+
+   PCB marked as ADS1015, but with ADS1115 chip (see ``BOGI`` marking)
+
+If you're really unlucky, you may receive a board with the markings filed off from the chip.
+These are very likely fake clones, which will hardly work.
+
+.. figure:: P025_Fake_ADS1115_chip.jpg
+   :alt: ADS1115 PCB with fake unmarked chip
+   :width: 50 %
+   :align: center
+
+   Complete rip-off: ADS1115 PCB with fake unmarked chip
+
+ESPEasy will reject those and show "None" as this utter garbage really should NOT be used.
+The sampled value (if any) is very likely not taken from the expected pin and in the end the chip may even stall other I2C communications.
+
+The sensor type detection is based on how long it takes to take a single sample with the sample rate set to "250 / 2400".
+This is used as it only takes a few msec to check and its expected duration differs significantly.
+
+Possible detected output values:
+
+* None - For Fake units, or when no chip has been detected at the configured I2C address.
+* ADS1015 - Device Markings: ``BRPI`` or ``N7J``.
+* ADS1115 - Device Markings: ``BOGI`` or ``N4J``.
+
+.. note::
+
+  Please report fake boards immediately to the seller and request a refund!
+
+  The ESPEasy dev team will NOT support fake chips as too much time has been wasted on those already!
+
+
+
 Gain
 ^^^^
 
-The ADC111x ADCs have a programmable gain.
+The ADS1015 and ADS1115 ADCs have a programmable gain.
+
 This can be used to set the sensitivity and thus the full scale (FS) range of the ADC.
 
-* 2/3x gain (FS=6.144V)
-* 1x gain (FS=4.096V)
-* 2x gain (FS=2.048V)
-* 4x gain (FS=1.024V)
-* 8x gain (FS=0.512V)
-* 16x gain (FS=0.256V)
+.. code-block:: none
+
+  +------+----------+------------+----------+
+  |      |          | LSB Size   | LSB Size |
+  | Gain | FS range | ADS1115    | ADS1015  |
+  +======+==========+============+==========+
+  | 2/3x |  6.144 V | 187.5 μV   | 3 mV     |
+  +------+----------+------------+----------+
+  | 1x   |  4.096 V | 125 μV     | 2 mV     |
+  +------+----------+------------+----------+
+  | 2x   |  2.048 V | 62.5 μV    | 1 mV     |
+  +------+----------+------------+----------+
+  | 4x   |  1.024 V | 31.25 μV   | 0.5 mV   |
+  +------+----------+------------+----------+
+  | 8x   |  0.512 V | 15.625 μV  | 0.25 mV  |
+  +------+----------+------------+----------+
+  | 16x  |  0.256 V | 7.8125 μV  | 0.125 mV |
+  +------+----------+------------+----------+
+
 
 .. note::
 
-  Never supply an analog voltage exceeding the Vdd of the chip.
+  Do not apply more than VDD + 0.3 V to the analog inputs of the device.
+
+Sample Rate
+^^^^^^^^^^^
+
+(Added: 2023/09/05)
 
-Input Multiplexer
-^^^^^^^^^^^^^^^^^
+The ADS1015 and ADS1115 differ mainly in their internal sample rate and resolution.
 
-The ADS1115 does have 4 analog input pins.
+* ADS1015: 12 bit resolution @ 128 - 3300 samples per second.
+* ADS1115: 16 bit resolution @ 8 - 860 samples per second.
+
+.. figure:: P025_select_samplerate.png
+   :alt: ADS1115 / ADS1015 Sample Rate Selection
+   :width: 25 %
+   :align: center
+
+   ADS1115 / ADS1015 Sample Rate Selection
+
+Both the ADS1015 and ADS1115 use the same internal register values for different sample rates.
+
+The first (lower) value refers to the sample rate for the ADS1115, while the second (higher) value refers to the ADS1015 sample rate.
+
+.. note::
+
+  Only use sample rates less than 64 samples/sec when absolutely needed.
+  Sample rates less than 128 SPS will hardly improve on noise, but will take longer to acquire and thus interfere with other timing critical tasks on the node.
+  When aliasing due to mains frequency noise is observed, add some small capacitor (e.g. 10 nF) over the input pin, close to the ADS1x15.
+
+
+Convert to Volt
+^^^^^^^^^^^^^^^
+
+(Added: 2023/03/31)
+
+When this option is checked, the measured value will be converted to Volt, based on the selected gain.
+
+Two Point Calibration
+---------------------
+
+Regardless of the number of output values, the same device settings are used within a single task.
+Thus there is only a single set of "Two Point Calibration" points available.
+
+When enabled, the user needs to perform some calibration to correct for some offset and factor.
+
+For example a DC-offset should be applied when measuring a voltage, with a diode in series with the signal.
+
+Another typical use case is when a voltage divider using resistors is put in front of the ADC, one may need to correct for the actually used resistor values.
+
+N.B. It is still possible per output value to use a formula for corrections per input.
+
+
+Output Configuration
+--------------------
+
+Analog Input Multiplexer
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+The ADS1015 and ADS1115 have 4 analog input pins which are routed via a multiplexer (MUX).
 
 When measuring "Single-Ended", the voltage is measured against GND.
+
 In "differential" mode, the voltage between given pins is measured.
 
+.. figure:: P025_ADS1x15_mux_block_diagram.png
+   :alt: ADS1115 / ADS1015 MUX Analog Input Block Diagram
+   :width: 50 %
+   :align: center
+
+   ADS1115 / ADS1015 MUX Analog Input Block Diagram
+
+Possible Multiplexer Input Combinations:
+
 * AIN0 - AIN1 (Differential)
 * AIN0 - AIN3 (Differential)
 * AIN1 - AIN3 (Differential)
@@ -51,10 +198,23 @@ In "differential" mode, the voltage between given pins is measured.
 * AIN2 - GND (Single-Ended)
 * AIN3 - GND (Single-Ended)
 
+Number Output Values
+^^^^^^^^^^^^^^^^^^^^
 
-Convert to Volt
-^^^^^^^^^^^^^^^
+(Added: 2023/09/05)
 
-(Added: 2023/03/31)
+It is possible to set upto 4 output values, each with its own input multiplexer configuration.
+
+.. figure:: P025_output_configuration.png
+   :alt: Output Configuration Selection
+   :width: 50 %
+   :align: center
+
+   Output Configuration Selection
+
+
+When multiple output values are configured, the samples will be taken in a single burst.
+This also means the sample rate should be set to a relatively high value (preferrably > 128 SPS) as it would otherwise block execution of other code in ESPEasy.
+
+In order to keep the interface clean and simple, all output values configured in the same task will use the same gain and sample rate and will all be using the same calibration (if set) and output to the same unit of measure (raw sample value or Volt).
 
-When this option is checked, the measured value will be converted to Volt, based on the selected gain.
diff --git a/docs/source/Plugin/P025_select_samplerate.png b/docs/source/Plugin/P025_select_samplerate.png
diff --git a/docs/source/Plugin/_plugin_substitutions_p02x.repl b/docs/source/Plugin/_plugin_substitutions_p02x.repl
@@ -63,9 +63,9 @@
 .. |P024_compileinfo| replace:: `.`
 .. |P024_usedlibraries| replace:: `.`
 
-.. |P025_name| replace:: :cyan:`ADS1115`
+.. |P025_name| replace:: :cyan:`ADS1x15`
 .. |P025_type| replace:: :cyan:`Analog input`
-.. |P025_typename| replace:: :cyan:`Analog input - ADS1115`
+.. |P025_typename| replace:: :cyan:`Analog input - ADS1x15`
 .. |P025_porttype| replace:: `.`
 .. |P025_status| replace:: :green:`NORMAL` :yellow:`ENERGY` :yellow:`CLIMATE`
 .. |P025_github| replace:: P025_ADS1115.ino

diff --git a/src/Custom-sample.h b/src/Custom-sample.h
@@ -365,7 +365,7 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
 // #define USES_P022   // PCA9685
 // #define USES_P023   // OLED
 // #define USES_P024   // MLX90614
-// #define USES_P025   // ADS1115
+// #define USES_P025   // ADS1x15
 // #define USES_P026   // SysInfo
 // #define USES_P027   // INA219
 // #define USES_P028   // BME280

diff --git a/src/_P005_DHT.ino b/src/_P005_DHT.ino
@@ -66,7 +66,7 @@ boolean Plugin_005(uint8_t function, struct EventStruct *event, String& string)
         const __FlashStringHelper * options[] = { F("DHT 11"), F("DHT 22"), F("DHT 12"), F("Sonoff am2301"), F("Sonoff si7021"), F("Sonoff MS01") };
         const int indices[] = { P005_DHT11, P005_DHT22, P005_DHT12, P005_AM2301, P005_SI7021, P005_MS01 };
 
-        constexpr size_t nrElements = sizeof(indices) / sizeof(indices[0]);
+        constexpr size_t nrElements = NR_ELEMENTS(indices);
 
         addFormSelector(F("Sensor model"), F("dhttype"), nrElements, options, indices, PCONFIG(0) );