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

         uint8_t current;
         uint8_t last;
         uint8_t mask;
 } pcInt[1];
+volatile struct {
+	uint8_t button;
+	uint8_t timer;
+} buttons;
 static uchar    idleRate;           /* in 4 ms units */
+volatile uint8_t tmr0_ovf = 0;
+volatile uint32_t systime = 0;
 /* ------------------------------------------------------------------------- */
 const PROGMEM char usbHidReportDescriptor[USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH] = { /* USB report descriptor */
 x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
 x19, 0x01,                    //     USAGE_MINIMUM (Button 1)
 x29, 0x02,                    //     USAGE_MAXIMUM (Button 2)
 x15, 0x00,                    //     LOGICAL_MINIMUM (0)
 x25, 0x01,                    //     LOGICAL_MAXIMUM (1)
 x75, 0x01,                    //     REPORT_SIZE (1)
-x95, 0x02,                    //     REPORT_COUNT (2)
+x95, 0x08,                    //     REPORT_COUNT (2)
-x81, 0x02,                    //     INPUT (Data,Var,Abs)
-x75, 0x01,                    //     REPORT_SIZE (1)
-x95, 0x06,                    //     REPORT_COUNT (6)
 x81, 0x02,                    //     INPUT (Data,Var,Abs)
 xc0,                          //   END_COLLECTION
 xc0                           // END_COLLECTION
 };
-/* ------------------------------------------------------------------------- */
-/* ------------------------ interface to USB driver ------------------------ */
-/* ------------------------------------------------------------------------- */
 uchar	usbFunctionSetup(uchar data[8])
