PE43711 MBIC 에 맞춤 / Uart Memory 증가 / Bluecell Operate 추가

.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="-1446200846035591216" 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="1681877287601945682" 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>
@@ -14,7 +14,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="-1446200846035591216" 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="1681877287601945682" 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>

Bluecell_Inc/PE43711.h

@@ -23,20 +23,28 @@
  }PE43711_st;
  
  typedef struct{
-   PE43711_st ATT0;
-   uint8_t    data0;
-   PE43711_st ATT1;
-   uint8_t    data1;
-   PE43711_st ATT2;
-   uint8_t    data2;
-   PE43711_st ATT3;
-   uint8_t    data3;
-   PE43711_st ATT4;    
-   uint8_t    data4;
-   PE43711_st ATT5;    
-   uint8_t    data5;
+   PE43711_st ATT_DL1;
+   uint8_t    data_DL1;
+   PE43711_st ATT_UL1;
+   uint8_t    data_UL1;
+   
+   PE43711_st ATT_DL2;
+   uint8_t    data_DL2;
+   PE43711_st ATT_UL2;
+   uint8_t    data_UL2;
+   
+   PE43711_st ATT_DL3;
+   uint8_t    data_DL3;
+   PE43711_st ATT_UL3;
+   uint8_t    data_UL3;
+   
+   PE43711_st ATT_DL4;
+   uint8_t    data_DL4;
+   PE43711_st ATT_UL4;
+   uint8_t    data_UL4;
  }ALL_PE43711_st;
-ALL_PE43711_st ALL_ATT_3_5G;
+ALL_PE43711_st ALL_ATT;
+
 
 
 #endif /* PE43711_H_ */

Bluecell_Inc/uart.h

@@ -12,7 +12,7 @@
 #include "main.h"
 #define hTerminal    huart1
 
-#define QUEUE_BUFFER_LENGTH 1024
+#define QUEUE_BUFFER_LENGTH 10240
 
 typedef struct
 {
@@ -34,5 +34,6 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart);
 bool Get_UartRcv(void);
 void Set_UartRcv(bool);
 void Uart1_Data_Send(uint8_t* data,uint8_t size);
+void Uart_Check(void);
 
 #endif /* UART_H_ */

Bluecell_Src/Bluecell_operate.c

@@ -2,10 +2,18 @@
 #include "main.h"
 #include "Bluecell_operate.h"
 
+extern volatile uint32_t LedTimerCnt;
 
 uint8_t Alarm_Status[MAX_ALARM_Len] = {0,};
 
 uint8_t ResultData[1024] = {0,};
