EEPROM 라이브러리 추가

Warning 수정
Controller ID Set 함수 추가
Controller ID Get 함수  추가
EEPROM에서 Data 가져오는 Initialize 함수 추가 Main 문에도 추가하였음

Debug/Src/M24C32.su

@@ -0,0 +1,3 @@
+M24C32.c:12:6:I2c_Status_Check	0	static
+M24C32.c:27:6:M24C32_Data_Write	64	static
+M24C32.c:37:9:M24C32_Data_Read	32	static

Debug/Src/RGB_Controller.su

@@ -1,9 +1,12 @@
-RGB_Controller.c:10:6:RGB_Response_Func	8	static
-RGB_Controller.c:61:6:RGB_Sensor_LED_Alarm_ON	8	static
-RGB_Controller.c:99:6:RGB_Sensor_LED_Alarm_OFF	8	static
-RGB_Controller.c:138:6:RGB_Alarm_Operate	32	static
-RGB_Controller.c:171:9:RGB_DeviceStatusCheck	12	static
-RGB_Controller.c:245:9:RGB_BufCal	0	static
-RGB_Controller.c:218:6:RGB_Data_Stack	24	static
-RGB_Controller.c:154:6:RGB_Alarm_Check	48	static
-RGB_Controller.c:262:6:RGB_Controller_Func	120	static
+RGB_Controller.c:43:10:RGB_Limit_Address_Check	0	static
+RGB_Controller.c:57:10:RGB_Location_Address_Check	0	static
+RGB_Controller.c:17:6:RGB_Data_Init	48	static
+RGB_Controller.c:72:6:RGB_Response_Func	8	static
+RGB_Controller.c:125:6:RGB_Sensor_LED_Alarm_ON	8	static
+RGB_Controller.c:163:6:RGB_Sensor_LED_Alarm_OFF	8	static
+RGB_Controller.c:202:6:RGB_Alarm_Operate	32	static
+RGB_Controller.c:239:9:RGB_DeviceStatusCheck	12	static
+RGB_Controller.c:313:9:RGB_BufCal	0	static
+RGB_Controller.c:286:6:RGB_Data_Stack	24	static
+RGB_Controller.c:218:6:RGB_Alarm_Check	96	static
+RGB_Controller.c:330:6:RGB_Controller_Func	120	static

Debug/Src/main.su

@@ -15,6 +15,6 @@ main.c:383:6:test_read	24	static
 main.c:402:6:Flash_RGB_Data_Write	16	static
 main.c:415:6:Flash_write	24	static
 main.c:468:6:Flash_InitRead	12	static
-main.c:721:6:SystemClock_Config	72	static
+main.c:729:6:SystemClock_Config	72	static
 main.c:506:5:main	112	static
-main.c:995:6:Error_Handler	0	static
+main.c:1003:6:Error_Handler	0	static

Inc/M24C32.h

@@ -0,0 +1,7 @@
+#include "main.h"
+
+extern void I2c_Status_Check(I2C_HandleTypeDef* hi2cx,HAL_StatusTypeDef status);
+extern void M24C32_Data_Write(I2C_HandleTypeDef* hi2cx,uint8_t* data,uint16_t address,uint8_t size);
+extern uint8_t M24C32_Data_Read(I2C_HandleTypeDef* hi2cx,uint16_t address);
+
+

Inc/RGB_Controller.h

@@ -4,6 +4,9 @@
 extern void RGB_Controller_Func(uint8_t* data);
 extern void RGB_Alarm_Operate(void);
 extern void RGB_Sensor_LED_Alarm_OFF(uint8_t id );
+extern void RGB_Data_Init(void);
+extern uint8_t M24C32_Data_Read(I2C_HandleTypeDef* hi2cx,uint16_t address);
+extern void M24C32_Data_Write(I2C_HandleTypeDef* hi2cx,uint8_t* data,uint16_t address,uint8_t size);
 
 extern uint8_t SensorID_buf[8];
 extern uint8_t SensorID_Cnt;

Inc/main.h

@@ -78,6 +78,12 @@ typedef enum{ //LIMIT SET enum
     bluecell_crc,
     bluecell_etx,
 }RGB_Protocol_t;    
