Diff: Parameters.c

Revision:

129:406995a91322

Parent:

21:bc8c1cec3da6

--- a/Parameters.c	Mon Apr 11 11:04:34 2016 +0000
+++ b/Parameters.c	Tue Apr 12 11:10:49 2016 +0000
@@ -11,7 +11,7 @@
 ******************************************************************************/
 void LoadFlashParam(unsigned source) 
 {
-  if (source == FromFLASH) 
+/*  if (source == FromFLASH) 
   {  
    	 while (LPC_GPDMACH3->CConfig & (1<<17));      	   //e. wait while DMA channel3 is busy
 
@@ -34,7 +34,7 @@
    else  //e. source == ByDefault
 	   init_DefaultParam();		//e. load parameters by default 
 
-  blt_in_test = ((uint32_t)FIRMWARE_VER << 8) | (Device_blk.Str.Device_SerialNumber & 0x00FF);
+  blt_in_test = ((uint32_t)FIRMWARE_VER << 8) | (Device_blk.Str.Device_SerialNumber & 0x00FF);*/
 }
 /******************************************************************************
 ** Function name:		init_DefaultParam
@@ -47,7 +47,7 @@
 ******************************************************************************/
 void init_DefaultParam(void)      
 {
-	int i;
+	/*int i;
         
 		Device_blk.Str.My_Addres = My_Addres_const; //r. 0x00; //e. direct set of the main device address //r. прямое назначение основного адреса у-ва
 
@@ -115,7 +115,7 @@
 		Device_blk.Str.Gain_Ph_B = G_PHOTO_STRB;
 
 		Device_blk.Str.Device_SerialNumber = DEVICE_SN;  //e. serial number of the device is by default written down in the register of self-testing  //r. серийный номер прибора по умолчанию записываем в регистр самотестирования
-		
+		*/
 } // init_DefaultParam
 /******************************************************************************
 ** Function name:		FlashDMA_Init
@@ -127,13 +127,13 @@
 ** 
 ******************************************************************************/
 void FlashDMA_Init()
-{
+{/*
 	LPC_GPDMACH3->CConfig &= ~DMAChannelEn; 
 
 	LPC_GPDMA->IntTCClear = DMA3_IntTCClear;
 	LPC_GPDMA->IntErrClr = DMA3_IntTCClear;
 
-	  /* Ch3 set for M2M transfer from Flash to RAM. */
+	 
 	  LPC_GPDMACH3->CSrcAddr = 0x40000;	   //e. address of device parameter block in flash memory (22 sec)
 	  LPC_GPDMACH3->CDestAddr = (uint32_t)&(Device_blk.Array);//e. address of device parameter block in RAM
 
@@ -142,5 +142,5 @@
 
 	  LPC_GPDMACH3->CConfig = MaskTCInt |MaskErrInt|DMA_MEMORY |DMA_MEMORY |(M2M << 11)| DMAChannelEn;	
 
-  return;
+  return;*/
 }