seniordesign-firmware Changeset - bbe7bcc4bf57

Changeset - bbe7bcc4bf57

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-03-28 15:04:31
kripperger@CL-SEC241-09.cedarville.edu

Humidity debugging

4 files changed with 4 insertions and 4 deletions:

slave/slave/config.h

slave/slave/lib/sensors.c

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/config.h

➞

Show inline comments

@@ @@ -34,13 +34,13 @@ @@
 #define CAMERA_PULSE 500			// Camera pulse duration
  //I2C Addresses
  #define EEPROM_ADDR 0xA0		// Read 0xA1 - Write 0xA0
  #define BOARDTEMP_ADDR 0x90	// Read 0x91 - Write 0x90
  #define PRESSURE_ADDR 0xEE		// Read 0xEF - Write 0xEE
- #define HUMID_ADDR 0x26		// Read 0x27 - Write 0x26
+ #define HUMID_ADDR 0x27		// Read 0x28 - Write 0x27
  #define LIGHT_ADDR 0x94		// Read 0x95 - Write 0x94
  #define ACCEL_ADDR	0x38		// Read 0x39 - Write 0x38
  #define RTC_ADDR 0xB2			//DEBUG [Used for testing]      // Read 0xA3 - Write 0xA2

slave/slave/lib/sensors.c

➞

Show inline comments

@@ @@ -192,13 +192,13 @@ void sensors_readPressure() @@
 void sensors_readHumid()
+{
 	humid = i2c_read16(HUMID_ADDR);
 	//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 / 16383) * 100;
+}
 void sensors_readLux()
+{
 	lightH = i2c_read(LIGHT_ADDR, 0x03);
 	lightL = i2c_read(LIGHT_ADDR, 0x04);

slave/slave/modules.c

➞

Show inline comments

@@ @@ -130,13 +130,13 @@ @@
  void modules_sensors()
+ {
 	// Gathers data and performs functions for sensor daughter board
 	sensors_readBoardTemp();		//Data Read
 	sensors_readSpiTemp();			//Data Read
 	sensors_readPressure();			//Data Read
-	//sensors_readHumid();			//Data Read
 	sensors_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
+ }
  void modules_geiger()
+ {

slave/slave/slave.c

➞

Show inline comments

@@ @@ -91,13 +91,13 @@ int main(void) @@
 			sensors_readBatt();				// Read Battery level
 			sensors_readBoardTemp();		// Read board temperature sensor (Common on all slaves) (Data Read)
 			modules_run(io_getModuleId());	// Runs specific module functions (like data reading)
 			io_regulateTemp();			// Gets board temperature and enables heater if below threshold
 			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu |Battery: %u \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt()); //DEBUG
+			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu |Battery: %u |Humidity: %u \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt(),sensors_getHumid()); //DEBUG
 			serial1_sendString(buff); //DEBUG
 			led_off(0);
 			lastLoop = time_millis();
 // Writes ID to EEPROM, change for all modules and delete after programming

0 comments (0 inline, 0 general)