Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
LeandroLimaPRO committed Jun 9, 2020
1 parent b7f2f2b commit c0e9b2a
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 70 deletions.
67 changes: 10 additions & 57 deletions Pressure.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand All @@ -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
Expand Down
14 changes: 6 additions & 8 deletions Pressure.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

#ifndef Pressure_h
#define Pressure_h
/*
Lib Pressure
version: 1.0.0
Expand All @@ -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
{
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -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" ,
Expand Down
8 changes: 4 additions & 4 deletions library.properties
Original file line number Diff line number Diff line change
@@ -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., [email protected]
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=*

0 comments on commit c0e9b2a

Please sign in to comment.