1. RGB Sensor Location 관련 프로토콜 추가

2. switch break; 추가
3. Rgb Response 프로토콜 시 ID 같이 반환 할 수 있도록 수정

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-840853398896664778" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="157605811251204298" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Debug/Src/RGB_Controller.su

@@ -1,13 +1,13 @@
-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:44:10:RGB_Limit_Address_Check	0	static
+RGB_Controller.c:58: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	128	static
-RGB_Controller.c:131:6:RGB_Sensor_LED_Alarm_ON	8	static
-RGB_Controller.c:169:6:RGB_Sensor_LED_Alarm_OFF	8	static
-RGB_Controller.c:208:6:RGB_Alarm_Operate	32	static
-RGB_Controller.c:251:9:RGB_DeviceStatusCheck	12	static
-RGB_Controller.c:325:9:RGB_BufCal	0	static
-RGB_Controller.c:298:6:RGB_Data_Stack	24	static
-RGB_Controller.c:224:6:RGB_Alarm_Check	104	static
-RGB_Controller.c:339:9:RGB_LimitData_Get	0	static
-RGB_Controller.c:350:6:RGB_Controller_Func	120	static
+RGB_Controller.c:73:6:RGB_Response_Func	24	static
+RGB_Controller.c:134:6:RGB_Sensor_LED_Alarm_ON	8	static
+RGB_Controller.c:172:6:RGB_Sensor_LED_Alarm_OFF	8	static
+RGB_Controller.c:211:6:RGB_Alarm_Operate	32	static
+RGB_Controller.c:254:9:RGB_DeviceStatusCheck	12	static
+RGB_Controller.c:328:9:RGB_BufCal	0	static
+RGB_Controller.c:301:6:RGB_Data_Stack	24	static
+RGB_Controller.c:227:6:RGB_Alarm_Check	104	static
+RGB_Controller.c:342:9:RGB_LimitData_Get	0	static
+RGB_Controller.c:353:6:RGB_Controller_Func	120	static

Debug/Src/main.su

@@ -1,20 +1,20 @@
-main.c:121:6:HAL_UART_RxCpltCallback	8	static
-main.c:161:6:HAL_TIM_PeriodElapsedCallback	0	static
-main.c:170:6:LoraDataSendSet	0	static
-main.c:173:9:LoraDataSendGet	0	static
-main.c:177:6:UartDataRecvSet	0	static
-main.c:180:9:UartDataRecvGet	0	static
-main.c:183:6:RGB_SensorIDAutoSet	0	static
-main.c:186:9:RGB_SensorIDAutoGet	0	static
-main.c:190:6:Uart2_Data_Send	0	static
-main.c:193:6:Uart1_Data_Send	0	static
-main.c:197:5:_write	8	static
-main.c:202:6:Uart_dataCheck	24	static
-main.c:231:6:RGB_Sensor_PowerOnOff	8	static
-main.c:385:6:test_read	24	static
-main.c:404:6:Flash_RGB_Data_Write	16	static
-main.c:417:6:Flash_write	24	static
-main.c:470:6:Flash_InitRead	12	static
-main.c:668:6:SystemClock_Config	72	static
-main.c:508:5:main	112	static
-main.c:942:6:Error_Handler	0	static
+main.c:131:6:HAL_UART_RxCpltCallback	8	static
+main.c:176:6:HAL_TIM_PeriodElapsedCallback	0	static
+main.c:185:6:LoraDataSendSet	0	static
+main.c:188:9:LoraDataSendGet	0	static
+main.c:192:6:UartDataRecvSet	0	static
+main.c:195:9:UartDataRecvGet	0	static
+main.c:198:6:RGB_SensorIDAutoSet	0	static
+main.c:201:9:RGB_SensorIDAutoGet	0	static
+main.c:205:6:Uart2_Data_Send	0	static
+main.c:208:6:Uart1_Data_Send	0	static
+main.c:212:5:_write	8	static
+main.c:248:6:Uart_dataCheck	24	static
+main.c:280:6:RGB_Sensor_PowerOnOff	8	static
+main.c:434:6:test_read	24	static
+main.c:453:6:Flash_RGB_Data_Write	16	static
+main.c:466:6:Flash_write	24	static
+main.c:519:6:Flash_InitRead	12	static
+main.c:751:6:SystemClock_Config	72	static
+main.c:557:5:main	296	static
+main.c:1025:6:Error_Handler	0	static

