Changeset bbcd1f8 in avrstuff

Timestamp:

Sep 7, 2019, 4:53:59 PM (5 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

6f22754

Parents:

38a6d09

Message:

Rewrite main loop in non-blocking way

Otherwise it is not possible to handle multiple pads at the same time.

Location:

grip2hid

Files:

• Makefile (modified) (2 diffs)
• main.cpp (modified) (2 diffs)

grip2hid/Makefile

@@ -1 +1 @@
 #Set vars
 MCU=at90usb1287
-COMPILE = avr-gcc -Wall -Os -Iusbdrv -I. -std=c99 -mmcu=$(MCU) -DF_CPU=16000000 
+COMPILE = avr-gcc -Wall -Wextra -Werror -Os -Iusbdrv -I. -mmcu=$(MCU) -DF_CPU=16000000 
 PROJECT=grip2hid
 
@@ -19 +19 @@
 
 flash: $(PROJECT).hex
-        avrdude -c flip1 -p $(MCU) -Uflash:w:$^
+        avrdude -u -c flip1 -p $(MCU) -Uflash:w:$^
 
 clean:

grip2hid/main.cpp

@@ -43 +43 @@
 private:
         uint32_t word = 0;
-        uint32_t count = 0;
-        uint32_t state = 0;
+        uint8_t count = 0;
+        uint8_t state = 0;
 };
 
 int main() {
         wdt_enable(WDTO_2S);
-    // configure timer 0 for a rate of 16M/(256 * 256) = ~244Hz
-    TCCR0A = 0;          // timer 0 prescaler: 256
-        TCCR0B = 4;
 
         // debug LEDs - output
         DDRD |= 0xF0;
+        PORTD = 0;
 
         // GrIP input
         DDRB = 0;
+        uint8_t oldv = PINB;
 
-        PORTD = 0;
         GrIP pad;
 
@@ -65 +63 @@
                 wdt_reset();
 
-                // Wait for next bit
-                while(!(PINB & 2));
-                while(PINB & 2);
+                uint8_t newv = PINB;
 
-                // Read bit
-                uint32_t bit = (PINB & 1) != 0;
-                pad.PushBit(bit);
+                if (!(newv & 2)) { // clock is down
+                        if (oldv & 2) { // and it was up at previous read
+                                // Read bit
+                                uint32_t bit = (newv & 1) != 0;
+                                pad.PushBit(bit);
+                        }
+                }
+                oldv = newv;
         }