diff --git a/master/master/lib/serparser.c b/master/master/lib/serparser.c --- a/master/master/lib/serparser.c +++ b/master/master/lib/serparser.c @@ -114,7 +114,7 @@ int serparser_parse(void) else // Not start of frame, reset { #ifdef DEBUG - //serial0_sendString("invalid\r\n"); + serial0_sendString("invalid\r\n"); #endif setParserState(STATE_RESET); return PARSERESULT_NODATA; // no valid start bit; better luck next time. run the function the next time around the main loop. @@ -135,7 +135,7 @@ int serparser_parse(void) else // Transmission is intended for another module; reset { #ifdef DEBUG - //serial0_sendString("bad dest\r\n"); + serial0_sendString("bad dest\r\n"); #endif setParserState(STATE_RESET); } @@ -157,11 +157,11 @@ int serparser_parse(void) { if (byte == ']') // End of frame { - //#ifdef DEBUG + #ifdef DEBUG serial0_sendString("eof\r\n"); sprintf(debugBuff, "%d B, sum=%d\r\n", payloadLength, checksumCalc); serial0_sendString((debugBuff)); - //#endif + #endif receivedPayload[payloadLength] = 0; // null-terminate string for atoi @@ -200,12 +200,16 @@ int serparser_parse(void) { // TODO: Compare checksums if(byte == checksumCalc) { + #ifdef DEBUG serial0_sendString("check\r\n"); + #endif setParserState(STATE_RESET); return PARSERESULT_PARSEOK; } else { + #ifdef DEBUG serial0_sendString("bcheck\r\n"); + #endif setParserState(STATE_RESET); return PARSERESULT_FAIL; diff --git a/master/master/master.c b/master/master/master.c --- a/master/master/master.c +++ b/master/master/master.c @@ -59,12 +59,12 @@ int main(void) //serial0_sendString("\r\n\r\n---------------------------------\r\n"); //serial0_sendString("HAB Controller 1.0 - Initialized!\r\n"); //serial0_sendString("---------------------------------\r\n\r\n"); - serial0_sendString("\r\n\r\nHELLO.\r\n\r\n"); + //serial0_sendString("\f\r\n\r\Hello.\r\n\r\n"); led_on(POWER); // Buffer for string operations - char logbuf[32]; + char logbuf[16]; // Software timers uint32_t lastAprsBroadcast = 0; @@ -74,7 +74,7 @@ int main(void) int parseResult = PARSERESULT_NODATA; // Write CSV header to SD card - logger_log("ProgramTime,LastAprsBroadcast,LastLog\n"); + //logger_log("ProgramTime,LastAprsBroadcast,LastLog\n"); while(1) { @@ -82,8 +82,8 @@ int main(void) if(time_millis() - lastLog > LOGGER_RATE) { led_on(STAT); - //snprintf(logbuf, 32, "%lu,%lu,%lu,\r\n", time_millis(), lastAprsBroadcast,lastLog); - //logger_log(logbuf); + snprintf(logbuf, 16, "%lu,%d,\r\n", time_millis(), sensordata_get(HUMIDITY)); + logger_log(logbuf); led_off(STAT); lastLog = time_millis(); }