summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormartinbra <martinbra@gmail.com>2020-07-30 05:21:11 +0200
committermartinbra <martinbra@gmail.com>2020-07-30 05:21:11 +0200
commit2e73f1aec042986fae435d68cacafcba8b8ec49f (patch)
treea90e5eff739ab474b9a8d4df71a28ac55352107d
parentAdding keywords.txt for the Arduino lazy sintax highlighting. (diff)
downloadADS1115_WE-2e73f1aec042986fae435d68cacafcba8b8ec49f.tar
ADS1115_WE-2e73f1aec042986fae435d68cacafcba8b8ec49f.tar.gz
ADS1115_WE-2e73f1aec042986fae435d68cacafcba8b8ec49f.tar.bz2
ADS1115_WE-2e73f1aec042986fae435d68cacafcba8b8ec49f.tar.lz
ADS1115_WE-2e73f1aec042986fae435d68cacafcba8b8ec49f.tar.xz
ADS1115_WE-2e73f1aec042986fae435d68cacafcba8b8ec49f.tar.zst
ADS1115_WE-2e73f1aec042986fae435d68cacafcba8b8ec49f.zip
Diffstat (limited to '')
-rw-r--r--examples/Alert_Window_Mode/Alert_Window_Mode.ino10
-rw-r--r--examples/Alert_Window_Mode_with_Latch/Alert_Window_Mode_with_Latch.ino8
-rw-r--r--examples/Single_Shot/Single_Shot.ino10
-rw-r--r--examples/Single_Shot_Conv_Ready_Alert_Controlled/Single_Shot_Conv_Ready_Alert_Controlled.ino8
-rw-r--r--examples/Single_Shot_Conv_Ready_Controlled/Single_Shot_Conv_Ready_Controlled.ino10
-rw-r--r--src/ADS1115_WE.h11
6 files changed, 29 insertions, 28 deletions
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
diff --git a/src/ADS1115_WE.h b/src/ADS1115_WE.h
index c5a269a..c531368 100644
--- a/src/ADS1115_WE.h
+++ b/src/ADS1115_WE.h
@@ -70,8 +70,9 @@ typedef enum ADS1115_CONV_RATE{
} convRate;
typedef enum ADS1115_MEASURE_MODE{
- ADS1115_CONTINOUS = 0x0000,
- ADS1115_SINGLE = 0x0100
+ ADS1115_CONTINOUS = 0x0000, // keeping misspelled enum for backwards compatibility.
+ ADS1115_CONTINUOUS = 0x0000,
+ ADS1115_SINGLE = 0x0100
} measureMode;
typedef enum ADS1115_RANGE{
@@ -139,7 +140,7 @@ public:
*/
void setAlertPol(ADS1115_ALERT_POL polarity);
- /* 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
@@ -164,9 +165,9 @@ public:
*/
void setConvRate(ADS1115_CONV_RATE rate);
- /* 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)
*/
void setMeasureMode(ADS1115_MEASURE_MODE mode);