WebSVN – group.NITPanels – Diff – /Devices/NITAudioSel/firmware/main.c

 #ifndef NULL
 #define NULL    ((void *)0)
 #endif
-#define USB_GET_STATE  100
+#define USB_GET_STATE  		100
-#define USB_LEDS_SET  101
+#define USB_LEDS_SET  		101
+#define USB_GET_ANALOG 		102
+#define USB_SET_POWER_LED	103
 /* ------------------------------------------------------------------------- */
 uint8_t getKey(void);
-void doButtons(uint8_t);
-inline void setLeds(uint8_t);
+inline void setLeds();
-struct {
-	int16_t axis[2];
-	uint8_t buttons;
-} reportBuffer;
-volatile struct {
+void analogInit();
-	uint8_t buttons;
+uint8_t analogRead(uint8_t channel);
-	uint8_t waitup;
-	uint8_t timer;
-} debounce;
+/*
 volatile struct {
 	uint8_t data;
 	union {
 		uint8_t led_method:1;
 		uint8_t other:1;
 		uint8_t reserved:6;
 	};
-} config;
+} config;*/
 static uchar usbReplyBuf[16];
+volatile uint8_t pwrLed = 0;
 volatile uint8_t currLeds = 0;
 volatile uint8_t currKeys = 0;
+volatile uint8_t analogPin = 0;
 volatile uint8_t tmr0_ovf = 0;
 volatile uint32_t systime = 0;
 /* ------------------------------------------------------------------------- */
 			usbMsgPtr = usbReplyBuf;
 			return sizeof(usbReplyBuf);
 		case USB_LEDS_SET:
 			currLeds = rq->wValue.bytes[0];
 			return 0;
+		case USB_GET_ANALOG:
+			usbReplyBuf[0] = (analogPin);
+			usbMsgPtr = usbReplyBuf;
+			return sizeof(usbReplyBuf);
+		case USB_SET_POWER_LED:
+			pwrLed = rq->wValue.bytes[0];
+        }
 	return 0;
+}
   PORT: 1 = Pullup for Input, otherwise set output
   PIN : Read input pin
   */
   /*
-        PB0     - Output                - LED 3
+        PB0     - Output            - LED 3
-        PB1     - Output                - LED 4
+        PB1     - Output            - LED 4
-        PB2     - Output                - LED 5
+        PB2     - Output            - LED 5
-        PB3     - Output                - LED 6
+        PB3     - Output            - LED 6
-        PB4     - Output                - LED 7
+        PB4     - Output            - LED 7
-        PB5     -
+        PB5     - Input				- Config Switch 1
-        PB6     -
+        PB6     - Osc
-        PB7     -
+        PB7     - Osc
   */
   DDRB          = 0B00011111;
   PORTB         = 0B00000000;
   /*
-        PC0     - Output		- ButtonPad Gnd0
+        PC0     - Input, ADC		- Potentiometer
-        PC1     - Output		- ButtonPad Gnd1
+        PC1     - Output			- Power LED
         PC2     - Input, Pullup		- ButtonPad 0
         PC3     - Input, Pullup		- ButtonPad 1
         PC4     - Input, Pullup		- ButtonPad 2
         PC5     - Input, Pullup		- ButtonPad 3
+        PC6		- Reset
   */
-  DDRC          = 0B00000011;
+  DDRC          = 0B00000010;
-  PORTC         = 0B00111111;
+  PORTC         = 0B00111100;
   /*
-        PD0     -
+        PD0     - Output		- ButtonPad Gnd0
-        PD1     -
+        PD1     - Output		- ButtonPad Gnd1
-        PD2     -
+        PD2     - USB D+
-        PD3     -
+        PD3     - USB D-
-        PD4     -
+        PD4     - Input			- Config Switch 2
         PD5     - Output		- LED 0
         PD6     - Output		- LED 1
         PD7     - Output		- LED 2
   */
-  DDRD          = 0B11100000;
+  DDRD          = 0B11100011;
-  PORTD         = 0B00000000;
+  PORTD         = 0B00000011;
-	setLeds(0xff);
+	// The USB connect stuff, flash the power led
+  	sbi(PORTC, PC0);
     usbDeviceDisconnect();
     _delay_ms(500);
     usbDeviceConnect();
+    cbi(PORTC, PC0);
+    // @TODO: Don't really need the system time anymore, remove?
+    TIMSK0 = (1<<TOIE0);            // Enable timer overflow
+    TCNT0 = 0x00;                   // Set Timer0 initial value to 0
+    TCCR0B = (1<< CS00) ;           // /1 prescaler
-    TIMSK0 = (1<<TOIE0);                    // Enable timer overflow
-    TCNT0 = 0x00;                           // Set Timer0 initial value to 0
-    TCCR0B = (1<< CS00) ;                   // /1 prescaler
-    wdt_enable(WDTO_1S);
+    wdt_enable(WDTO_1S);			// WatchDog at 1s
-    usbInit();
+    usbInit();						// Init the USB port
-    sei();
+    sei();							// Enable interrupts
-	config.led_method = 1;
-	setLeds(currLeds);
+	setLeds();						// Set default LED status
+	analogInit();					// Init the ADC for PC0 (ADC0)
     for(;;){
         wdt_reset();
-        usbPoll();
-	currKeys = getKey();
-	if (config.led_method != rbi(PORTB, 5)) {
+        usbPoll();					// Poll USB port (Every ~10ms!)
-		// Reset the leds when switcing	to buttons
+        currKeys = getKey();		// Check the button presses
-		if (config.led_method == 0) currLeds = 1;
+        analogPin = analogRead(0);	// Read the pot (VolControl)
-		config.led_method = rbi(PORTB, 5);
+		setLeds();					// Set the leds
-	}
-	if (config.led_method == 1) {
+									// @TODO: Only do this on change
-		uint8_t pressed = getKey();
-		doButtons(pressed);
-	}
-	setLeds(currLeds);
+    }
     return 0;
