Diff: main.cpp

Revision:

40:72ed373557ea

Parent:

39:52539bea375c

Child:

41:c18e7c2b912a

--- a/main.cpp	Sat Feb 02 04:39:21 2013 +0000
+++ b/main.cpp	Sat Feb 02 05:31:17 2013 +0000
@@ -9,7 +9,7 @@
     lcd.FillScreen(COLOR_BLUE);
     //printf("superDisplay\c\n");
 }
-void superSd(unsigned char*buffer,int offset,int bytes,const char *path)
+void superSd(unsigned char*buffer,unsigned int *offset,int bytes,const char *path)
 {
      printf("superSD\c\n");
      SDFileSystem sd(p11, p12, p13, p8, "sd"); // the pinout on the mbed Cool Components workshop board
@@ -20,43 +20,43 @@
     }
     //fprintf(fp, "Hello fun SD Card World!\c\n");
     //fread ( void * ptr, size_t size, size_t count, FILE * stream );
-    printf("offset at ssd %d\n",offset);
-    fseek(fp, offset,SEEK_SET);
+    printf("offset at ssd %d\n",*offset);
+    fseek(fp, *offset,SEEK_SET);
+    *offset=*offset+bytes;
     fread((char*)buffer,1,bytes,fp);
-     for(int i=0; i<bytes;i++)
+     /*for(int i=0; i<bytes;i++)
     {
-        printf("%x  ",buffer[i]);
-    }
+        printf("%c  ",buffer[i]);
+    }*/
     printf("\n");
     fclose(fp); 
      
 }
 void colorCompute(unsigned char*buffer, unsigned int* colorBuffer,int offset,int sizeOfBuffer)
 {
-    //printf("ColorCompute\c\n");
+    printf("ColorCompute\n");
     int aux= sizeOfBuffer+offset;
     int j=offset;
     for(int i=i;i<sizeOfBuffer;i=i+4)
     {
-        //printf("%d ",i);
-        colorBuffer[j]=buffer[i]<<16+buffer[i+1]<<8+buffer[i+2];
+        printf("%d ,%d ",i,j);
+        colorBuffer[j]=(buffer[i]<<16)+(buffer[i+1]<<8)+(buffer[i+2]);
         j++;
     }
-    //printf("\n");
+    printf("\n");
 }
-void pickUpLine(unsigned char*buffer, unsigned int* colorBuffer,int sizeOfBuffer,int sizeOfLine,const char *path, int absPtr)
+void pickUpLine(unsigned char*buffer, unsigned int* colorBuffer,int sizeOfBuffer,int sizeOfLine,const char *path, unsigned int *absPtr)
 {
-    printf("Pickupline\c\n");
-    int i =absPtr;
+    printf("Pickupline\n");
     int delta=20;
     for(int j=0;j<sizeOfLine;j=j+delta)
     {
-        superSd(buffer,i,sizeOfBuffer,path);
-        printf("byteofFile%d, pixelnum %d, delta %d",i,j,delta);
+        superSd(buffer,absPtr,sizeOfBuffer,path);
+        printf("byteofFile%d, pixelnum %d, delta %d",*absPtr,j,delta);
         colorCompute(buffer,colorBuffer,j,sizeOfBuffer);
-        i=i+delta;
+        //i=i+delta;
     }
-    
+    printf("\n");
 }
 void drawLine(unsigned int* color,int y)
 {
@@ -84,7 +84,7 @@
  */
 int main() {
     printf("Hello Stinky World!\c\n");    
- 
+    wait(5);
     //mkdir("/sd/mydir", 0777);
     
     
@@ -94,9 +94,8 @@
     superDisplay();
     for(int i=0;i<176;i++)
     {
-        pickUpLine(rawbytes,color,80,220,"/sd/mydir/rose.bmp",absPtr);
+        pickUpLine(rawbytes,color,80,220,"/sd/mydir/rose.bmp",&absPtr);
         drawLine(color,i);
-        absPtr=absPtr+880;
         printf("absptr %d\n\n\n", absPtr);
     }