Changeset - d39ec58232af
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-04-05 01:09:00
kripperger@CL-SEC241-09.cedarville.edu
attempts to fix spi
3 files changed with 13 insertions and 13 deletions:
slave/slave/lib/sensors.c
1
1
slave/slave/modules.c
11
11
slave/slave/slave.c
1
1
0 comments (0 inline, 0 general)
slave/slave/lib/sensors.c
➞
Show inline comments
 
@@ -176,49 +176,49 @@ void sensors_readPressure()
 
	{
 
		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 - 20750;	// Linear Offset for actual pressure
 
 
	altitude = (float)44330 * (1 - pow(((float) pressure/105225), 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();
 
//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 / 2500) * 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)
slave/slave/modules.c
➞
Show inline comments
 
/*
 
 * modules.c
 
 *
 
 * Created: 11/9/2012 11:44:22 AM
 
 *  Author: kripperger
 
 */
 
 
 #include <inttypes.h>
 
 #include <avr/io.h>
 
 #include <avr/interrupt.h>
 
 #include "config.h"
 
 #include <util/delay.h>
 
 #include "modules.h"
 
 #include "lib/spi.h"
 
 #include "lib/i2c.h"
 
 #include "lib/sensors.h"
 
 #include "lib/loopTimer.h"
 
 #include "lib/led.h"
 
 
 uint32_t lastPicture;
 
 uint32_t lastRefresh;	// Time in ms when last geiger refresh occurred
 
// uint32_t lastRefresh;	// Time in ms when last geiger refresh occurred
 
 
 void modules_setup(uint8_t id)
 
 {
 
	switch(id)
 
	{
 
		case 0:
 
			modules_generic_setup();
 
			break;
 
 
		case 1:
 
			modules_sensors_setup();
 
			break;
 
 
		case 2:
 
			modules_geiger_setup();
 
			break;
 
 
		case 3:
 
			modules_cameras_setup();
 
			break;
 
 
		default:
 
			modules_generic_setup();
 
			break;
 
@@ -70,106 +70,106 @@
 
		default:
 
			modules_generic();
 
			break;
 
	}
 
 
 }
 
 
 
 void modules_generic_setup()
 
 {
 
 
 }
 
 
 void modules_sensors_setup()
 
 {
 
	DESELECT_TEMP;
 
	setup_spi();
 
	sensors_setupPressure();
 
 }
 
 
 void modules_geiger_setup()
 
 {
 
	// Pin setup
 
	DDRA &= ~(1 << DDA0);	// PA0 is an input
 
	DDRA |= (1 << DDA1);	// PA1 is an output
 
	//DDRA |= (1 << DDA1);	// PA1 is an output	///////////
 
 
	geiger_on();	// Turn on HV supply
 
	//geiger_on();	// Turn on HV supply	//////////////
 
 
	// Setup for interrupt input on PA0 (PCINT0)
 
	//PCMSK0 |= (1 << PCINT0);	// Enable interrupt for PA0
 
	//PCICR |= (1 << PCIE0);		// Enable ioc section PCIF0
 
	PCMSK0 |= (1 << PCINT0);	// Enable interrupt for PA0
 
	PCICR |= (1 << PCIE0);		// Enable ioc section PCIF0
 
 
	// Setup for interrupt from Timer2
 
	ASSR &= ~(1 << EXCLK);	// Disable external clock input (enabling crystal use)
 
	ASSR |= (1 << AS2);		// Enable timer2 async mode with an external crystal
 
	_delay_ms(100);			// 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
 
 }
 
 
 
 
 void modules_cameras_setup()
 
 {
 
	 lastPicture = time_millis();
 
 
	 DDRA |= (1 << DDA0);	// Set PA0 to Output for Camera
 
	 DDRA |= (1 << DDA1);	// Set PA1 to Output for Camera
 
	 DDRA |= (1 << DDA2);	// Set PA2 to Output for Camera
 
	 DDRA |= (1 << DDA3);	// Set PA3 to Output for Camera
 
 }
 
 
 
 void modules_generic()
 
 {
 
	// Gathers data and performs functions for generic daughter board
 
 
 
 }
 
 
 void modules_sensors()
 
 {
 
	// 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_readHumid();			//Data Read
 
	sensors_readLux();				//Data Read
 
 
 }
 
 
 void modules_geiger()
 
 {
 
	// No data gatering function needed for geiger daughter board
 
		// This is taken care of in interrupt (See geiger.c)
 
 
		lastRefresh = time_millis();
 
		if ((time_millis() - lastRefresh) > 1000000)
 
		{
 
			geiger_refresh();	//Refreshes every 1000sec (16min)
 
		}
 
		//lastRefresh = time_millis();
 
		//if ((time_millis() - lastRefresh) > 1000000)
 
		//{
 
		//	geiger_refresh();	//Refreshes every 1000sec (16min)
 
		//}
 
 
 }
 
 
 void modules_cameras()
 
 {
 
 
	// Gathers data and performs functions for cameras daughter board
 
 
		//cameras_readAccelXYZ();
 
 
		if ((time_millis() - lastPicture) > CAMERA_FREQ)
 
		{
 
			cameras_sendPulse();
 
			lastPicture = time_millis();
 
		}
 
		else if ((time_millis() - lastPicture) > CAMERA_PULSE)
 
		{
 
			PORTA &= ~(1 << PA0);	// Pull pin on usb low
 
			PORTA &= ~(1 << PA1);	// Pull pin on usb low
 
			PORTA &= ~(1 << PA2);	// Pull pin on usb low
 
			PORTA &= ~(1 << PA3);	// Pull pin on usb low
 
		}
 
 }
 
 
\ No newline at end of file
slave/slave/slave.c
➞
Show inline comments
 
@@ -73,49 +73,49 @@ int main(void)
 
	uint32_t lastLoop = 0;	// Time in ms when last loop occurred
 
 
	// Serial output //DEBUG
 
	char buff[128];						//Buffer for serial output //DEBUG
 
	serial1_sendString("Starting Slave\r\n");	//DEBUG
 
 
    while(1)
 
    {
 
		wdt_reset();	// Resets WDT (to prevent restart)
 
 
		// Master communication
 
		masterComm_checkParser();	//Checks parser for data requests from master
 

			




	
	
	
		
 
		// Main slave operations

			




	
	
	
		
 
		if ((time_millis() - lastLoop) > SENSOR_LOOP)	// 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)

			




	
	
	
		
 
			

			




	
	
	
		
 
			io_regulateTemp();			// Gets board temperature and enables heater if below threshold

			




	
	
	
		
 

			




	
	
	
		
 
			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Press: %lu |Altitude: %lu |Batt: %u |Humidity: %u |spiTemp: %i \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt(),sensors_getHumid(),sensors_getSpiTemp()); //DEBUG

			




	
	
	
		
 
			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Press: %lu |Altitude: %lu |Batt: %u |spiTemp: %i |Humidity: %u \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt(),sensors_getSpiTemp(),sensors_getHumid()); //DEBUG

			




	
	
	
		
 
			serial1_sendString(buff); //DEBUG

			




	
	
	
		
 
			

			




	
	
	
		
 
			led_off(0);

			




	
	
	
		
 
			lastLoop = time_millis();

			




	
	
	
		
 
			

			




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

			




	
	
	
		
 
			

			




	
	
	
		
 
		}	// IFloop

			




	
	
	
		
 

			




	
	
	
		
 
    }	// While(1)

			




	
	
	
		
 
	

			




	
	
	
		
 
	return 0;

			




	
	
	
		
 
}	// Main

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
		/********Examples of data reading and getting******************

			




	
	
	
		
 
		x = geiger_getCpm();				//Data get

			




	
	
	
		
 
		x = sensors_getSpiTemp();			//Data get

			




	
	
	
		
 
		x = sensors_getBoardTemp();			//Data get

			




        

    



    


    



    



      

      





    
    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