seniordesign-firmware Changeset - ca106d2f993f

Changeset - ca106d2f993f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-04-10 23:33:39
kripperger@CL-SEC241-09.cedarville.edu

Fixed Geiger timing issue

2 files changed with 5 insertions and 1 deletions:

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/modules.c

➞

Show inline comments

@@ @@ -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();

slave/slave/slave.c

➞

Show inline comments

@@ @@ -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
+		{

0 comments (0 inline, 0 general)