# HG changeset patch
# User kripperger@CL-SEC241-09.cedarville.edu
# Date 2013-02-04 17:25:50
# Node ID 03f315df1ad521adc2181d62c05b928e7ebad019
# Parent 9342b3947420cd6b0e9422de858665318e789450
Fixes so it compiles onto slave
diff --git a/slave/slave/modules.c b/slave/slave/modules.c
--- a/slave/slave/modules.c
+++ b/slave/slave/modules.c
@@ -79,7 +79,7 @@
{
DESELECT_TEMP;
setup_spi();
- sensors_setupPressure();
+ //sensors_setupPressure();
}
void modules_geiger_setup()
@@ -122,10 +122,10 @@
{
// Gathers data and performs functions for sensor daughter board
sensors_readBoardTemp(); //Data Read
- sensors_readSpiTemp(); //Data Read
- sensors_readPressure(); //Data Read
- sensors_readHumid(); //Data Read
- sensors_readLight(); //Data Read
+ //sensors_readSpiTemp(); //Data Read
+ //sensors_readPressure(); //Data Read
+ //sensors_readHumid(); //Data Read
+ //sensors_readLight(); //Data Read
//sensors_readBatt();
}
diff --git a/slave/slave/slave.c b/slave/slave/slave.c
--- a/slave/slave/slave.c
+++ b/slave/slave/slave.c
@@ -55,7 +55,7 @@ int main(void)
io_readModuleId();
modules_setup(io_getModuleId()); // Run setup functions for specific module
-
+
//uint8_t test; //Debug
//uint8_t test2; //Debug
@@ -65,7 +65,7 @@ int main(void)
char buff[64]; //Buffer for serial output //DEBUG
serial0_sendString("Starting Slave\r\n");
-
+
while(1)
{
diff --git a/slave/slave/slave.cproj b/slave/slave/slave.cproj
--- a/slave/slave/slave.cproj
+++ b/slave/slave/slave.cproj
@@ -77,7 +77,7 @@
127.0.0.1
- 60480
+ 61820
False