+void Boot_LED_Toggle(void){
+  if(LedTimerCnt > 500){
+    HAL_GPIO_TogglePin(GPIOG,GPIO_PIN_14);
+    LedTimerCnt = 0;
+//    printf("LED OF OFF\r\n");
+  }
+}
 
 uint8_t* MBIC_HeaderDataSetting(uint8_t* data){
 	ResultData[MBIC_PREAMBLE_0] = MBIC_PREAMBLE0;
@@ -34,7 +42,50 @@ uint8_t* MBIC_HeaderDataSetting(uint8_t* data){
 
 	return ResultData;
 }
+typedef enum{
+  BLUECELL_DL_PATH1 = 0x01,
+  BLUECELL_UL_PATH1,
+  BLUECELL_DL_PATH2,
+  BLUECELL_UL_PATH2,
+  BLUECELL_DL_PATH3,
+  BLUECELL_UL_PATH3,
+  BLUECELL_DL_PATH4,
+  BLUECELL_UL_PATH4,
+};
+
 bool Bluecell_Operate(uint8_t* data){
+  uint8_t datatype = 0;
+
+  switch(datatype){
+	case BLUECELL_DL_PATH1:
+
+        break;
+	case BLUECELL_UL_PATH1:
+        
+        break;
+	case BLUECELL_DL_PATH2:
+        
+        break;
+	case BLUECELL_UL_PATH2:
+        
+        break;
+	case BLUECELL_DL_PATH3:
+        
+        break;
+	case BLUECELL_UL_PATH3:
+        
+        break;
+	case BLUECELL_DL_PATH4:
+        
+        break;
+	case BLUECELL_UL_PATH4:
+        
+        break;
+  }
+  return true;
+
+}
+bool MBIC_Operate(uint8_t* data){
 	uint16_t datatype = 0;
 
 	switch(datatype){

Bluecell_Src/PE43711.c

@@ -6,78 +6,100 @@
  */
  #include "PE43711.h"
 #if 1 // PYJ.2019.07.26_BEGIN -- 
-#define ATTEN_3_5G_Initial_Val 0
+#define ATTEN_Initial_Val 0
 extern void Pol_Delay_us(volatile uint32_t microseconds);
 void PE43711_ALL_atten_ctrl(ALL_PE43711_st ATT);
 
 void PE43711_atten_ctrl(PE43711_st ATT ,uint8_t data);
 
-/*
-ALL_PE43711_st ALL_ATT_3_5G;
 
-PE43711_st ATT_3_5G_LOW1 ={
-    ATT_CLK_3_5G_GPIO_Port,
-    ATT_CLK_3_5G_Pin,
-    ATT_DATA_3_5G_LOW1_GPIO_Port,
-    ATT_DATA_3_5G_LOW1_Pin,
-    ATT_EN_3_5G_GPIO_Port,
-    ATT_EN_3_5G_Pin,
+ALL_PE43711_st ALL_ATT;
+
+PE43711_st ATT_DL1 ={
+    ATT_CLOCK1_GPIO_Port,
+    ATT_CLOCK1_Pin,
+    ATT_DATA1_GPIO_Port,
+    ATT_DATA1_Pin,
+    ATT_EN_DL1_GPIO_Port,
+    ATT_EN_DL1_Pin,
 }; 
-PE43711_st ATT_3_5G_HIGH1 ={
-    ATT_CLK_3_5G_GPIO_Port,
-    ATT_CLK_3_5G_Pin,
-    ATT_DATA_3_5G_HIGH1_GPIO_Port,
-    ATT_DATA_3_5G_HIGH1_Pin,
-    ATT_EN_3_5G_GPIO_Port,
-    ATT_EN_3_5G_Pin,
+PE43711_st ATT_UL1 ={
+    ATT_CLOCK1_GPIO_Port,
+    ATT_CLOCK1_Pin,
+    ATT_DATA1_GPIO_Port,
+    ATT_DATA1_Pin,
+    ATT_EN_UL1_GPIO_Port,
+    ATT_EN_UL1_Pin,
 }; 
-PE43711_st ATT_3_5G_COM1={
-    ATT_CLK_3_5G_GPIO_Port,
-    ATT_CLK_3_5G_Pin,
-    ATT_DATA_3_5G_COM1_GPIO_Port,
-    ATT_DATA_3_5G_COM1_Pin,
-    ATT_EN_3_5G_GPIO_Port,
-    ATT_EN_3_5G_Pin,
+PE43711_st ATT_DL2 ={
+    ATT_CLOCK2_GPIO_Port,
+    ATT_CLOCK2_Pin,
+    ATT_DATA2_GPIO_Port,
+    ATT_DATA2_Pin,
+    ATT_EN_DL2_GPIO_Port,
+    ATT_EN_DL2_Pin,
 }; 
-PE43711_st ATT_3_5G_LOW2 ={
-  ATT_CLK_3_5G_GPIO_Port,
-  ATT_CLK_3_5G_Pin,
-  ATT_DATA_3_5G_LOW2_GPIO_Port,
-  ATT_DATA_3_5G_LOW2_Pin,
-  ATT_EN_3_5G_GPIO_Port,
-  ATT_EN_3_5G_Pin,
+PE43711_st ATT_UL2 ={
+    ATT_CLOCK2_GPIO_Port,
+    ATT_CLOCK2_Pin,
+    ATT_DATA2_GPIO_Port,
+    ATT_DATA2_Pin,
+    ATT_EN_UL2_GPIO_Port,
+    ATT_EN_UL2_Pin,
+}; PE43711_st ATT_DL3 ={
+    ATT_CLOCK3_GPIO_Port,
+    ATT_CLOCK3_Pin,
+    ATT_DATA3_GPIO_Port,
+    ATT_DATA3_Pin,
+    ATT_EN_DL3_GPIO_Port,
+    ATT_EN_DL3_Pin,
 }; 
-PE43711_st ATT_3_5G_HIGH2 ={
-  ATT_CLK_3_5G_GPIO_Port,
-  ATT_CLK_3_5G_Pin,
-  ATT_DATA_3_5G_HIGH2_GPIO_Port,
-  ATT_DATA_3_5G_HIGH2_Pin,
-  ATT_EN_3_5G_GPIO_Port,
-  ATT_EN_3_5G_Pin,
+PE43711_st ATT_UL3 ={
+    ATT_CLOCK3_GPIO_Port,
+    ATT_CLOCK3_Pin,
+    ATT_DATA3_GPIO_Port,
+    ATT_DATA3_Pin,
+    ATT_EN_UL3_GPIO_Port,
+    ATT_EN_UL3_Pin,
+}; PE43711_st ATT_DL4 ={
+    ATT_CLOCK4_GPIO_Port,
+    ATT_CLOCK4_Pin,
+    ATT_DATA4_GPIO_Port,
+    ATT_DATA4_Pin,
+    ATT_EN_DL4_GPIO_Port,
+    ATT_EN_DL4_Pin,
 }; 
-PE43711_st ATT_3_5G_COM2={
-    ATT_CLK_3_5G_GPIO_Port,
-    ATT_CLK_3_5G_Pin,
-    ATT_DATA_3_5G_COM2_GPIO_Port,
-    ATT_DATA_3_5G_COM2_Pin,
-    ATT_EN_3_5G_GPIO_Port,
-    ATT_EN_3_5G_Pin,
+PE43711_st ATT_UL4 ={
+    ATT_CLOCK4_GPIO_Port,
+    ATT_CLOCK4_Pin,
+    ATT_DATA4_GPIO_Port,
+    ATT_DATA4_Pin,
+    ATT_EN_UL4_GPIO_Port,
+    ATT_EN_UL4_Pin,
 }; 
-*/
+
+
 void PE43711_PinInit(void){
- /* ALL_ATT_3_5G.ATT0 = ATT_3_5G_LOW1;
-  ALL_ATT_3_5G.ATT1 = ATT_3_5G_HIGH1;
-  ALL_ATT_3_5G.ATT2 = ATT_3_5G_COM1;
-  ALL_ATT_3_5G.ATT3 = ATT_3_5G_LOW2;
-  ALL_ATT_3_5G.ATT4 = ATT_3_5G_HIGH2;    
-  ALL_ATT_3_5G.ATT5 = ATT_3_5G_COM2;
-  ALL_ATT_3_5G.data0 = ATTEN_3_5G_Initial_Val;    
-  ALL_ATT_3_5G.data1 = ATTEN_3_5G_Initial_Val;
-  ALL_ATT_3_5G.data2 = ATTEN_3_5G_Initial_Val;
-  ALL_ATT_3_5G.data3 = ATTEN_3_5G_Initial_Val;
-  ALL_ATT_3_5G.data4 = ATTEN_3_5G_Initial_Val;    
-  ALL_ATT_3_5G.data5 = ATTEN_3_5G_Initial_Val;        
-  PE43711_ALL_atten_ctrl(ALL_ATT_3_5G);*/
+  ALL_ATT.ATT_DL1 = ATT_DL1;
+  ALL_ATT.ATT_UL1 = ATT_UL1;
+  
+  ALL_ATT.ATT_DL1 = ATT_DL2;
+  ALL_ATT.ATT_UL1 = ATT_UL2;
+  
+  ALL_ATT.ATT_DL1 = ATT_DL3;
+  ALL_ATT.ATT_UL1 = ATT_UL3;
+  
+  ALL_ATT.ATT_DL1 = ATT_DL4;
+  ALL_ATT.ATT_UL1 = ATT_UL4;
+  ALL_ATT.data_DL1 = ATTEN_Initial_Val;
+  ALL_ATT.data_UL1 = ATTEN_Initial_Val;  
+  ALL_ATT.data_DL2 = ATTEN_Initial_Val;
+  ALL_ATT.data_UL2 = ATTEN_Initial_Val;  
+  ALL_ATT.data_DL3 = ATTEN_Initial_Val;
+  ALL_ATT.data_UL3 = ATTEN_Initial_Val;  
+  ALL_ATT.data_DL4 = ATTEN_Initial_Val;
+  ALL_ATT.data_UL4 = ATTEN_Initial_Val;  
+//  PE43711_ALL_atten_ctrl(ALL_ATT);
 }
 #endif // PYJ.2019.07.26_END -- 
 void Bit_Compare(PE43711_st ATT,uint8_t data,uint8_t Shift_Index){
@@ -88,8 +110,10 @@ void Bit_Compare(PE43711_st ATT,uint8_t data,uint8_t Shift_Index){
         HAL_GPIO_WritePin(ATT.DATA_PORT,ATT.DATA_PIN,GPIO_PIN_RESET);//DATA
     }
 }
+#if 0 // PYJ.2020.04.17_BEGIN -- 
 void PE43711_ALL_atten_ctrl(ALL_PE43711_st ATT){
-    HAL_GPIO_WritePin(ATT.ATT0.LE_PORT,ATT.ATT0.LE_PIN,GPIO_PIN_RESET);
+    HAL_GPIO_WritePin(ATT.ATT_DL1.LE_PORT,ATT.ATT_DL1.LE_PIN,GPIO_PIN_RESET);
+    
     Pol_Delay_us(10);
 //    printf("why not? \r\n");
     for(uint8_t i = 0; i < 8; i++){
@@ -108,6 +132,7 @@ void PE43711_ALL_atten_ctrl(ALL_PE43711_st ATT){
     Pol_Delay_us(10);
     HAL_GPIO_WritePin(ATT.ATT0.LE_PORT,ATT.ATT0.LE_PIN,GPIO_PIN_RESET);
 }
+#endif // PYJ.2020.04.17_END -- 
 
 void PE43711_atten_ctrl(PE43711_st ATT ,uint8_t data){
     uint8_t i = 0;

Bluecell_Src/uart.c

@@ -12,6 +12,7 @@
 UARTQUEUE TerminalQueue;
 UARTQUEUE WifiQueue;
 uart_hal_tx_type uart_hal_tx;
+extern volatile uint32_t UartRxTimerCnt;
 
 void InitUartQueue(pUARTQUEUE pQueue)
 {
@@ -54,7 +55,7 @@ void PutDataToUartQueue(UART_HandleTypeDef *huart, uint8_t data)
    // HAL_UART_Receive_DMA(&hTerminal,  pQueue->Buffer + pQueue->head, 10);
 }
 
-uint8_t uart_buf[QUEUE_BUFFER_LENGTH];
+volatile uint8_t uart_buf[QUEUE_BUFFER_LENGTH];
 void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 {
     volatile static int cnt;
@@ -80,7 +81,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 //        printf("data cnt zero !!!  \r\n");
         //RF_Ctrl_Main(&uart_buf[Header]);
 //        HAL_UART_Transmit(dst, &temp_buf[BLUECELL_HEADER00], 11, 3000);
-#if 0 // PYJ.2019.07.15_BEGIN -- 
+#if 1 // PYJ.2019.07.15_BEGIN -- 
             for(int i = 0; i < cnt; i++){
                 printf("%02x ",uart_buf[i]);
             }
@@ -95,6 +96,9 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
     }
 
 }
+void Uart_Check(void){
+  while (TerminalQueue.data > 0 && UartRxTimerCnt > 100) GetDataFromUartQueue(&hTerminal);
+}
 
 void Uart1_Data_Send(uint8_t* data,uint8_t size){
     HAL_UART_Transmit_DMA(&huart1, data,size); 

Inc/main.h

@@ -48,6 +48,7 @@ extern "C" {
 /* Exported macro ------------------------------------------------------------*/
 /* USER CODE BEGIN EM */
 
+
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/

Src/main.c

@@ -80,6 +80,16 @@ static void MX_TIM6_Init(void);
 
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
+void Pol_Delay_us(volatile uint32_t microseconds)
+{
+  /* Go to number of cycles for system */
+  microseconds *= (SystemCoreClock / 1000000);
+ 
+  /* Delay till end */
+  while (microseconds--);
+}
+
+
 int _write (int file, uint8_t *ptr, uint16_t len)
 {
     HAL_UART_Transmit(&huart1, ptr, len,10);
@@ -135,9 +145,11 @@ int main(void)
   /* USER CODE BEGIN WHILE */
   while (1)
   {
-	 printf("data\r\n");
-	  HAL_GPIO_TogglePin(GPIOG,GPIO_PIN_14);
-	  HAL_Delay(1000);
+
+//	  HAL_GPIO_TogglePin(GPIOG,GPIO_PIN_14);
+//	  HAL_Delay(1000);
+    Boot_LED_Toggle();
+    Uart_Check();
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */