seniordesign-firmware Changeset - 6646841229cc

Changeset - 6646841229cc

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

mkroening@CL-ENS241-07.cedarville.edu - 12 years ago 2013-04-04 17:01:04
mkroening@CL-ENS241-07.cedarville.edu

Humid and press

3 files changed with 10 insertions and 10 deletions:

slave/slave/lib/i2c.c

slave/slave/lib/inputOutput.c

slave/slave/lib/sensors.c

0 comments (0 inline, 0 general)

slave/slave/lib/i2c.c

➞

Show inline comments

@@ @@ -324,36 +324,34 @@ uint16_t i2c_read16(unsigned char addr) @@
 	dataL = i2c_readNak();
 	i2c_stop();
 	data = data << 8;
 	data = data | dataL;
 	return data;
 }/* i2c_read16 */
 uint16_t i2c_humidRead()
+{
 	uint16_t   data;
 	uint8_t   dataL;
 	//i2c_start_wait(HUMID_ADDR+I2C_WRITE);	// set device address and write mode
 	//i2c_rep_start(HUMID_ADDR+I2C_READ);   // set device address and read mode
 	i2c_start(HUMID_ADDR+I2C_WRITE);	// Measurement Request
 	i2c_stop();					// Stop
 	i2c_start(HUMID_ADDR+I2C_READ);		// Measurement Request
 	i2c_readAck();               // read one byte
 	i2c_readNak();
 	data = i2c_readAck();               // read one byte
-	dataL = i2c_readAck();
+	dataL = i2c_readNak();
 	i2c_stop();
 	data = data << 8;
 	data = data | dataL;
 	return data;
+}
@@ \ No newline at end of file @@

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ @@ -22,66 +22,66 @@ int8_t moduleID; // Slave Module ID from @@
 	DDRC &= ~(1 << DDC3);		// Set PC3 to input for rotary dip
 	DDRC &= ~(1 << DDC4);		// Set PC4 to input for rotary dip
 	DDRC &= ~(1 << DDC5);		// Set PC5 to input for rotary dip
 	DDRA &= ~(1 << DDA7);		// Set PA7 to input for battery voltage divider
 	//ADC register configurations for battery level detection on PA7
 	ADCSRA |= (1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0);	// Set prescaler for ADC, 128 gives ADC freq of 125 KHz
 	ADMUX |= (1 << REFS0);									// Set ADC reference voltage to AVCC
 	//ADMUX |= (1 << ADLAR);								// Sets 10 bit ADC to 8 bit
 	ADMUX |= (1 << MUX2) | (1 << MUX1) | (1 << MUX0);		// Select ADC7 as the conversion channel
 	ADCSRA |= (1 << ADATE);									// Enables auto trigger, determined in ADCSRB bits ADTS
 	//ADCSRA |= (1 << ADIF);								//
 	//ADCSRA |= (1 << ADIE);								// ADC interrupt enable set
 	ADCSRB &= ~((1 << ADTS2) | (1 << ADTS1) | (1 << ADTS0));// Set ADC auto trigger source to free running mode
 	ADCSRA |= (1 << ADEN);									// Enable ADC
 	ADCSRA |= (1 << ADSC);									// Start ADC measurements.  ADC should now continuously run conversions, which are stored in ADCH 0x79
+ }
  void io_readModuleId()
+ {
 	// Get ID from rotary dip and return it.
-	moduleID = 2;
+	moduleID = 0;
 	/*
 	// This method is temporary as the next release will read the module ID from EEPROM
 	PORTC |= (1 << PC2);	// Pull pins on rotary dip high
 	PORTC |= (1 << PC3);	// Pull pins on rotary dip high
 	PORTC |= (1 << PC4);	// Pull pins on rotary dip high
 	PORTC |= (1 << PC5);	// Pull pins on rotary dip high
 	moduleID = ((PINC & 0b00011100) >> 2);		// Read Dip Encoder
 	moduleID = ~moduleID;						//Invert Dip reading
 	moduleID = (moduleID & 0b0111);				//Mask bits
 	*/
 	//while(moduleID==0)           //UNCOMMENT ALL THIS
 	//{
 	//	moduleID = i2c_read(EEPROM_ADDR, 0x05);
 	//}
 	while(moduleID==0)           //UNCOMMENT ALL THIS
+	{
 		moduleID = i2c_read(EEPROM_ADDR, 0x05);
+	}
+ }
  uint8_t io_getModuleId()
+ {
 	return moduleID;
+ }
  void io_heaterOn()
+ {
 	PORTB |= (1 << PB4);	//ON
+ }
  void io_heaterOff()
+ {
 	PORTB &= ~(1 << PB4);	//OFF
+ }
  uint8_t io_heaterStatus()
+ {
 	 uint8_t state;
 	 state = 0;

slave/slave/lib/sensors.c

➞

Show inline comments

@@ @@ -165,62 +165,64 @@ void sensors_readPressure() @@
 	b3 = ((ac1 * 4 + x3) + 2) / 4;
 	//calculate b4
 	x1 = (ac3 * b6) >> 16;
 	x2 = (b1 * ((b6 * b6) >> 12)) >> 16;
 	x3 = ((x1 + x2) + 2) >> 2;
 	b4 = (ac4 * (x3 + 32768)) >> 15;
 	b7 = (up - b3) * 50000;
 	if (b7 < 0x80000000)
+	{
 		pressure = (b7 << 1) / b4;
+	}
 	else
+	{
 		pressure = (b7 / b4) << 1;
+	}
 	x1 = (pressure >> 8) * (pressure >> 8);
 	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 (Debug?)
+	pressure = pressure - 21000;	// Linear Offset for actual pressure
 	altitude = (float)44330 * (1 - pow(((float) pressure/101325), 0.190295));	// 101325
 	altitude = (float)44330 * (1 - pow(((float) pressure/101325), 0.190295));	// 101325 THIS IS IN METERS
 	altitude = altitude * 3.2804;	//THIS IS IN FEET
+}
 void sensors_readHumid()
+{
 	//i2c_write(HUMID_ADDR, 0x00, 0x00);		//Measurement Request
 	//humid = i2c_read16(HUMID_ADDR);
 	humid = i2c_humidRead();
 	//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;
+}
 void sensors_readLux()
+{
 	lightH = i2c_read(LIGHT_ADDR, 0x03);
 	lightL = i2c_read(LIGHT_ADDR, 0x04);
 	exponent = lightH;
 	exponent = exponent >> 4;
 	lightH = lightH << 4;
 	mantissa = lightH | lightL;
 	lux = (float)(pow(2,exponent) * mantissa) * 0.045;
+}
 void sensors_readBatt()
+{
 	battL = ADCL;					// Read low battery byte from ADC (all 8 bits)
 	batt = ADCH;					// Read high battery byte from ADC (only two LSBs)
 	batt = batt << 8;
 	batt |= battL;
 	vBatt = (batt * 10.0) / 67.4;
+}

0 comments (0 inline, 0 general)