Src/RGB_Controller.c

@@ -39,6 +39,7 @@ void RGB_Data_Init(void){
         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;
@@ -71,7 +72,7 @@ uint16_t RGB_Location_Address_Check(uint8_t id){
 
 void RGB_Response_Func(uint8_t* data){
 	RGB_CMD_T type = data[bluecell_type];
-    uint8_t temp_data[100] = {0,};
+    uint16_t temp  = 0;
 #if 0
 for(uint8_t i = 0; i < 10; i++){
             printf("%02x ",data[i]);
@@ -105,18 +106,20 @@ for(uint8_t i = 0; i < 10; i++){
         case RGB_Reset:
         case RGB_SensorID_SET_Success:
         case RGB_ID_Allocate_Request:
-            case RGB_Lora_Data_Report:
+        case RGB_Lora_Data_Report:
             break;
         case RGB_Location_Report:
-            M24C32_Data_Write(&hi2c2,&data[Location_stx],RGB_Location_Address_Check(data[data[bluecell_length]]),data[bluecell_length] + 3); // EEPROM Controller ID Save 
+            M24C32_Data_Write(&hi2c2,&data[Location_stx],RGB_Location_Address_Check(data[bluecell_srcid]),data[bluecell_length] + 3); // EEPROM Controller ID Save 
             break;
         case RGB_Location_Response:
-            temp_data[bluecell_length] = M24C32_Data_Read(&hi2c2,RGB_Location_Address_Check(data[bluecell_dstid]) + 2); // EEPROM Controller ID Save 
-            for(uint8_t i = 0; i < temp_data[bluecell_length] + 3; i++)
-                temp_data[i] = M24C32_Data_Read(&hi2c2,RGB_Location_Address_Check(data[bluecell_dstid]) + i); // EEPROM Controller ID Save 
-            temp_data[bluecell_type] = RGB_Location_Response;
-            temp_data[temp_data[bluecell_length] + 1] = STH30_CreateCrc(&temp_data[bluecell_type],temp_data[bluecell_length]);
-            Uart1_Data_Send(temp_data,temp_data[bluecell_length] + 3);    
+            data[bluecell_length] = M24C32_Data_Read(&hi2c2,RGB_Location_Address_Check(data[bluecell_dstid]) + 2); // EEPROM Controller ID Save 
+            temp = RGB_Location_Address_Check(data[bluecell_srcid]);
+            for(uint8_t i = 0; i < (data[bluecell_length] + 3); i++){
+                data[i] = M24C32_Data_Read(&hi2c2,(temp + i)); // EEPROM Controller ID Save 
+            }
+            data[bluecell_type] = RGB_Location_Response;
+            data[data[bluecell_length] + 1] = STH30_CreateCrc(&data[bluecell_type],data[bluecell_length]);
+            Uart1_Data_Send(data,data[bluecell_length] + 3);    
             break;
          case RGB_ControllerID_GET:
              Uart1_Data_Send(data,data[bluecell_length] + 3);
@@ -397,7 +400,10 @@ void RGB_Controller_Func(uint8_t* data){
             break;
         case RGB_Location_Report:
             memcpy(&Result_buf[bluecell_stx],&data[bluecell_stx],data[bluecell_length] + 3);
+            break;
         case RGB_Location_Response:
+            Result_buf[bluecell_type] = RGB_Location_Response;
+            Result_buf[bluecell_srcid] = data[bluecell_srcid];
             break;
         case RGB_ControllerID_GET:
             Result_buf[bluecell_stx]         = 0xbe;

Src/main.c

@@ -75,9 +75,9 @@ uint8_t rx2_data[1];
 
 
 uint8_t ring_buf[buf_size];
-uint8_t count_in1 = 0;//, count_out = 0;
-uint8_t count_in2 = 0;//, count_out = 0;
-uint8_t count_in3 = 0, count_out = 0;
+uint8_t count_in1 = 0, count_out1 = 0;
+uint8_t count_in2 = 0, count_out2 = 0;
+//uint8_t count_in3 = 0, count_out = 0;
 
 
 uint8_t UartDataisReved;
@@ -91,6 +91,10 @@ volatile uint32_t LoraTxTimerCnt = 0;
 
 
 uint8_t buf[buf_size] = {0,};
+uint8_t buf1[buf_size] = {0,};
+uint8_t buf2[buf_size] = {0,};
+
+
 
 uint8_t MyControllerID = 0;
 uint8_t  SensorID = 0;
@@ -109,7 +113,12 @@ static void MX_NVIC_Init(void);
 void RGB_SensorIDAutoSet(uint8_t set);
 uint8_t RGB_SensorIDAutoGet(void);
 void UartDataRecvSet(uint8_t val);
+#if 0 // PYJ.2019.04.19_BEGIN -- 
 void Uart_dataCheck(uint8_t* cnt);
+#else
+void Uart_dataCheck(uint8_t*,uint8_t* cnt);
+
+#endif // PYJ.2019.04.19_END -- 
 void Uart1_Data_Send(uint8_t* data,uint8_t size);
 /* USER CODE END PFP */
 
@@ -118,24 +127,30 @@ void Uart1_Data_Send(uint8_t* data,uint8_t size);
 
 
 
+
 void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
 {
     if(huart->Instance == USART1)//RGB Comunication 
     {
-        buf[count_in1] = rx1_data[0];//(uint8_t)USART2->DR;
+        buf1[count_in1] = rx1_data[0];//(uint8_t)USART2->DR;
+         if(++count_in1>=buf_size){ count_in1 = 0; }
 //        printf("data %02x \r\n",rx1_data[0]);
+#if 0 // PYJ.2019.04.19_BEGIN -- 
         if(buf[count_in1++] == 0xEB){
             if(buf[bluecell_length] == (count_in1 - 3))
                 UartDataRecvSet(1);
             else
                 count_in1 = 0;
         }
+#endif // PYJ.2019.04.19_END -- 
         HAL_UART_Receive_IT(&huart1,&rx1_data[0],1);
     }
     if(huart->Instance == USART2) // Lora?? ?†µ?‹ ?•˜?Š” ?¬?Š¸
     {
-        buf[count_in2] = rx2_data[0];//(uint8_t)USART2->DR;
-//        if(buf[count_in++] == 0xEB)UartDataRecvSet(1);
+        buf2[count_in2] = rx2_data[0];//(uint8_t)USART2->DR;
+        if(++count_in2>=buf_size){ count_in2 = 0; }
+//      if(buf[count_in++] == 0xEB)UartDataRecvSet(1);
+#if 0 // PYJ.2019.04.19_BEGIN -- 
         if(buf[count_in2++] == 0xEB){
             if(buf[bluecell_length] == (count_in2 - 3))
                 UartDataRecvSet(2);
@@ -143,7 +158,7 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
                 count_in1 = 0;
 //                printf("UART 2 %d",((count_in2 -1) - 3));
         }
-
+#endif // PYJ.2019.04.19_END -- 
         HAL_UART_Receive_IT(&huart2,&rx2_data[0],1);
     }
 #if 0 // PYJ.2019.04.13_BEGIN -- 
@@ -199,6 +214,7 @@ int _write (int file, uint8_t *ptr, uint16_t len)
     HAL_UART_Transmit (&huart1, ptr, len, 10); 
     return len;
 }
+#if 0 // PYJ.2019.04.19_BEGIN -- 
 void Uart_dataCheck(uint8_t* cnt){
 
     etError crccheck = 0;
@@ -228,6 +244,39 @@ void Uart_dataCheck(uint8_t* cnt){
     
     memset(buf,0x00,buf_size);
 }
+#else
+void Uart_dataCheck(uint8_t* Que_Buf,uint8_t* cnt){
+
+    etError crccheck = 0;
+#if 0
+    for(uint8_t i = 0; i < (* cnt); i++){
+        printf("%02x ",buf[i]);
+    }
+        printf("\r\n");
+#endif  
+
+    crccheck = STH30_CheckCrc(&Que_Buf[bluecell_type],Que_Buf[bluecell_length],Que_Buf[Que_Buf[bluecell_length] + 1]);
+    if(crccheck == CHECKSUM_ERROR){
+        for(uint8_t i = 0; i < (*cnt); i++){
+            printf("%02x ",Que_Buf[i]);
+        }
+        printf("Original CRC : %02x RecvCRC : %02x \r\n",crccheck,Que_Buf[Que_Buf[bluecell_length] + 1]);
+    }
+    else if(crccheck == NO_ERROR){
+        RGB_Controller_Func(&Que_Buf[bluecell_stx]);
+    }
+    else{
+         printf("What Happen?\r\n");
+        /*NOP*/
+    }
+
+    //*cnt = 0;
+    
+    memset(Que_Buf,0x00,buf_size);
+}
+
+
+#endif // PYJ.2019.04.19_END -- 
 void RGB_Sensor_PowerOnOff(uint8_t id){
     printf("%d Power ON \r\n",id);
 
@@ -588,7 +637,9 @@ int main(void)
    }
 #endif // PYJ.2019.04.16_END -- 
      
-
+    uint8_t data1[100]= {0,};
+    uint8_t data2[100]= {0,};
+    uint8_t uartrecv1=0,uartrecv2=0,cnt1 = 0,cnt2=0;
   while (1)
   {
      if(LoraTxTimerCnt > LORA_TIMER_CNT){
@@ -607,7 +658,7 @@ int main(void)
 //        printf("%02x ",buffer[i]);
 //        printf("\n");
     }else {
-            HAL_Delay(1);
+//            HAL_Delay(1);
            ret = SX1276_LoRaRxPacket(&SX1276);
            if (ret > 0) {
                SX1276_read(&SX1276, &buffer[0], ret);
@@ -618,15 +669,47 @@ int main(void)
            }
        
        }
+    
+     if(count_in1 != count_out1){ // <------- 
+        data1[cnt1++] = buf1[count_out1++];
+        if(count_out1 >= 100){ count_out1 = 0; }
+        UartTimerCnt = 0;
+//        uartrecv1 = 1;
+        UartDataRecvSet(1);
+    }
+    if(count_in2 != count_out2){ // <------- 
+         data2[cnt2++] = buf2[count_out2++];
+         if(count_out2 >= 100){ count_out2 = 0; }
+         UartTimerCnt = 0;
+//         uartrecv2 = 1;
+         UartDataRecvSet(2);
+
+    }
+#if 0 // PYJ.2019.04.19_BEGIN -- 
     uartdatarecv = UartDataRecvGet(); 
     if(uartdatarecv != 0){
         if(uartdatarecv == 1){
-            Uart_dataCheck(&count_in1);
+            Uart_dataCheck(data1,&count_in1);
         }else if(uartdatarecv == 2){
-            Uart_dataCheck(&count_in2);
+            Uart_dataCheck(data2,&count_in2);
         }  
         UartDataRecvSet(0);
     }
+#endif // PYJ.2019.04.19_END -- 
+    uartdatarecv = UartDataRecvGet(); 
+
+    if(uartdatarecv == 1 && UartTimerCnt > 100){
+        cnt1 = 0;
+        UartDataRecvSet(0);
+        Uart_dataCheck(&data1[0],&count_in1);
+        memset(&data1[0],0,100);
+    }
+    if(uartdatarecv == 2 && UartTimerCnt > 100){
+        cnt2 = 0;
+        UartDataRecvSet(0);
+        Uart_dataCheck(&data2[0],&count_in2);
+        memset(&data2[0],0,100);
+    }
     else{
         if(LedTimerCnt > 500){
             if(RGB_SensorIDAutoGet() == 1){
@@ -648,7 +731,7 @@ int main(void)
                 if(temp_sensorid > (SensorID_Cnt)){
                     temp_sensorid = 0;
                 }
-                 RGB_Controller_Func(&StatusRequest_data[bluecell_stx]);
+                RGB_Controller_Func(&StatusRequest_data[bluecell_stx]);
             }
             HAL_GPIO_TogglePin(GPIOC,GPIO_PIN_15);
             LedTimerCnt = 0;