missing commits

x393.py

@@ -173,12 +173,14 @@ class Camera:
     shout(self.sshcmd+" 'echo 1 > /sys/devices/soc0/amba@0/80000000.elphel-ahci/load_module'")
 
   def read_camogm_disk_file_blocks(self, part,fname="camogm.disk"):
+    print("camera: read_camogm_disk_file_blocks() "+fname+ "self.scpcmd="+self.scpcmd)
     result = 0
     tmp_mount_point = tempfile.mkdtemp()
     print(self.scpcmd+"/mnt/"+part+"/"+fname+" "+tmp_mount_point)
     shout(self.scpcmd+"/mnt/"+part+"/"+fname+" "+tmp_mount_point)
     try:
       with open (tmp_mount_point+"/"+fname, "r") as myfile:
+        print ("Opened "+tmp_mount_point+"/"+fname)  
         data=myfile.readlines()
         if len(data)==2:
           l2 = data[1]
@@ -210,11 +212,13 @@ class PC():
   # mounts partition (/dev/sd?1), reads camogm.disk file
   # returns the download size from raw partition ((/dev/sd?2))
   def read_camogm_disk_file(self,part,fname="camogm.disk"):
+    print("read_camogm_disk_file() "+fname)
     result = 0
     tmp_mount_point = tempfile.mkdtemp()
     print("mounting "+part+" to "+tmp_mount_point)
     shout("sudo mount "+part+" "+tmp_mount_point)
-
+    print("mounted "+part+" to "+tmp_mount_point)
+    time.sleep(1)
     try:
       with open (tmp_mount_point+"/"+fname, "r") as myfile:
         data=myfile.readlines()
@@ -256,13 +260,20 @@ class PC():
   Returns block offset from the start of partition to the current LBA pointer
   """
   def read_camogm_disk_file_blocks(self,part,fname="camogm.disk"):
+#    print("PC: read_camogm_disk_file_blocks() "+fname)
     result = 0
     tmp_mount_point = tempfile.mkdtemp()
     print("mounting "+part+" to "+tmp_mount_point)
     shout("sudo mount "+part+" "+tmp_mount_point)
+    print("mounted "+part+" to "+tmp_mount_point)
+    time.sleep(1)
+#    print ("Opening "+tmp_mount_point+"/"+fname)
+#    time.sleep(100);
     try:
       with open (tmp_mount_point+"/"+fname, "r") as myfile:
+#        print("reading "+tmp_mount_point+"/"+fname)  
         data=myfile.readlines()
+#       print("len(data)= "+str(len(data)))
         if len(data)==2:
           l2 = data[1]
           pointers = l2.split("\t")
@@ -284,7 +295,9 @@ class PC():
     shout("scp root@"+ip+":/mnt/"+part+"/"+fname+" "+tmp_mount_point)
     try:
       with open (tmp_mount_point+"/"+fname, "r") as myfile:
+#        print("reading "+tmp_mount_point+"/"+fname)  
         data=myfile.readlines()
+#        print("len(data)= "+str(len(data)))
         if len(data)==2:
           l2 = data[1]
           pointers = l2.split("\t")
@@ -371,6 +384,7 @@ class PC():
 #        fname = dirname+"/"+"file_"+str(num_file)+".img"
         fname = "%s/file_%03d.img" %(dirname, num_file) #dirname+"/"+"file_"+str(num_file)+".img"
         print("Downloading %d %d-byte chunks, skipping %d chunks to %s"%(chunks_write, chunk_bytes, chunks_skip, fname))
+        print("sudo dd if="+part+" "+" of="+fname+" bs="+str(chunk_bytes)+" count="+str(chunks_write)+" skip="+str(chunks_skip))
         shout("sudo dd if="+part+" "+" of="+fname+" bs="+str(chunk_bytes)+" count="+str(chunks_write)+" skip="+str(chunks_skip))
         bwrite = chunks_write * chunk_blocks
         blocks_skip += bwrite