seniordesign-firmware Changeset - 6060ac6db4a5

Changeset - 6060ac6db4a5

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

ethanzonca@CL-SEC241-08.cedarville.edu - 12 years ago 2012-11-28 21:37:02
ethanzonca@CL-SEC241-08.cedarville.edu

Added error code functionality for error LED, added SD card errors.

5 files changed with 44 insertions and 27 deletions:

master/master/config.h

master/master/lib/led.c

master/master/lib/led.h

master/master/lib/logger.c

master/master/master.c

0 comments (0 inline, 0 general)

master/master/config.h

➞

Show inline comments

@@ @@ -4,24 +4,32 @@ @@
  * Created: 10/25/2012 3:28:22 PM
  *  Author: ethanzonca
  */
 #ifndef CONFIG_H_
 #define CONFIG_H_
 #define F_CPU 11059200
 #define MODULE_ID '1'
 // --------------------------------------------------------------------------
 // Error Codes config (led.c)
 // --------------------------------------------------------------------------
 // SD Card
 #define ERROR_SD_INIT 2
 #define ERROR_SD_PARTITION 3
 // --------------------------------------------------------------------------
 // Slave Sensors config (slavesensors.c)
 // --------------------------------------------------------------------------
 #define SLAVE0_SENSORS BOARDTEMP
 #define SLAVE1_SENSORS BOARDTEMP | HUMIDITY | TEMPERATURE | PRESSURE | AMBIENTLIGHT
 #define SLAVE2_SENSORS BOARDTEMP | GEIGER
 #define SLAVE3_SENSORS BOARDTEMP | CAMERA
 #define SLAVE4_SENSORS NONE
 #define SLAVE5_SENSORS NONE
 #define SLAVE6_SENSORS NONE
 #define SLAVE7_SENSORS NONE

master/master/lib/led.c

➞

Show inline comments

 /*
  * led.c
+ *
  * Created: 10/25/2012 3:34:03 PM
  *  Author: ethanzonca
  */
+#include "../config.h"
 #include <avr/io.h>
 #include <util/delay.h>
 #include "led.h"
 void led_setup() {
 void led_setup()
+{
 	// Configure ports/pins for LEDs
 	DDRA = 0xff;
 	//PORTA = 0x00;
+}
 void led_on(uint8_t led) {
 void led_on(uint8_t led)
+{
 	// Turn the specified LED on
 	PORTA |= (1<<led);
+}
 void led_off(uint8_t led) {
 void led_off(uint8_t led)
+{
 	// Turn the specified LED off
 	PORTA &= ~(1<<led);
+}
 void led_toggle(uint8_t led) {
 void led_toggle(uint8_t led)
+{
 	// Toggle the specified LED
+}
 // Flashes error LED a set amount of times, then leaves it on
 void led_errorcode(uint8_t code)
+{
 	_delay_ms(400);
 	for(int i=0; i<code; i++)
+	{
 		led_on(ERROR);
 		_delay_ms(150);
 		led_off(ERROR);
 		_delay_ms(150);
+	}
 	_delay_ms(400);
 	led_on(ERROR);
+}
@@ \ No newline at end of file @@

master/master/lib/led.h

➞

Show inline comments

@@ @@ -9,15 +9,15 @@ @@
 #ifndef LED_H_
 #define LED_H_
 #define POWER PB2
 #define ERROR PB1
 #define STAT PB0
 #define OK 2
 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);
 #endif /* LED_H_ */

master/master/lib/logger.c

➞

Show inline comments

@@ @@ -10,68 +10,55 @@ @@
 #include <string.h>
 #include <stdio.h>
 #include <avr/pgmspace.h>
 #include <avr/sleep.h>
 #include <avr/eeprom.h>
 #include <string.h>
 #include "sd/fat.h"
 #include "sd/fat_config.h"
 #include "sd/partition.h"
 #include "sd/sd_raw.h"
 #include "sd/sd_raw_config.h"
 #include "logger.h"
 /*
 	//config edits
   * By changing the MCU* variables in the Makefile, you can use other Atmel
   * microcontrollers or different clock speeds. You might also want to change
   * the configuration defines in the files fat_config.h, partition_config.h,
   * sd_raw_config.h and sd-reader_config.h. For example, you could disable
   * write support completely if you only need read support.
  */
 #include "led.h"
 struct partition_struct* partition;
 struct fat_fs_struct* fs;
 struct fat_dir_entry_struct directory;
 struct fat_dir_struct* dd;
 struct fat_file_struct* fd;
 void logger_setup()
+{
 	if(!sd_raw_init())
+	{
 		// initialization failed
 		// Initializing SD card failed!
 		// Error opening partition. MBR might be screwed up.
 		led_errorcode(ERROR_SD_INIT);
 		return;
+	}
 	// TODO: Check SD card switch to see if inserted.
 	// this was included in the library, but is commented out right now
 	// Open first partition
 	partition = partition_open(sd_raw_read, sd_raw_read_interval, sd_raw_write, sd_raw_write_interval, 0);
 	// Check that partition was created correctly
 	if(!partition)
+	{
 		// error
 		// If the partition did not open, assume the storage device is a "superfloppy", i.e. has no MBR.
 		partition = partition_open(sd_raw_read, sd_raw_read_interval, sd_raw_write, sd_raw_write_interval, -1);
 		if(!partition)
+		{
 			// opening partition failed
 			return;
+		}
 		// Error opening partition. MBR might be screwed up.
 		led_errorcode(ERROR_SD_PARTITION);
 		return;
+	}
 	// Open FAT filesystem
 	fs = fat_open(partition);
 	if(!fs)
+	{
 		// opening filesystem failed
 		return;
+	}
 	// Open directory

master/master/master.c

➞

Show inline comments

@@ @@ -42,25 +42,26 @@ int main(void) @@
 	micro_setup();
 	watchdog_setup();
 	led_setup();
 	serial0_setup();
 	serial1_setup();
 	slavesensors_setup();
 	logger_setup();
 	afsk_setup();
 	serial0_sendString("\r\n\r\n---------------------------------\r\nHAB Controller 1.0 - Initialized!\r\n---------------------------------\r\n\r\n");
 	led_on(POWER);
 	// Buffer for string operations
 	char logbuf[32];
 	const char* logBufPtr = logbuf;
 	// Software timers
 	uint32_t lastAprsBroadcast = 0;
 	uint32_t lastLog = 0;
 	// If we are currently processing sensor data
 	bool isProcessing = false;
 	// Write CSV header to SD card

0 comments (0 inline, 0 general)