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

@@ @@ -28,7 +28,8 @@ enum leds { @@
 	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;
@@ @@ -53,10 +54,12 @@ static led_t ledList[] = { @@
 	{&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);

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -144,7 +144,7 @@ void slavesensors_network_scan() { @@
 	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");

master/master/master.c

➞

Show inline comments

@@ @@ -40,12 +40,16 @@ @@
 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();
@@ @@ -120,6 +124,9 @@ int main(void) @@
 					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);
@@ @@ -136,7 +143,8 @@ int main(void) @@
+				}
 				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);

0 comments (0 inline, 0 general)