seniordesign-firmware Changeset - 83e403019e80

Changeset - 83e403019e80

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca@CL-SEC241-08.cedarville.edu - 12 years ago 2012-12-04 12:30:30
ethanzonca@CL-SEC241-08.cedarville.edu

AFSK now generated on pin matching PCB

2 files changed with 9 insertions and 10 deletions:

master/master/lib/afsk.c

master/master/lib/led.c

0 comments (0 inline, 0 general)

master/master/lib/afsk.c

➞

Show inline comments

@@ @@ -66,164 +66,166 @@ extern const uint16_t TABLE_SIZE = sizeo @@
 #define BAUD_RATE 1200
 //#define SAMPLES_PER_BAUD PLAYBACK_RATE / BAUD_RATE // = 36
 //#define SAMPLES_PER_BAUD 36
 #define SAMPLES_PER_BAUD 36
 // phase offset of 1800 gives ~1900 Hz
 // phase offset of 3300 gives ~2200 Hz
 #define PHASE_DELTA_1200 1800
 #define PHASE_DELTA_2200 2200
 // Module globals
 volatile unsigned char current_byte;
 volatile unsigned char current_sample_in_baud;    // 1 bit = SAMPLES_PER_BAUD samples
 volatile bool go = false;
 volatile unsigned int packet_pos;                 // Next bit to be sent out
 volatile unsigned int afsk_packet_size = 10;
 volatile const uint8_t *afsk_packet;
 void afsk_ptt_off()
+{
 	// turn ptt off
 	PORTA &= ~(1<<PA5);
+}
 void afsk_ptt_on()
+{
 	// turn the ptt on... possibly delay based on spec
 	PORTA |= (1<<PA5);
 	_delay_ms(5); // from datasheet
+}
 ISR(TIMER2_OVF_vect)
+{
 	if (go) {
 		// If done sending packet
 		if (packet_pos == afsk_packet_size)
+		{
 			go = false;         // End of transmission
 			afsk_timer_stop();  // Disable modem
 			afsk_ptt_off();    // Release PTT
 			return; // done
+		}
 		// If sent SAMPLES_PER_BAUD already, go to the next bit
 		if (current_sample_in_baud == 0)  // Load up next bit
+		{
 			if ((packet_pos & 7) == 0) // Load up next byte
+			{
 				current_byte = afsk_packet[packet_pos >> 3];
+			}
 			else
+			{
 				current_byte = current_byte / 2;  // ">>1" forces int conversion
+			}
 			if ((current_byte & 1) == 0)
+			{
 				// Toggle tone (1200 <> 2200)
 				phasedelta ^= (PHASE_DELTA_1200 ^ PHASE_DELTA_2200);
+			}
+		}
 		phase += phasedelta;
 		uint8_t s = afsk_read_sample((phase >> 7) & (TABLE_SIZE - 1));
 		afsk_output_sample(s);
 		if(++current_sample_in_baud == SAMPLES_PER_BAUD)
+		{
 			current_sample_in_baud = 0;
 			packet_pos++;
+		}
+	}
+}
 void afsk_output_sample(uint8_t s)
+{
-	OCR2B = s;
+	OCR2A = s;
+}
 void afsk_timer_start()
+{
 	// Clear the overflow flag, so that the interrupt doesn't go off
 	// immediately and overrun the next one (p.163).
 	TIFR2 |= _BV(TOV2);       // Yeah, writing a 1 clears the flag.
 	// Enable interrupt when TCNT2 reaches TOP (0xFF) (p.151, 163)
 	TIMSK2 |= _BV(TOIE2);
+}
 void afsk_timer_stop()
+{
 	// Resting duty cycle
 	// Output 0v (could be 255/2, which is 0v after coupling... doesn't really matter)
-	OCR2B = 0x80;
+	OCR2A = 0x80;
 	// Disable playback interrupt
 	TIMSK2 &= ~_BV(TOIE2);
+}
 // External
 void afsk_start()
+{
 	phasedelta = PHASE_DELTA_1200;
 	phase = 0;
 	packet_pos = 0;
 	current_sample_in_baud = 0;
 	go = true;
 	// Key the radio
 	afsk_ptt_on();
 	// Start transmission
 	afsk_timer_start();
+}
 int afsk_busy()
+{
 	return go;
+}
 void afsk_send(const uint8_t *buffer, int len)
+{
 	afsk_packet_size = len;
 	afsk_packet = buffer;
+}
 void afsk_setup()
+{
 	// Source timer2 from clkIO (datasheet p.164)
 	ASSR &= ~(_BV(EXCLK) | _BV(AS2));
 	// Set fast PWM mode with TOP = 0xff: WGM22:0 = 3  (p.150)
 	TCCR2A |= _BV(WGM21) | _BV(WGM20);
 	TCCR2B &= ~_BV(WGM22);
 	// Do non-inverting PWM on pin OC2B (arduino pin 3) (p.159).
 	// OC2A (arduino pin 11) stays in normal port operation:
 	// COM2B1=1, COM2B0=0, COM2A1=0, COM2A0=0
 	TCCR2A = (TCCR2A | _BV(COM2B1)) & ~(_BV(COM2B0) | _BV(COM2A1) | _BV(COM2A0));
 	// Do non-inverting PWM on pin OC2A
 	TCCR2A = (TCCR2A | _BV(COM2A1)) & ~(_BV(COM2A0) | _BV(COM2B1) | _BV(COM2B0));
 	// No prescaler (p.162)
 	TCCR2B = (TCCR2B & ~(_BV(CS22) | _BV(CS21))) | _BV(CS20);
 	// Enable interrupt when TCNT2 reaches TOP (0xFF) (p.151, 163)
 	//TIMSK2 |= _BV(TOIE2);
 	TIMSK2 |= 0b00000001;
 	// FIXME TODO
 	DDRD = 0xff;
 	PORTD = 0xff;
 	// todo: init radio, maybe in main
 	sei();
 	while(afsk_busy());
+}
@@ \ No newline at end of file @@

master/master/lib/led.c

➞

Show inline comments

 /*
  * Master Firmware: Status and Error LED Handler
+ *
  * 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 "led.h"
+// Configure port direction and initial state of LEDs
 void led_setup()
+{
 	for(int i=0; i<NUM_LEDS; i++)  {
 		*(ledList[i].direction) |= (1<<ledList[i].pin); // set pin to output
 		*(ledList[i].port) &= ~(1<<ledList[i].pin); // set pin low
+	}
+}
 // Turn the specified LED on
 void led_on(uint8_t led)
+{
 	*(ledList[led].port) |= (1<<ledList[led].pin);
+}
 	// Turn the specified LED off
 void led_off(uint8_t led)
+{
 	*(ledList[led].direction) &= ~(1<<ledList[led].pin);
+}
 // 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(LED_ERROR);
 		_delay_ms(150);
 		led_off(LED_ERROR);
 		_delay_ms(150);
+	}
 	_delay_ms(400);
 	led_on(LED_ERROR);
+}
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)