Changeset 5649b6c in avrstuff for starkadroid/code/main.c

Timestamp:

Nov 14, 2010, 12:01:03 PM (13 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

8f4b118

Parents:

98713b5

Message:

• Report everything as buttons.
• Don't periodically send reports. Only send one when there is an actual change of button state
• Set the period to 20ms, as that's enough.
• Some code cleanup.

git-svn-id: ​svn://pulkomandy.tk/avrstuff@31 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

File:

• starkadroid/code/main.c (modified) (4 diffs)

starkadroid/code/main.c

@@ -10 +10 @@
 #include "usbdrv/usbdrv.h"
 
-static uint8_t reportBuffer[5]; 
+#define DDRIN DDRB
+#define PORTIN PORTB
+#define PININ PINB
+
+#define DDROUT DDRC
+#define PORTOUT PORTC
+
+static uint8_t reportBuffer[6]; 
 static uint8_t idleRate;
 
 void main() {
+        bool which = false;
         uint8_t idleCounter = 0;
 
@@ -23 +31 @@
         bool doReport;
 
-        DDRB = 0; // Keyboard matrix out
-        PORTB = 255; // Enable pull up
+        DDROUT = 0; // Keyboard matrix out
+        PORTOUT = 255; // Enable pull up
                 // We put all pins as input then output a 0 in only one at a time.
                 // All the other pins are high-Z to avoid short circuits when many buttons are pressed.
-        DDRC = 0; // Keyboard matrix in
-        PORTC = 255; // Enable pull up
+        DDRIN = 0; // Keyboard matrix in
+        PORTIN = 255; // Enable pull up
 
     // configure timer 0 for a rate of 16M/(256 * 256) = ~244Hz
     TCCR0 = 4;          // timer 0 prescaler: 256
-        
+
         while(1) {
                 wdt_reset();
@@ -38 +46 @@
 
                 doReport = false;
-                for(int i=0; i < 5; i++) {
-                        DDRB = ~(1<<i);
-                        PORTB = ~(1<<i);
-                        reportBuffer[i] = (~PINC)&0x3F;
+                for(char i = 0; i != 6; i++) {
+                        DDROUT = 1<<i;
+                        PORTOUT = ~(1<<i);
+                        if (reportBuffer[i] != ((~PININ)&0x3F))
+                                doReport = true;
+                        reportBuffer[i] = (~PININ)&0x3F;
                 }
+                DDROUT = 0;
+                PORTOUT = 255;
 
-                DDRB = ~(1<<5);
-                PORTB = ~(1<<5);
-                reportBuffer[0] |= (~PINC)<<6 & 0xC0;
-                reportBuffer[1] |= (~PINC)<<4 & 0xC0;
-                reportBuffer[2] |= (~PINC)<<2 & 0xC0;
-                // reportBuffer[3] |= (~PINC)<<0 & 0xC0; // These are not existing pins...
-
-                DDRB = 255;
-                PORTB = 255;
-
-                if (usbInterruptIsReady()) {
+                if (doReport && usbInterruptIsReady()) {
                         usbSetInterrupt(reportBuffer, sizeof(reportBuffer));
-//                      LEDOFF;
                         doReport = false;
-                }
-
-                if (TIFR & (1 << TOV0)) {
-                        TIFR = (1 << TOV0); // reset flag
-
-                        if(++idleCounter > 4){ // yes, but not yet
-                                idleCounter -= 5; // 22ms in units of 4ms
-                        } else { // yes, it is time now
-                                idleCounter = idleRate;
-                                if (usbInterruptIsReady()) {
-                                        usbSetInterrupt(reportBuffer, sizeof(reportBuffer));
-                                }
-                        }
                 }
         }
@@ -81 +69 @@
 
 char PROGMEM usbHidReportDescriptor[USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH] = {
-    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
+        0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
     0x09, 0x05,                    // USAGE (Game Pad)
     0xa1, 0x01,                    // COLLECTION (Application)
-    0x09, 0x01,                    //   USAGE (Pointer)
     0xa1, 0x00,                    //   COLLECTION (Physical)
-    0x09, 0x30,                    //     USAGE (X)
-    0x09, 0x31,                    //     USAGE (Y)
-    0x15, 0xff,                    //     LOGICAL_MINIMUM (-1)
+    0x05, 0x09,                    //     USAGE_PAGE (Button)
+    0x19, 0x01,                    //     USAGE_MINIMUM (Button 1)
+    0x29, 0x30,                    //     USAGE_MAXIMUM (Button 40)
+    0x15, 0x00,                    //     LOGICAL_MINIMUM (0)
     0x25, 0x01,                    //     LOGICAL_MAXIMUM (1)
-    0x75, 0x02,                    //     REPORT_SIZE (2)
-    0x95, 0x02,                    //     REPORT_COUNT (2)
+    0x95, 0x30,                    //     REPORT_COUNT (40)
+    0x75, 0x01,                    //     REPORT_SIZE (1)
     0x81, 0x02,                    //     INPUT (Data,Var,Abs)
     0xc0,                          //   END_COLLECTION
-    0x05, 0x09,                    //   USAGE_PAGE (Button)
-    0x19, 0x01,                    //   USAGE_MINIMUM (Button 1)
-    0x29, 0x24,                    //   USAGE_MAXIMUM (Button 36)
-    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
-    0x25, 0x01,                    //   LOGICAL_MAXIMUM (1)
-    0x75, 0x01,                    //   REPORT_SIZE (1)
-    0x95, 0x24,                    //   REPORT_COUNT (36)
-    0x81, 0x02,                    //   INPUT (Data,Var,Abs)
     0xc0                           // END_COLLECTION
 };