Code supports writing to the SD card as well as working with the Volckens group smartphone apps for the mbed HRM1017

Dependencies:   ADS1115 BLE_API BME280 Calibration CronoDot EEPROM LSM303 MCP40D17 NCP5623BMUTBG SDFileSystem SI1145 STC3100 mbed nRF51822

Fork of UPAS_BLE_and_USB by Volckens Group Sensors

Revision:
52:80480b2fafba
Parent:
51:91cfb90e901c
Child:
54:8ee11c9ecd8a
--- a/main.cpp	Tue Jun 16 16:57:58 2015 +0000
+++ b/main.cpp	Thu Jun 18 23:34:37 2015 +0000
@@ -27,6 +27,27 @@
 NCP5623BMUTBG RGB_LED(p22, p20);
 CronoDot RTC(p22, p20);
 
+//UPAS0012 CALIBRATION TRANSFER FUNCTION COEFFICIENTS FROM 'UPAS v2 OSU-calibration primary flow data.xlsx'
+//mass flow sensor output signal (x) vs. mass flow (y)
+//y = -0.9198x4 + 4.995x3 - 9.0171x2 + 8.1039x - 2.1758
+float MF4 = -0.9198;
+float MF3 = 4.995;
+float MF2 = -9.0171;
+float MF1 = 8.1039;
+float MF0 = -2.1758;
+//Mass flow sensor polynomial deviation limits
+float omronVMin = 0.500; //V
+float omronVMax = 2.437; //V
+float omronMFMin = 0.189; //g/L
+float omronMFMax = 3.873; //g/L
+//DIGITAL POTENTIOSTAT dig-pot vs m_dot POLYNOMIAL TRANSFER FUNCTION COEFFICIENTS FROM 'UPAS v2 OSU-calibration primary flow data.xlsx'
+//y = 6.2912x4 - 56.643x3 + 195.7x2 - 329.36x + 245.2
+float DP4 = 6.2912;
+float DP3 = -56.643;
+float DP2 = 195.7;
+float DP1 = -329.36;
+float DP0 = 245.2;
+
 float press;
 float temp;
 float rh;
@@ -38,47 +59,33 @@
 float accel_x;
 float accel_y;
 float accel_z;
+float accel_comp;
 float mag_x;
 float mag_y;
 float mag_z;
 
-
 int vInReading;
 int vBlowerReading;
 int omronDiff;
-
+float omronVolt; //V
 int omronReading;
-float omronVolt; //V
-float omronVMin = 0.7; //V
-float omronVMax = 2.3; //V
-float omronMFMin = 0.2209; //g/L
-float omronMFMax = 3.548944; //g/L
+float atmoRho; //g/L
 
-float atmoRho; //g/L
-//UPAS0011 values
-float MF0 = -8.794;
-float MF1 = 27.914;
-float MF2 = -30.738;
-float MF3 = 15.031;
-float MF4 = -2.5778;
 float massflow; //g/min
 float volflow; //L/min
-float volflowSet = 1.0; //L/min
+float volflowSet = 1
+; //L/min
+int   logInerval = 10;
 float massflowSet;
 float deltaVflow = 0.0;
 float deltaMflow = 0.0;
 float gainFlow;
+float sampledVol; //L, total sampled volume
 
 uint8_t digital_pot_setpoint; //min = 0x7F, max = 0x00
 uint8_t digital_pot_set;
-//UPAS0011 values
-float DP0 = 376.73;
-float DP1 = -512.82;
-float DP2 = 303.77;
-float DP3 = -85.942;
-float DP4 = 9.2763;
 
-char filename[] = "/sd/UPAS0011LOG000000000000.txt";
+char filename[] = "/sd/UPAS0012LOG000000000000.txt";
 SDFileSystem sd(SPIS_PSELMOSI, SPIS_PSELMISO, SPIS_PSELSCK, SPIS_PSELSS, "sd"); // I believe this matches Todd's pinout, let me know if this doesn't work. (p12, p13, p15, p14)
 
 char Seconds = 0; //Seconds
@@ -91,11 +98,11 @@
 double secondsD = 0;
 char * RTCtime;
 
