seniordesign-firmware Changeset - 29db24a20666

Changeset - 29db24a20666

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-04-10 18:07:19
kripperger@CL-SEC241-09.cedarville.edu

Geiger CPM averaging

6 files changed with 59 insertions and 16 deletions:

slave/slave/lib/geiger.c

slave/slave/lib/geiger.h

slave/slave/lib/inputOutput.c

slave/slave/lib/inputOutput.h

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/geiger.c

➞

Show inline comments

@@ @@ -3,65 +3,87 @@ @@
+ *
  * Created: 11/19/2012 9:24:05 PM
  *  Author: kripperger
  */
 #include <inttypes.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include "../config.h"
 #include <util/delay.h>
 #include "geiger.h"
 #include "loopTimer.h"
 volatile uint8_t seconds;		// Counts Seconds from Timer2 interrupt
 volatile uint16_t counts;		// Counts the pulses
 volatile uint16_t cpm;			// Counts per minuite
 volatile uint16_t CPM;			// Counts per Minuite
 volatile uint32_t countStart = 0;
 volatile uint8_t CPS[30];		// Counts per Second
 volatile uint8_t i;
 ISR(TIMER2_OVF_vect)    // Timer 2 overflow interrupt handler
+{
 	// This executes every second.  Update real-time clocks.
 	// Used only in Geiger module
 	//	The following is a 30 second moving average of the CPS
 	seconds++;
 	if (seconds>=30)
+	{
 		cpm = (counts*2);
 		CPM = 0;
 		for (i=0;i<30;i++)
+		{
 			CPM = CPM + CPS[i];
+		}
 		CPM = CPM * 2;
 		seconds = 0;
 		counts = 0;
+	}
 	CPS[seconds] = counts;
 	counts = 0;
+}
 ISR(PCINT0_vect)    // Interrupt on PA0
+{
 	if(((PINA & 0b00000001))==1)
+	{
 		// Interrupts when pulse received from Geiger tube
 		counts++;	// Increment counter.
 		led_toggle(2);
 		_delay_ms(5);
 		countStart = time_millis();
 		led_on(1);
 		io_piezoOn();
 		_delay_us(50);
+	}
+}
 uint16_t geiger_getCpm()
+{
-	return cpm;
+	return CPM;
+}
 uint8_t geiger_getCount()	//DEBUG
+{
 	return counts;
+}
 uint32_t geiger_getCountStart()
+{
 	return countStart;
+}
 void geiger_on()
+{
 	// Turn the Flyback Transformer on
 	PORTA |= (1 << PA1);	//ON
+}
 void geiger_refresh()
+{
 	// Turn the Flyback Transformer off
 	PORTA &= ~(1 << PA1);	//OFF
 	_delay_ms(1);

slave/slave/lib/geiger.h

➞

Show inline comments

 /*
  * geiger.h
+ *
  * Created: 11/19/2012 9:24:17 PM
  *  Author: kripperger
  */
 #ifndef GEIGER_H_
 #define GEIGER_H_
 uint16_t geiger_getCpm();
 uint8_t geiger_getCount();	//DEBUG
 uint8_t geiger_getCount();
 uint32_t geiger_getCountStart();
 void geiger_on();
 void geiger_refresh();
 #endif /* GEIGER_H_ */
@@ \ No newline at end of file @@

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ @@ -71,24 +71,34 @@ int8_t moduleID; // Slave Module ID from @@
  void io_heaterOn()
+ {
 	PORTB |= (1 << PB4);	//ON
+ }
  void io_heaterOff()
+ {
 	PORTB &= ~(1 << PB4);	//OFF
+ }
  void io_piezoOn()
+ {
 	 PORTA |= (1 << PA2);	//ON
+ }
  void io_piezoOff()
+ {
 	 PORTA &= ~(1 << PA2);	//OFF
+ }
  uint8_t io_heaterStatus()
+ {
 	 uint8_t state;
 	 state = 0;
 	 state = ((PORTB & 0b00010000) >> 4);
 	 return state;
+ }
   void io_regulateTemp()
+  {

slave/slave/lib/inputOutput.h

➞

Show inline comments

@@ @@ -7,17 +7,19 @@ @@
 #ifndef IO_H_
 #define IO_H_
 void io_configure();
 void io_readModuleId();	// Reads ID from rotary dip (or EEPROM).
 uint8_t io_getModuleId();	// Gets ID and returns it.
 void io_heaterOn();
 void io_heaterOff();
 void io_piezoOn();
 void io_piezoOff();
 uint8_t io_heaterStatus();
 void io_regulateTemp();		// Gets board temperature and enables heater if below threshold
 #endif /* IO_H_ */
@@ \ No newline at end of file @@

slave/slave/modules.c

➞

Show inline comments

@@ @@ -81,26 +81,27 @@ @@
+ }
  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 << DDA0);	// PA0 is an input for count interrupt
 	DDRA |= (1 << DDA1);	// PA1 is an output for HV control
 	DDRA |= (1 << DDA2);	// PA2 is an output for piezo
 	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
 	// 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
@@ @@ -135,29 +136,36 @@ @@
 	sensors_readSpiTemp();			//Data Read
 	sensors_readPressure();			//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)
 	//}
 	if ((time_millis() - geiger_getCountStart()) > 50)
+	{
 		led_off(1);
 		io_piezoOff();
+	}
+ }
  void modules_cameras()
+ {
 	// Gathers data and performs functions for cameras daughter board
 		//cameras_readAccelXYZ();
 		if ((time_millis() - lastPicture) > CAMERA_FREQ)
+		{

slave/slave/slave.c

➞

Show inline comments

@@ @@ -85,25 +85,25 @@ int main(void) @@
 		// 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 |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
+			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Press: %lu |Altitude: %lu |Batt: %u |spiTemp: %i |CPM: %u \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt(),sensors_getSpiTemp(),geiger_getCount()); //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)

0 comments (0 inline, 0 general)