seniordesign-firmware Changeset - 632be4bc87e2

Changeset - 632be4bc87e2

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-02-21 15:33:58
kripperger@CL-SEC241-09.cedarville.edu

ADC edits

3 files changed with 4 insertions and 4 deletions:

slave/slave/lib/inputOutput.c

slave/slave/lib/sensors.c

slave/slave/lib/sensors.h

0 comments (0 inline, 0 general)

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ int8_t moduleID; // Slave Module ID from @@
 	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
+	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
+ }

slave/slave/lib/sensors.c

➞

Show inline comments

@@ @@ -251,13 +251,13 @@ uint16_t sensors_getHumid(void) // Get @@
 uint32_t sensors_getLux(void)		// Gets light from variable
+{
 	return lux;
+}
 //possibly uint8_t
-int8_t sensors_getBatt(void)		// Gets battery voltage from variable
+uint8_t sensors_getBatt(void)		// Gets battery voltage from variable
+{
 	return batt;
+}
 uint32_t sensors_getAltitude(void)
+{

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_readLux(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
 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
 uint32_t sensors_getAltitude(void);	// Gets altitude from variable
 #endif /* SENSORS_H_ */
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)