From 2e73f1aec042986fae435d68cacafcba8b8ec49f Mon Sep 17 00:00:00 2001 From: martinbra Date: Thu, 30 Jul 2020 00:21:11 -0300 Subject: Fixing some minor typos (continous, maxium and paramater). Keeping "typoed" ADS1115_CONTINOUS enum value for backward compatibilities. --- examples/Alert_Window_Mode/Alert_Window_Mode.ino | 10 +++++----- .../Alert_Window_Mode_with_Latch.ino | 8 ++++---- examples/Single_Shot/Single_Shot.ino | 10 +++++----- .../Single_Shot_Conv_Ready_Alert_Controlled.ino | 8 ++++---- .../Single_Shot_Conv_Ready_Controlled.ino | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'examples') diff --git a/examples/Alert_Window_Mode/Alert_Window_Mode.ino b/examples/Alert_Window_Mode/Alert_Window_Mode.ino index 3be5dec..a68b684 100644 --- a/examples/Alert_Window_Mode/Alert_Window_Mode.ino +++ b/examples/Alert_Window_Mode/Alert_Window_Mode.ino @@ -81,14 +81,14 @@ void setup() { */ //adc.setConvRate(ADS1115_8_SPS); //uncomment if you want to change the default - /* Set continous or single shot mode: + /* Set continuous or single shot mode: * - * ADS1115_CONTINOUS -> continous mode - * ADS1115_SINGLE -> single shot mode (default) + * ADS1115_CONTINUOUS -> continuous mode + * ADS1115_SINGLE -> single shot mode (default) */ - adc.setMeasureMode(ADS1115_CONTINOUS); //comment or change you want to change to single shot + adc.setMeasureMode(ADS1115_CONTINUOUS); //comment or change you want to change to single shot - /* Choose maximum limit or maxium and minimum alert limit (window)in Volt - alert pin will + /* Choose maximum limit or maximum and minimum alert limit (window)in Volt - alert pin will * be active when measured values are beyond the maximum limit or outside the window * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) * In max limit mode the minimum value is the limit where the alert pin will be deactivated diff --git a/examples/Alert_Window_Mode_with_Latch/Alert_Window_Mode_with_Latch.ino b/examples/Alert_Window_Mode_with_Latch/Alert_Window_Mode_with_Latch.ino index 049a65f..f90d6db 100644 --- a/examples/Alert_Window_Mode_with_Latch/Alert_Window_Mode_with_Latch.ino +++ b/examples/Alert_Window_Mode_with_Latch/Alert_Window_Mode_with_Latch.ino @@ -83,14 +83,14 @@ void setup() { */ //adc.setConvRate(ADS1115_8_SPS); //uncomment if you want to change the default - /* Set continous or single shot mode: + /* Set continuous or single shot mode: * - * ADS1115_CONTINOUS -> continous mode + * ADS1115_CONTINUOUS -> continuous mode * ADS1115_SINGLE -> single shot mode (default) */ - adc.setMeasureMode(ADS1115_CONTINOUS); //comment or change if you want to change single shot + adc.setMeasureMode(ADS1115_CONTINUOUS); //comment or change if you want to change single shot - /* Choose maximum limit or maxium and minimum alert limit (window)in Volt - alert pin will + /* Choose maximum limit or maximum and minimum alert limit (window)in Volt - alert pin will * be active when measured values are beyond the maximum limit or outside the window * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) * In max limit mode the minimum value is the limit where the alert pin will be deactivated diff --git a/examples/Single_Shot/Single_Shot.ino b/examples/Single_Shot/Single_Shot.ino index 8a5a198..3b583b2 100644 --- a/examples/Single_Shot/Single_Shot.ino +++ b/examples/Single_Shot/Single_Shot.ino @@ -32,7 +32,7 @@ void setup() { * ADS1115_RANGE_0512 -> +/- 512 mV * ADS1115_RANGE_0256 -> +/- 256 mV */ - adc.setVoltageRange_mV(ADS1115_RANGE_6144); //comment line/change paramater to change range + adc.setVoltageRange_mV(ADS1115_RANGE_6144); //comment line/change parameter to change range /* Set the inputs to be compared * @@ -71,14 +71,14 @@ void setup() { */ //adc.setConvRate(ADS1115_128_SPS); //uncomment if you want to change the default - /* Set continous or single shot mode: + /* Set continuous or single shot mode: * - * ADS1115_CONTINOUS -> continous mode + * ADS1115_CONTINUOUS -> continuous mode * ADS1115_SINGLE -> single shot mode (default) */ - //adc.setMeasureMode(ADS1115_CONTINOUS); //uncomment if you want to change the default + //adc.setMeasureMode(ADS1115_CONTINUOUS); //uncomment if you want to change the default - /* Choose maximum limit or maxium and minimum alert limit (window)in Volt - alert pin will + /* Choose maximum limit or maximum and minimum alert limit (window)in Volt - alert pin will * be active when measured values are beyond the maximum limit or outside the window * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) * In max limit mode the minimum value is the limit where the alert pin will be deactivated (if diff --git a/examples/Single_Shot_Conv_Ready_Alert_Controlled/Single_Shot_Conv_Ready_Alert_Controlled.ino b/examples/Single_Shot_Conv_Ready_Alert_Controlled/Single_Shot_Conv_Ready_Alert_Controlled.ino index a02067a..5822f01 100644 --- a/examples/Single_Shot_Conv_Ready_Alert_Controlled/Single_Shot_Conv_Ready_Alert_Controlled.ino +++ b/examples/Single_Shot_Conv_Ready_Alert_Controlled/Single_Shot_Conv_Ready_Alert_Controlled.ino @@ -76,14 +76,14 @@ void setup() { */ adc.setConvRate(ADS1115_8_SPS); //comment line/change parameter to change SPS - /* Set continous or single shot mode: + /* Set continuous or single shot mode: * - * ADS1115_CONTINOUS -> continous mode + * ADS1115_CONTINUOUS -> continuous mode * ADS1115_SINGLE -> single shot mode (default) */ - //adc.setMeasureMode(ADS1115_CONTINOUS); // continous mode does not work with conversion ready + //adc.setMeasureMode(ADS1115_CONTINUOUS); // continuous mode does not work with conversion ready - /* Choose maximum limit or maxium and minimum alert limit (window)in Volt - alert pin will + /* Choose maximum limit or maximum and minimum alert limit (window)in Volt - alert pin will * be active when measured values are beyond the maximum limit or outside the window * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) * In max limit mode the minimum value is the limit where the alert pin will be deactivated (if diff --git a/examples/Single_Shot_Conv_Ready_Controlled/Single_Shot_Conv_Ready_Controlled.ino b/examples/Single_Shot_Conv_Ready_Controlled/Single_Shot_Conv_Ready_Controlled.ino index 976e682..9ca409e 100644 --- a/examples/Single_Shot_Conv_Ready_Controlled/Single_Shot_Conv_Ready_Controlled.ino +++ b/examples/Single_Shot_Conv_Ready_Controlled/Single_Shot_Conv_Ready_Controlled.ino @@ -2,7 +2,7 @@ * Example sketch for the ADS1115_WE library * * This sketch shows how you can use the conversion ready bit with the isBusy function. -* This does not work in the continous mode. +* This does not work in the continuous mode. * * Further information can be found on: * https://wolles-elektronikkiste.de/ads1115 @@ -72,14 +72,14 @@ void setup() { */ adc.setConvRate(ADS1115_8_SPS); //comment line/change parameter to change SPS - /* Set continous or single shot mode: + /* Set continuous or single shot mode: * - * ADS1115_CONTINOUS -> continous mode + * ADS1115_CONTINUOUS -> continuous mode * ADS1115_SINGLE -> single shot mode (default) */ - //adc.setMeasureMode(ADS1115_CONTINOUS); //continous mode does not work with conversion ready (isBusy) + //adc.setMeasureMode(ADS1115_CONTINUOUS); //continuous mode does not work with conversion ready (isBusy) - /* Choose maximum limit or maxium and minimum alert limit (window)in Volt - alert pin will + /* Choose maximum limit or maximum and minimum alert limit (window)in Volt - alert pin will * be active when measured values are beyond the maximum limit or outside the window * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) * In max limit mode the minimum value is the limit where the alert pin will be deactivated (if -- cgit v1.2.3 From 7c13f3251907b629a18776c5abadfe6d5d0fcb35 Mon Sep 17 00:00:00 2001 From: martinbra Date: Thu, 30 Jul 2020 08:35:15 -0300 Subject: fixing typos and example folder and file name for continuous. --- examples/Continous/Continous.ino | 129 ------------------------------------- examples/Continuous/Continuous.ino | 129 +++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 examples/Continous/Continous.ino create mode 100644 examples/Continuous/Continuous.ino (limited to 'examples') diff --git a/examples/Continous/Continous.ino b/examples/Continous/Continous.ino deleted file mode 100644 index bece321..0000000 --- a/examples/Continous/Continous.ino +++ /dev/null @@ -1,129 +0,0 @@ -/*************************************************************************** -* Example sketch for the ADS1115_WE library -* -* This sketch shows how to use the ADS1115 in continous mode. -* -* Further information can be found on: -* https://wolles-elektronikkiste.de/ads1115 -* -***************************************************************************/ - -#include -#include -#define I2C_ADDRESS 0x48 - -ADS1115_WE adc(I2C_ADDRESS); -// ADS1115_WE adc = ADS1115_WE(); // Alternative: uses default address 0x48 - -void setup() { - Wire.begin(); - Serial.begin(9600); - if(!adc.init()){ - Serial.println("ADS1115 not connected!"); - } - - /* Set the voltage range of the ADC to adjust the gain - * Please note that you must not apply more than VDD + 0.3V to the input pins! - * - * ADS1115_RANGE_6144 -> +/- 6144 mV - * ADS1115_RANGE_4096 -> +/- 4096 mV - * ADS1115_RANGE_2048 -> +/- 2048 mV (default) - * ADS1115_RANGE_1024 -> +/- 1024 mV - * ADS1115_RANGE_0512 -> +/- 512 mV - * ADS1115_RANGE_0256 -> +/- 256 mV - */ - adc.setVoltageRange_mV(ADS1115_RANGE_6144); //comment line/change parameter to change range - - /* Set the inputs to be compared - * - * ADS1115_COMP_0_1 -> compares 0 with 1 (default) - * ADS1115_COMP_0_3 -> compares 0 with 3 - * ADS1115_COMP_1_3 -> compares 1 with 3 - * ADS1115_COMP_2_3 -> compares 2 with 3 - * ADS1115_COMP_0_GND -> compares 0 with GND - * ADS1115_COMP_1_GND -> compares 1 with GND - * ADS1115_COMP_2_GND -> compares 2 with GND - * ADS1115_COMP_3_GND -> compares 3 with GND - */ - adc.setCompareChannels(ADS1115_COMP_0_GND); //comment line/change parameter to change channel - - /* Set number of conversions after which the alert pin will be active - * - or you can disable the alert - * - * ADS1115_ASSERT_AFTER_1 -> after 1 conversion - * ADS1115_ASSERT_AFTER_2 -> after 2 conversions - * ADS1115_ASSERT_AFTER_4 -> after 4 conversions - * ADS1115_DISABLE_ALERT -> disable comparator / alert pin (default) - */ - //adc.setAlertPinMode(ADS1115_ASSERT_AFTER_1); //uncomment if you want to change the default - - /* Set the conversion rate in SPS (samples per second) - * Options should be self-explaining: - * - * ADS1115_8_SPS - * ADS1115_16_SPS - * ADS1115_32_SPS - * ADS1115_64_SPS - * ADS1115_128_SPS (default) - * ADS1115_250_SPS - * ADS1115_475_SPS - * ADS1115_860_SPS - */ - // adc.setConvRate(ADS1115_8_SPS); //uncomment if you want to change the default - - /* Set continous or single shot mode: - * - * ADS1115_CONTINOUS -> continous mode - * ADS1115_SINGLE -> single shot mode (default) - */ - adc.setMeasureMode(ADS1115_CONTINOUS); //comment line/change parameter to change mode - - /* Choose maximum limit or maxium and minimum alert limit (window)in Volt - alert pin will - * be active when measured values are beyond the maximum limit or outside the window - * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) - * In max limit mode the minimum value is the limit where the alert pin will be deactivated (if - * not latched) - * - * ADS1115_MAX_LIMIT - * ADS1115_WINDOW - * - */ - //adc.setAlertModeAndLimit_V(ADS1115_MAX_LIMIT, 3.0, 1.5); //uncomment if you want to change the default - - /* Enable or disable latch. If latch is enabled the alarm pin will be active until the - * conversion register is read (getResult functions). If disabled the alarm pin will be - * deactivated with next value within limits. - * - * ADS1115_LATCH_DISABLED (default) - * ADS1115_LATCH_ENABLED - */ - //adc.setAlertLatch(ADS1115_LATCH_ENABLED); //uncomment if you want to change the default - - /* Sets the alert pin polarity if active: - * - * Enable or disable latch. If latch is enabled the alarm pin will be active until the - * conversion register is read (getResult functions). If disabled the alarm pin will be - * deactivated with next value within limits. - * - * ADS1115_ACT_LOW -> active low (default) - * ADS1115_ACT_HIGH -> active high - */ - //adc.setAlertPol(ADS1115_ACT_LOW); //uncomment if you want to change the default - - /* With this function the alert pin will be active, when a conversion is ready. - * In order to deactivate, use the setAlertLimit_V function - */ - //adc.setAlertPinToConversionReady(); //uncomment if you want to change the default - - Serial.println("ADS1115 Example Sketch - Continous Mode"); - Serial.println(); -} - -void loop() { - float voltage = 0.0; - voltage = adc.getResult_V(); // alternative: getResult_mV for Millivolt - Serial.print("Channel 0 vs GND [V]: "); - Serial.println(voltage); - Serial.println("-------------------------------"); - delay(2000); -} diff --git a/examples/Continuous/Continuous.ino b/examples/Continuous/Continuous.ino new file mode 100644 index 0000000..3c8313a --- /dev/null +++ b/examples/Continuous/Continuous.ino @@ -0,0 +1,129 @@ +/*************************************************************************** +* Example sketch for the ADS1115_WE library +* +* This sketch shows how to use the ADS1115 in continuous mode. +* +* Further information can be found on: +* https://wolles-elektronikkiste.de/ads1115 +* +***************************************************************************/ + +#include +#include +#define I2C_ADDRESS 0x48 + +ADS1115_WE adc(I2C_ADDRESS); +// ADS1115_WE adc = ADS1115_WE(); // Alternative: uses default address 0x48 + +void setup() { + Wire.begin(); + Serial.begin(9600); + if(!adc.init()){ + Serial.println("ADS1115 not connected!"); + } + + /* Set the voltage range of the ADC to adjust the gain + * Please note that you must not apply more than VDD + 0.3V to the input pins! + * + * ADS1115_RANGE_6144 -> +/- 6144 mV + * ADS1115_RANGE_4096 -> +/- 4096 mV + * ADS1115_RANGE_2048 -> +/- 2048 mV (default) + * ADS1115_RANGE_1024 -> +/- 1024 mV + * ADS1115_RANGE_0512 -> +/- 512 mV + * ADS1115_RANGE_0256 -> +/- 256 mV + */ + adc.setVoltageRange_mV(ADS1115_RANGE_6144); //comment line/change parameter to change range + + /* Set the inputs to be compared + * + * ADS1115_COMP_0_1 -> compares 0 with 1 (default) + * ADS1115_COMP_0_3 -> compares 0 with 3 + * ADS1115_COMP_1_3 -> compares 1 with 3 + * ADS1115_COMP_2_3 -> compares 2 with 3 + * ADS1115_COMP_0_GND -> compares 0 with GND + * ADS1115_COMP_1_GND -> compares 1 with GND + * ADS1115_COMP_2_GND -> compares 2 with GND + * ADS1115_COMP_3_GND -> compares 3 with GND + */ + adc.setCompareChannels(ADS1115_COMP_0_GND); //comment line/change parameter to change channel + + /* Set number of conversions after which the alert pin will be active + * - or you can disable the alert + * + * ADS1115_ASSERT_AFTER_1 -> after 1 conversion + * ADS1115_ASSERT_AFTER_2 -> after 2 conversions + * ADS1115_ASSERT_AFTER_4 -> after 4 conversions + * ADS1115_DISABLE_ALERT -> disable comparator / alert pin (default) + */ + //adc.setAlertPinMode(ADS1115_ASSERT_AFTER_1); //uncomment if you want to change the default + + /* Set the conversion rate in SPS (samples per second) + * Options should be self-explaining: + * + * ADS1115_8_SPS + * ADS1115_16_SPS + * ADS1115_32_SPS + * ADS1115_64_SPS + * ADS1115_128_SPS (default) + * ADS1115_250_SPS + * ADS1115_475_SPS + * ADS1115_860_SPS + */ + // adc.setConvRate(ADS1115_8_SPS); //uncomment if you want to change the default + + /* Set continuous or single shot mode: + * + * ADS1115_CONTINUOUS -> continuous mode + * ADS1115_SINGLE -> single shot mode (default) + */ + adc.setMeasureMode(ADS1115_CONTINUOUS); //comment line/change parameter to change mode + + /* Choose maximum limit or maximum and minimum alert limit (window)in Volt - alert pin will + * be active when measured values are beyond the maximum limit or outside the window + * Upper limit first: setAlertLimit_V(MODE, maximum, minimum) + * In max limit mode the minimum value is the limit where the alert pin will be deactivated (if + * not latched) + * + * ADS1115_MAX_LIMIT + * ADS1115_WINDOW + * + */ + //adc.setAlertModeAndLimit_V(ADS1115_MAX_LIMIT, 3.0, 1.5); //uncomment if you want to change the default + + /* Enable or disable latch. If latch is enabled the alarm pin will be active until the + * conversion register is read (getResult functions). If disabled the alarm pin will be + * deactivated with next value within limits. + * + * ADS1115_LATCH_DISABLED (default) + * ADS1115_LATCH_ENABLED + */ + //adc.setAlertLatch(ADS1115_LATCH_ENABLED); //uncomment if you want to change the default + + /* Sets the alert pin polarity if active: + * + * Enable or disable latch. If latch is enabled the alarm pin will be active until the + * conversion register is read (getResult functions). If disabled the alarm pin will be + * deactivated with next value within limits. + * + * ADS1115_ACT_LOW -> active low (default) + * ADS1115_ACT_HIGH -> active high + */ + //adc.setAlertPol(ADS1115_ACT_LOW); //uncomment if you want to change the default + + /* With this function the alert pin will be active, when a conversion is ready. + * In order to deactivate, use the setAlertLimit_V function + */ + //adc.setAlertPinToConversionReady(); //uncomment if you want to change the default + + Serial.println("ADS1115 Example Sketch - Continuous Mode"); + Serial.println(); +} + +void loop() { + float voltage = 0.0; + voltage = adc.getResult_V(); // alternative: getResult_mV for Millivolt + Serial.print("Channel 0 vs GND [V]: "); + Serial.println(voltage); + Serial.println("-------------------------------"); + delay(2000); +} -- cgit v1.2.3