-
 int main()
 {
-    // Setup and Initialization
-   //---------------------------------------------------------------------------------------------//
+
+// Setup and Initialization
+//---------------------------------------------------------------------------------------------//
    
     if(volflowSet==1.0){
         gainFlow = 100;}
@@ -126,7 +133,7 @@
     blower = 1;
 
     RTCtime = RTC.get_time();
-    sprintf(filename, "/sd/UPAS0011LOG_%02d-%02d-%02d_%02d-%02d-%02d.txt",RTCtime[5],RTCtime[4],RTCtime[3],RTCtime[2],RTCtime[1],RTCtime[0]);
+    sprintf(filename, "/sd/UPAS0012LOG_%02d-%02d-%02d_%02d-%02d-%02d.txt",RTCtime[5],RTCtime[4],RTCtime[3],RTCtime[2],RTCtime[1],RTCtime[0]);
     FILE *fp = fopen(filename, "w");
     fclose(fp);
     //pc.printf("%d\r\n",digital_pot_setpoint); 
@@ -138,7 +145,6 @@
  
     omronReading = ads.readADC_SingleEnded(0, 0xC583); // read channel 0 PGA = 2 : Full Scale Range = 2.048V
     omronVolt = (omronReading*4.096)/(32768*2);
-    //Mass Flow tf from file: UPAS v2 OSU-PrimaryFlowData FullSet 2015-05-29 CQ mods.xlsx
     if(omronVolt<=omronVMin){
         massflow = omronMFMin;
     }else if(omronVolt>=omronVMax){
@@ -146,8 +152,7 @@
     }else{
         massflow = MF4*pow(omronVolt,(float)4)+MF3*pow(omronVolt,(float)3)+MF2*pow(omronVolt,(float)2)+MF1*omronVolt+MF0;}
         deltaMflow = massflow-massflowSet;    
-        digital_pot_set = digital_pot_setpoint;
-        //pc.printf("%f,%f,%f,%f,%d,%u,%x\r\n",omronVolt,massflow,massflowSet,deltaMflow,digital_pot_set,digital_pot_set,digital_pot_set);                  
+        digital_pot_set = digital_pot_setpoint;             
         wait(5);
     
      //---------------------------------------------------------------------------------------------//    
@@ -183,8 +188,9 @@
             
             
             }
-
-     RGB_LED.set_led(0,1,0);
+    
+    sampledVol = 0.0;
+    RGB_LED.set_led(0,1,0);
      
       //---------------------------------------------------------------------------------------------// 
       //---------------------------------------------------------------------------------------------//    
@@ -204,45 +210,24 @@
         
         secondsD = (double)RTCtime[0];
         
