seniordesign-firmware Changeset - b882d646bb6d

Changeset - b882d646bb6d

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

mkroening@CL-ENS241-07.cedarville.edu - 12 years ago 2013-02-27 16:30:53
mkroening@CL-ENS241-07.cedarville.edu

EEPROM work

2 files changed with 11 insertions and 10 deletions:

slave/slave/lib/inputOutput.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ @@ -25,66 +25,68 @@ int8_t moduleID; // Slave Module ID from @@
 	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 = 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)
+	{
 		moduleID = i2c_read(EEPROM_ADDR, 0x05);
+	}
 */
  //moduleID = i2c_read(EEPROM_ADDR, 0x05);
 	*/
 	//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;

slave/slave/slave.c

➞

Show inline comments

@@ @@ -26,93 +26,92 @@ @@
 #include "lib/led.h"
 #include "lib/inputOutput.h"
 #include "lib/i2c.h"
 #include "lib/spi.h"
 #include "lib/geiger.h"
 #include "lib/sensors.h"
 #include "lib/cameras.h"
 #include "lib/loopTimer.h"
 #include "lib/masterComm.h"
 void micro_setup()
+{
 	// Generic microcontroller config options
 	sei();	// Enable interrupts
+}
 int main(void)
+{
 	// Writes ID to EEPROM, change for all modules and delete after programming
 	// 0 is for generic setup, 1 is for sensors, 2 is for Geiger, 3 is for cameras
+	//i2c_write(EEPROM_ADDR, 0x05, 0x01);
 	// Initialize
 	micro_setup();			// Generic microcontroller config options
 	time_setup();			// Setup loop timer and interrupts (TIMER0)
 	led_configure();		// Configure ports and registers for LED operation
 	io_configure();			// Configure IO ports and registers
 	i2c_init();				// Setup I2C
 	serial0_setup();		// Config serial port
 	io_readModuleId();
 	modules_setup(io_getModuleId());	// Run setup functions for specific module
 	// Serial output //DEBUG
 	char buff[128];						//Buffer for serial output //DEBUG
 	serial0_sendString("Starting Slave\r\n");	//DEBUG
     while(1)
+    {
 		// Master communication
 		masterComm_checkParser();	//Checks parser for data requests from master
 		// Main slave operations
 		if ((time_millis() % SENSOR_LOOP) == 0)	// Uses program timer to run every so often. Time interval defined in config.h
+		{
 			led_on(0);
 			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)
 			i2c_write(EEPROM_ADDR, 0x05, 0x01);
 			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
 			//serial0_sendString(buff); //DEBUG
 			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
 			serial0_sendString(buff); //DEBUG
 			_delay_ms(1);		// Delay to prevent the sensor loop from running again before time_millis changes
 			led_off(0);
 			led_off(2);
 			led_output(i2c_read(EEPROM_ADDR, 0x05));
 			//led_output(i2c_read(EEPROM_ADDR, 0x05));	// Debugging, delete
 			//led_output(io_getModuleId());
+		}
+    }
 	return 0;
+}
 		/********Examples of data reading and getting******************
 		x = geiger_getCpm();				//Data get
 		x = sensors_getSpiTemp();			//Data get
 		x = sensors_getBoardTemp();			//Data get
 		sensors_readSpiTemp();				//Data Read
 		sensors_readBoardTemp();			//Data Read
 		led_output(0xFF);					//Output value to LED array
 		i2c_write(RTC_ADDR, 0x05, 0x3A);	//i2c Write Example
 		PORTA &= ~(1 << PA1);	//OFF
 		PORTA |= (1 << PA1);	//ON

0 comments (0 inline, 0 general)