Changeset 643 in Sophya for trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c

Timestamp:

Nov 25, 1999, 2:26:53 PM (26 years ago)

Author:

ansari

Message:

archediab 26

File:

• trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c (modified) (4 diffs)

trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c

@@ -50 +50 @@
 if(verifie_block_printf(blk_tm))        return;
 
-//{def_nom_block  printf("lit un block %s   N°%d   \n",nom_block[type_block(blk_tm)],numero_block(blk_tm));     }                               
+        {
+        def_nom_block
+        static int mon_num_block;
+        if(mon_num_block!=numero_block(blk_tm))
+                {
+                mon_num_block=numero_block(blk_tm);
+                printf("\n%d ->",mon_num_block);
+                }
+        printf(" %s  ",nom_block[type_block(blk_tm)]);  
+        }                               
 
 switch(type_block(blk_tm))
@@ -66 +75 @@
         case block_une_periode :        traite_block_une_periode((block_type_une_periode*)blk_tm);      break;
         
-        case block_bolo_comprime :      traite_block_bolo_comprime((block_type_bolo_comprime*)blk_tm);  break;
-        
         case block_bolo :               traite_block_bolo((block_type_bolo*)blk_tm);                    break;
+        case block_bolo_comprime :      traite_block_bolo_comprime((block_type_bolo_comprime*)blk_tm);  break;  
         
         case block_sst :                traite_block_sst((block_type_sst*)blk_tm);                      break;
+        case block_sst_comprime  :      traite_block_sst_comprime((block_type_sst_comprime*)blk_tm);    break;
+
+        case block_gyro :               traite_block_gyro((block_type_gyro*)blk_tm);                    break;
+        case block_gyro_comprime  :     traite_block_gyro_comprime((block_type_gyro_comprime*)blk_tm);  break;
         
         case block_synchro_sol :        traite_block_synchro_sol((block_type_synchro_sol*)blk_tm);      break;
+        
+        case block_status_flash :       printf("******************status flash recut  ********************* \n");son(133);                      break;
         
 #ifdef  transmet_data_brute
@@ -201 +215 @@
 void    traite_block_bolo_comprime(block_type_bolo_comprime*    blk)
 {               
-int j;
+int j,jc;
 #define blk2  ((block_type_bolo*)(&bktm))       // pointeur sur la memoire locale
 // maintenant, decomprime  blk  pour le reecrire dans blk2
@@ -210 +224 @@
         ( (blk->data_bolo[1][0] & 0x0000ffff)<<5 )  & 0x001fffe0);
 */
+/*
 for(j=0;j<nb_bolo_util;j++)     
                 {
                 decompress_7_2((long *)blk->data_bolo[j],blk2->data_bolo[j],nb_per_block*2);
                 }
-
+*/
+jc=0;for(j=0;j<nb_max_bolo;j++)  // jc = bolo_comprime  //   j=bolo normal
+                {
+                if( (parametr.bolo[j].bolo_code_util==bolo_normal_transmis) &&  (jc<nb_bolo_util)  )
+                        {
+                        decompress_7_2((long *)blk->data_bolo[jc],blk2->data_bolo[j],nb_per_block*2);
+                        jc++;
+                        }
+                }
 /*printf("ds1= %x  , %x  ds2= %x  , %x   \n",
                                         blk2->data_bolo[0][0],