Diff: COM_MNG_TMTC.h

Revision:

354:eb6c863756a8

Parent:

353:e1803e801e20

Child:

356:197c93dc2012

--- a/COM_MNG_TMTC.h	Tue Feb 21 06:30:56 2017 +0000
+++ b/COM_MNG_TMTC.h	Sat Mar 11 05:52:18 2017 +0000
@@ -486,8 +486,10 @@
                                 for(uint8_t z=24;z<32;z++)
                                     flasharray_thres[z] = scp_threshold_m0[z+8];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
-                                
+   //                            FCTN_CDMS_WR_S_FLASH(mid,flasharray_thres);
+                                erase_sector(strt_add_thres);
+                                program_flash(strt_add_thres, (char*)flasharray_thres,32);
+     
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));
                                 return tm_ptr_short;
@@ -499,7 +501,9 @@
                                 for(uint8_t z=0;z<12;z++)
                                     flasharray_thres[z] = scp_threshold_m0[z+40];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+  //                              FCTN_CDMS_WR_S_FLASH(mid,flasharray_thres);
+                                erase_sector(strt_add_thres+SECTOR_SIZE);
+                                program_flash(strt_add_thres+SECTOR_SIZE, (char*)flasharray_thres,32);
                                 
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));
@@ -512,7 +516,9 @@
                                 for(uint8_t z=0;z<32;z++)
                                     flasharray_thres[z] = scp_threshold_m1[z];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+  //                              THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+                                 erase_sector(strt_add_thres+(2*SECTOR_SIZE));
+                                program_flash(strt_add_thres+(2*SECTOR_SIZE), (char*)flasharray_thres,32);
                                 
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));
@@ -525,7 +531,9 @@
                                 for(uint8_t z=0;z<20;z++)
                                     flasharray_thres[z] = scp_threshold_m1[z+32];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+ //                               THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+                                erase_sector(strt_add_thres+(3*SECTOR_SIZE));
+                                program_flash(strt_add_thres+(3*SECTOR_SIZE), (char*)flasharray_thres,32);
                                 
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));
@@ -552,7 +560,10 @@
                                 flasharray_thres[10] = scp_sfp_threshold_m0_2[1];
                                 flasharray_thres[11] = scp_sfp_threshold_m0_2[2];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+  //                              THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+    
+                                erase_sector(strt_add_thres+(4*SECTOR_SIZE));
+                                program_flash(strt_add_thres+(4*SECTOR_SIZE), (char*)flasharray_thres,32);
                                 
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));
@@ -569,7 +580,9 @@
                                 for(uint8_t z=24;z<32;z++)
                                     flasharray_thres[z] = sfp_threshold_m0[z+8];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+  //                              THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+                                erase_sector(strt_add_thres+(5*SECTOR_SIZE));
+                                program_flash(strt_add_thres+(5*SECTOR_SIZE), (char*)flasharray_thres,32);
                                 
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));
@@ -582,8 +595,9 @@
                                 for(uint8_t z=0;z<12;z++)
                                     flasharray_thres[z] = sfp_threshold_m0[z+40];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
-                                
+ //                               THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+                                        erase_sector(strt_add_thres+(6*SECTOR_SIZE));
+                                program_flash(strt_add_thres+(6*SECTOR_SIZE), (char*)flasharray_thres,32);                             
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));
                                 return tm_ptr_short;
@@ -595,7 +609,10 @@
                                 for(uint8_t z=0;z<32;z++)
                                     flasharray_thres[z] = sfp_threshold_m1[z];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+ //                               THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+ 
+                                erase_sector(strt_add_thres+(7*SECTOR_SIZE));
+                                program_flash(strt_add_thres+(7*SECTOR_SIZE), (char*)flasharray_thres,32);
                                 
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));
@@ -608,7 +625,9 @@
                                 for(uint8_t z=0;z<20;z++)
                                     flasharray_thres[z] = sfp_threshold_m1[z+32];
                                 
-                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+//                                THRES_WRITE_TO_EEPROM(mid,flasharray_thres);
+                                erase_sector(strt_add_thres+(8*SECTOR_SIZE));
+                                program_flash(strt_add_thres+(8*SECTOR_SIZE), (char*)flasharray_thres,32);
                                 
                                 Base_tm *tm_ptr_short = new Short_tm;
                                 ACK_L234(tm_ptr_short,0xA0,GETpacket_seq_count(tc_ptr));