Merge pull request #16 from DrGFreeman/GP2Y0A41SK0F

Addition of GP2YA41SK0F sensor model (1.5.0)

Author: DrGFreeman

README.md

@@ -1,9 +1,9 @@
 # SharpDistSensor
 A library for the Arduino IDE that helps interface with Sharp analog distance sensors.  
 
-Version 1.4.2  
+Version 1.5.0  
 [![Build Status](https://travis-ci.org/DrGFreeman/SharpDistSensor.svg?branch=master)](https://travis-ci.org/DrGFreeman/SharpDistSensor)  
-By Julien de la Bruère-Terreault (drgfreeman@tuta.io) 
+By Julien de la Bruère-Terreault (drgfreeman@tuta.io)
 
 ## Summary
 The analog value from the sensor is converted to distance using either a
@@ -59,31 +59,34 @@ Sets the range of analog values for which the polynomial or power fit is valid (
 
 ## Pre-defined sensor models
 * `GP2Y0A60SZLF_5V`: GP2Y0A60SZLF Analog Distance Sensor 10-150cm, 5V, polynomial fit.
-* `GP2Y0A710K0F_5V_DS`: GP2Y0A710K0F Analog Distance Sensor 100-500cm, 5V (data sheet), polynomial fit.
+* `GP2Y0A41SK0F_5V_DS`: GP2Y0A41SK0F Analog Distance Sensor 3-40cm, 5V (data sheet), polynomial fit.
 * `GP2Y0A51SK0F_5V_DS`: GP2Y0A51SK0F Analog Distance Sensor 2-15cm, 5V (data sheet), power fit.
+* `GP2Y0A710K0F_5V_DS`: GP2Y0A710K0F Analog Distance Sensor 100-500cm, 5V (data sheet), polynomial fit.
 
 #### Polynomial / Power fit coefficients:
 
 Model | Units | C0/C | C1/P | C2 | C3 | C4 | C5
 ------|-------|----|----|----|----|----|----
 **GP2Y0A60SZLF_5V** | mm | 1734 | -9.005 | 2.032E-2 | -2.251E-5 | 1.167E-8 | -2.037E-12
-**GP2Y0A710K0F_5V_DS** | mm | 178506 | -1607.72 | 5.5239 | -8.47601E-3 | 4.87819E-6 |
+**GP2Y0A41SK0F_5V_DS** | mm | 761.9 | -8.13336 | 4.18857E-2 | -1.11338E-4 | 1.46237E-7 | -7.49656E-11
 **GP2Y0A51SK0F_5V_DS** | mm | 4.03576E+4 | -1.26093 | | | |
+**GP2Y0A710K0F_5V_DS** | mm | 178506 | -1607.72 | 5.5239 | -8.47601E-3 | 4.87819E-6 |
 
 #### Analog values range:
 
 Model | valMin | valMax
 ------|--------|--------
 **GP2Y0A60SZLF_5V** | 30 | 875
-**GP2Y0A710K0F_5V_DS** | 284 | 507
+**GP2Y0A41SK0F_5V_DS** | 61 | 614
 **GP2Y0A51SK0F_5V_DS** | 70 | 500
-
+**GP2Y0A710K0F_5V_DS** | 284 | 507
 
 **Important Note:** The analog voltage returned by the sensor is largely dependent of the reflected object size and reflectivity. The distance returned by these pre-defined calibration functions can therefore vary significantly from the real distance depending on the object detected. Where accuracy is required by the application, it is recommended to perform calibration with the object to be detected and use custom calibration fit functions instead.
 
 This library has been designed so that it is easy to add sensor models. Contributions are therefore welcome. Adding models to the library can be done by either submitting a pull request or providing me the proposed fit function and associated calibration data by email so I can add it myself. Thank you for contributing!
 
 ## Version history
+* 1.5.0 (2018-10-22): Added GP2Y0A41SK0F_5V_DS model.
 * 1.4.2 (2018-09-23): Improved comments in SharpDistSensorArray example.
 * 1.4.1 (2018-08-07): Updated MedianFilter to latest version from [daPhoosa/MedianFilter](https://github.com/daPhoosa/MedianFilter).
 * 1.4.0 (2018-05-21): Added GP2Y0A51SK0F_5V_DS model.

SharpDistSensor.cpp

@@ -99,6 +99,13 @@ void SharpDistSensor::setModel(const models model)
       setPolyFitCoeffs(5, coeffs, 284, 507);
       break;
     }
+    case GP2Y0A41SK0F_5V_DS:
+    {
+      // Set coefficients and range for Sharp GP2Y0A41SK0F 5V
+      float coeffs[] = {761.913, -8.13336, 4.18857E-02, -1.11338E-04, 1.46237E-07, -7.49656E-11};
+      setPolyFitCoeffs(6, coeffs, 61, 614);
+      break;
+    }
     case GP2Y0A51SK0F_5V_DS:
     {
       // Set coefficients and range for Sharp GP2Y0A51SK0F 5V

SharpDistSensor.h

@@ -73,6 +73,8 @@ class SharpDistSensor
     GP2Y0A710K0F_5V_DS,
     // Constant for GP2Y0A51SK0F 5V model
     GP2Y0A51SK0F_5V_DS,
+    // Constant for GP2Y0A41SK0F 5V model
+    GP2Y0A41SK0F_5V_DS
   };
 
   /** Constructor

keywords.txt

@@ -5,4 +5,6 @@ setPolyFitCoeffs	KEYWORD2
 setPowerFitCoeffs	KEYWORD2
 setValMinMax	KEYWORD2
 GP2Y0A60SZLF_5V	LITERAL1
+GP2Y0A41SK0F_5V_DS	LITERAL1
+GP2Y0A51SK0F_5V_DS	LITERAL1
 GP2Y0A710K0F_5V_DS	LITERAL1

library.properties

@@ -1,5 +1,5 @@
 name=SharpDistSensor
-version=1.4.2
+version=1.5.0
 author=Julien de la Bruere-Terreault, drgfreeman@tuta.io
 maintainer=Julien de la Bruere-Terreault, drgfreeman@tuta.io
 sentence=Sharp analog distance sensor library