-        if(fmod(secondsD,10)==0) {
+        if(fmod(secondsD,logInerval)==0) {
             
             omronReading = ads.readADC_SingleEnded(0, 0xC583); // read channel 0 PGA = 2 : Full Scale Range = 2.048V
             omronVolt = (omronReading*4.096)/(32768*2);
 
-            //Mass Flow tf from file: UPAS v2 OSU-PrimaryFlowData FullSet
-            //UPAS0001=-2.8112*L14^4+15.636*L14^3-30.192*L14^2+25.945*L14-7.6599
-            //massflow = -2.8112*pow(omronVolt,(float)4)+15.636*pow(omronVolt,(float)3)-30.192*pow(omronVolt,(float)2)+25.945*omronVolt-7.6599;
-            //UPAS0002=-1.4365*L14^4+8.4231*L14^3-16.754*L14^2+15.071*L14-4.5382
-            //massflow = -1.4365*pow(omronVolt,(float)4)+8.4231*pow(omronVolt,(float)3)-16.754*pow(omronVolt,(float)2)+15.071*omronVolt-4.5382;
-            //UPAS0003=-2.7391*L14^4+15.215*L14^3-29.522*L14^2+25.424*L14-7.5516
-            //massflow = -2.7391*pow(omronVolt,(float)4)+15.215*pow(omronVolt,(float)3)-29.522*pow(omronVolt,(float)2)+25.424*omronVolt-7.5516;
-            //UPAS0004 =-1.5374*L14^4+9.2898*L14^3-18.894*L14^2+17.112*L14-5.1938
-            //massflow = -1.5374*pow(omronVolt,(float)4)+9.2898*pow(omronVolt,(float)3)-18.894*pow(omronVolt,(float)2)+17.112*omronVolt-5.1938;
-            //UPAS0005 =-0.4654*L14^4+3.507*L14^3-7.7254*L14^2+7.8831*L14-2.4317
-            //massflow = -0.4654*pow(omronVolt,(float)4)+3.507*pow(omronVolt,(float)3)-7.7254*pow(omronVolt,(float)2)+7.8831*omronVolt-2.4317;
-            //UPAS0006=-0.0507*L14^4+1.2322*L14^3-2.9659*L14^2+3.9118*L14-1.0765
-            //massflow = -0.0507*pow(omronVolt,(float)4)+1.2322*pow(omronVolt,(float)3)-2.9659*pow(omronVolt,(float)2)+3.9118*omronVolt-1.0765;
-            //UPAS0007=-1.5303*L14^4+10.411*L14^3-24.002*L14^2+24.321*L14-8.4713
-            //massflow = -1.5303*pow(omronVolt,(float)4)+10.411*pow(omronVolt,(float)3)-24.002*pow(omronVolt,(float)2)+24.321*omronVolt-8.4713;
-            //UPAS0008=-1.1291*L14^4+7.701*L14^3-17.501*L14^2+17.754*L14-6.073
-            //massflow = -1.1291*pow(omronVolt,(float)4)+7.701*pow(omronVolt,(float)3)-17.501*pow(omronVolt,(float)2)+17.754*omronVolt-6.073;
-            //UPAS0009=-2.662*L14^4+16.421*L14^3-35.797*L14^2+34.579*L14-11.77
-            //massflow = -2.662*pow(omronVolt,(float)4)+16.421*pow(omronVolt,(float)3)-35.797*pow(omronVolt,(float)2)+34.579*omronVolt-11.77;
-            //UPAS0010=-3.6933*L14^4+21.633*L14^3-44.694*L14^2+40.387*L14-12.82
             if(omronVolt<=omronVMin){
                 massflow = omronMFMin;
             }else if(omronVolt>=omronVMax){
                 massflow = omronMFMax;
             }else{
             massflow = MF4*pow(omronVolt,(float)4)+MF3*pow(omronVolt,(float)3)+MF2*pow(omronVolt,(float)2)+MF1*omronVolt+MF0;}
-            
+           
             atmoRho = ((press-((6.1078*pow((float)10,(float)((7.5*temp)/(237.3+temp))))*(rh/100)))*100)/(287.0531*(temp+273.15))+((6.1078*pow((float)10,(float)((7.5*temp)/(237.3+temp))))*(rh/100)*100)/(461.4964*(temp+273.15));
             volflow = massflow/atmoRho;
+            sampledVol = sampledVol + ((((float)logInerval)/60.0)*volflow);
             deltaVflow = volflow-volflowSet;
             massflowSet = volflowSet*atmoRho; 
             deltaMflow = massflow-massflowSet;
-   
-            //pc.printf("%f,%f,%f,%f,%d,%u,%x\r\n",omronVolt,massflow,massflowSet,deltaMflow,digital_pot_set,digital_pot_set,digital_pot_set);
             
             if(abs(deltaMflow)>.025){
                 digital_pot_set = (uint8_t)(digital_pot_set+(int8_t)(gainFlow*deltaMflow));
@@ -266,6 +251,7 @@
             accel_x = movementsensor.AccelData.x;
             accel_y = movementsensor.AccelData.y;
             accel_z = movementsensor.AccelData.z;
+            accel_comp = pow(accel_x,(float)2)+pow(accel_y,(float)2)+pow(accel_z,(float)2)-1.0;
             mag_x = movementsensor.MagData.x;
             mag_y = movementsensor.MagData.y;
             mag_z = movementsensor.MagData.z;
@@ -274,17 +260,16 @@
             vBlowerReading = ads.readADC_SingleEnded(2, 0xE783); // read channel 0
             omronDiff = ads.readADC_Differential(0x8583); // differential channel 2-3
             press = bmesensor.getPressure();
-            temp = bmesensor.getTemperature()-5;
+            temp = bmesensor.getTemperature()-5.0;
             rh = bmesensor.getHumidity();
             uv =  lightsensor.getUV();
             vis = lightsensor.getVIS();
             ir = lightsensor.getIR();
-
-
+  
             //Mount the filesystem
             //sd.mount();
             FILE *fp = fopen(filename, "a");
-            fprintf(fp, "%02d,%02d,%02d,%02d,%02d,%02d,%f,%f,%f,%f,%2.2f,%04.2f,%2.2f,%1.4f,%1.4f,%1.4f,%.0f,%.0f,%.0f,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%f,%f\r\n",Year,Month,Date,Hour,Minutes,Seconds,omronVolt,atmoRho,volflow,massflow,temp,press,rh,accel_x, accel_y, accel_z, mag_x, mag_y, mag_z,uv, vis, ir,omronReading, vInReading, vBlowerReading, omronDiff,gasG.getAmps(), gasG.getVolts(), gasG.getCharge(),digital_pot_set, deltaMflow, deltaVflow);
+            fprintf(fp, "%02d,%02d,%02d,%02d,%02d,%02d,%1.3f,%1.3f,%2.2f,%4.2f,%2.1f,%1.3f,%1.3f,%5.1f,%1.1f,%1.1f,%1.1f,%1.1f,%d,%d,%d,%d,%d,%d,%d,%d,%d,%1.3f,%1.3f\r\n",Year,Month,Date,Hour,Minutes,Seconds,omronVolt,massflow,temp,press,rh,atmoRho,volflow,sampledVol,accel_x,accel_y,accel_z,accel_comp,uv,omronReading, vInReading, vBlowerReading, omronDiff,gasG.getAmps(), gasG.getVolts(), gasG.getCharge(),digital_pot_set, deltaMflow, deltaVflow);
             fclose(fp);
             //Unmount the filesystem
             //sd.unmount();