minor updates after testing

This commit is contained in:
mycarda 2021-02-09 11:32:01 +00:00
parent 0304e4ea32
commit 6e64cd753c
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
const char *version_name = "rdzTTGOsonde"; const char *version_name = "rdzTTGOsonde";
const char *version_id = "devel20210205"; const char *version_id = "devel20210209";
const int SPIFFS_MAJOR=2; const int SPIFFS_MAJOR=2;
const int SPIFFS_MINOR=9; const int SPIFFS_MINOR=9;

View File

@ -599,7 +599,6 @@ float GetRAHumidity( uint32_t humCurrent, uint32_t humMin, uint32_t humMax, floa
+ (calibration.value.refCapHigh - calibration.value.refCapLow) * current; + (calibration.value.refCapHigh - calibration.value.refCapLow) * current;
/* Apply calibration */ /* Apply calibration */
float Cp = ( C / calibration.value.calibU[0] - 1.0f) * calibration.value.calibU[1]; float Cp = ( C / calibration.value.calibU[0] - 1.0f) * calibration.value.calibU[1];
Serial.printf("Cp = %f\n", Cp );
int j, k; int j, k;
float sum = 0; float sum = 0;
@ -762,17 +761,18 @@ int RS41::decode41(byte *data, int maxlen)
if ( tempMeasMain > tempMeasRef1 && tempMeasMain < tempMeasRef2 ) { if ( tempMeasMain > tempMeasRef1 && tempMeasMain < tempMeasRef2 ) {
sonde.si()->temperature = GetRATemp( tempMeasMain, tempMeasRef1, tempMeasRef2, sonde.si()->temperature = GetRATemp( tempMeasMain, tempMeasRef1, tempMeasRef2,
calibration.value.calT, calibration.value.taylorT, calibration.value.polyT ); calibration.value.calT, calibration.value.taylorT, calibration.value.polyT );
Serial.printf("tempRA = %f\n", sonde.si()->temperature ); Serial.printf("External temperature = %f\n", sonde.si()->temperature );
} }
else { else {
Serial.println( "External temperature data measurement mismatch"); Serial.println( "External temperature data measurement mismatch");
} }
} }
if ( validHumidity ) { if ( validHumidity && validExternalTemperature ) {
if ( tempHumiMain > tempHumiRef1 && tempHumiMain < tempHumiRef2 ) { if ( tempHumiMain > tempHumiRef1 && tempHumiMain < tempHumiRef2 ) {
sonde.si()->tempRHSensor = GetRATemp( tempHumiMain, tempHumiRef1, tempHumiRef2, sonde.si()->tempRHSensor = GetRATemp( tempHumiMain, tempHumiRef1, tempHumiRef2,
calibration.value.calTU, calibration.value.taylorTU, calibration.value.polyTrh ); calibration.value.calTU, calibration.value.taylorTU, calibration.value.polyTrh );
Serial.printf("Humidity Sensor temperature = %f\n", sonde.si()->tempRHSensor );
sonde.si()->relativeHumidity = GetRAHumidity( humidityMain, humidityRef1, humidityRef2, sonde.si()->tempRHSensor, sonde.si()->temperature ); sonde.si()->relativeHumidity = GetRAHumidity( humidityMain, humidityRef1, humidityRef2, sonde.si()->tempRHSensor, sonde.si()->temperature );
Serial.printf("Relative humidity = %f\n", sonde.si()->relativeHumidity ); Serial.printf("Relative humidity = %f\n", sonde.si()->relativeHumidity );
} }