6 sharps, 2 ads hooked up
Dependencies: ADS1115 BME280 CronoDot SDFileSystem mbed
Fork of Outdoor_UPAS_v1_2_Tboard by
Diff: main.cpp
- Revision:
- 34:da333abe3476
- Parent:
- 33:03d0e7f5ef0a
- Child:
- 35:e0bdd6389a75
diff -r 03d0e7f5ef0a -r da333abe3476 main.cpp --- a/main.cpp Mon Apr 25 21:32:27 2016 +0000 +++ b/main.cpp Wed Apr 27 02:57:13 2016 +0000 @@ -559,8 +559,8 @@ if(pumps == 1){ - omronReading = ads.readADC_SingleEnded(0, 0xC583); // read channel 0 PGA = 2 : Full Scale Range = 2.048V - omronVolt = (omronReading*4.096)/(32768*2); + omronReading = ads.readADC_SingleEnded(0, 0xC383); // read channel 0 PGA = 2 : Full Scale Range = 2.048V + omronVolt = (omronReading*4.096)/(32768*1); if(omronVolt<=calibrations.omronVMin) { massflow = calibrations.omronMFMin; @@ -613,8 +613,8 @@ { //RGB_LED.set_led(0,1,0); - omronReading = ads.readADC_SingleEnded(0, 0xC583); // read channel 0 PGA = 2 : Full Scale Range = 2.048V - omronVolt = (omronReading*4.096)/(32768*2); + omronReading = ads.readADC_SingleEnded(0, 0xC383); // read channel 0 PGA = 2 : Full Scale Range = 2.048V + omronVolt = (omronReading*4.096)/(32768*1); if(omronVolt<=calibrations.omronVMin) { massflow = calibrations.omronMFMin; @@ -917,8 +917,8 @@ fclose(fp); - omronReading = ads.readADC_SingleEnded(0, 0xC583); // read channel 0 PGA = 2 : Full Scale Range = 2.048V - omronVolt = (omronReading*4.096)/(32768*2); + omronReading = ads.readADC_SingleEnded(0, 0xC383); // read channel 0 PGA = 2 : Full Scale Range = 2.048V + omronVolt = (omronReading*4.096)/(32768*1); if(omronVolt<=calibrations.omronVMin) { massflow = calibrations.omronMFMin; } else if(omronVolt>=calibrations.omronVMax) { @@ -935,8 +935,8 @@ /* while(abs(deltaMflow)>.025) { - omronReading = ads.readADC_SingleEnded(0, 0xC583); // read channel 0 PGA = 2 : Full Scale Range = 2.048V - omronVolt = (omronReading*4.096)/(32768*2); + omronReading = ads.readADC_SingleEnded(0, 0xC383); // read channel 0 PGA = 2 : Full Scale Range = 2.048V + omronVolt = (omronReading*4.096)/(32768*1); //Mass Flow tf from file: UPAS v2 OSU-PrimaryFlowData FullSet 2015-05-29 CQ mods.xlsx if(omronVolt<=calibrations.omronVMin) { massflow = calibrations.omronMFMin;