Changeset - 39ba984f39e8
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
mkroening@CL-ENS241-07.cedarville.edu - 12 years ago 2013-01-24 17:01:40
mkroening@CL-ENS241-07.cedarville.edu
Added sensor register info
4 files changed with 54 insertions and 3 deletions:
slave/slave/config.h
3
2
slave/slave/lib/sensors.c
44
slave/slave/lib/sensors.h
6
slave/slave/slave.cproj
1
1
0 comments (0 inline, 0 general)
slave/slave/config.h
➞
Show inline comments
 
@@ -13,31 +13,32 @@
 
 
//Serial
 
#define USART0_BAUDRATE 115200
 
#define USART1_BAUDRATE 115200
 
 
// Circular serial buffer size. Must be at least MAX_CMD_LEN + 5
 
#define BUFFER_SIZE 32
 
 
// Maximum payload size of command
 
#define MAX_PAYLOAD_LEN 16
 
 
// Number of datatypes to transmit per module type
 
#define DATATYPES_GENERIC 1
 
#define DATATYPES_SENSOR 6
 
#define DATATYPES_GEIGER 2
 
#define DATATYPES_CAMERA 1
 
 
//Sensors and IO
 
#define SENSOR_LOOP 200				// Frequency of sensor reads (in ms)
 
#define HEATER_THRESHOLD 40			// Temperature threshold in Fahrenheit where heater is activated
 
 
 //I2C Addresses
 
 #define EEPROM_ADDR 0xA0		// Read 0xA1 - Write 0xA0
 
 #define BOARDTEMP_ADDR 0x90	// Read 0x91 - Write 0x90
 
 #define PRESSURE_ADDR 0xB1		//THIS VALUE IS WRONG
 
 #define HUMID_ADDR 0xB4		//THIS VALUE IS WRONG
 
 #define PRESSURE_ADDR 0xEF		// Read 0xEF - Write 0xEE
 
 #define HUMID_ADDR 0x27		// Read 0x27 - Write 0x26
 
 #define LIGHT_ADDR 0x95		// Read 0x95 - Write 0x94
 
 #define RTC_ADDR 0xB2			//DEBUG [Used for testing]      // Read 0xA3 - Write 0xA2
 
 
 
 
 #endif /* CONFIG_H_ */
 
\ No newline at end of file
slave/slave/lib/sensors.c
➞
Show inline comments
 
/*
 
 * sensors.c
 
 *
 
 * Created: 11/19/2012 9:25:01 PM
 
 *  Author: kripperger
 
 */
 
 
 
#include <inttypes.h>
 
#include <avr/io.h>
 
#include <avr/interrupt.h>
 
#include "../config.h"
 
#include <util/delay.h>
 
#include "sensors.h"
 
#include "spi.h"
 
#include "i2c.h"
 
 
int16_t	spiTemp;	// Thermocouple Temperature (from spi)
 
int8_t	boardTemp;	// Board Temperature (from i2c)
 
uint16_t pressure;	// Pressure (from i2c)
 
//int humid;		// Humidity (from i2c)
 
uint8_t light;		// Lux reading (from i2c)
 
 
 
void sensors_readSpiTemp()
 
