Changeset c8ec8ce in avrstuff

Timestamp:

Sep 3, 2012, 11:08:47 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

41d46ae

Parents:

8659a17

Message:

• debug leds
• fix read and write code (still not working !)

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

File:

• V-USB_Dev/firmwares/herePic/main.c (modified) (10 diffs)

V-USB_Dev/firmwares/herePic/main.c

@@ -27 +27 @@
 #define VPP 1
 
+// VUSB leds (PD6 and PD7)
+#define RED 64
+#define GREEN 128
 
 // TODO is it wise to use a timer or two for bit patterns generation ? (see
@@ -56 +59 @@
         PORTB |= VPP; // Enter programming mode
 
+        // Configure leds
+        DDRD |= RED | GREEN;
+        PORTD |= RED | GREEN;
+
+        int k = 0;
+
         while(1) {
+                if (k-- < 0)
+                {
+                        k = 20000;
+                        PORTD ^= RED;
+                }
                 wdt_reset();
                 usbPoll();
@@ -67 +81 @@
         for(int i = 6; --i>= 0;)
         {
-                PORTB |= PGC;
                 if(cmd & 1)
                         PORTB |= PGD;
                 else
                         PORTB &= ~PGD;
+                PORTB |= PGC;
                 PORTB &= ~PGC;
 
@@ -88 +102 @@
         for(int i = 16; --i>= 0;)
         {
-                PORTB |= PGC;
                 if(data & 1)
                         PORTB |= PGD;
                 else
                         PORTB &= ~PGD;
+                PORTB |= PGC;
                 PORTB &= ~PGC;
 
@@ -105 +119 @@
         ICSP_command(cmd);
 
+        // PGD as input
+        DDRB &= ~PGD;
+        PORTB |= PGD; //pull up
+
         // get data
         for(int i = 16; --i>= 0;)
         {
                 PORTB |= PGC;
-                *data |= (PORTB & PGD) / PGD;
+                *data |= (PINB & PGD) / PGD;
                 PORTB &= ~PGC;
 
@@ -115 +133 @@
         }
         _delay_us(1);
+
+        // PGD as output
+        PORTB &= ~PGD;
+        DDRB |= PGD;
 }
 
@@ -121 +143 @@
         usbRequest_t *rq = (void *)data;
 
+        PORTD &= ~GREEN;
+
+        if ((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_VENDOR)
         switch(rq->bRequest)
         {
@@ -138 +163 @@
 
                         // Return the number of bytes we wrote (none here)
+                        PORTD |= GREEN;
                         return 0;
                 }
@@ -153 +179 @@
 
                         // send the command
-                        ICSP_command(command);
-
+                        ICSP_write(command, 0);
+
+                        PORTD |= GREEN;
                         return 0; 
                 }
@@ -167 +194 @@
                         usbMsgPtr = (uint8_t*)&ICSP_data;
 
+                        PORTD |= GREEN;
                         return 2; // We send 2 bytes back
                 }
         }
+
+        // Unhandled commands leave the green led on.
         return 0;
 }