Revision 8:4ae84166c8c1, committed 2022-07-20

Comitter:

MPhalke@MPHALKE-L02.ad.analog.com

Date:

Wed Jul 20 11:20:01 2022 +0530

Parent:

7:217c27bc3082

Commit message:

Minor code comment updates

Changed in this revision

diff -r 217c27bc3082 -r 4ae84166c8c1 LICENSE.md
--- a/LICENSE.md	Wed Jul 21 11:49:48 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-Copyright (c) 2020 Analog Devices, Inc.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.  
-  - Modified versions of the software must be conspicuously marked as such.
-  - This software is licensed solely and exclusively for use with processors/products manufactured by or for Analog Devices, Inc.
-  - This software may not be combined or merged with other code in any manner that would cause the software to become subject to terms and conditions which differ from those listed here.
-  - Neither the name of Analog Devices, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-  - The use of this software may or may not infringe the patent rights of one or more patent holders.  This license does not release you from the requirement that you obtain separate licenses from these patent holders to use this software.
-
-THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES, INC. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, TITLE, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ANALOG DEVICES, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, DAMAGES ARISING OUT OF CLAIMS OF INTELLECTUAL PROPERTY RIGHTS INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-2020-02-24-7CBSD SLA

diff -r 217c27bc3082 -r 4ae84166c8c1 LICENSE.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE.txt	Wed Jul 20 11:20:01 2022 +0530
@@ -0,0 +1,14 @@
+Copyright (c) 2020 Analog Devices, Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.  
+  - Modified versions of the software must be conspicuously marked as such.
+  - This software is licensed solely and exclusively for use with processors/products manufactured by or for Analog Devices, Inc.
+  - This software may not be combined or merged with other code in any manner that would cause the software to become subject to terms and conditions which differ from those listed here.
+  - Neither the name of Analog Devices, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+  - The use of this software may or may not infringe the patent rights of one or more patent holders.  This license does not release you from the requirement that you obtain separate licenses from these patent holders to use this software.
+
+THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES, INC. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, TITLE, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ANALOG DEVICES, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, DAMAGES ARISING OUT OF CLAIMS OF INTELLECTUAL PROPERTY RIGHTS INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+2020-02-24-7CBSD SLA

diff -r 217c27bc3082 -r 4ae84166c8c1 app/ad7124_console_app.c
--- a/app/ad7124_console_app.c	Wed Jul 21 11:49:48 2021 +0100
+++ b/app/ad7124_console_app.c	Wed Jul 20 11:20:01 2022 +0530
@@ -2437,7 +2437,7 @@
 	{ " " },
 	{ "Perform Averaged Measurement", 'A', perform_2wire_rtd_measurement, AVERAGED_MEASUREMENT },
 	{ "Perform Single Measurement",   'S', perform_2wire_rtd_measurement, SINGLE_MEASUREMENT },
-	{ "Perform Continuos Measurement",'C', perform_2wire_rtd_measurement, CONTINUOUS_MEASUREMENT },
+	{ "Perform Continuous Measurement",'C', perform_2wire_rtd_measurement, CONTINUOUS_MEASUREMENT },
 };
 
 console_menu rtd_2wire_menu = {
@@ -2462,7 +2462,7 @@
 	{ "No Calibration Measurement:" },
 	{ "Perform Averaged Measurement", 'A', perform_3wire_rtd_measurement, AVERAGED_MEASUREMENT },
 	{ "Perform Single Measurement",   'S', perform_3wire_rtd_measurement, SINGLE_MEASUREMENT },
-	{ "Perform Continuos Measurement",'C', perform_3wire_rtd_measurement, CONTINUOUS_MEASUREMENT },
+	{ "Perform Continuous Measurement",'C', perform_3wire_rtd_measurement, CONTINUOUS_MEASUREMENT },
 };
 
 console_menu rtd_3wire_menu = {
@@ -2480,7 +2480,7 @@
 	{ " " },
 	{ "Perform Averaged Measurement", 'A', calibrate_and_measure_3wire_rtd, AVERAGED_MEASUREMENT },
 	{ "Perform Single Measurement",   'S', calibrate_and_measure_3wire_rtd, SINGLE_MEASUREMENT },
-	{ "Perform Continuos Measurement",'C', calibrate_and_measure_3wire_rtd, CONTINUOUS_MEASUREMENT },
+	{ "Perform Continuous Measurement",'C', calibrate_and_measure_3wire_rtd, CONTINUOUS_MEASUREMENT },
 };
 
 console_menu rtd_3wire_calibration_menu = {
@@ -2503,7 +2503,7 @@
 	{ " " },
 	{ "Perform Averaged Measurement", 'A', perform_4wire_rtd_measurement, AVERAGED_MEASUREMENT },
 	{ "Perform Single Measurement",   'S', perform_4wire_rtd_measurement, SINGLE_MEASUREMENT },
-	{ "Perform Continuos Measurement",'C', perform_4wire_rtd_measurement, CONTINUOUS_MEASUREMENT },
+	{ "Perform Continuous Measurement",'C', perform_4wire_rtd_measurement, CONTINUOUS_MEASUREMENT },
 };
 
 console_menu rtd_4wire_menu = {
@@ -2529,7 +2529,7 @@
 	{ " " },
 	{ "Perform Averaged Measurement",  'A', perform_ntc_thermistor_measurement, AVERAGED_MEASUREMENT },
 	{ "Perform Single Measurement",    'S', perform_ntc_thermistor_measurement, SINGLE_MEASUREMENT },
-	{ "Perform Continuos Measurement", 'C', perform_ntc_thermistor_measurement, CONTINUOUS_MEASUREMENT },
+	{ "Perform Continuous Measurement", 'C', perform_ntc_thermistor_measurement, CONTINUOUS_MEASUREMENT },
 };
 
 console_menu ntc_thermistor_menu = {
@@ -2557,7 +2557,7 @@
 	{ " " },
 	{ "Perform Averaged Measurement", 'A', perform_thermocouple_measurement, AVERAGED_MEASUREMENT },
 	{ "Perform Single Measurement",   'S', perform_thermocouple_measurement, SINGLE_MEASUREMENT },
-	{ "Perform Continuos Measurement",'C', perform_thermocouple_measurement, CONTINUOUS_MEASUREMENT },
+	{ "Perform Continuous Measurement",'C', perform_thermocouple_measurement, CONTINUOUS_MEASUREMENT },
 };
 
 console_menu thermocouple_menu = {

diff -r 217c27bc3082 -r 4ae84166c8c1 app/app_config.h
--- a/app/app_config.h	Wed Jul 21 11:49:48 2021 +0100
+++ b/app/app_config.h	Wed Jul 20 11:20:01 2022 +0530
@@ -24,9 +24,9 @@
 /********************** Macros and Constants Definition ***********************/
 /******************************************************************************/
 
-/* Supported AD7124 devices (One selected at a time, default is AD7124-8) */
-//#define		AD7124_4
-#define		AD7124_8
+/* Supported AD7124 devices (One selected at a time, default is AD7124-4) */
+#define		AD7124_4
+//#define		AD7124_8
 
 #if defined(AD7124_4)
 #define ACTIVE_DEVICE	"AD7124-4"