seniordesign-firmware Changeset - c7c9ce2b01e3

Changeset - c7c9ce2b01e3

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

mkroening@CL-ENS241-07.cedarville.edu - 12 years ago 2013-02-14 16:31:59
mkroening@CL-ENS241-07.cedarville.edu

Lux edit

4 files changed with 26 insertions and 13 deletions:

slave/slave/lib/sensors.c

slave/slave/lib/sensors.h

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/sensors.c

➞

Show inline comments

@@ @@ -19,13 +19,17 @@ @@
 int16_t	spiTemp;	// Thermocouple Temperature (from spi)
 int8_t	boardTemp;	// Board Temperature (from i2c)
 //Should these two be int16_t?  CHANGED TO INT32 BASED ON DATASHEET
 int32_t ut;			// Temperature from BMP085 (from i2c)
 int32_t up;			// Pressure from BMP085 (from i2c)
 uint16_t humid;		// Humidity (from i2c)
 uint8_t light;		// Lux reading (from i2c)
 uint8_t lightH;		// Higher byte from light sensor (from i2c)
 uint8_t lightL;		// Lower byte from light sensor
 uint8_t exponent;	// Exponent for Lux
 uint8_t mantissa;	// Mantissa for Lux
 uint32_t lux;		// Calculated Lux value
 int8_t batt;		// Read battery voltage from ADC
 int16_t ac1;		// The following 11 variables are the calibration values for the BMP085
 int16_t ac2;
 int16_t ac3;
 uint16_t ac4;
@@ @@ -191,19 +195,28 @@ 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;
+}
-void sensors_readLight()
+void sensors_readLux()
+{
 	// FOR FIRST BYTE:
 	light = i2c_read(LIGHT_ADDR, 0x03);
 	// exponent = 8xE3 + 4xE2 + 2xE1 + E0
 	// mantissa = 8xM7 + 4xM6 + 2xM5 + M4
 	// light = 2^(exponent)*mantissa*0.72
 	lightH = i2c_read(LIGHT_ADDR, 0x03);
 	lightL = i2c_read(LIGHT_ADDR, 0x04);
 	exponent = lightH;
 	exponent = exponent >> 4;
 	lightH = lightH << 4;
 	mantissa = lightH | lightL;
 	//mantissa = mantissa << 4;
 	//mantissa = mantissa >> 4;
 	//lux = (pow(2, exponent) * (float)(mantissa * 0.045));
 	lux = (float)(pow(2,exponent) * mantissa) * 0.045;
 	// FOR BOTH BYTES:
 	// light = light << 4;
 	// light = light | (0x0F & i2c_read(LIGHT_ADDR, 0x04));  //  This can be used to read in the 4 LSBs from the second register
 	// exponent = 8xE3 + 4xE2 + 2xE1 + E0
 	// mantissa = 128xM7 + 64xM6 + 32xM5 + 16xM4 + 8xM3 + 4xM2 + 2xM1 + M0
@@ @@ -232,15 +245,15 @@ int32_t sensors_getPressure(void) // Get @@
 uint16_t sensors_getHumid(void)			// Gets relative humidity from variable
+{
 	return humid;
+}
-uint8_t sensors_getLight(void)		// Gets light from variable
+uint32_t sensors_getLux(void)		// Gets light from variable
+{
-	return light;
+	return lux;
+}
 //possibly uint8_t
 int8_t sensors_getBatt(void)		// Gets battery voltage from variable
+{
 	return batt;

slave/slave/lib/sensors.h

➞

Show inline comments

@@ @@ -12,18 +12,18 @@ @@
 void sensors_setupPressure(void);	// Reads pressure calibration values
 void sensors_readSpiTemp(void);		// Reads spi temperature
 void sensors_readBoardTemp(void);	// Reads board temperature
 void sensors_readPressure(void);	// Reads pressure
 void sensors_readHumid(void);		// Reads humidity
-void sensors_readLight(void);		// Reads lux
+void sensors_readLux(void);		// Reads lux
 void sensors_readBatt(void);
 int16_t sensors_getSpiTemp(void);	// Gets spi temperature from variable
 int8_t sensors_getBoardTemp(void);	// Gets board temperature from variable
 int32_t sensors_getPressure(void);	// Gets pressure from variable
 uint16_t sensors_getHumid(void);	// Gets humidity from variable
-uint8_t sensors_getLight(void);		// Gets lux from variable
+uint32_t sensors_getLux(void);		// Gets lux from variable
 int8_t sensors_getBatt(void);		// Gets battery voltage from variable
 uint32_t sensors_getAltitude(void);		// Gets altitude from variable
 #endif /* SENSORS_H_ */
@@ \ No newline at end of file @@

slave/slave/modules.c

➞

Show inline comments

@@ @@ -122,13 +122,13 @@ @@
+ {
 	// 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_readLight();				//Data Read
+	sensors_readLux();				//Data Read
 	sensors_readBatt();
+ }
  void modules_geiger()
+ {

slave/slave/slave.c

➞

Show inline comments

@@ @@ -79,14 +79,14 @@ int main(void) @@
 			led_on(0);
 			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 |Light: %u |Pressure: %lu |Altitude: %lu \r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLight(),sensors_getPressure(),sensors_getAltitude()); //DEBUG
 			//serial0_sendString(buff); //DEBUG
 			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu \r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude()); //DEBUG
 			serial0_sendString(buff); //DEBUG
 			_delay_ms(2);		// Delay to prevent the sensor loop from running again before time_millis changes
 			led_off(0);
 			led_off(2);
+		}

0 comments (0 inline, 0 general)