Skip to content

Commit 42734f9

Browse files
committed
data raw conversion implemented when you set DataRaw to true in Constants.h file
1 parent c770403 commit 42734f9

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed

sck_beta_v0_8_6_SDCARD/SCKAmbient.ino

100755100644
Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,11 @@ float kr= ((float)P1*1000)/RES; //Constante de conversion a resistencia de p
235235
#if DataRaw
236236
lastTemperature = sckReadSHT21(0xE3); // Datos en RAW para conversion por plataforma
237237
lastHumidity = sckReadSHT21(0xE5); // Datos en RAW para conversion por plataforma
238-
#else
239-
lastTemperature = (-46.85 + 175.72 / 65536.0 * (float)(sckReadSHT21(0xE3)))*10; // formula original
240-
lastHumidity = (-6.0 + 125.0 / 65536.0 * (float)(sckReadSHT21(0xE5)))*10; // formula orginal
238+
#else
239+
//T = -53 + 175.72 / 65536.0 * ( Traw * 10 )
240+
lastTemperature = (-50 + 175.72 / 65536.0 * ( sckReadSHT21(0xE3))) * 10 ;
241+
//H = 7 + 125.0 / 65536.0 * ( Hraw * 10 )
242+
lastHumidity = (4 + 125.0 / 65536.0 * ( sckReadSHT21(0xE5))) * 10 ;
241243
#endif
242244

243245
#if debuggSCK
@@ -482,7 +484,24 @@ float kr= ((float)P1*1000)/RES; //Constante de conversion a resistencia de p
482484

483485
#if F_CPU == 8000000
484486
#if DataRaw==false
485-
dB = 0.0222*mVRaw + 58.006;
487+
//dB = 0.0222*mVRaw + 58.006;
488+
//aplicar aqui conversion
489+
if(mVRaw<=5){
490+
dB = (5+44*mVRaw)/5;
491+
}else if(mVRaw<=15){
492+
dB = (195 + 8*mVRaw)/5;
493+
}else if(mVRaw<=40){
494+
dB = (1220 + 4*mVRaw)/20;
495+
}else if(mVRaw <= 300){
496+
//y=69.242283950617+0.038618827160494x
497+
dB = (69.242283950617 + 0.038618827160494*mVRaw);
498+
}else if(mVRaw <= 950){
499+
//y=76.744423542059+0.013363343187315x
500+
dB = (76.744423542059+0.013363343187315*mVRaw);
501+
} else {
502+
//y=80.167357356927+0.0085240259833374x
503+
dB = (80.167357356927+0.0085240259833374*mVRaw);
504+
}
486505
#endif
487506
#else
488507
#if DataRaw==false

sck_beta_v0_8_6_SDCARD/SDUpdate.ino

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ void txDebugSD() {
109109
Serial.println(UNITS[i]);
110110
}
111111
Serial.print(SENSOR[9]);
112+
Serial.print(": ");
112113
Serial.println(sckRTCtime());
113114
Serial.println(F("*******************"));
114115
}
@@ -123,6 +124,9 @@ void txHeader() {
123124
for (int i=0; i<8; i++)
124125
{
125126
myFile.print(SENSOR[i]);
127+
myFile.print(" (");
128+
myFile.print(UNITS[i]);
129+
myFile.print(") ");
126130
myFile.print(", ");
127131
}
128132
myFile.print(SENSOR[9]);

0 commit comments

Comments
 (0)