seniordesign-firmware Changeset - 28bdbd881b55

Changeset - 28bdbd881b55

Parent rev.

Child rev.

[Not reviewed]

default

0 6 2

ethanzonca@CL-SEC241-08.cedarville.edu - 13 years ago 2012-11-19 22:04:11
ethanzonca@CL-SEC241-08.cedarville.edu

Added looptime and other optimizations. LoopTime interrupt is firing, but incrementing may or may not work.

8 files changed with 67 insertions and 12 deletions:

master/master/lib/led.c

master/master/lib/logger.c

master/master/lib/looptime.c

master/master/lib/looptime.h

master/master/lib/sd/sd_raw.c

master/master/lib/watchdog.c

master/master/master.c

master/master/master.cproj

0 comments (0 inline, 0 general)

master/master/lib/led.c

➞

Show inline comments

 /*
  * led.c
+ *
  * Created: 10/25/2012 3:34:03 PM
  *  Author: ethanzonca
  */
 #include <avr/io.h>
 void led_setup() {
 	// Configure ports/pins for LEDs
 	DDRA = 0xff;
 	PORTA = 0x00;
+	//PORTA = 0x00;
+}
 void led_on(uint8_t led) {
 	// Turn the specified LED on
 	PORTA |= (1<<led);
+}
 void led_off(uint8_t led) {
 	// Turn the specified LED off
 	PORTA &= ~(1<<led);
+}
 void led_toggle(uint8_t led) {
 	// Toggle the specified LED
+}
@@ \ No newline at end of file @@

master/master/lib/logger.c

➞

Show inline comments

@@ @@ -59,82 +59,79 @@ void logger_setup() @@
 		partition = partition_open(sd_raw_read, sd_raw_read_interval, sd_raw_write, sd_raw_write_interval, -1);
 		if(!partition)
+		{
 			// opening partition failed
 			return;
+		}
+	}
 	// Open FAT filesystem
 	fs = fat_open(partition);
 	if(!fs)
+	{
 		// opening filesystem failed
 		return;
+	}
 	// Open directory
 	fat_get_dir_entry_of_path(fs, "/", &directory);
 	dd = fat_open_dir(fs, &directory);
 	if(!dd)
+	{
 		// opening root directory failed
 		//PORTA |= 0b00000101;
 		_delay_ms(10);
 		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
 	fat_create_file(dd, filename, &directory);
 	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)
+	{
 		_delay_ms(10);
 		//PORTA |= 0b00000110;
 		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
 		//PORTA |= 0b00000111;
 		_delay_ms(10);
 		fat_close_file(fd);
 		return;
+	}
 	// Write header information
 	logger_log(LOGGER_HEADERTEXT);
 	logger_log("\n-- BEGIN DATA --\n");
 	logger_log("C1, C2, C3, C4, C5, C6\n");
+}
 void logger_log(char *buffer) {
 	uint8_t len = strlen(buffer);
 	if(fat_write_file(fd, (uint8_t*) buffer, len) != len)
+	{
 		// Error writing to file
 		return;
+	}
+}
 void logger_closeLog() {
 	fat_close_file(fd);
 	fat_close_dir(dd);

master/master/lib/looptime.c

➞

Show inline comments

@@ new file 100644 @@
 /*
  * looptime.c
+ *
  * Created: 11/19/2012 8:56:42 PM
  *  Author: ethanzonca
  */
 #include <avr/io.h>
 #include <avr/interrupt.h>
 volatile uint32_t millis = 0; // Milliseconds since initialization
 void time_setup() {
 	DDRA = 0xff;
 	// Generic microcontroller config options
 	OCR0A = 173; // Approx 172.7969 ticks per ms with 64 prescaler
 	TCCR0A |= (1 << WGM01) | (1 << WGM00); // Count until OCR0A, then overflow (wgm02 in the next line specifies this as well)
 	TCCR0B |= (1 << CS01) | (1 << CS00) | (1 << WGM02); // clock div by 64
 	TIFR0 |= ( 1 << TOV0 ); // clear pending interrupts
 	TIMSK0 |= (1 << TOIE0); // enable overflow interrupt
+}
 ISR(TIMER0_OVF_vect) {
 	PORTA = 0xff;
 	millis++;
+}
 uint32_t time_millis() {
 	return millis; // meh accuracy, but that's OK
+}

master/master/lib/looptime.h

➞

Show inline comments

@@ new file 100644 @@
 /*
  * looptime.h
+ *
  * Created: 11/19/2012 8:56:49 PM
  *  Author: ethanzonca
  */
 #ifndef LOOPTIME_H_
 #define LOOPTIME_H_
 void time_setup();
 uint32_t time_millis();
 #endif /* LOOPTIME_H_ */
@@ \ No newline at end of file @@

master/master/lib/sd/sd_raw.c

➞

Show inline comments

@@ @@ -333,90 +333,88 @@ uint8_t sd_raw_init() @@
     raw_block_written = 1;
 #endif
     if(!sd_raw_read(0, raw_block, sizeof(raw_block)))
         return 0;
 #endif
     return 1;
+}
 /**
  * \ingroup sd_raw
  * Checks wether a memory card is located in the slot.
+ *
  * \returns 1 if the card is available, 0 if it is not.
  */
 uint8_t sd_raw_available()