+typedef enum{ //LIMIT SET enum
+    Location_stx = 0,
+    Location_type,
+    Location_length,
+    Location_Data,
+}RGB_Location_Protocol_t;    
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
@@ -106,6 +112,7 @@ void Error_Handler(void);
 extern uint8_t MyControllerID;
 extern uint8_t  SensorID;
 extern uint8_t Lora_Buf[100];
+extern I2C_HandleTypeDef hi2c2;
 
 typedef enum{
     RGB_Status_Data_Request = 0x01,
@@ -118,8 +125,12 @@ typedef enum{
     RGB_Sensor_Check ,              //8
     RGB_Sensor_Ack,                 //9
     RGB_Reset,                      //10
-    RGB_ID_Allocate_Request,        //11
-    RGB_Lora_Data_Report,           //12
+    RGB_BootStart,                  //11
+    RGB_ID_Allocate_Request,        //12
+    RGB_Lora_Data_Report,           //13
+    RGB_Location_Report,           //14
+    RGB_Location_Response,           //15
+    RGB_ControllerID_GET,           //16
 }RGB_CMD_T;
 #define     RGB_ControllerID_SET_Length         10 
 #define     RGB_SensorID_SET_Length             10 
@@ -132,6 +143,99 @@ typedef enum{
 #define     RGB_SensorDataResponseData_Length   RGB_SensorDataResponse_Length - 3
 #define     Lora_Max_Amount                     5
 #define     LORA_MAX_DATA_CNT                   Lora_Max_Amount + 3
+
+/*ID 정보  */
+
+#define MY_ID_ADDRESS               0x0000
+
+/*색깔 제한 정보 */
+/*SENSOR 1  ADDRESS*/
+#define RGB1_LIMIT_RED_H_ADDRESS     0x0001
+#define RGB1_LIMIT_RED_L_ADDRESS     0x0002
+#define RGB1_LIMIT_GREEN_H_ADDRESS   0x0003
+#define RGB1_LIMIT_GREEN_L_ADDRESS   0x0004
+#define RGB1_LIMIT_BLUE_H_ADDRESS    0x0005
+#define RGB1_LIMIT_BLUE_L_ADDRESS    0x0006
+/*SENSOR 2  ADDRESS*/
+#define RGB2_LIMIT_RED_H_ADDRESS     0x0007
+#define RGB2_LIMIT_RED_L_ADDRESS     0x0008
+#define RGB2_LIMIT_GREEN_H_ADDRESS   0x0009
+#define RGB2_LIMIT_GREEN_L_ADDRESS   0x000A
+#define RGB2_LIMIT_BLUE_H_ADDRESS    0x000B
+#define RGB2_LIMIT_BLUE_L_ADDRESS    0x000C
+/*SENSOR 3  ADDRESS*/
+#define RGB3_LIMIT_RED_H_ADDRESS     0x000D
+#define RGB3_LIMIT_RED_L_ADDRESS     0x000E
+#define RGB3_LIMIT_GREEN_H_ADDRESS   0x000F
+#define RGB3_LIMIT_GREEN_L_ADDRESS   0x0010
+#define RGB3_LIMIT_BLUE_H_ADDRESS    0x0011
+#define RGB3_LIMIT_BLUE_L_ADDRESS    0x0012
+/*SENSOR 4  ADDRESS*/
+#define RGB4_LIMIT_RED_H_ADDRESS     0x0013
+#define RGB4_LIMIT_RED_L_ADDRESS     0x0014
+#define RGB4_LIMIT_GREEN_H_ADDRESS   0x0015
+#define RGB4_LIMIT_GREEN_L_ADDRESS   0x0016
+#define RGB4_LIMIT_BLUE_H_ADDRESS    0x0017
+#define RGB4_LIMIT_BLUE_L_ADDRESS    0x0018
+/*SENSOR 5  ADDRESS*/
+#define RGB5_LIMIT_RED_H_ADDRESS     0x0019
+#define RGB5_LIMIT_RED_L_ADDRESS     0x001A
+#define RGB5_LIMIT_GREEN_H_ADDRESS   0x001B
+#define RGB5_LIMIT_GREEN_L_ADDRESS   0x001C
+#define RGB5_LIMIT_BLUE_H_ADDRESS    0x001D
+#define RGB5_LIMIT_BLUE_L_ADDRESS    0x001E
+/*SENSOR 6  ADDRESS*/
+#define RGB6_LIMIT_RED_H_ADDRESS     0x001F
+#define RGB6_LIMIT_RED_L_ADDRESS     0x0020
+#define RGB6_LIMIT_GREEN_H_ADDRESS   0x0021
+#define RGB6_LIMIT_GREEN_L_ADDRESS   0x0022
+#define RGB6_LIMIT_BLUE_H_ADDRESS    0x0023
+#define RGB6_LIMIT_BLUE_L_ADDRESS    0x0024
+/*SENSOR 7  ADDRESS*/
+#define RGB7_LIMIT_RED_H_ADDRESS     0x0025
+#define RGB7_LIMIT_RED_L_ADDRESS     0x0036
+#define RGB7_LIMIT_GREEN_H_ADDRESS   0x0027
+#define RGB7_LIMIT_GREEN_L_ADDRESS   0x0028
+#define RGB7_LIMIT_BLUE_H_ADDRESS    0x0029
+#define RGB7_LIMIT_BLUE_L_ADDRESS    0x002A
+/*SENSOR 8  ADDRESS*/
+#define RGB8_LIMIT_RED_H_ADDRESS     0x002B
+#define RGB8_LIMIT_RED_L_ADDRESS     0x002C
+#define RGB8_LIMIT_GREEN_H_ADDRESS   0x002D
+#define RGB8_LIMIT_GREEN_L_ADDRESS   0x002E
+#define RGB8_LIMIT_BLUE_H_ADDRESS    0x002F
+#define RGB8_LIMIT_BLUE_L_ADDRESS    0x0031
+/*위치 정보 */
+#define RGB1_LOCATION_ADDRESS        0x0032
+#define RGB2_LOCATION_ADDRESS        RGB1_LOCATION_ADDRESS + 50
+#define RGB3_LOCATION_ADDRESS        RGB2_LOCATION_ADDRESS + 50
+#define RGB4_LOCATION_ADDRESS        RGB3_LOCATION_ADDRESS + 50
+#define RGB5_LOCATION_ADDRESS        RGB4_LOCATION_ADDRESS + 50
+#define RGB6_LOCATION_ADDRESS        RGB5_LOCATION_ADDRESS + 50
+#define RGB7_LOCATION_ADDRESS        RGB6_LOCATION_ADDRESS + 50
+#define RGB8_LOCATION_ADDRESS        RGB7_LOCATION_ADDRESS + 50
+/*reserved*/
+#define RESERVED_ADDRESS             RGB8_LOCATION_ADDRESS + 50
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /* USER CODE END EFP */
 

Src/M24C32.c

@@ -0,0 +1,46 @@
+#include "M24C32.h"
+
+
+uint8_t writedata[1] = {0xAA};
+uint8_t Readdata[1] = {0,};  
+
+
+
+
+
+
+void I2c_Status_Check(I2C_HandleTypeDef* hi2cx,HAL_StatusTypeDef status){
+    if(HAL_OK == status){
+        printf("HAL_OK\n");
+    }
+    else if(HAL_ERROR == status){
+        printf("HAL_ERROR\n");
+    }else if(HAL_BUSY == status){
+        printf("HAL_ERROR\n");
+    }else if(HAL_TIMEOUT == status){
+        printf("HAL_ERROR\n");
+    }  
+}
+
+
+
+void M24C32_Data_Write(I2C_HandleTypeDef* hi2cx,uint8_t* data,uint16_t address,uint8_t size){
+    HAL_StatusTypeDef status = HAL_ERROR;
+    for(uint8_t i = 0; i < size; i++){
+        status = HAL_I2C_Mem_Write(hi2cx,0xA0,address + i, I2C_MEMADD_SIZE_16BIT, &data[i],1, 2000);
+        HAL_Delay(5);
+        if(status > HAL_OK)
+            printf("EEPROM SAVE ERROR!!! \n");
+    }
+   // I2c_Status_Check(status);
+}
+uint8_t M24C32_Data_Read(I2C_HandleTypeDef* hi2cx,uint16_t address){
+    uint8_t data[1] = {0};
+    HAL_StatusTypeDef status = HAL_ERROR;
+    status = HAL_I2C_Mem_Read(hi2cx,0xA1, address,I2C_MEMADD_SIZE_16BIT, &data[0],1, 2000);
+  //  I2c_Status_Check(status);
+//    printf("Readdata[0] : %02x\n",data);
+    return data[0];
+}
+
+

Src/RGB_Controller.c

@@ -4,8 +4,70 @@ void RGB_Response_Func(uint8_t* data);
 uint8_t RGB_BufCal(uint8_t srcid);
 void RGB_Alarm_Operate(void);
 void RGB_Data_Stack(uint8_t* rgb_buf);
+uint16_t RGB_Location_Address_Check(uint8_t id);
 
+uint8_t SensorID_Cnt = 0;
+uint8_t SensorID_buf[8] = {0,};
+uint16_t RGB_SensorRedLimit_Buf[9]={0,};
+uint16_t RGB_SensorGreenLimit_Buf[9]={0,};
+uint16_t RGB_SensorBlueLimit_Buf[9]={0,};
+uint8_t LED_Alarm[9] = {0,};
+uint8_t RGB_Location_Buf[9][50] = {0};
 
+void RGB_Data_Init(void){
+    MyControllerID = M24C32_Data_Read(&hi2c2,MY_ID_ADDRESS);
+  
+    for(uint8_t i = 0; i < 8; i++){
+        RGB_SensorRedLimit_Buf[i + 1] = (M24C32_Data_Read(&hi2c2,RGB1_LIMIT_RED_H_ADDRESS + (6 * i)) << 8);
+        RGB_SensorRedLimit_Buf[i + 1] |= M24C32_Data_Read(&hi2c2,RGB1_LIMIT_RED_L_ADDRESS + (6 * i));
+    }
+    for(uint8_t i = 0; i < 8; i++){
+        RGB_SensorGreenLimit_Buf[i + 1] = (M24C32_Data_Read(&hi2c2,RGB1_LIMIT_GREEN_H_ADDRESS + (6 * i)) << 8);
+        RGB_SensorGreenLimit_Buf[i + 1] |= M24C32_Data_Read(&hi2c2,RGB1_LIMIT_GREEN_L_ADDRESS + (6 * i));
+    }
+    for(uint8_t i = 0; i < 8; i++){
+        RGB_SensorBlueLimit_Buf[i + 1] = (M24C32_Data_Read(&hi2c2,RGB1_LIMIT_BLUE_H_ADDRESS + (6 * i)) << 8);
+        RGB_SensorBlueLimit_Buf[i + 1] |= M24C32_Data_Read(&hi2c2,RGB1_LIMIT_BLUE_L_ADDRESS + (6 * i));
+    }
+    for(uint8_t i = 0; i < 8; i++){
+        for(uint8_t aa= 0; aa < 50; aa++)
+            RGB_Location_Buf[i + 1][aa] = M24C32_Data_Read(&hi2c2,RGB_Location_Address_Check(i + 1) + aa);
+    }
+    printf("MY id is %d \n",MyControllerID);
+    for(uint8_t i = 1; i <= 8; i++){
+        printf("RGB_SensorRedLimit_Buf[%d]    :  %04x\n",i,RGB_SensorRedLimit_Buf[i]);
+        printf("RGB_SensorGreenLimit_Buf[%d]  :  %04x\n",i,RGB_SensorGreenLimit_Buf[i]);
+        printf("RGB_SensorBlueLimit_Buf[%d]   :  %04x\n",i,RGB_SensorBlueLimit_Buf[i]);    
+    }
+}
+uint16_t RGB_Limit_Address_Check(uint8_t id){
+    uint16_t ret = 0;
+    switch(id){
+        case 1: ret = RGB1_LIMIT_RED_H_ADDRESS;break;
+        case 2: ret = RGB2_LIMIT_RED_H_ADDRESS;break;
+        case 3: ret = RGB3_LIMIT_RED_H_ADDRESS;break;
+        case 4: ret = RGB4_LIMIT_RED_H_ADDRESS;break;
+        case 5: ret = RGB5_LIMIT_RED_H_ADDRESS;break;
+        case 6: ret = RGB6_LIMIT_RED_H_ADDRESS;break;
+        case 7: ret = RGB7_LIMIT_RED_H_ADDRESS;break;
+        case 8: ret = RGB8_LIMIT_RED_H_ADDRESS;break;        
+    }
+    return ret;
+}
+uint16_t RGB_Location_Address_Check(uint8_t id){
+    uint16_t ret = 0;
+    switch(id){
+        case 1: ret = RGB1_LOCATION_ADDRESS;break;
+        case 2: ret = RGB2_LOCATION_ADDRESS;break;
+        case 3: ret = RGB3_LOCATION_ADDRESS;break;
+        case 4: ret = RGB4_LOCATION_ADDRESS;break;
+        case 5: ret = RGB5_LOCATION_ADDRESS;break;
+        case 6: ret = RGB6_LOCATION_ADDRESS;break;
+        case 7: ret = RGB7_LOCATION_ADDRESS;break;
+        case 8: ret = RGB8_LOCATION_ADDRESS;break;        
+    }
+    return ret;
+}
 
 void RGB_Response_Func(uint8_t* data){
 	RGB_CMD_T type = data[bluecell_type];
@@ -20,6 +82,7 @@ for(uint8_t i = 0; i < 10; i++){
             break;
         case RGB_ControllerID_SET: 
             Uart1_Data_Send(data,RGB_ControllerID_SET_Length);
+            M24C32_Data_Write(&hi2c2,&MyControllerID,MY_ID_ADDRESS,1); // EEPROM Controller ID Save 
             break;
         case RGB_SensorID_SET:  
             Uart2_Data_Send(data,RGB_SensorIDAutoSetRequest_Length);
@@ -29,7 +92,7 @@ for(uint8_t i = 0; i < 10; i++){
             break;
         case RGB_ControllerLimitSet:
             Uart1_Data_Send(data,data[bluecell_length] + 3);
-            Flash_write(&data[0]);
+            M24C32_Data_Write(&hi2c2,&data[bluecell_red_H],RGB_Limit_Address_Check(data[bluecell_dstid]),6); // EEPROM Controller ID Save 
             break;
         case RGB_Sensor_Start:    
         case RGB_Sensor_Check:
@@ -40,23 +103,24 @@ for(uint8_t i = 0; i < 10; i++){
             break;
         case RGB_Reset:
         case RGB_SensorID_SET_Success:
+        case RGB_ID_Allocate_Request:
+            case RGB_Lora_Data_Report:
+            break;
+        case RGB_Location_Report:
+        case RGB_Location_Response:
+            M24C32_Data_Write(&hi2c2,&data[Location_Data],RGB_Location_Address_Check(data[bluecell_dstid]),data[bluecell_length] - 2); // EEPROM Controller ID Save 
             break;
-             
+         case RGB_ControllerID_GET:
+             Uart1_Data_Send(data,data[bluecell_length] + 3);
+             break;
     }
 
 }
-uint8_t SensorID_Cnt = 0;
-uint8_t SensorID_buf[8] = {0,};
-uint16_t RGB_SensorRedLimit_Buf[9]={0,};
-uint16_t RGB_SensorGreenLimit_Buf[9]={0,};
-uint16_t RGB_SensorBlueLimit_Buf[9]={0,};
 
 
-uint16_t Sensor_red[9] = {0,};
-uint16_t Sensor_green[9] = {0,};
-uint16_t Sensor_blue[9] = {0,};    
 
-uint8_t LED_Alarm[9] = {0,};
+
+
 void RGB_Sensor_LED_Alarm_ON(uint8_t id ){
     switch(id){
         case 0:// 모든 LED의 전원을 ON
@@ -151,6 +215,10 @@ void RGB_Alarm_Operate(void){
     }
 }
 void RGB_Alarm_Check(uint8_t* data){
+    uint16_t Sensor_red[9] = {0,};
+    uint16_t Sensor_green[9] = {0,};
+    uint16_t Sensor_blue[9] = {0,};    
+
     Sensor_red[data[bluecell_srcid]] = ((data[bluecell_red_H + 2] << 8)| data[bluecell_red_L + 2]);
     Sensor_green[data[bluecell_srcid]] = ((data[bluecell_green_H + 2] << 8)| data[bluecell_green_L + 2]);
     Sensor_blue[data[bluecell_srcid]] = ((data[bluecell_blue_H + 2] << 8)| data[bluecell_blue_L + 2]);  
@@ -274,13 +342,13 @@ void RGB_Controller_Func(uint8_t* data){
             break;
         case RGB_ControllerID_SET:        
             memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
-            Result_buf[7] = data[bluecell_srcid]; // �긽��諛⑹쓽 SRC ID�뒗 �굹�쓽 DST ID�씠�떎.
-            MyControllerID = Result_buf[7] = data[7];//�긽��諛⑹쓽 DST ID �뒗 �굹�쓽 ID �씠�떎.
+            MyControllerID = data[bluecell_srcid]; // �긽��諛⑹쓽 SRC ID�뒗 �굹�쓽 DST ID�씠�떎.
+            
             break;
         case RGB_SensorID_SET:        
             RGB_SensorIDAutoSet(1);
             memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
-            Result_buf[5]   = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
+            Result_buf[5]  = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
             break;
         case RGB_SensorID_SET_Success:
             SensorID_Cnt++;
@@ -306,7 +374,18 @@ void RGB_Controller_Func(uint8_t* data){
             NVIC_SystemReset();
             break;
         case RGB_ID_Allocate_Request:
-            
+            break;
+        case RGB_Location_Report:
+            break;
+        case RGB_Location_Response:
+            break;
+        case RGB_ControllerID_GET:
+            Result_buf[bluecell_stx]         = 0xbe;
+            Result_buf[bluecell_type]        = RGB_ControllerID_GET;
+            Result_buf[bluecell_length]      = 3;
+            Result_buf[bluecell_srcid]       = MyControllerID;      
+            Result_buf[bluecell_srcid + 1]   = STH30_CreateCrc(&Result_buf[bluecell_type],Result_buf[bluecell_length]);
+            Result_buf[bluecell_srcid + 2]   = 0xeb;
             break;
         default:
         break;

Src/SX1276.c

@@ -59,7 +59,7 @@ __weak uint8_t SX1276_hw_SPIReadByte(SX1276_hw_t * hw) {
 }
 #endif // PYJ.2019.04.01_END -- 
 uint8_t SX1276_hw_SPIReadByte(SX1276_hw_t * hw) {
-	uint8_t txByte = 0x00;
+	//uint8_t txByte = 0x00;
 	uint8_t rxByte = 0x00;
 
 	SX1276_hw_SetNSS(hw, 0);

Src/main.c

@@ -551,6 +551,7 @@ int main(void)
 #endif // PYJ.2019.03.04_END -- 
   RGB_SensorIDAutoSet(1);
   Flash_InitRead();
+  RGB_Data_Init();
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -562,11 +563,8 @@ int main(void)
    SX1276_hw.nss.pin = GPIO_PIN_15;
    SX1276_hw.reset.port = SX1276_RESET_GPIO_Port;
    SX1276_hw.reset.pin = SX1276_RESET_Pin;
-  
   // SX1276_hw.spi = &hspi3;
-   
    SX1276.hw = &SX1276_hw;
-
    printf("Configuring LoRa module\r\n");
    SX1276_begin(&SX1276, SX1276_917MHZ, SX1276_POWER_17DBM, SX1276_LORA_SF_8,
            SX1276_LORA_BW_20_8KHZ, 10);
@@ -577,7 +575,17 @@ int main(void)
    } else {
        ret = SX1276_LoRaEntryRx(&SX1276, LORA_MAX_DATA_CNT, 2000);
    }
+#if 0 // PYJ.2019.04.16_BEGIN -- 
+   for(uint8_t i = 0; i < 100; i++){
+    Test_data[i] = i;
+    M24C32_Data_Write(&hi2c2,&Test_data[i],(uint16_t)i,1);
+   }
    
+   for(uint8_t i = 0; i < 100; i++){
+    printf("%d \n",M24C32_Data_Read(&hi2c2,(uint16_t)i));
+   }
+#endif // PYJ.2019.04.16_END -- 
+     
 
   while (1)
   {