Revision 174:44a6d7c7674c, committed 2016-04-22

Comitter:

ee12b079

Date:

Fri Apr 22 11:27:33 2016 +0000

Parent:

173:f81ded27423d

Child:

175:e869e7837978

Commit message:

Next commit will include ADF Changes

Changed in this revision

--- a/Compression.h	Fri Apr 22 09:52:38 2016 +0000
+++ b/Compression.h	Fri Apr 22 11:27:33 2016 +0000
@@ -80,7 +80,7 @@
     srp_mode = head[2]&0x1;
     at = 0;     //above threshold is false
     for(int counter = 0 ; counter < 60 ; counter++){
-        gPC.puts("Y");
+        //gPC.puts("Y");
 //        gPC.printf("counter = %d\n",counter);
 //        cout<<"counter = "<<counter<<endl;
         pzf = 1;    ezf = 1;
@@ -300,7 +300,7 @@
                     space = adjust(4,2,pointer,space);
                     FSC_science = FCTN_SD_MNGR(2);
                     
-                    gPC.printf("SID = 2, FSC = %02X\r\n", FSC_science);
+ //                   gPC.printf("SID = 2, FSC = %02X\r\n", FSC_science);
                     frames[id][1] = (FSC_science>>16)&0xff;
                     frames[id][2] = (FSC_science>>8)&0xff;
                     frames[id][3] = FSC_science&0xff;
@@ -309,11 +309,11 @@
                 frames[id][132] = temp_crc>>8;
                 frames[id][133] = temp_crc & 0xff;
               //  if(test_cntr++ == 0){
-//                    gPC.puts("frame start\r\n");
+                    //gPC.puts("frame start\r\n");
 //                    for(int i = 0; i<134; i++){
 //                        gPC.printf("%02X",frames[id][i]);
 //                    }    
-//                    gPC.puts("frame ends\r\n");
+                   // gPC.puts("frame ends\r\n");
 //                }
                    
                 

--- a/ThreadsAndFunctions.h	Fri Apr 22 09:52:38 2016 +0000
+++ b/ThreadsAndFunctions.h	Fri Apr 22 11:27:33 2016 +0000
@@ -18,8 +18,7 @@
     gPAY_SPI.format(8,0);
     gPAY_SPI.bulkRead_init(gPAYLOAD_BUFFER, PAYLOAD_BUFFER_LENGTH, &payload_isr_fun);
     gPAY_SPI.bulkRead_start();
-    gPAY_SPI.bulkRead_end();
-    Init_gPAY_SPI;
+    
     
     while(true){
         gPC.puts("entering sci\r\n");

--- a/cdms_sd.h	Fri Apr 22 09:52:38 2016 +0000
+++ b/cdms_sd.h	Fri Apr 22 11:27:33 2016 +0000
@@ -269,11 +269,11 @@
 // send CMD8 to determine whther it is ver 2.x
     int r = cmd8();
     if (r == R1_IDLE_STATE) {
-//        printf("\rEntering v2\r\n");
+        gPC.printf("\rEntering v2\r\n");
         return initialise_card_v2();
 
     } else if (r == (R1_IDLE_STATE | R1_ILLEGAL_COMMAND)) {
-//        printf("\rEntering v1\r\n");
+        gPC.printf("\rEntering v1\r\n");
         return initialise_card_v1();
 
     } else {
@@ -515,7 +515,7 @@
         debug("\rSet 512-byte block timed out\r\n");
         return 1;
     } else {
-//        printf("\rDisk initialization successfull\r\n");
+        gPC.printf("\rDisk initialization successfull\r\n");
     }
 
     spi.frequency(1000000); // Set to 1MHz for data transfer