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 @@ -13,6 +13,9 @@ #include "serial.h" #include "serparser.h" #include "inputOutput.h" +#include "sensors.h" +#include "geiger.h" +#include "led.h" uint8_t dataTypes; char buff2[64]; @@ -155,10 +158,7 @@ void masterComm_send() serial0_sendString("]"); // Send closing bracket serial0_sendString(masterComm_checksum(buff2)); // Calculate and send checksum - masterComm_modules(); // Send sensor data - - - serial0_sendString("got request\r\n"); //DEBUG + masterComm_modules(); // Send sensor data } @@ -168,8 +168,10 @@ void masterComm_checkParser() { if (getPayloadType() == ('@'-0x30)) // Request for data recieved { + led_on(2); // Send all data masterComm_send(); + led_off(2); } } } diff --git a/slave/slave/lib/serparser.c b/slave/slave/lib/serparser.c --- a/slave/slave/lib/serparser.c +++ b/slave/slave/lib/serparser.c @@ -90,7 +90,7 @@ ISR(USART0_RX_vect) -#define DEBUG +//#define DEBUG // Parse data from circular buffer int serparser_parse(void) diff --git a/slave/slave/slave.c b/slave/slave/slave.c --- a/slave/slave/slave.c +++ b/slave/slave/slave.c @@ -70,14 +70,14 @@ int main(void) { // Master communication - //masterComm_check(); + masterComm_checkParser(); // Main slave operations if ((time_millis() % SENSOR_LOOP) == 0) // Uses program timer to run every so often. Time interval defined in config.h { - + 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) @@ -86,8 +86,9 @@ int main(void) //snprintf(buff,64,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Heater: %u\r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),io_heaterStatus()); //DEBUG //serial0_sendString(buff); //DEBUG - led_toggle(0); // Toggle LED0(Blue) to show loop running - _delay_ms(1); // Delay to prevent the sensor loop from running again before time_millis changes + //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); } } diff --git a/slave/slave/slave.cproj b/slave/slave/slave.cproj --- a/slave/slave/slave.cproj +++ b/slave/slave/slave.cproj @@ -22,7 +22,7 @@ 0 2.11.1 ISP - com.atmel.avrdbg.tool.ispmk2 + com.atmel.avrdbg.tool.avrdragon com.atmel.avrdbg.tool.simulator AVR Simulator @@ -77,7 +77,7 @@ 127.0.0.1 - 64369 + 60480 False