+{
 	int i;
 	return 1; // !!TODO: OH GOSH CHANGE ME
     return get_pin_available() == 0x00;
+}
 /**
  * \ingroup sd_raw
- * Checks wether the memory card is locked for write access.
+ * Checks whether the memory card is locked for write access.
+ *
  * \returns 1 if the card is locked, 0 if it is not.
  */
 uint8_t sd_raw_locked()
+{
 	int i;
 	// !!TODO oh gosh change me
 	return 0;
     return get_pin_locked() == 0x00;
+}
 /**
  * \ingroup sd_raw
  * Sends a raw byte to the memory card.
+ *
  * \param[in] b The byte to sent.
  * \see sd_raw_rec_byte
  */
 void sd_raw_send_byte(uint8_t b)
+{
     SPDR0 = b;
     /* wait for byte to be shifted out */
     while(!(SPSR0 & (1 << SPIF0)));
     SPSR0 &= ~(1 << SPIF0);
+}
 /**
  * \ingroup sd_raw
  * Receives a raw byte from the memory card.
+ *
  * \returns The byte which should be read.
  * \see sd_raw_send_byte
  */
 uint8_t sd_raw_rec_byte()
+{
     /* send dummy data for receiving some */
     SPDR0 = 0xff;
 		//PORTA = 0x01;
     while(!(SPSR0 & (1 << SPIF0)));
 	//PORTA = 0x02;
     SPSR0 &= ~(1 << SPIF0);
     return SPDR0;
+}
 /**
  * \ingroup sd_raw
  * Send a command to the memory card which responses with a R1 response (and possibly others).
+ *
  * \param[in] command The command to send.
  * \param[in] arg The argument for command.
  * \returns The command answer.
  */
 uint8_t sd_raw_send_command(uint8_t command, uint32_t arg)
+{
     uint8_t response;
     /* wait some clock cycles */
     sd_raw_rec_byte();
     /* send command via SPI */
     sd_raw_send_byte(0x40 | command);
     sd_raw_send_byte((arg >> 24) & 0xff);
     sd_raw_send_byte((arg >> 16) & 0xff);

master/master/lib/watchdog.c

➞

Show inline comments

@@ @@ -5,26 +5,26 @@ @@
  *  Author: ethanzonca
  */
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <avr/wdt.h>
 //initialize watchdog
 void watchdog_setup(void)
+{
 	cli();
 	wdt_reset();
 	// Set change enable bit, enable the WDT
 	WDTCSR = (1<<WDCE)|(1<<WDE);
 	// Start watchdog, 4 second timeout
 	WDTCSR = (1<<WDE)|(1<<WDP3)|(1<<WDP0);
 	sei();
+}
 // ISR for watchdog timeout. Not currently used, interrupt is disabled.
 ISR(WDT_vect)
+{
-	PORTA = 0xff;
+}

master/master/master.c

➞

Show inline comments

 /*
  * Master Firmware
+ *
  * Wireless Observational Modular Aerial Network
+ *
  * Ethan Zonca
  * Matthew Kanning
  * Kyle Ripperger
  * Matthew Kroening
+ *
  */
 #include "config.h"
 #include <avr/io.h>
 #include <util/delay.h>
 #include <avr/wdt.h>
 #include <avr/interrupt.h>
 #include "lib/serial.h"
 #include "lib/aprs.h"
 #include "lib/afsk.h"
 #include "lib/led.h"
 #include "lib/logger.h"
 #include "lib/watchdog.h"
 #include "lib/sd/sd_raw_config.h"
 void micro_setup() {
-	// Generic microcontroller config options
+}
 int main(void)
+{
 	// Initialize. If this takes more than 4 seconds, be sure to reset the WDT
 	time_setup();
 	micro_setup();
 	watchdog_setup();
 	led_setup();
 	serial_setup(); // Config serial ports
 	logger_setup(); // this takes a few ms
 	afsk_setup(); // can take a few ms
 	led_on(POWER);
 	//led_on(POWER);
 	uint16_t ctr1 = 0;
 	uint16_t ctr2 = 255;
 	char logbuf[32];
 	while(1)
+    {
 		led_on(STAT);
-		sprintf(logbuf, "%d,%d,%d,%d,%d,%d\n", ctr1,5*ctr1,ctr2, 12*ctr2,43*ctr1,5*ctr2);
+		sprintf(logbuf, "%d,%d,%d,%d,%d,%d\n", time_millis(),5*ctr1,ctr2, 12*ctr2,43*ctr1,5*ctr2);
 		logger_log(logbuf);
 		led_off(STAT);
 		// Wait for transmission to complete before starting another.
 		// Hopefully this will never delay because it should issue on a timed schedule. Software timers!
 		while(afsk_busy());
 		aprs_send(); // non-blocking
 		ctr1++;
 		ctr2-=6;
 		wdt_reset();
+    }
+}
@@ \ No newline at end of file @@

master/master/master.cproj

➞

Show inline comments

@@ @@ -123,48 +123,54 @@ @@
     <Compile Include="lib\aprs.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\aprs.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\ax25.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\ax25.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\logger.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\led.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\led.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\logger.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\looptime.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\looptime.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sd\byteordering.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sd\byteordering.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sd\fat.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sd\fat.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sd\fat_config.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sd\partition.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sd\partition.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sd\partition_config.h">
       <SubType>compile</SubType>
     </Compile>

0 comments (0 inline, 0 general)