# HG changeset patch
# User kripperger@CL-SEC241-09.cedarville.edu
# Date 2013-04-10 23:33:39
# Node ID ca106d2f993f7e675c2b903c552c9a6426eb2d69
# Parent  381ec8b85cb2513d8b19819507372509ea270acc

Fixed Geiger timing issue

diff --git a/slave/slave/modules.c b/slave/slave/modules.c
--- a/slave/slave/modules.c
+++ b/slave/slave/modules.c
@@ -16,6 +16,7 @@
  #include "lib/sensors.h"
  #include "lib/loopTimer.h"
  #include "lib/led.h"
+ #include "lib/geiger.h"
  
  uint32_t lastPicture;
  uint32_t lastRefresh;	// Time in ms when last geiger refresh occurred 
@@ -151,7 +152,7 @@
 	//	geiger_refresh();	//Refreshes every 1000sec (16min)
 	//}
 		
-	if ((time_millis() - geiger_getCountStart()) > 20)
+	if ((time_millis() - geiger_getCountStart()) > 30)
 	{
 		led_off(1);
 		io_piezoOn();
diff --git a/slave/slave/slave.c b/slave/slave/slave.c
--- a/slave/slave/slave.c
+++ b/slave/slave/slave.c
@@ -83,6 +83,9 @@ int main(void)
 		// Master communication
 		masterComm_checkParser();	//Checks parser for data requests from master
 
+		// Constant timer operations for Geiger
+		if(io_getModuleId()==2) modules_geiger();
+
 		// Main slave operations
 		if ((time_millis() - lastLoop) > SENSOR_LOOP)	// Uses program timer to run every so often. Time interval defined in config.h
 		{