seniordesign-firmware Changeset - 381ec8b85cb2

Changeset - 381ec8b85cb2

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-04-10 21:20:17
kripperger@CL-SEC241-09.cedarville.edu

Geiger moving avg filter improvements

3 files changed with 15 insertions and 13 deletions:

slave/slave/lib/geiger.c

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/geiger.c

➞

Show inline comments

@@ @@ -15,48 +15,50 @@ @@
 #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 uint32_t countStart = 0;
-volatile uint8_t CPS[30];		// Counts per Second
+volatile uint8_t CPS[60];		// 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
+	//	The following is a 60 second moving average of the CPS
 	seconds++;
-	if (seconds>=30)
+	if (seconds>=60)
+	{
 		CPM = 0;
 		for (i=0;i<30;i++)
+		{
 			CPM = CPM + CPS[i];
+		}
 		CPM = CPM * 2;
 		seconds = 0;
+	}
 	CPS[seconds] = counts;
 	counts = 0;
 	CPM = 0;
 	for (i=0;i<60;i++)
+	{
 		CPM = CPM + CPS[i];
+	}
 	//CPM = CPM * 2;	// For a 30 second moving average
+}
 ISR(PCINT0_vect)    // Interrupt on PA0
+{
 	if(((PINA & 0b00000001))==1)
+	{
 		// Interrupts when pulse received from Geiger tube
 		counts++;	// Increment counter.
 		countStart = time_millis();
 		led_on(1);
-		io_piezoOn();
+		io_piezoOff();
 		_delay_us(50);
+	}
+}

slave/slave/modules.c

➞

Show inline comments

@@ @@ -148,16 +148,16 @@ @@
 	//lastRefresh = time_millis();
 	//if ((time_millis() - lastRefresh) > 1000000)
 	//{
 	//	geiger_refresh();	//Refreshes every 1000sec (16min)
 	//}
-	if ((time_millis() - geiger_getCountStart()) > 50)
+	if ((time_millis() - geiger_getCountStart()) > 20)
+	{
 		led_off(1);
-		io_piezoOff();
+		io_piezoOn();
+	}
+ }
  void modules_cameras()

slave/slave/slave.c

➞

Show inline comments

@@ @@ -91,13 +91,13 @@ int main(void) @@
 			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 |CPM: %u \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt(),sensors_getSpiTemp(),geiger_getCount()); //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_getCpm()); //DEBUG
 			serial1_sendString(buff); //DEBUG
 			led_off(0);
 			lastLoop = time_millis();
 // Writes ID to EEPROM, change for all modules and delete after programming

0 comments (0 inline, 0 general)