{
 
	// Select TEMP wait 100 microseconds then read four bytes
 
	SELECT_TEMP;
 
	_delay_us(100);
 
	uint8_t one = send_spi(0xFF);
 
	_delay_us(100);
 
	uint8_t two = send_spi(0xFF);
 
	_delay_us(100);
 
	uint8_t three = send_spi(0xFF);
 
	_delay_us(100);
 
	uint8_t four = send_spi(0xFF);
 
	DESELECT_TEMP;
 
 
	int16_t temperature = ((one<<4)|(two>>4));	// Shift and place into larger int. (Cuts off Decimal)
 
	temperature = (temperature & (0x0800)) ? (temperature & 0xF000) : temperature;	// Sign extend
 
 
	//int16_t temperature = ((one<<6)|(two>>2));	// Shift and place into larger int. (Includes Decimal)
 
	//temperature = (temperature & (0x2000)) ? (temperature & 0xC000) : temperature;	// Sign extend
 
 
	temperature = (two & 0x01) ? 0x00DE : temperature;	// Error Condition. If error is detected output is set to 222 degrees (0x00DE)
 
 
	// Note: Temperature still needs to be scaled in order to be accurate (eg. boil water). Do this before implementing.
 
	spiTemp = temperature;
 
}
 

			




	
	
	
		
 
void sensors_readBoardTemp()

			




	
	
	
		
 
{

			




	
	
	
		
 
	boardTemp = i2c_read(BOARDTEMP_ADDR, 0x00);		// Read only the first byte of data (we don't need the resolution here)

			




	
	
	
		
 
	boardTemp = ((boardTemp*18)/10) + (32);			// Converting Celsius to Fahrenheit

			




	
	
	
		
 
	boardTemp = boardTemp - 3;						// Linear offset

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void sensors_readPressure()

			




	
	
	
		
 
{//needs editing

			




	
	
	
		
 
	pressure = i2c_read(PRESSURE_ADDR, 0xF6);

			




	
	
	
		
 
	pressure = pressure << 8;

			




	
	
	
		
 
	pressure = pressure | i2c_read(PRESSURE_ADDR, 0xF7);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void sensors_readHumid()

			




	
	
	
		
 
{

			




	
	
	
		
 
	//humid = i2c_read(HUMID_ADDR, 0xXX);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void sensors_readLight()

			




	
	
	
		
 
{

			




	
	
	
		
 
	light = i2c_read(LIGHT_ADDR, 0x03);

			




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

			




	
	
	
		
 
	// FOR FIRST BYTE:

			




	
	
	
		
 
	// Lux = 2^(exponent)*mantissa*0.72

			




	
	
	
		
 
	// exponent = 8xE3 + 4xE2 + 2xE1 + E0

			




	
	
	
		
 
	// mantissa = 8xM7 + 4xM6 + 2xM5 + M4

			




	
	
	
		
 
	// FOR BOTH BYTES:

			




	
	
	
		
 
	// Lux = 2^(exponent)*mantissa*0.045

			




	
	
	
		
 
	// exponent = 8xE3 + 4xE2 + 2xE1 + E0

			




	
	
	
		
 
	// mantissa = 128xM7 + 64xM6 + 32xM5 + 16xM4 + 8xM3 + 4xM2 + 2xM1 + M0

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int16_t sensors_getSpiTemp(void)	// Gets spi temperature from variable

			




	
	
	
		
 
{

			




	
	
	
		
 
	return spiTemp;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int8_t sensors_getBoardTemp(void)	// Gets board temperature from variable

			




	
	
	
		
 
{

			




	
	
	
		
 
	return boardTemp;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
uint16_t sensors_getPressure(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
	return pressure;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
//int sensors_getHumid(void)

			




	
	
	
		
 
//{

			




	
	
	
		
 
	//return humid;

			




	
	
	
		
 
//}

			




	
	
	
		
 

			




	
	
	
		
 
uint8_t sensors_getLight(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
	return light;

			




	
	
	
		
 
}

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    slave/slave/lib/sensors.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
 * sensors.h

			




	
	
	
		
 
 *

			




	
	
	
		
 
 * Created: 11/19/2012 9:24:50 PM

			




	
	
	
		
 
 *  Author: kripperger

			




	
	
	
		
 
 */ 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef SENSORS_H_

			




	
	
	
		
 
#define SENSORS_H_

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
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

			




	
	
	
		
 

			




	
	
	
		
 
int16_t sensors_getSpiTemp(void);	// Gets spi temperature from variable

			




	
	
	
		
 
int8_t sensors_getBoardTemp(void);	// Gets board temperature from variable

			




	
	
	
		
 
uint16_t sensors_getPressure(void);	// Gets pressure from variable

			




	
	
	
		
 
//int sensors_getHumid(void);	// Gets humidity from variable

			




	
	
	
		
 
uint8_t sensors_getLight(void);		// Gets lux from variable

			




	
	
	
		
 

			




	
	
	
		
 
#endif /* SENSORS_H_ */

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    slave/slave/slave.cproj
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<?xml version="1.0" encoding="utf-8"?>

			




	
	
	
		
 
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

			




	
	
	
		
 
  <PropertyGroup>

			




	
	
	
		
 
    <SchemaVersion>2.0</SchemaVersion>

			




	
	
	
		
 
    <ProjectVersion>6.0</ProjectVersion>

			




	
	
	
		
 
    <ToolchainName>com.Atmel.AVRGCC8</ToolchainName>

			




	
	
	
		
 
    <ProjectGuid>{40d97b6e-7ff4-48e7-9a9e-5e50ba18526b}</ProjectGuid>

			




	
	
	
		
 
    <avrdevice>ATmega644PA</avrdevice>

			




	
	
	
		
 
    <avrdeviceseries>none</avrdeviceseries>

			




	
	
	
		
 
    <OutputType>Executable</OutputType>

			




	
	
	
		
 
    <Language>C</Language>

			




	
	
	
		
 
    <OutputFileName>$(MSBuildProjectName)</OutputFileName>

			




	
	
	
		
 
    <OutputFileExtension>.elf</OutputFileExtension>

			




	
	
	
		
 
    <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>

			




	
	
	
		
 
    <AssemblyName>slave</AssemblyName>

			




	
	
	
		
 
    <Name>slave</Name>

			




	
	
	
		
 
    <RootNamespace>slave</RootNamespace>

			




	
	
	
		
 
    <ToolchainFlavour>Native</ToolchainFlavour>

			




	
	
	
		
 
    <KeepTimersRunning>true</KeepTimersRunning>

			




	
	
	
		
 
    <OverrideVtor>false</OverrideVtor>

			




	
	
	
		
 
    <OverrideVtorValue />

			




	
	
	
		
 
    <eraseonlaunchrule>0</eraseonlaunchrule>

			




	
	
	
		
 
    <AsfVersion>3.1.3</AsfVersion>

			




	
	
	
		
 
    <AsfVersion>2.11.1</AsfVersion>

			




	
	
	
		
 
    <avrtoolinterface>ISP</avrtoolinterface>

			




	
	
	
		
 
    <avrtool>com.atmel.avrdbg.tool.ispmk2</avrtool>

			




	
	
	
		
 
    <com_atmel_avrdbg_tool_simulator>

			




	
	
	
		
 
      <ToolType xmlns="">com.atmel.avrdbg.tool.simulator</ToolType>

			




	
	
	
		
 
      <ToolName xmlns="">AVR Simulator</ToolName>

			




	
	
	
		
 
      <ToolNumber xmlns="">

			




	
	
	
		
 
      </ToolNumber>

			




	
	
	
		
 
      <KeepTimersRunning xmlns="">true</KeepTimersRunning>

			




	
	
	
		
 
      <OverrideVtor xmlns="">false</OverrideVtor>

			




	
	
	
		
 
      <OverrideVtorValue xmlns="">

			




	
	
	
		
 
      </OverrideVtorValue>

			




	
	
	
		
 
      <Channel xmlns="">

			




	
	
	
		
 
        <host>127.0.0.1</host>

			




	
	
	
		
 
        <port>55286</port>

			




	
	
	
		
 
        <ssl>False</ssl>

			




	
	
	
		
 
      </Channel>

			




	
	
	
		
 
    </com_atmel_avrdbg_tool_simulator>

			




	
	
	
		
 
    <com_atmel_avrdbg_tool_ispmk2>

			




	
	
	
		
 
      <ToolType>com.atmel.avrdbg.tool.ispmk2</ToolType>

			




	
	
	
		
 
      <ToolName>AVRISP mkII</ToolName>

			




	
	
	
		
 
      <ToolNumber>000200131077</ToolNumber>

			




	
	
	
		
 
      <KeepTimersRunning>true</KeepTimersRunning>

			




	
	
	
		
 
      <OverrideVtor>false</OverrideVtor>

			




	
	
	
		
 
      <OverrideVtorValue>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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