+{
-usbRequest_t    *rq = (void *)data;
+    usbRequest_t    *rq = (void *)data;
     //usbMsgPtr = reportBuffer;
     if((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_CLASS){
         if(rq->bRequest == USBRQ_HID_GET_REPORT){
             return sizeof(reportBuffer);
+    }
 	return 0;
+}
-/* ------------------------------------------------------------------------- */
-/* ------------------------ Oscillator Calibration ------------------------- */
-/* ------------------------------------------------------------------------- */
-/* Calibrate the RC oscillator to 8.25 MHz. The core clock of 16.5 MHz is
- * derived from the 66 MHz peripheral clock by dividing. Our timing reference
- * is the Start Of Frame signal (a single SE0 bit) available immediately after
- * a USB RESET. We first do a binary search for the OSCCAL value and then
- * optimize this value with a neighboorhod search.
- * This algorithm may also be used to calibrate the RC oscillator directly to
- * 12 MHz (no PLL involved, can therefore be used on almost ALL AVRs), but this
- * is wide outside the spec for the OSCCAL value and the required precision for
- * the 12 MHz clock! Use the RC oscillator calibrated to 12 MHz for
- * experimental purposes only!
- */
-static void calibrateOscillator(void)
+static void calibrateOscillator(void) {
-{
-uchar       step = 128;
+    uchar step = 128;
-uchar       trialValue = 0, optimumValue;
+    uchar trialValue = 0, optimumValue;
+    int x, optimumDev;
-int         x, optimumDev, targetValue = (unsigned)(1499 * (double)F_CPU / 10.5e6 + 0.5);
+    int targetValue = (unsigned)(1499 * (double)F_CPU / 10.5e6 + 0.5);
     /* do a binary search: */
-    do{
+    do {
         OSCCAL = trialValue + step;
         x = usbMeasureFrameLength();    /* proportional to current real frequency */
         if(x < targetValue)             /* frequency still too low */
             trialValue += step;
         step >>= 1;
-    }while(step > 0);
+    } while(step > 0);
     /* We have a precision of +/- 1 for optimum OSCCAL here */
     /* now do a neighborhood search for optimum value */
     optimumValue = trialValue;
     optimumDev = x; /* this is certainly far away from optimum */
     for(OSCCAL = trialValue - 1; OSCCAL <= trialValue + 1; OSCCAL++){
             optimumValue = OSCCAL;
+        }
+    }
     OSCCAL = optimumValue;
+}
-/*
-Note: This calibration algorithm may try OSCCAL values of up to 192 even if
-the optimum value is far below 192. It may therefore exceed the allowed clock
-frequency of the CPU in low voltage designs!
-You may replace this search algorithm with any other algorithm you like if
-you have additional constraints such as a maximum CPU clock.
-For version 5.x RC oscillators (those with a split range of 2x128 steps, e.g.
-ATTiny25, ATTiny45, ATTiny85), it may be useful to search for the optimum in
-both regions.
-*/
-void    usbEventResetReady(void)
+void usbEventResetReady(void) {
-{
-    /* Disable interrupts during oscillator calibration since
-     * usbMeasureFrameLength() counts CPU cycles.
-     */
     cli();
     calibrateOscillator();
     sei();
     eeprom_write_byte(0, OSCCAL);   /* store the calibrated value in EEPROM */
+}
 void usbSendHidReport(uchar * data, uchar len) {
-        while(1)
-        {
-                usbPoll();
-                if (usbInterruptIsReady())
-                {
-                        usbSetInterrupt(data, len);
+	usbSetInterrupt(data, len);
-                        break;
-                }
-        }
+}
-int main(void)
+int main(void) {
-{
 uchar   i;
 uchar   calibrationValue;
     calibrationValue = eeprom_read_byte(0); /* calibration value from last time */
     if(calibrationValue != 0xff){
     wdt_enable(WDTO_1S);
   PCMSK |= (( 1 << PCINT3 ) | ( 1 << PCINT4 )); //enable encoder pins interrupt sources
   GIMSK |= ( 1 << PCIE ); //enable pin change interupts
+        TIMSK = (1<<TOIE0);                    // Enable timer overflow
+        TCNT0 = 0x00;                           // Set Timer0 initial value to 0
+        TCCR0B = (1<< CS01) ;                   // /1 prescaler
   DDRB          = 0B00000001;
   PORTB         = 0B00000000;
     usbInit();
     sei();
     for(;;){    /* main event loop */
         wdt_reset();
         usbPoll();
         if(usbInterruptIsReady()){
+		// Check if our buttons need pressing
+		reportBuffer.buttons = 0;
+		if (buttons.timer != 0) {
+			if (buttons.button == 1)
+				reportBuffer.b1 = 1;
+			else
+				reportBuffer.b2 = 1;
+		}
 		usbSendHidReport(&reportBuffer, sizeof(reportBuffer));
-    		reportBuffer.buttons = 0;
+        }
+    }
     return 0;
+}
                 && rbi(pcInt[pcint].mask, PCINT4) ) {
                         if (reportBuffer.axis2 < 32500)
                                 reportBuffer.axis2 += 200;
+			buttons.button = 1;
-			reportBuffer.b1 = 1;
+			buttons.timer = 5;
         } else if (rbi(pcInt[pcint].current, PCINT3) == 0
                 && rbi(pcInt[pcint].current, PCINT4) == 0
                 && rbi(pcInt[pcint].mask, PCINT3) ) {
                         if (reportBuffer.axis2 > -32500)
                                 reportBuffer.axis2 -= 200;
+			buttons.button = 2;
-			reportBuffer.b2 = 1;
+			buttons.timer = 5;
+        }
         // Clear the mask so we know we've delth with it
         pcInt[pcint].mask = 0;
+}
 ISR(PCINT0_vect) {
         pcInterrupt(0);
+}
+ISR(TIMER0_OVF_vect) {
+        tmr0_ovf++;
+        if (tmr0_ovf>=50) {
+                systime++;
+                tmr0_ovf = 0;
+		if (buttons.timer != 0)
+			buttons.timer--;
+        }
+}

Subversion Repositories group.electronics

(root)/Projects/trimwheel/main.c – Rev 77 → 78