seniordesign-firmware Changeset - d39ec58232af

Changeset - d39ec58232af

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-04-05 01:09:00
kripperger@CL-SEC241-09.cedarville.edu

attempts to fix spi

3 files changed with 14 insertions and 14 deletions:

slave/slave/lib/sensors.c

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/sensors.c

➞

Show inline comments

@@ @@ -197,7 +197,7 @@ void sensors_readHumid() @@
 	//i2c_write(HUMID_ADDR, 0x00, 0x00);		//Measurement Request
 	//humid = i2c_read16(HUMID_ADDR);
-	humid = i2c_humidRead();
+//humid = i2c_humidRead();
 	//calculations to relative humidity: humid = (humid/((2^14) - 1))*100%       >> is divide by power, << is multiply by power, 2^14-1 = 16383
 	 //humid = (humid / 16383) * 100;

slave/slave/modules.c

➞

Show inline comments

@@ @@ -18,7 +18,7 @@ @@
  #include "lib/led.h"
  uint32_t lastPicture;
  uint32_t lastRefresh;	// Time in ms when last geiger refresh occurred
+// uint32_t lastRefresh;	// Time in ms when last geiger refresh occurred
  void modules_setup(uint8_t id)
+ {
@@ @@ -91,13 +91,13 @@ @@
+ {
 	// Pin setup
 	DDRA &= ~(1 << DDA0);	// PA0 is an input
 	DDRA |= (1 << DDA1);	// PA1 is an output
+	//DDRA |= (1 << DDA1);	// PA1 is an output	///////////
 	geiger_on();	// Turn on HV supply
+	//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
 	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)
@@ @@ -134,7 +134,7 @@ @@
 	sensors_readBoardTemp();		//Data Read
 	sensors_readSpiTemp();			//Data Read
 	sensors_readPressure();			//Data Read
 	sensors_readHumid();			//Data Read
+	//sensors_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
+ }
@@ @@ -144,11 +144,11 @@ @@
 	// 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)
 		//}
+ }

slave/slave/slave.c

➞

Show inline comments

@@ @@ -75,7 +75,7 @@ int main(void) @@
 	// Serial output //DEBUG
 	char buff[128];						//Buffer for serial output //DEBUG
 	serial1_sendString("Starting Slave\r\n");	//DEBUG
     while(1)
+    {
 		wdt_reset();	// Resets WDT (to prevent restart)
@@ @@ -94,7 +94,7 @@ int main(void) @@
 			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 |Humidity: %u |spiTemp: %i \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt(),sensors_getHumid(),sensors_getSpiTemp()); //DEBUG
+			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
 			serial1_sendString(buff); //DEBUG
 			led_off(0);

0 comments (0 inline, 0 general)