seniordesign-firmware Changeset - 8b84d04493fa

Changeset - 8b84d04493fa

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-01-29 14:23:15
ethanzonca@CL-ENS241-08.cedarville.edu

Node scanning and logger selection functional, reverted some portions of code.

3 files changed with 19 insertions and 8 deletions:

master/master/lib/led.h

master/master/lib/slavesensors.c

master/master/master.c

0 comments (0 inline, 0 general)

master/master/lib/led.h

➞

Show inline comments

@@ @@ -19,50 +19,53 @@ @@
 enum leds {
 	LED_ACT0 = 0,
 	LED_ACT1,
 	LED_ACT2,
 	LED_ACT3,
 	LED_POWER,
 	LED_STATUS,
 	LED_ERROR,
 	LED_SIDEBOARD,
 	LED_ACTIVITY,
 	LED_CYCLE,
 	LED_HEAT
 	LED_HEAT,
 	LED_BUZZ,
 };
 typedef struct {uint8_t* direction; uint8_t* port; uint8_t pin;} led_t;
 // Match order of leds enum
 static led_t ledList[] = {
 	{&DDRA, &PORTA, PA1}, // ACT0
 	{&DDRA, &PORTA, PA2}, // ACT1
 	{&DDRA, &PORTA, PA3}, // ACT2
 	{&DDRA, &PORTA, PA4}, // ACT3
 //pcb:
 	{&DDRB, &PORTB, PB4}, // POWER
 	{&DDRB, &PORTB, PB3}, // STATUS
 	{&DDRB, &PORTB, PB2}, // ERROR
 //breadboard:
 //	{&DDRA, &PORTA, PA2}, // POWER
 //	{&DDRA, &PORTA, PA0}, // STATUS
 //	{&DDRA, &PORTA, PA1}, // ERROR
 	{&DDRD, &PORTD, PD6}, // SIDEBOARD
 	{&DDRD, &PORTD, PD5}, // ACTIVITY
 	{&DDRD, &PORTD, PD4}, // CYCLE
 	{&DDRA, &PORTA, PD6}, // HEAT
 	{&DDRA, &PORTA, PA6}, // HEAT
 	{&DDRA, &PORTA, PA7}, // BUZZER
 };
-#define NUM_LEDS 11
+#define NUM_LEDS 12
 void led_setup();
 void led_on(uint8_t led);
 void led_off(uint8_t led);
 void led_toggle(uint8_t led);
 void led_errorcode(uint8_t code);
 void led_spin();
 #endif /* LED_H_ */

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -135,25 +135,25 @@ void slavesensors_network_scan() { @@
 			_delay_ms(100);
+	}
 	led_on(LED_SIDEBOARD);
 	_delay_ms(200);
 	led_off(LED_SIDEBOARD);
 	#ifdef DEBUG_OUTPUT
 	char debugBuf[64];
 	serial0_sendString("Discovered: \r\n");
 	for(int i=0; i<nodeCount; i++) {
-		snprintf(debugBuf, 64, "  %s - %s%s (%u)\r\n", slaveNames[i],slaveAddressHigh,slaveAddressLow[i], nodeCount);
+		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) {
 		serial0_sendString("AT mode failed \r\n");
+	}
 	#endif
 	for(int i=0; i<nodeCount; i++)
+	{
 		if(strcmp(slaveNames[i], XBEE_LOGDEST_NAME) == 0)

master/master/master.c

➞

Show inline comments

@@ @@ -31,30 +31,34 @@ @@
 #include "lib/gps.h"
 #include "lib/i2c.h"
 #include "lib/boardtemp.h"
 #include "lib/heater.h"
 #include "lib/looptime.h"
 #include "lib/slavesensors.h"
 #include "lib/serparser.h"
 #include "lib/sensordata.h"
 int main(void)
+{
 	led_on(LED_POWER);
 	// Initialize libraries
 	time_setup();
 	watchdog_setup(); // enables interrupts
 	led_setup();
 	led_setup();
 	led_on(LED_POWER);
 	led_on(LED_BUZZ);
 	_delay_ms(1);
 	led_off(LED_BUZZ);
 	gps_setup();
 	serial0_setup();
 	serial1_setup();
 	i2c_init();
 	sensordata_setup(); // must happen before sensors/logger/afsk
 	slavesensors_setup();
 	logger_setup();
 	afsk_setup();
 	//\f
 	#ifdef DEBUG_OUTPUT
 	serial0_sendString("\r\n---------------------------------\r\n");
@@ @@ -111,41 +115,45 @@ int main(void) @@
 			else {
 				led_on(LED_SIDEBOARD);
+			}
 			sensors_readBoardTemp(); // i2c read, 400k
 			// If we've gotten data from all slaves once, we're ready to make a CSV header and start logging
 			if(slavesensors_dataReady()) {
 				if(!dataWasReady) {
 					char csvHeader[128];
 					csvHeader[0] = 0x00;
 					// Add master data headers
 					snprintf(csvHeader, 128, "Time,BoardTemp,Lat,Lon,HDOP,Speed,GPS SV,");
 					for(uint8_t i=0; i<MAX_NUM_SLAVES; i++) {
 						for(uint8_t j=0; j<MAX_NUM_SENSORS; j++) {
 							int16_t tmp = sensordata_get(i, j);
 							if(tmp != -32768) {
 								// FIXME: will the 128 here really provide safety? might want to subtract the strlen
 								snprintf(csvHeader + strlen(csvHeader), 128,"%s-Sensor%u,", slavesensors_slavename(i), j);
+							}
+						}
+					}
 					snprintf(csvHeader + strlen(csvHeader), 128,"\r\n");
 					serial0_sendString(csvHeader);
 					logger_log(csvHeader);
 					dataWasReady = true;
+				}
 				logbuf[0] = 0x00;
 				//snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s\r\n", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
 				snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s\r\n", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
 				serial0_sendString(logbuf);
 				for(int i=0; i<MAX_NUM_SLAVES; i++) {
 					for(int j=0; j<MAX_NUM_SENSORS; j++) {
 						int16_t tmp = sensordata_get(i, j);
 						if(tmp != -32768) {
 							snprintf(logbuf + strlen(logbuf),128," %d,", tmp);
+						}
+					}
+				}
 				snprintf(logbuf + strlen(logbuf),128,"\r\n");
 				serial0_sendString(logbuf);
 				logger_log(logbuf);

0 comments (0 inline, 0 general)