seniordesign-firmware Changeset - 3f293b73357b

Changeset - 3f293b73357b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-02-12 12:23:52
kripperger@CL-SEC241-09.cedarville.edu

Small Changes

2 files changed with 3 insertions and 3 deletions:

slave/slave/config.h

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/config.h

➞

Show inline comments

@@ @@ -25,13 +25,13 @@ @@
 #define DATATYPES_GENERIC 3
 #define DATATYPES_SENSOR 8
 #define DATATYPES_GEIGER 4
 #define DATATYPES_CAMERA 3
 //Sensors and IO
-#define SENSOR_LOOP 3000				// Frequency of sensor reads (in ms) (should be 200)
+#define SENSOR_LOOP 100				// Frequency of sensor reads (in ms) (should be 200)
 #define HEATER_THRESHOLD 40			// Temperature threshold in Fahrenheit where heater is activated
  //I2C Addresses
  #define EEPROM_ADDR 0xA0		// Read 0xA1 - Write 0xA0
  #define BOARDTEMP_ADDR 0x90	// Read 0x91 - Write 0x90
  #define PRESSURE_ADDR 0xEF		// Read 0xEF - Write 0xEE

slave/slave/slave.c

➞

Show inline comments

@@ @@ -79,14 +79,14 @@ int main(void) @@
 			led_on(0);
 			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,64,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |SpiTemp: %i\r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getSpiTemp()); //DEBUG
 			serial0_sendString(buff); //DEBUG
 			//snprintf(buff,64,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |SpiTemp: %i\r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getSpiTemp()); //DEBUG
 			//serial0_sendString(buff); //DEBUG
 			_delay_ms(2);		// Delay to prevent the sensor loop from running again before time_millis changes
 			led_off(0);
 			led_off(2);
+		}

0 comments (0 inline, 0 general)