+}
-inline void setLeds(uint8_t leds) {
+inline void setLeds() {
+	// Set the status leds.
+	// @TODO: Verify that this doesn't mess with other port functions
 	PORTB &= 0xE0;
-        PORTB |= (0x1F & (leds >> 3));
+	PORTB |= (0x1F & (currLeds >> 3));
 	PORTD &= 0x1F;
-        PORTD |= (0xE0 & (leds << 5));
+	PORTD |= (0xE0 & (currLeds << 5));
-}
-void doButtons(uint8_t pressed) {
-        // Deboucing
-        // When i key first goes down, wait 5 ms, check it again to see if its still down
-        if (pressed && debounce.buttons == 0 && debounce.timer == 0) {
-                debounce.buttons = pressed;
-                debounce.timer = 5;
-        }
-        // The key has come up
-        if (pressed != debounce.buttons) {
-                debounce.buttons = 0;
-                debounce.timer = 0;
-                debounce.waitup = 0;
-        }
-        // Debounce timer is up, process our button
+	// Set the power led if required
-        if (debounce.buttons && debounce.timer == 0 && debounce.waitup != 1) {
-                uint8_t i = 0;
+	// @TODO: Check this works
-                for (i=0; i<=7; i++) {
+	if (pwrLed)
-                        // Button pressed and the led is currently on
-                        if ( rbi(debounce.buttons, i) == 1 && rbi(currLeds, i) == 1 ) {
-                                if ( i == 0 && rbi(currLeds, 1) != 1)  //Dont turn off com1 if no comm2
-                                        break;
-                                if ( i == 1 && rbi(currLeds, 0) != 1)  //Dont turn off com2 if no comm1
-                                        break;
-                                cbi(currLeds, i);
+		sbi(PORTC, PC1);
-                        // Button is pressed and led is currently off
-                         } else if ( rbi(debounce.buttons, i) == 1 && rbi(currLeds, i) == 0 ) {
-                                if ( i == 0 && rbi(currLeds, 1) == 1)  //Turn on comm2, turn off comm1
-                                        cbi(currLeds,1);
+	else
-                                if ( i == 1 && rbi(currLeds, 0) == 1)  //Turn on comm1, turn off comm2
-                                        cbi(currLeds,0);
-                                sbi(currLeds, i);
-                        }
-                }
+		cbi(PORTC, PC1);
-                debounce.waitup = 1;
-        }
+}
-// Gnd = PC0, PC1
+// Gnd = PD0, PD1
 // Btn = PC2, PC3, PC4, PC5
 uint8_t getKey() {
         uint8_t key = 0;
-        cbi(PORTC, 1);
+        cbi(PORTD, PD1);		// Read the first row of buttons
-        _delay_us(10);        // Wait for the port change
+        _delay_us(10);			// Wait for the port change
-        if (rbi(PINC, 2) == 0) key = 1;
+        if (rbi(PINC, PC2) == 0) key = 1;
-        if (rbi(PINC, 3) == 0) key = 2;
+        if (rbi(PINC, PC3) == 0) key = 2;
-        if (rbi(PINC, 4) == 0) key = 4;
+        if (rbi(PINC, PC4) == 0) key = 4;
-        if (rbi(PINC, 5) == 0) key = 8;
+        if (rbi(PINC, PC5) == 0) key = 8;
-        sbi(PORTC, 1);
+        sbi(PORTD, PD1);
-        cbi(PORTC, 0);
+        cbi(PORTD, PD0);		// Read the second row of buttons
         _delay_us(10);
-        if (rbi(PINC, 2) == 0) key = 16;
+        if (rbi(PINC, PC2) == 0) key = 16;
-        if (rbi(PINC, 3) == 0) key = 32;
+        if (rbi(PINC, PC3) == 0) key = 32;
-        if (rbi(PINC, 4) == 0) key = 64;
+        if (rbi(PINC, PC4) == 0) key = 64;
-        if (rbi(PINC, 5) == 0) key = 128;
+        if (rbi(PINC, PC5) == 0) key = 128;
-        sbi(PORTC, 0);
+        sbi(PORTD, PD0);
         return key;
+}
+uint8_t analogRead(uint8_t channel) {
+        ADMUX = (1<<ADLAR) | (1<<REFS0) | (0<<REFS1) | (channel & 0x0f);
+        ADCSRA |= (1<<ADSC);            	// Start converting
+        while (((ADCSRA >> ADSC) & 1)) {}   //Wait until conversion finished
+        uint8_t result = ADCH;
+        //ADCSRA |= (0<<ADSC);          	// Stop converting
+        return result;
+}
+void analogInit() {
+	ACSR |= (1<<ACD); // Disable analog comparator
+	/*
+        Setup ADC
+        ADMUX: 8 bit mode, Avcc ref
+        ADCSRA: Enable, 128 prescale
+	*/
+	ADMUX = (1<<ADLAR) | (0<<REFS0) | (1<<REFS1);
+	ADCSRA = (1<<ADEN) | (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0) ;
+}
 ISR(TIMER0_OVF_vect) {
         tmr0_ovf++;
 	// Clk/1 TCCR0B = (1<< CS00);
 	//12.0Mhz, 1ms = 46ovf
         if (tmr0_ovf>=78) {
                 systime++;
                 tmr0_ovf = 0;
-		if (debounce.timer != 0)
-			debounce.timer--;
+        }
+}

Subversion Repositories group.NITPanels

(root)/Devices/NITAudioSel/firmware/main.c – Rev 17 → 18