WebSVN – group.electronics – Diff – /Projects/commselect/main.c

 #include <avr/interrupt.h>
 #include <avr/pgmspace.h>
 #include <util/delay.h>
 #include "usbdrv.h"
-//#include "oddebug.h"
 #include "config.h"
 #ifndef NULL
 #define NULL    ((void *)0)
 #endif
 /* ------------------------------------------------------------------------- */
 uint8_t getKey(void);
-void doButtons(void);
+void doButtons(uint8_t);
 inline void setLeds(uint8_t);
 struct {
-	union {
-		int16_t axis[2];
+	int16_t axis[2];
-		struct {
-			int16_t axis0:16;
-			int16_t axis1:16;
-		};
-		uint8_t buttons;
+	uint8_t buttons;
-		struct {
-			int8_t b1:1;
-			int8_t b2:2;
-			int8_t b3:3;
-			int8_t b4:4;
-			int8_t b5:5;
-			int8_t b6:6;
-			int8_t b7:7;
-			int8_t b8:8;
-		};
-	};
 } reportBuffer;
 volatile struct {
 	uint8_t buttons;
 	uint8_t waitup;
 	uint8_t timer;
 } debounce;
-uint8_t currleds = 128;
+uint8_t currleds = 1;
 static uchar    idleRate;           /* in 4 ms units */
 volatile uint8_t tmr0_ovf = 0;
 volatile uint32_t systime = 0;
 /* ------------------------------------------------------------------------- */
 xc0,                          //   END_COLLECTION
 xc0                           // END_COLLECTION
 };
