Changeset - 37e2258751ea
Parent rev.
Child rev.
[Not reviewed]
Merge default
0 4 0
ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-03-15 16:31:36
ethanzonca@CL-ENS241-08.cedarville.edu
merge
4 files changed with 21 insertions and 10 deletions:
slave/slave/lib/inputOutput.c
4
4
slave/slave/modules.c
2
slave/slave/slave.c
11
4
slave/slave/slave.cproj
6
0 comments (0 inline, 0 general)
slave/slave/lib/inputOutput.c
➞
Show inline comments
 
@@ -54,16 +54,16 @@ int8_t	moduleID;	// Slave Module ID from
 
 
	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);
 
	}
 
//	while(moduleID==0)           //UNCOMMENT ALL THIS
 
//	{
 
//		moduleID = i2c_read(EEPROM_ADDR, 0x05);
 
//	}
 
 }
 
 
 
 uint8_t io_getModuleId()
 
 {
 
	return moduleID;
slave/slave/modules.c
➞
Show inline comments
 
@@ -97,14 +97,12 @@
 
	ASSR &= ~(1 << EXCLK);	// Disable external clock input (enabling crystal use)
 
	ASSR |= (1 << AS2);		// Enable timer2 async mode with an external crystal
 
	_delay_ms(250);			// Let external 32KHz crystal stabilize
 
	TCCR2B = 0x05;			// Set the prescaler to 128: 32.768kHz / 128 = 1Hz overflow
 
	TIFR2 = 0x01;			// Reset timer2 overflow interrupt flag
 
	TIMSK2 = 0x01;			// Enable interrupt on overflow
 
 
	sei();					// Enable all interrupts
 
 }
 
 
 
 
 void modules_cameras_setup()
 
 {
slave/slave/slave.c
➞
Show inline comments
 
@@ -29,13 +29,13 @@
 
#include "lib/spi.h"
 
#include "lib/geiger.h"
 
#include "lib/sensors.h"
 
#include "lib/cameras.h"
 
#include "lib/loopTimer.h"
 
#include "lib/masterComm.h"
 

			




	
	
	
		
 
#include "lib/watchdog.h"

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
void micro_setup()

			




	
	
	
		
 
{

			




	
	
	
		
 
	// Generic microcontroller config options

			




	
	
	
		
 
	sei();	// Enable interrupts

			




	
	
		
 
@@ -46,15 +46,19 @@ void micro_setup()

			




	
	
	
		
 
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, 0x03);

			




	
	
	
		
 
		

			




	
	
	
		
 
	// Initialize		

			




	
	
	
		
 
	// Power debounce

			




	
	
	
		
 
	_delay_ms(20);

			




	
	
	
		
 
		

			




	
	
	
		
 
	// Initialize	

			




	
	
	
		
 
	micro_setup();			// Generic microcontroller config options

			




	
	
	
		
 
	time_setup();			// Setup loop timer and interrupts (TIMER0)

			




	
	
	
		
 
	//watchdog_setup();		// Setup watchdog timer

			




	
	
	
		
 
	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();

			




	
	
		
 
@@ -67,14 +71,17 @@ int main(void)

			




	
	
	
		
 
			

			




	
	
	
		
 
    while(1)

			




	
	
	
		
 
    {	

			




	
	
	
		
 
		

			




	
	
	
		
 
		// Master communication

			




	
	
	
		
 
		masterComm_checkParser();	//Checks parser for data requests from master

			




	
	
	
		
 
		

			




	
	
	
		
 
		

			




	
	
	
		
 
		led_on(0);

			




	
	
	
		
 
		led_on(1);

			




	
	
	
		
 
		led_on(2);

			




	
	
	
		
 
		led_on(3);

			




	
	
	
		
 
		io_heaterOn();

			




	
	
	
		
 
		// 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

			




        

    


    
    

    

        

                

                    slave/slave/slave.cproj
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -205,12 +205,18 @@

			




	
	
	
		
 
    <Compile Include="lib\spi.c">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




	
	
	
		
 
    <Compile Include="lib\spi.h">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




	
	
	
		
 
    <Compile Include="lib\watchdog.c">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




	
	
	
		
 
    <Compile Include="lib\watchdog.h">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




	
	
	
		
 
    <Compile Include="modules.c">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




	
	
	
		
 
    <Compile Include="modules.h">

			




	
	
	
		
 
      <SubType>compile</SubType>

			




	
	
	
		
 
    </Compile>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-756375
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support