seniordesign-firmware Changeset - b68fde48a3b7

Changeset - b68fde48a3b7

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-01-16 22:56:20
ethanzonca@CL-ENS241-08.cedarville.edu

Fixed SD card logging (broken from previous commit)

2 files changed with 2 insertions and 2 deletions:

master/master/lib/logger.c

master/master/master.c

0 comments (0 inline, 0 general)

master/master/lib/logger.c

➞

Show inline comments

@@ @@ -68,49 +68,49 @@ void logger_setup() @@
 		return;
+	}
 	// Open directory
 	fat_get_dir_entry_of_path(fs, "/", &directory);
 	dd = fat_open_dir(fs, &directory);
 	if(!dd)
+	{
 		// opening root directory failed
 		_delay_ms(10);
 		led_errorcode(ERROR_SD_FILE);
 		return;
+	}
 	// Create new log file
 	uint8_t logid = eeprom_read_byte(LOGGER_ID_EEPROM_ADDR);
 	char filename[48];
 	// we pre-increment logid here because it starts at 255, then wraps to 0
 	sprintf(filename, "data%d.csv",++logid);
 	// TODO: Catch errors here
-	if(!fat_create_file(dd, filename, &directory)) {
+	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
 	fd = open_file_in_dir(fs, dd, filename);
 	if(!fd)
+	{
 		led_errorcode(ERROR_SD_FILE);
 		_delay_ms(10);
 		return;
+	}
 	// Seek to beginning of file
 	// TODO: Is this needed?
 	int32_t offset = 0;
 	if(!fat_seek_file(fd, &offset, FAT_SEEK_SET))
+	{
 		// Error seeking to file
 		led_errorcode(ERROR_SD_FILE);
 		_delay_ms(10);
 		fat_close_file(fd);
 		return;

master/master/master.c

➞

Show inline comments

@@ @@ -55,49 +55,49 @@ int main(void) @@
 	//\f
 	serial0_sendString("\r\n---------------------------------\r\n");
 	serial0_sendString("HAB Controller 1.0 - Initialized!\r\n");
 	serial0_sendString("---------------------------------\r\n");
 	serial0_sendString("\r\nHello.\r\n\r\n");
 	slavesensors_network_scan();
 	led_on(LED_POWER);
 	led_off(LED_SIDEBOARD);
 	// Buffer for string operations
 	char logbuf[128];
 	char debugBuf[128];
 	// Software timers
 	uint32_t lastAprsBroadcast = 0;
 	uint32_t lastLog = 0;
 	uint32_t lastLedCycle = 0;
 	// Result of last parser run
 	int parseResult = PARSERESULT_NODATA;
 	// Write CSV header to SD card
-	//logger_log("ProgramTime,LastAprsBroadcast,LastLog\n");
 	logger_log("ProgramTime,LastAprsBroadcast,LastLog\n");
 	uint8_t ctr = 0;
 	void spin() {
 		if(ctr == 0) {
 			led_on(LED_ACT0);
 			led_off(LED_ACT1);
 			led_off(LED_ACT2);
 			led_off(LED_ACT3);
+		}
 		else if (ctr == 1) {
 			led_on(LED_ACT1);
 			led_off(LED_ACT0);
 			led_off(LED_ACT2);
 			led_off(LED_ACT3);
+		}
 		else if (ctr == 2) {
 			led_on(LED_ACT2);
 			led_off(LED_ACT1);
 			led_off(LED_ACT0);
 			led_off(LED_ACT3);
+		}
 		else if (ctr == 3) {
 			led_on(LED_ACT3);

0 comments (0 inline, 0 general)