-void usbEventResetReady(void) {
+void hadUsbReset(void) {
+}
 uchar	usbFunctionSetup(uchar data[8])
+{
     if((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_CLASS){
         if(rq->bRequest == USBRQ_HID_GET_REPORT){
             return sizeof(reportBuffer);
         }else if(rq->bRequest == USBRQ_HID_GET_IDLE){
-            usbMsgPtr = &idleRate;
+            //usbMsgPtr = &idleRate;
             return 1;
         }else if(rq->bRequest == USBRQ_HID_SET_IDLE){
             idleRate = rq->wValue.bytes[1];
+        }
     }else{
 void usbSendHidReport(uchar * data, uchar len) {
 	usbSetInterrupt(data, len);
+}
+/*
+void usbSendHidReport(uchar * data, uchar len) {
+        while(1)
+        {
+                usbPoll();
+                if (usbInterruptIsReady())
+                {
+                        usbSetInterrupt(data, len);
+                        break;
+                }
+        }
+}
+*/
 int main(void) {
+	DIDR0 = 0x00;
   /*
   DDR : 1 = Output, 0 = Input
   PORT: 1 = Pullup for Input, otherwise set output
   PIN : Read input pin
   */
         PC2     - Input, Pullup		- ButtonPad 0
         PC3     - Input, Pullup		- ButtonPad 1
         PC4     - Input, Pullup		- ButtonPad 2
         PC5     - Input, Pullup		- ButtonPad 3
   */
-  DDRD          = 0B00000011;
+  DDRC          = 0B00000011;
-  PORTD         = 0B00111111;
+  PORTC         = 0B00111111;
   /*
         PD0     -
         PD1     -
         PD2     -
         PD7     - Output		- LED 2
   */
   DDRD          = 0B11100000;
   PORTD         = 0B00000000;
-	setLeds(255);
+	setLeds(0xff);
-	_delay_ms(20);
-	setLeds(currleds);
     usbDeviceDisconnect();
-        _delay_ms(500);
+    _delay_ms(500);
     usbDeviceConnect();
-    wdt_enable(WDTO_1S);
     TIMSK0 = (1<<TOIE0);                    // Enable timer overflow
     TCNT0 = 0x00;                           // Set Timer0 initial value to 0
     TCCR0B = (1<< CS00) ;                   // /1 prescaler
+    wdt_enable(WDTO_1S);
     usbInit();
     sei();
-    reportBuffer.axis0 = 0;
+    reportBuffer.axis[0] = 0xfffd;
-    reportBuffer.axis1 = 0;
+    reportBuffer.axis[1] = 0xfffd;
-    reportBuffer.buttons = 0;
+    reportBuffer.buttons = 0x00;
+	setLeds(currleds);
-    for(;;){    /* main event loop */
+    for(;;){
         wdt_reset();
         usbPoll();
+	uint8_t pressed = getKey();
-	doButtons();
+	doButtons(pressed);
         if(usbInterruptIsReady()){
+                reportBuffer.buttons = pressed;
 		usbSendHidReport(&reportBuffer, sizeof(reportBuffer));
+        }
-	_delay_ms(1);
+    }
     return 0;
+}
 inline void setLeds(uint8_t leds) {
+	PORTB &= 0xE0;
         PORTB |= (0x1F & (leds >> 3));
+	PORTD &= 0x1F;
         PORTD |= (0xE0 & (leds << 5));
+}
-void doButtons() {
+void doButtons(uint8_t pressed) {
-        uint8_t pressed = getKey();
         // 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;
         if (debounce.buttons && debounce.timer == 0 && debounce.waitup != 1) {
                 uint8_t i = 0;
                 for (i=0; i<=7; i++) {
                         // Button pressed and the led is currently on
                         if ( rbi(debounce.buttons, i) == 1 && rbi(currleds, i) == 1 ) {
-                                if ( i == 6 && rbi(currleds, 7) != 1)  //Dont turn off com1 if no comm2
+                                if ( i == 0 && rbi(currleds, 1) != 1)  //Dont turn off com1 if no comm2
                                         break;
-                                if ( i == 7 && rbi(currleds, 6) != 1)  //Dont turn off com2 if no comm1
+                                if ( i == 1 && rbi(currleds, 0) != 1)  //Dont turn off com2 if no comm1
                                         break;
                                 cbi(currleds, i);
                         // Button is pressed and led is currently off
                          } else if ( rbi(debounce.buttons, i) == 1 && rbi(currleds, i) == 0 ) {
-                                if ( i == 6 && rbi(currleds, 7) == 1)  //Turn on comm2, turn off comm1
+                                if ( i == 0 && rbi(currleds, 1) == 1)  //Turn on comm2, turn off comm1
-                                        cbi(currleds,7);
+                                        cbi(currleds,1);
-                                if ( i == 7 && rbi(currleds, 6) == 1)  //Turn on comm1, turn off comm2
+                                if ( i == 1 && rbi(currleds, 0) == 1)  //Turn on comm1, turn off comm2
-                                        cbi(currleds,6);
+                                        cbi(currleds,0);
                                 sbi(currleds, i);
+                        }
+                }
                 setLeds(currleds);
-                reportBuffer.buttons = debounce.buttons;
-                // Set debounce to wait to button up
                 debounce.waitup = 1;
+        }
+}
 // Gnd = PC0, PC1
 // Btn = PC2, PC3, PC4, PC5
 uint8_t getKey() {
         uint8_t key = 0;
-        cbi(PORTC, 0);
+        cbi(PORTC, 1);
         _delay_us(10);        // Wait for the port change
         if (rbi(PINC, 2) == 0) key = 1;
         if (rbi(PINC, 3) == 0) key = 2;
         if (rbi(PINC, 4) == 0) key = 4;
         if (rbi(PINC, 5) == 0) key = 8;
-        sbi(PORTC, 0);
+        sbi(PORTC, 1);
-        cbi(PORTC, 1);
+        cbi(PORTC, 0);
         _delay_us(10);
         if (rbi(PINC, 2) == 0) key = 16;
         if (rbi(PINC, 3) == 0) key = 32;
         if (rbi(PINC, 4) == 0) key = 64;
         if (rbi(PINC, 5) == 0) key = 128;
-        sbi(PORTC, 1);
+        sbi(PORTC, 0);
         return key;
+}
         tmr0_ovf++;
 	//16.5Mhz, 1ms = 50ovf
 	//12.0Mhz, 1ms = 46ovf
-        if (tmr0_ovf>=46) {
+        if (tmr0_ovf>=65) {
                 systime++;
                 tmr0_ovf = 0;
 		if (debounce.timer != 0)
 			debounce.timer--;

Subversion Repositories group.electronics

(root)/Projects/commselect/main.c – Rev 85 → 86