seniordesign-firmware Changeset - 5c3e3bff1c56

Changeset - 5c3e3bff1c56

Parent rev.

Child rev.

[Not reviewed]

default

0 9 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-02-05 17:01:36
ethanzonca@CL-ENS241-08.cedarville.edu

Code formatting and additional commenting

9 files changed with 197 insertions and 122 deletions:

master/master/lib/gps.c

master/master/lib/led.c

master/master/lib/logger.c

master/master/lib/sensordata.c

master/master/lib/serial.c

master/master/lib/serial.h

master/master/lib/serparser.c

master/master/lib/slavesensors.c

master/master/master.c

0 comments (0 inline, 0 general)

master/master/lib/gps.c

➞

Show inline comments

@@ @@ -43,60 +43,69 @@ int numBytes = 0; @@
 //variables to store data from transmission
 //least significant digit is stored at location 0 of arrays
 char tramsmissionType[7];
 char timestamp[12];	//hhmmss.ss
 char* get_timestamp() {
 char* get_timestamp()
+{
 	return timestamp;
+}
 char latitude[14];	//lllll.lla
 char* get_latitude() {
 char* get_latitude()
+{
 	return latitude;
+}
 char longitude[14];	//yyyyy.yyb
 char* get_longitude() {
 char* get_longitude()
+{
 	return longitude;
+}
 char quality;		//quality for GGA and validity for RMC
 char numSatellites[4];
 char* get_sv() {
 char* get_sv()
+{
 	return numSatellites;
+}
 char hdop[6];		//xx.x
 char* get_hdop() {
 char* get_hdop()
+{
 	return hdop;
+}
 char altitude[10];	//xxxxxx.x
 char wgs84Height[8];	//sxxx.x
 char lastUpdated[8];	//blank - included for testing
 char stationID[8];	//blank - included for testing
 char checksum[3];	//xx
 char knots[8];		//xxx.xx
 char* get_speedKnots() {
 char* get_speedKnots()
+{
 	return knots;
+}
 char course[8];		//xxx.x
 char* get_course() {
 char* get_course()
+{
 	return course;
+}
 char dayofmonth[9];	//ddmmyy
 char* get_dayofmonth() {
 char* get_dayofmonth()
+{
 	return dayofmonth;
+}
 bool gps_hasfix() {
 bool gps_hasfix()
+{
 	return strcmp("99.99", get_hdop());
+}
 char variation[9];	//xxx.xb
 int calculatedChecksum;
 int receivedChecksum;
@@ @@ -173,31 +182,34 @@ void parse_gps_transmission(void){ @@
 	// Pull byte off of the buffer
 	char byte;
 	while(nmeaBufferDataPosition != nmeaBufferParsePosition) {
 	led_on(LED_ACTIVITY);
 	while(nmeaBufferDataPosition != nmeaBufferParsePosition)
+	{
 		led_on(LED_ACTIVITY);
 		byte = nmeaBuffer[nmeaBufferParsePosition];
 		if(decodeState == INITIALIZE) //start of transmission sentence
+		{
 			if(byte == '$') {
 			if(byte == '$')
+			{
 				#ifdef DEBUG_NMEA
 				serial0_sendString("found $\r\n");
 				#endif
 				setParserState(GET_TYPE);
 				numBytes = 0; //prep for next phases
 				skipBytes = 0;
 				calculatedChecksum = 0;
+			}
 			else {
 			else
+			{
 				setParserState(INITIALIZE);
+			}
+		}
 		//parse transmission type
 		else if (decodeState == GET_TYPE)

master/master/lib/led.c

➞

Show inline comments

@@ @@ -16,13 +16,14 @@ @@
 #include <stdbool.h>
 #include "led.h"
 // Configure port direction and initial state of LEDs
 void led_setup()
+{
 	for(int i=0; i<NUM_LEDS; i++)  {
 	for(int i=0; i<NUM_LEDS; i++)
+	{
 		*(ledList[i].direction) |= (1<<ledList[i].pin); // set pin to output
 		*(ledList[i].port) &= ~(1<<ledList[i].pin); // set pin low
+	}
 	// Beep on startup
 	led_on(LED_POWER);
@@ @@ -61,58 +62,64 @@ void led_errorcode(uint8_t code) @@
 		_delay_ms(150);
+	}
 	_delay_ms(400);
 	led_on(LED_ERROR);
+}
 void led_alert() {
 void led_alert()
+{
 	led_on(LED_ACT0);
 	led_on(LED_ACT1);
 	led_on(LED_ACT2);
 	led_on(LED_ACT3);
 	_delay_ms(10);
+}
 uint8_t ctr = 0;
 void led_spin() {
 void led_spin()
+{
 	if(ctr == 0) {
 	if(ctr == 0)
+	{
 		led_on(LED_ACT0);
 		led_off(LED_ACT1);
 		led_off(LED_ACT2);
 		led_off(LED_ACT3);
+	}
 	else if (ctr == 1) {
 	else if (ctr == 1)
+	{
 		led_on(LED_ACT1);
 		led_off(LED_ACT0);
 		led_off(LED_ACT2);
 		led_off(LED_ACT3);
+	}
 	else if (ctr == 2) {
 	else if (ctr == 2)
+	{
 		led_on(LED_ACT2);
 		led_off(LED_ACT1);
 		led_off(LED_ACT0);
 		led_off(LED_ACT3);
+	}
 	else if (ctr == 3) {
 	else if (ctr == 3)
+	{
 		led_on(LED_ACT3);
 		led_off(LED_ACT1);
 		led_off(LED_ACT2);
 		led_off(LED_ACT0);
+	}
 	ctr = (ctr + 1) % 4;
+}
 bool pulseUp = true;
 void led_pulsate() {
 void led_pulsate()
+{
 	if(OCR0B >= 240 && pulseUp)
 		pulseUp = false;
 	else if(OCR0B <= 12 && !pulseUp);
 		pulseUp = true;
 	if(pulseUp)
 		OCR0B+=5;
 	else
 		OCR0B-=5;
+}
@@ \ No newline at end of file @@

master/master/lib/logger.c

➞

Show inline comments

@@ @@ -84,13 +84,14 @@ void logger_setup() @@
 	char filename[16];
 	// we pre-increment logid here because it starts at 255, then wraps to 0
 	snprintf(filename, 16, "data%d.csv",++logid);
 	// TODO: Catch errors here
 	if(fat_create_file(dd, filename, &directory) == 0) {
 	if(fat_create_file(dd, filename, &directory) == 0)
+	{
 		led_errorcode(ERROR_SD_FILE);
+	}
 	eeprom_update_byte(LOGGER_ID_EEPROM_ADDR, logid);
 	// Search for file in current directory and open it

master/master/lib/sensordata.c

➞

Show inline comments

@@ @@ -18,96 +18,121 @@ @@
 #include "slavesensors.h"
 #include "boardtemp.h"
 #include "looptime.h"
 #include "gps.h"
 #include "logger.h"
 // Slave sensor reading storage
 int32_t slaves[MAX_NUM_SLAVES][MAX_NUM_SENSORS];
 void sensordata_setup()
+{
 	for(int i=0; i<MAX_NUM_SLAVES; i++) {
 		for(int j=0; j<MAX_NUM_SENSORS; j++) {
 	for(int i=0; i<MAX_NUM_SLAVES; i++)
+	{
 		for(int j=0; j<MAX_NUM_SENSORS; j++)
+		{
 			slaves[i][j] = -2111111111; // minimum value of 16 bit integer
+		}
+	}
+}
 // Store a sensor value in memory
 void sensordata_set(uint8_t nodeID, uint8_t type, int32_t value)
+{
 	if(nodeID < MAX_NUM_SLAVES) {
 	if(nodeID < MAX_NUM_SLAVES)
+	{
 		slaves[nodeID][type] = value;
+	}
+}
 // Retrieve a sensor value from memory
 int32_t sensordata_get(uint8_t nodeID, uint8_t type)
+{
 	// Avoid reading out of bad places!
 	if(nodeID < MAX_NUM_SLAVES) {
 	if(nodeID < MAX_NUM_SLAVES)
+	{
 		return slaves[nodeID][type];
+	}
 	else {
 	else
+	{
 		return 0;
+	}
+}
 // Generate APRS comment
 // TODO: Can we move this buffer to a local scope of this function?
 char commentBuffer[128];
 // [A-30.5 B45.64 C99542]"
 char* slavesensors_getAPRScomment() {
 char* slavesensors_getAPRScomment()
+{
 	snprintf(commentBuffer,128, "T%d S%s V%s H%s", sensors_getBoardTemp(), get_sv(), get_speedKnots(), get_hdop());
 	return commentBuffer;
+}
 // Generates CSV headers on first run and logs values to the SD card (if data available)
 bool dataWasReady = false;
 void sensordata_logvalues() {
 void sensordata_logvalues()
+{
 	// Generate CSV header after we have queried all slaves once
 	if(slavesensors_dataReady()) {
 	if(slavesensors_dataReady())
+	{
 		// Only generate/write header the first time data is ready
 		if(!dataWasReady) {
 		if(!dataWasReady)
+		{
 			#define CSV_HEADER_SIZE 512
 			char csvHeader[CSV_HEADER_SIZE];
 			csvHeader[0] = 0x00;
 			// Add master data headers
 			snprintf(csvHeader, CSV_HEADER_SIZE, "Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV,");
 			// Add slave data headers
 			for(uint8_t i=0; i<MAX_NUM_SLAVES; i++) {
 				for(uint8_t j=0; j<MAX_NUM_SENSORS; j++) {
 			for(uint8_t i=0; i<MAX_NUM_SLAVES; i++)
+			{
 				for(uint8_t j=0; j<MAX_NUM_SENSORS; j++)
+				{
 					int32_t tmp = sensordata_get(i, j);
 					if(tmp != -2111111111) {
 						// FIXME: will the 128 here really provide safety? might want to subtract the strlen
 					// If a sensor value exists, write a header for it
 					if(tmp != -2111111111)
+					{
 						snprintf(csvHeader + strlen(csvHeader), CSV_HEADER_SIZE-strlen(csvHeader),"%s-%s,", slavesensors_slavename(i), slavesensors_getLabel(j));
+					}
+				}
+			}
-			// Terminate header string and write to SD card
+			// End line and write to SD card
 			snprintf(csvHeader + strlen(csvHeader), CSV_HEADER_SIZE-strlen(csvHeader),"\r\n");
 			logger_log(csvHeader);
 			dataWasReady = true;
+		}
 		// Write CSV sensor values to SD card
 		char logbuf[256];
 		logbuf[0] = 0x00;
 		// Write master sensor values
 		snprintf(logbuf, 256, "%lu,%d,%s,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course(), get_sv());
 		for(int i=0; i<MAX_NUM_SLAVES; i++) {
 			for(int j=0; j<MAX_NUM_SENSORS; j++) {
 		// Write slave sensor values
 		for(int i=0; i<MAX_NUM_SLAVES; i++)
+		{
 			for(int j=0; j<MAX_NUM_SENSORS; j++)
+			{
 				int32_t tmp = sensordata_get(i, j);
 				if(tmp != -2111111111) {
 				// If a sensor value exists, log the data
 				if(tmp != -2111111111)
+				{
 					snprintf(logbuf + strlen(logbuf),256-strlen(logbuf)," %ld,", tmp);
+				}
+			}
+		}
 		// End line and write to log
 		snprintf(logbuf + strlen(logbuf),256-strlen(logbuf),"\r\n");
 		logger_log(logbuf);
+	}
+}
@@ \ No newline at end of file @@

master/master/lib/serial.c

➞

Show inline comments

@@ @@ -16,37 +16,29 @@ @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <avr/wdt.h>
 // NOTE: USART ISRs for character reception are included in serparser.c
 void serial0_setup() {
 	//PORTD &= ~(1<<PD0);
 	//PORTD |= (1<<PD1);
 // Configure USART0
 void serial0_setup()
+{
 	/* Enable receiver and transmitter */
 	UCSR0B |= (1<<RXEN0)|(1<<TXEN0); // Enable rx/tx
 	/* Set frame format: 8data, 1stop bit */
 	UCSR0C |= (1 << UCSZ00) | (1 << UCSZ01); // - 1 stop bit
 	/* Set baud rate */
 	UBRR0H = (unsigned char)(USART0_BAUD_PRESCALE>>8);
 	UBRR0L = (unsigned char)USART0_BAUD_PRESCALE;
 	UCSR0B |= (1 << RXCIE0); // Enable interrupt
 	//UCSR0A |= (1<<RXC0);
+}
 // Configure USART1
 void serial1_setup() {
 //PROVEN in test project
 	/* Enable receiver and transmitter */
 	UCSR1B |= (1<<RXEN1)|(1<<TXEN1); // Enable rx/tx
 	/* Set frame format: 8data, 1stop bit */
 	UCSR1C |= (1 << UCSZ10) | (1 << UCSZ11); // - 1 stop bit
@@ @@ -54,56 +46,62 @@ void serial1_setup() { @@
 	UBRR1H = (unsigned char)(USART1_BAUD_PRESCALE>>8);
 	UBRR1L = (unsigned char)USART1_BAUD_PRESCALE;
 	UCSR1B |= (1 << RXCIE1); // Enable interrupt
+}
 // Enable USART1 rx interrupt
 void serial1_ion() {
 	UCSR1B |= (1<<RXEN1); // Enable rx
 	UCSR1B |= (1 << RXCIE1); // Enable interrupt
+}
 // Disable USART1 rx interrupt
 void serial1_ioff() {
 	UCSR1B &= ~(1<<RXEN1); // Disable rx
 	UCSR1B &= ~(1 << RXCIE1); // Disable interrupt
+}
 // Enable USART0 rx interrupt
 void serial0_ion() {
 	UCSR0B |= (1 << RXCIE0); // Enable interrupt
+}
 // Disable USART0 rx interrupt
 void serial0_ioff() {
 	UCSR0B &= ~(1 << RXCIE0); // Disable interrupt
+}
+// Send char on USART0
 void serial0_sendChar( unsigned char byte )
+{
 	while (!(UCSR0A & (1<<UDRE0)));
 	UDR0 = byte;
+}
 // Send char on USART1
 void serial1_sendChar( unsigned char byte )
+{
 	while (!(UCSR1A & (1<<UDRE1)));
 	UDR1 = byte;
+}
+// Read char on USART0 (blocking)
 unsigned char serial0_readChar()
+{
 	while(!(UCSR0A &(1<<RXC0)));
 	//char c = UDR0;
 	//serial0_sendString("Read: ");
 	//serial0_sendChar(c);
 	//serial0_sendChar('\n');
 	return UDR0;
+}
 // Returns 1 if data in USART0 buffer
 uint8_t serial0_hasChar() {
 	return (UCSR0A &(1<<RXC0));
+}
 // Read line from USART0 (blocking)
 // TODO: Can we make readBuf local?
 char readBuf[128];
 char* serial0_readLine() {
 	char c;
 	int i = 0;
@@ @@ -116,29 +114,31 @@ char* serial0_readLine() { @@
+	}
 	readBuf[i] = '\0';
 	return readBuf;
+}
+// Send string on USART0
 void serial0_sendString(const char* stringPtr){
 	while(*stringPtr != 0x00)
+	{
 		serial0_sendChar(*stringPtr);
 		stringPtr++;
+	}
+}
 // Send string on USART1
 void serial1_sendString(const char* stringPtr){
 	while(*stringPtr != 0x00)
+	{
 		serial1_sendChar(*stringPtr);
 		stringPtr++;
+	}
+}
 // Send custom protocol command on USART0
 void serial_sendCommand(char* data )
+{
 	char checkSum = 0x00; //initialize checksum
 	serial0_sendChar('['); //bracket indicates start of command
@@ @@ -149,13 +149,7 @@ void serial_sendCommand(char* data ) @@
 		checkSum += *data;
 		data++;
+	}
 	serial0_sendChar(']'); //bracket indicates end of command
 	serial0_sendChar(checkSum); // checksum moved behind bracket to solve bug FS#29
+}
 void serial_sendResponseData()
+{
+}
+}
@@ \ No newline at end of file @@

master/master/lib/serial.h

➞

Show inline comments

@@ @@ -30,14 +30,12 @@ void serial1_sendString(const char* stri @@
 unsigned char serial0_readChar();
 uint8_t serial0_hasChar();
 char* serial0_readLine();
 void serial_sendCommand( char* data );
 void serial_sendResponseData();
 void serial0_ion();
 void serial0_ioff();
 void serial1_ion();
 void serial1_ioff();

master/master/lib/serparser.c

➞

Show inline comments

@@ @@ -72,22 +72,16 @@ static void setParserState(uint8_t state @@
 	// Every time we change state, we have parsed a byte
 	bufferParsePosition = (bufferParsePosition + 1) % BUFFER_SIZE;
+}
 // Receive data on USART
 char debugBuff[16];
 ISR(USART0_RX_vect)
+{
 	buffer[bufferDataPosition % BUFFER_SIZE] = UDR0;
 	bufferDataPosition = (bufferDataPosition + 1) % BUFFER_SIZE;
 	//sprintf(debugBuff, "bdp: %d, bpp: %d \r\n", bufferDataPosition, bufferParsePosition);
 	//serial0_sendString((debugBuff));
+}
 //#define DEBUG
@@ @@ -137,12 +131,13 @@ int serparser_parse(void) @@
 		// Get payload data
 		else if(parserState == STATE_GETDATA)
+		{
 			if (byte == ']') // End of frame
+			{
 				#ifdef DEBUG
 				char debugBuff[16];
 				serial0_sendString("eof\r\n");
 				sprintf(debugBuff, "%d B, sum=%d\r\n", payloadLength, checksumCalc);
 				serial0_sendString((debugBuff));
 				#endif
 				receivedPayload[payloadLength] = 0; // null-terminate string for atoi
@@ @@ -159,39 +154,43 @@ int serparser_parse(void) @@
 				#endif
 				receivedPayload[payloadLength] = byte;
 				payloadLength++;
 				checksumCalc += byte;
 				// Data buffer overrun protection
 				if(payloadLength > MAX_PAYLOAD_LEN) {
 				if(payloadLength > MAX_PAYLOAD_LEN)
+				{
 					#ifdef DEBUG
 					serial0_sendString("ovf\r\n");
 					#endif
 					setParserState(STATE_RESET);
 					return PARSERESULT_FAIL;
+				}
 				else {
 				else
+				{
 					// Set state. MUST call even though state is maintained to update parse position
 					setParserState(STATE_GETDATA);
 					return PARSERESULT_STILLPARSING;
+				}
+			}
+		}
 		else if(STATE_GETCHECKSUM)
+		{
 			// TODO: Compare checksums
 			if(byte == checksumCalc) {
 			if(byte == checksumCalc)
+			{
 				#ifdef DEBUG
 				serial0_sendString("check\r\n");
 				#endif
 				setParserState(STATE_RESET);
 				return PARSERESULT_PARSEOK;
+			}
 			else {
 			else
+			{
 				#ifdef DEBUG
 				serial0_sendString("bcheck\r\n");
 				#endif
 				setParserState(STATE_RESET);
 				return PARSERESULT_PARSEOK;

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -49,20 +49,22 @@ const char *const labelLookup[] PROGMEM @@
 	label_6,
 	label_7,
 	label_8,
 };
 char labelBuffer[15]; // Size to length of label
 char* slavesensors_getLabel(uint8_t sensorID) {
 char* slavesensors_getLabel(uint8_t sensorID)
+{
 	if(sensorID < 9)
+	{
 		strncpy_P(labelBuffer,(char*)pgm_read_word(&(labelLookup[sensorID])),15);
 		return labelBuffer;
+	}
 	else {
 	else
+	{
 		return NULL;
+	}
+}
 uint8_t currentSlave = 0;
 uint8_t currentSlaveSensor = 0;
@@ @@ -84,17 +86,19 @@ static char slaveAddressHigh[MAX_NUM_SLA @@
 static char slaveNames[MAX_NUM_SLAVES][15];
 uint8_t loggerIndex = 255;
 uint8_t nodeCount = 0;
 bool dataReady = false;
 char* slavesensors_slavename(uint8_t id) {
 char* slavesensors_slavename(uint8_t id)
+{
 	return slaveNames[id];
+}
 void slavesensors_network_scan() {
 void slavesensors_network_scan()
+{
 	serial0_ioff();
 	int atOK;
 	#ifdef DEBUG_OUTPUT
 	serial0_sendString("Beginning network scan...\r\n\r\n");
@@ @@ -113,58 +117,68 @@ void slavesensors_network_scan() { @@
 		led_on(LED_CYCLE);
 		serial0_sendString("ATND");
 		serial0_sendChar(0x0D);
 		// wait for scan to complete
 		uint16_t scanStart = time_millis();
 		while(!serial0_hasChar()) {
 			if(time_millis() - scanStart > 7000) {
 		while(!serial0_hasChar())
+		{
 			if(time_millis() - scanStart > 7000)
+			{
 				led_errorcode(ERROR_XBEETIMEOUT);
 				return;
+			}
 			wdt_reset();
+		}
 		// Scan data end when newline by itself ("")
 		int lineCount = 0;
 		while(1) {
 		while(1)
+		{
 			bufPtr = serial0_readLine();
 			// If we're starting a new block but got a newline instead, we're done!
 			if(lineCount == 0 && strcmp(bufPtr, "") == 0) {
 			if(lineCount == 0 && strcmp(bufPtr, "") == 0)
+			{
 				break;
+			}
 			if(lineCount == 1) {
 			if(lineCount == 1)
+			{
 				strncpy(slaveAddressHigh[nodeCount],bufPtr, 9);
+			}
 			else if(lineCount == 2) {
 			else if(lineCount == 2)
+			{
 				strncpy(slaveAddressLow[nodeCount],bufPtr, 9);
+			}
 			else if(lineCount == 3) {
 			else if(lineCount == 3)
+			{
 				strncpy(slaveNames[nodeCount], bufPtr, 15);
+			}
 			// If we've finished one chunk (including the newline after it). Can't be else if because it controls increment.
 			if(lineCount == 9) {
 			if(lineCount == 9)
+			{
 				// bufPtr should be null at this point, because we read in a newline after one chunk
 				nodeCount++;
 				lineCount = 0;
+			}
 			else {
 			else
+			{
 				lineCount++;
+			}
+		}
 		slavesensors_exitAT();
+	}
 	// Display number of found nodes on spinning indicator
 	switch(nodeCount) {
 	switch(nodeCount)
+	{
 		case 0:
 			break;
 		case 3:
 			led_on(LED_ACT2);
 			_delay_ms(100);
 		case 2:
@@ @@ -180,18 +194,20 @@ void slavesensors_network_scan() { @@
 	led_off(LED_SIDEBOARD);
 	#ifdef DEBUG_OUTPUT
 	char debugBuf[64];
 	serial0_sendString("Discovered: \r\n");
 	for(int i=0; i<nodeCount; i++) {
 	for(int i=0; i<nodeCount; i++)
+	{
 		snprintf(debugBuf, 64, "  %s - %s%s (%u)\r\n", slaveNames[i],slaveAddressHigh,slaveAddressLow[i], i);
 		serial0_sendString(debugBuf);
+	}
 	serial0_sendString("\r\n");
 	if(atOK != 0) {
 	if(atOK != 0)
+	{
 		serial0_sendString("AT mode failed \r\n");
+	}
 	#endif
 	for(int i=0; i<nodeCount; i++)
@@ @@ -209,19 +225,21 @@ void slavesensors_network_scan() { @@
+}
 //#define DEBUG_CONTEXTSWITCH
 //#define DEBUG_SELECTNODE
 uint8_t selectedNode = 0;
 uint8_t slavesensors_getselectednode() {
 uint8_t slavesensors_getselectednode()
+{
 	return selectedNode;
+}
 void slavesensors_selectnode(uint8_t nodeIndex)
+{
 	if(selectedNode == nodeIndex) {
 	if(selectedNode == nodeIndex)
+	{
 		return;
+	}
 	serial0_ioff();
 	#ifdef DEBUG_CONTEXTSWITCH
 	uint32_t startTime = time_millis();
@@ @@ -234,26 +252,29 @@ void slavesensors_selectnode(uint8_t nod @@
 	#endif
 	_delay_ms(20);
 	char tmpBuf[23];
 	// If we can get into AT mode
 	if(slavesensors_enterAT() == 0) {
 	if(slavesensors_enterAT() == 0)
+	{
 		snprintf(tmpBuf, 23, "ATDH %s%c",slaveAddressHigh[nodeIndex], 0x0D);
 		serial0_sendString(tmpBuf);
 		if(xbeeIsOk() != 0) {
 		if(xbeeIsOk() != 0)
+		{
 			led_errorcode(ERROR_NOXBEE);
 			return;
+		}
 		snprintf(tmpBuf, 23, "ATDL %s%c",slaveAddressLow[nodeIndex], 0x0D);
 		serial0_sendString(tmpBuf);
 		if(xbeeIsOk() != 0) {
 		if(xbeeIsOk() != 0)
+		{
 			led_errorcode(ERROR_NOXBEE);
 			return;
+		}
 		slavesensors_exitAT();
 		selectedNode = nodeIndex;
@@ @@ -276,13 +297,14 @@ void slavesensors_selectnode(uint8_t nod @@
 	serial0_ion();
 	return;
+}
 void slavesensors_selectlogger()
+{
 	if(loggerIndex != 255) {
 	if(loggerIndex != 255)
+	{
 		slavesensors_selectnode(loggerIndex);
+	}
+}
 void slavesensors_exitAT()
+{
@@ @@ -342,13 +364,14 @@ int xbeeIsOk() @@
+	{
 		led_errorcode(ERROR_NOXBEE);
 		return 1;
+	}
+}
 bool slavesensors_dataReady() {
 bool slavesensors_dataReady()
+{
 	return dataReady;
+}
 bool slavesensors_isrequesting()
+{
 	return requesting;
@@ @@ -360,15 +383,17 @@ void slavesensors_startprocess() @@
 	slavesensors_request();
+}
 // TODO: inline. static.
 void slavesensors_request()
+{
 	if(currentSlave == loggerIndex) {
 	if(currentSlave == loggerIndex)
+	{
 		currentSlave++;
 		if(currentSlave >= (nodeCount)) {
 		if(currentSlave >= (nodeCount))
+		{
 			slavesensors_selectlogger();
 			return;
+		}
+	}
 	slavesensors_selectnode(currentSlave);
 	serial_sendCommand("@"); // Request data!
@@ @@ -378,20 +403,22 @@ void slavesensors_request() @@
 uint8_t numReadingsToExpect = 0; // number of values that the slave is about to send (testing)
 // TODO: needs to skip logger!
 void slavesensors_process(uint8_t parseResult)
+{
 	if(!requesting) {
 	if(!requesting)
+	{
 		// we got a command when we didn't request anything. probably skip it.
 		return;
+	}
 	// TODO: timeout. If we're at NODATA for a long time and we are requesting, that's an issue.
 	// TODO: If we time out, WE NEED TO RESET THE PARSER. It could be in a bad state.
 	else if(parseResult == PARSERESULT_NODATA) {
 	else if(parseResult == PARSERESULT_NODATA)
+	{
 		// Wait for data
+	}
 	// Finished reception of a message (one sensor data value). If not finished, send out command to get the next one
 	else if(parseResult == PARSERESULT_PARSEOK)
+	{
@@ @@ -407,25 +434,27 @@ void slavesensors_process(uint8_t parseR @@
 		uint8_t len = getPayloadLength();
 		char* load = getPayload();
 		uint8_t type = getPayloadType();
 		int32_t parsedVal = strtol(load, NULL, 10);//atoi(load);
 		// Special case for slave telling us how many things we're about to get
 		if(type + 0x30 == '@') {
 		if(type + 0x30 == '@')
+		{
 			#ifdef DEBUG_GETSLAVEDATA
 			serial0_sendString("Got an awesome count!\r\n");
 			serial0_sendChar(parsedVal + 0x30);
 			serial0_sendString("\r\n");
 			#endif
 			numReadingsToExpect = parsedVal;
 			currentSlaveSensor = 0;
 			requesting = true;
+		}
 		else {
 		else
+		{
 			// Store data in structure
 			sensordata_set(currentSlave,type,parsedVal);
 			#ifdef DEBUG_GETSLAVEDATA
 			serial0_sendString("Stored some sexy data!\r\n");
@@ @@ -453,23 +482,26 @@ void slavesensors_process(uint8_t parseR @@
 				#endif
 				currentSlave++;
 				currentSlaveSensor = 0;
 				requesting = true;
 				if(currentSlave == loggerIndex) {
 					if(currentSlave >= (nodeCount-1)) {
 				if(currentSlave == loggerIndex)
+				{
 					if(currentSlave >= (nodeCount-1))
+					{
 						// We hit the last one, we're done.
 						dataReady = true;
 						currentSlave = 0;
 						currentSlaveSensor = 0;
 						requesting = false;
 						led_alert();
 						return;
+					}
 					else {
 					else
+					{
 						currentSlave++; // increment to the next slave after the logger
+					}
+				}
 				slavesensors_request();
+			}
@@ @@ -487,22 +519,25 @@ void slavesensors_process(uint8_t parseR @@
+			}
+		}
+	}
 	// If fail, try retransmit. Or we could skip and hit it next time.
 	// TODO: Maximum number of retransmissions
 	else if(parseResult == PARSERESULT_FAIL) {
 		if(requesting) {
 	else if(parseResult == PARSERESULT_FAIL)
+	{
 		if(requesting)
+		{
 			slavesensors_request();	// re-request
+		}
+	}
 	else if(parseResult == PARSERESULT_STILLPARSING)
+	{
 		return; // do nothing
+	}
 	else {
 	else
+	{
 		// something is terribly wrong!
 		return;
+	}
+}
@@ \ No newline at end of file @@

master/master/master.c

➞

Show inline comments

@@ @@ -69,13 +69,14 @@ int main(void) @@
 	serial1_ioff();
 	while(1)
+    {
 		// Periodic: LED execution indicator
 		if(time_millis() - lastLedCycle > LEDCYCLE_RATE) {
 		if(time_millis() - lastLedCycle > LEDCYCLE_RATE)
+		{
 			led_spin();
 			// Enable GPS serial interrupts if we aren't doing AFSK
 			if(!afsk_busy())
 				serial1_ion();
@@ @@ -87,16 +88,18 @@ int main(void) @@
+		{
 			led_on(LED_CYCLE);
 			heater_regulateTemp();
 			// Turn on sideboard LED if we have a fix
 			if(gps_hasfix()) {
 			if(gps_hasfix())
+			{
 				led_on(LED_SIDEBOARD);
+			}
 			else {
 			else
+			{
 				led_off(LED_SIDEBOARD);
+			}
 			sensors_readBoardTemp();
 			// Write CSV header and log data values
@@ @@ -105,13 +108,14 @@ int main(void) @@
 			led_off(LED_CYCLE);
 			lastLog = time_millis();
+		}
 		// Periodic: Data Request
 		if(time_millis() - lastDataReq > DATAREQUEST_RATE)  {
 		if(time_millis() - lastDataReq > DATAREQUEST_RATE)
+		{
 			// Start getting values for next transmission
 			if(slavesensors_isrequesting())
+			{
 				// TODO: something is terribly wrong. Timeout?
+			}

0 comments (0 inline, 0 general)