seniordesign-firmware Changeset - a723b60d6d07

Changeset - a723b60d6d07

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 4

ethanzonca@CL-SEC241-08.cedarville.edu - 12 years ago 2012-11-30 16:42:16
ethanzonca@CL-SEC241-08.cedarville.edu

Merge

6 files changed with 191 insertions and 1 deletions:

slave/slave/lib/loopTimer.c

slave/slave/lib/loopTimer.h

slave/slave/lib/serial.c

slave/slave/lib/serial.h

slave/slave/slave.c

slave/slave/slave.cproj

0 comments (0 inline, 0 general)

slave/slave/lib/loopTimer.c

➞

Show inline comments

@@ new file 100644 @@
 /*
  * looptimer.c
+ *
  * Created: 11/29/2012 3:35:18 PM
  *  Author: kripperger
  */
 #include "../config.h"
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <util/delay.h>
 #include "loopTimer.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)
+{
 	millis = millis + 1;
+}
 uint32_t time_millis()
+{
 	return millis; // meh accuracy, but that's OK
+}

slave/slave/lib/loopTimer.h

➞

Show inline comments

@@ new file 100644 @@
 /*
  * loopTimer.h
+ *
  * Created: 11/29/2012 3:35:34 PM
  *  Author: kripperger
  */
 #ifndef LOOPTIMER_H_
 #define LOOPTIMER_H_
 void time_setup();
 uint32_t time_millis();
 #endif /* LOOPTIMER_H_ */
@@ \ No newline at end of file @@

slave/slave/lib/serial.c

➞

Show inline comments

@@ new file 100644 @@
 /*
  * serial.c
+ *
  * Created: 10/25/2012 3:19:49 PM
  *  Author: ethanzonca
  */
 #include "serial.h"
 #include "../config.h"
 #include <avr/io.h>
 void serial0_setup() {
 	/* Set baud rate */
 	UBRR0H = (unsigned char)(USART0_BAUD_PRESCALE>>8);
 	UBRR0L = (unsigned char)USART0_BAUD_PRESCALE;
 	/* Enable receiver and transmitter */
 	UCSR0B = (1<<RXEN0)|(1<<TXEN0);
 	/* Set frame format: 8data, 1stop bit */
 	UCSR0C = (3<<UCSZ00); // - 1 stop bit
+}
 void serial1_setup() {
 	/* Set baud rate */
 	UBRR1H = (unsigned char)(USART1_BAUD_PRESCALE>>8);
 	UBRR1L = (unsigned char)USART1_BAUD_PRESCALE;
 	/* Enable receiver and transmitter */
 	UCSR1B = (1<<RXEN1)|(1<<TXEN1);
 	/* Set frame format: 8data, 1stop bit */
 	UCSR1C = (3<<UCSZ10); // - 1 stop bit
+}
 void serial0_sendChar( unsigned char byte )
+{
 	while (!(UCSR0A & (1<<UDRE0)));
 	UDR0 = byte;
+}
 void serial1_sendChar( unsigned char byte )
+{
 	while (!(UCSR1A & (1<<UDRE1)));
 	UDR1 = byte;
+}
 void serial0_sendString(char* stringPtr){
 	while(*stringPtr != 0x00){
 		serial0_sendChar(*stringPtr);
 		stringPtr++;
+	}
+}
 void serial1_sendString(char* stringPtr){
 	while(*stringPtr != 0x00){
 		serial1_sendChar(*stringPtr);
 		stringPtr++;
+	}
+}
 void serial_sendCommand( char moduleID, char sensorID, uint8_t dataLength, char* data )
+{
 	char checkSum = 0x00; //initialize checksum
 	serial0_sendChar('['); //bracket indicates start of command
 	serial0_sendChar(moduleID);
 	checkSum+=moduleID;
 	serial0_sendChar(sensorID);
 	checkSum+=sensorID;
 	//send each character of data individually
 	for (int i=0; i<dataLength; i++)
+	{
 		serial0_sendChar(data[i]);
 		checkSum+=data[i];
+	}
 	serial0_sendChar(checkSum);
 	serial0_sendChar(']'); //bracket indicates end of command
+}
 void serial_sendResponseData(){
+}

slave/slave/lib/serial.h

➞

Show inline comments

@@ new file 100644 @@
 /*
  * serial.h
+ *
  * Created: 10/25/2012 3:19:42 PM
  *  Author: ethanzonca
  */
 #ifndef SERIAL_H_
 #define SERIAL_H_
 #include <inttypes.h>
 #define USART0_BAUD_PRESCALE (((F_CPU / (USART0_BAUDRATE * 16UL))) -1 )
 #define USART1_BAUD_PRESCALE (((F_CPU / (USART1_BAUDRATE * 16UL))) -1 )
 void serial0_sendChar( unsigned char byte );
 void serial1_sendChar( unsigned char byte );
 void serial0_setup();
 void serial1_setup();
 void serial0_sendString(char* stringPtr);
 void serial1_sendString(char* stringPtr);
 void serial_sendCommand( char moduleID, char sensorID, uint8_t dataLength, char* data );
 void serial_sendResponseData();
 #endif /* SERIAL_H_ */
@@ \ No newline at end of file @@

slave/slave/slave.c

➞

Show inline comments

@@ @@ -44,13 +44,13 @@ int main(void) @@
 	micro_setup();			// Generic microcontroller config options
 	led_configure();		// Configure ports and registers for LED operation
 	i2c_init();				// Setup I2C
 	serial0_setup();		// Config serial port
 	uint8_t moduleID = io_getModuleId(); // Slave Module ID from rotary dip switch
-	//moduleID=1;	//DEBUG///////////////////////////////////////////////////////////////////////////////////////////
 	moduleID=1;	//DEBUG///////////////////////////////////////////////////////////////////////////////////////////
 	modules_setup(moduleID);	// Run setup functions for specific module
 	//PORTA &= ~(1 << PA1);	//DEBUG////////////////OFF///////////////////////////////////////////////////////////////
 	//PORTA |= (1 << PA1);	//DEBUG///////////////ON////////////////////////////////////////////////////////////////

slave/slave/slave.cproj

➞

Show inline comments

@@ @@ -141,12 +141,18 @@ @@
     <Compile Include="lib\led.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\led.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\loopTimer.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\loopTimer.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sensors.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\sensors.h">
       <SubType>compile</SubType>
     </Compile>

0 comments (0 inline, 0 general)