diff --git a/Pressure.cpp b/Pressure.cpp index 5973bc1..594a237 100644 --- a/Pressure.cpp +++ b/Pressure.cpp @@ -22,20 +22,20 @@ void Pressure::Init()// Func. Initialize, set into setup pinMode(PinAn, INPUT); //SET PIN AS INPUT } -float Pressure::Modo(float valor, uint8_t Model)// PRESSURE SENSOR MODEL +float Pressure::Modo(float val___Analog, uint8_t Model)// PRESSURE SENSOR MODEL { switch (Model) { case 0: // MXP5010 - return ((((valor/1023)*VFSO)-0.2)/0.45); // SENSOR TRANSFER FUNCTION OBTAINED FROM DATASHEET + return ((((val___Analog/1023)*VFSO)-0.2)/0.45); // SENSOR TRANSFER FUNCTION OBTAINED FROM DATASHEET break; case 1: // MXP3700 return 0.00; // INSERT TRANSFER FUNCTION IN THE PLACE OF "NULL" break; default:// MXP5010 //// ADD DEFINE IN .H FOR OTHER MODELS END INSERT FUNCTION TRANSFER IN CASE N+1 - return ((((valor/1023)*VFSO)-0.2)/0.45); + return ((((val___Analog/1023)*VFSO)-0.2)/0.45); break; } } @@ -44,62 +44,15 @@ Get (GREATNESS, SENSOR MODEL) GREATNESS OF RETURN: KPA, BAR, PSI, CMH2O (DEFAULT: KPA) SENSOR MODEL: MXP5010 (DEFAULT MXP5010) */ -float Pressure::Get(){ - uint8_t def_tag_pressure = 0; - int val = analogRead(PinAn); // GET ADC VALUE - float v_pressure = Modo(val, def_tag_pressure); // CALCULATE PRESSURE BASED MODEL - switch (def_tag_pressure) - { - - case 0: // KPA - return v_pressure; - break; - - case 1: // BAR - return v_pressure/100; - break; - - case 2: // PSI - return v_pressure/6.895; - break; - case 3: // CMH2O - return v_pressure*10.01972; - break; - default: // KPA - return v_pressure; - break; - } -} -float Pressure::Get( uint8_t model){ - int val = analogRead(PinAn); // GET ADC VALUE - float v_pressure = Modo(val, model); // CALCULATE PRESSURE BASED MODEL - int8_t gran__P = 0; - switch (gran__P) - { - - case 0: // KPA - return v_pressure; - break; - - case 1: // BAR - return v_pressure/100; - break; - - case 2: // PSI - return v_pressure/6.895; - break; - case 3: // CMH2O - return v_pressure*10.01972; - break; - default: // KPA - return v_pressure; - break; - } +float Pressure::Get(uint8_t model){ + int val___Analog = analogRead(PinAn); // GET ADC VALUE + float v_pressure = Modo(val___Analog, model); // CALCULATE PRESSURE BASED MODEL + return v_pressure; } float Pressure::Get( uint8_t model, uint8_t gran){ - int val = analogRead(PinAn); // GET ADC VALUE - float v_pressure = Modo(val, model); // CALCULATE PRESSURE BASED MODEL - switch (gran) + int val___Analog = analogRead(PinAn); // GET ADC VALUE + float v_pressure = Modo(val___Analog, model); // CALCULATE PRESSURE BASED MODEL + switch (gran) { case 0: // KPA diff --git a/Pressure.h b/Pressure.h index 9205e7d..ba37208 100644 --- a/Pressure.h +++ b/Pressure.h @@ -1,3 +1,6 @@ + +#ifndef Pressure_h +#define Pressure_h /* Lib Pressure version: 1.0.0 @@ -6,8 +9,6 @@ sentence: Pressure differential MXP serie paragraph: library for reading differential pressure / gauge sensors from the manufacturer NXP. With pressure return in KPA, PSI, BAR, CMH2O quantities. category: Sensor Analogic Pressure */ -#ifndef Pressure_h -#define Pressure_h #include "Arduino.h" class Pressure { @@ -22,14 +23,11 @@ class Pressure Pressure(uint8_t); Pressure(uint8_t, double); void Init(); - float Get(); - float Get( uint8_t); - float Get( uint8_t, uint8_t); - + float Get(uint8_t); // set model, for return value in KPA + float Get( uint8_t, uint8_t); //set model and measure type private: - - int vanalog; + int va__nalog; float pressure; float VFSO = 4.71; uint8_t PinAn; diff --git a/library.json b/library.json index 0291bde..d2c4101 100644 --- a/library.json +++ b/library.json @@ -1,5 +1,5 @@ { - "name" : "Pressure NXP Sensors Analog" , + "name" : "NXP Pressure Sensors Analog" , "keywords" : " Pressure, MXP, Diferential, NXP " , "description" : "library for reading differential pressure / gauge sensors from the manufacturer NXP. With pressure return in KPA, PSI, BAR, CMH2O quantities." , "url" : "https://github.com/LeandroLimaPRO/Pressure" , diff --git a/library.properties b/library.properties index c845c2f..6b27f66 100644 --- a/library.properties +++ b/library.properties @@ -1,9 +1,9 @@ -name=Pressure_NXP_MXP -version=1.0.0 +name=NXPPressureSensors +version=1.0.1 author=Leandro L. N. maintainer=Leandro L. N., eng.leandroln@gmail.com -sentence=Pressure differential MXP serie -paragraph=library for reading differential pressure / gauge sensors from the manufacturer NXP. With pressure return in KPA, PSI, BAR, CMH2O quantities. +sentence=NXP Differential Pressure Sensors +paragraph=library for reading differential pressure / gauge sensors from the manufacturer NXP, serie MXP. With pressure return in KPA, PSI, BAR, CMH2O quantities. category =Sensors url=https://github.com/LeandroLimaPRO/Pressure/ architectures=*