diff --git a/slave/slave/config.h b/slave/slave/config.h --- a/slave/slave/config.h +++ b/slave/slave/config.h @@ -23,7 +23,7 @@ // Number of datatypes to transmit per module type #define DATATYPES_GENERIC 1 -#define DATATYPES_SENSOR 6 +#define DATATYPES_SENSOR 3 //Should be set to more #define DATATYPES_GEIGER 2 #define DATATYPES_CAMERA 1 diff --git a/slave/slave/lib/masterComm.c b/slave/slave/lib/masterComm.c --- a/slave/slave/lib/masterComm.c +++ b/slave/slave/lib/masterComm.c @@ -67,11 +67,11 @@ void masterComm_types() void masterComm_modules() { // Send BoardTemperature (Common for all modules) - serial0_sendString("["); - snprintf(buff2,64,"1%u",sensors_getBoardTemp()); + serial0_sendChar('['); + snprintf(buff2,64,"0%u",sensors_getBoardTemp()); serial0_sendString(buff2); - serial0_sendString("]"); - serial0_sendString(masterComm_checksum(buff2)); + serial0_sendChar(']'); + serial0_sendChar(masterComm_checksum(buff2)); // Send module specific sensor readings switch(io_getModuleId()) @@ -85,40 +85,40 @@ void masterComm_modules() // Sensors // Send SPI Temperature (Air) - serial0_sendString("["); + serial0_sendChar('['); snprintf(buff2,64,"2%u",sensors_getSpiTemp()); serial0_sendString(buff2); - serial0_sendString("]"); - serial0_sendString(masterComm_checksum(buff2)); + serial0_sendChar(']'); + serial0_sendChar(masterComm_checksum(buff2)); // Send Ambient Light (Needs to be formatted) - serial0_sendString("["); + serial0_sendChar('['); snprintf(buff2,64,"3%u",geiger_getCpm()); //FIX serial0_sendString(buff2); - serial0_sendString("]"); - serial0_sendString(masterComm_checksum(buff2)); + serial0_sendChar(']'); + serial0_sendChar(masterComm_checksum(buff2)); /* // Send CPM (radiation) - serial0_sendString("["); + serial0_sendChar('['); snprintf(buff2,64,"7%u",geiger_getCpm()); serial0_sendString(buff2); - serial0_sendString("]"); - serial0_sendString(masterComm_checksum(buff2)); + serial0_sendChar(']'); + serial0_sendChar(masterComm_checksum(buff2)); // Send CPM (radiation) - serial0_sendString("["); + serial0_sendChar('['); snprintf(buff2,64,"7%u",geiger_getCpm()); serial0_sendString(buff2); - serial0_sendString("]"); - serial0_sendString(masterComm_checksum(buff2)); + serial0_sendChar(']'); + serial0_sendChar(masterComm_checksum(buff2)); // Send CPM (radiation) - serial0_sendString("["); + serial0_sendChar('['); snprintf(buff2,64,"7%u",geiger_getCpm()); serial0_sendString(buff2); - serial0_sendString("]"); - serial0_sendString(masterComm_checksum(buff2)); + serial0_sendChar(']'); + serial0_sendChar(masterComm_checksum(buff2)); */ break; @@ -127,11 +127,11 @@ void masterComm_modules() // Geiger // Send CPM (radiation) - serial0_sendString("["); + serial0_sendChar('['); snprintf(buff2,64,"7%u",geiger_getCpm()); serial0_sendString(buff2); - serial0_sendString("]"); - serial0_sendString(masterComm_checksum(buff2)); + serial0_sendChar(']'); + serial0_sendChar(masterComm_checksum(buff2)); break; @@ -151,12 +151,12 @@ void masterComm_send() { masterComm_types(); // Calculates how many data types to send - // Return resquest with number of data types to be sent - serial0_sendString("["); // Send opening bracket + // Return request with number of data types to be sent + serial0_sendChar('['); // Send opening bracket snprintf(buff2,64,"@%u",dataTypes); // Send package (@ reply and number of data types) serial0_sendString(buff2); - serial0_sendString("]"); // Send closing bracket - serial0_sendString(masterComm_checksum(buff2)); // Calculate and send checksum + serial0_sendChar(']'); // Send closing bracket + serial0_sendChar(masterComm_checksum(buff2)); // Calculate and send checksum masterComm_modules(); // Send sensor data } @@ -171,7 +171,7 @@ void masterComm_checkParser() led_on(2); // Send all data masterComm_send(); - led_off(2); + //led_off(2); } } } diff --git a/slave/slave/modules.c b/slave/slave/modules.c --- a/slave/slave/modules.c +++ b/slave/slave/modules.c @@ -12,7 +12,8 @@ #include #include "modules.h" #include "lib/spi.h" - + #include "lib/i2c.h" + #include "lib/sensors.h" void modules_setup(uint8_t id) { @@ -122,9 +123,9 @@ // 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_readPressure(); //Data Read + //sensors_readHumid(); //Data Read + //sensors_readLight(); //Data Read } diff --git a/slave/slave/slave.c b/slave/slave/slave.c --- a/slave/slave/slave.c +++ b/slave/slave/slave.c @@ -89,6 +89,7 @@ int main(void) //led_toggle(0); // Toggle LED0(Blue) to show loop running _delay_ms(2); // Delay to prevent the sensor loop from running again before time_millis changes led_off(0); + led_off(2); } }