diff --git a/slave/slave/config.h b/slave/slave/config.h --- a/slave/slave/config.h +++ b/slave/slave/config.h @@ -31,7 +31,7 @@ #define SENSOR_LOOP 200 // Frequency of sensor reads (in ms) (should be 200) #define HEATER_THRESHOLD 0 // Temperature threshold in Fahrenheit where heater is activated #define CAMERA_FREQ 30000 // Camera pulse frequency (Should be 30000 for 30 Secs) -#define CAMERA_PULSE 500 // Camera pulse duration +#define CAMERA_PULSE 400 // Camera pulse duration //I2C Addresses #define EEPROM_ADDR 0xA0 // Read 0xA1 - Write 0xA0 diff --git a/slave/slave/lib/i2c.c b/slave/slave/lib/i2c.c --- a/slave/slave/lib/i2c.c +++ b/slave/slave/lib/i2c.c @@ -349,7 +349,11 @@ uint16_t i2c_humidRead() dataL = i2c_readNak(); i2c_stop(); - data = data << 8; + //data = data << 8; + //data = data | dataL; + + data = data << 10; //Need this to drop S1 and S0? + data = data >> 2; data = data | dataL; return data; diff --git a/slave/slave/lib/sensors.c b/slave/slave/lib/sensors.c --- a/slave/slave/lib/sensors.c +++ b/slave/slave/lib/sensors.c @@ -186,9 +186,9 @@ void sensors_readPressure() x1 = (x1 * 3038) >> 16; x2 = (-7357 * pressure) >> 16; pressure += (x1 + x2 + 3791) >> 4; //This is the final value for our pressure - pressure = pressure - 21000; // Linear Offset for actual pressure + pressure = pressure - 20750; // Linear Offset for actual pressure - altitude = (float)44330 * (1 - pow(((float) pressure/101325), 0.190295)); // 101325 THIS IS IN METERS + altitude = (float)44330 * (1 - pow(((float) pressure/105225), 0.190295)); // 101325 THIS IS IN METERS altitude = altitude * 3.2804; //THIS IS IN FEET } @@ -201,7 +201,7 @@ void sensors_readHumid() //calculations to relative humidity: humid = (humid/((2^14) - 1))*100% >> is divide by power, << is multiply by power, 2^14-1 = 16383 //humid = (humid / 16383) * 100; - humid = (humid / 10100) * 100; + //humid = (humid / 2500) * 100; } void sensors_readLux()