LED Pin 변경 / 메모리 Start Position 변경

Bluecell_Src/Bluecell_operate.c

@@ -2479,7 +2479,7 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_LENGTH_1] = ((Length  + (3 * 74)) & 0x00FF);  
 
 
-    data[MBIC_HEADERCHECKSUM_0] = Chksum_Create(data,MBIC_HEADER_SIZE - 4);        
+    data[MBIC_HEADERCHECKSUM_0] = Chksum_Create(data);        
     data[MBIC_PAYLOADSTART + i++] = ((CRC16_Generate(&data[MBIC_PAYLOADSTART], (Length  + (3 * 74))) & 0xFF00) >> 8);  
     data[MBIC_PAYLOADSTART + i++] = CRC16_Generate(&data[MBIC_PAYLOADSTART], (Length  + (3 * 74))) & 0x00FF;  
     data[MBIC_PAYLOADSTART + i++] = 0x03; 

Bluecell_Src/uart.c

@@ -103,19 +103,21 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
             }else if(uart_buf[0] == MBIC_PREAMBLE0
                    &&uart_buf[1] == MBIC_PREAMBLE1
                    &&uart_buf[2] == MBIC_PREAMBLE2
-                   &&uart_buf[3] == MBIC_PREAMBLE3){
-                   
-               if(Chksum_Check(uart_buf,MBIC_HEADER_SIZE - 4,uart_buf[MBIC_CHECKSHUM_INDEX])){
-                Length = ((uart_buf[MBIC_LENGTH_0] << 8) | uart_buf[MBIC_LENGTH_1]);
-                CrcChk = ((uart_buf[MBIC_PAYLOADSTART + Length + 1] << 8) | (uart_buf[MBIC_PAYLOADSTART + Length + 2]));
-                    if((CRC16_Check(&uart_buf[MBIC_PAYLOADSTART], Length,CrcChk)
+                   &&uart_buf[3] == MBIC_PREAMBLE3)
+           {
+               if(Chksum_Check(uart_buf,MBIC_HEADER_SIZE - 4,uart_buf[MBIC_CHECKSHUM_INDEX]))
+               {
+                    Length = ((uart_buf[MBIC_LENGTH_0] << 8) | uart_buf[MBIC_LENGTH_1]);
+                    CrcChk = ((uart_buf[MBIC_PAYLOADSTART + Length + 1] << 8) | (uart_buf[MBIC_PAYLOADSTART + Length + 2]));
+                    if(CRC16_Check(&uart_buf[MBIC_PAYLOADSTART], Length,CrcChk))
                         MBIC_Operate(uart_buf);
                }
-               else{
+               else
+               {
                     printf("CHECK SUM ERR \r\n");
                }
             }
-        memset(uart_buf,0x00,cnt);
+            memset(uart_buf,0x00,cnt);
 //        for(int i  = 0; i < cnt; i++)
 //            uart_buf[i] = 0;
         cnt = 0;

Inc/main.h

@@ -69,8 +69,8 @@ extern I2C_HandleTypeDef hi2c2;
 /* USER CODE END EFP */
 
 /* Private defines -----------------------------------------------------------*/
-#define LED_ACT_Pin GPIO_PIN_3
-#define LED_ACT_GPIO_Port GPIOE
+#define LED_FAIL2_Pin GPIO_PIN_3
+#define LED_FAIL2_GPIO_Port GPIOE
 #define FAIL_MBIC_Pin GPIO_PIN_4
 #define FAIL_MBIC_GPIO_Port GPIOE
 #define BOOT_LED_Pin GPIO_PIN_15
@@ -125,7 +125,9 @@ extern I2C_HandleTypeDef hi2c2;
 #define PATH_EN_DL2_GPIO_Port GPIOD
 #define PATH_EN_UL2_Pin GPIO_PIN_11
 #define PATH_EN_UL2_GPIO_Port GPIOD
-#define LED_FAIL_Pin GPIO_PIN_14
+#define LED_ACT_Pin GPIO_PIN_14
+#define LED_ACT_GPIO_Port GPIOD
+#define LED_FAIL_Pin GPIO_PIN_15
 #define LED_FAIL_GPIO_Port GPIOD
 #define ATT_EN_DL3_Pin GPIO_PIN_2
 #define ATT_EN_DL3_GPIO_Port GPIOG
@@ -192,4 +194,3 @@ extern I2C_HandleTypeDef hi2c2;
 #endif /* __MAIN_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-

STM32F103ZET_JDASMBIC.ioc

@@ -284,9 +284,11 @@ PD11.GPIO_Label=PATH_EN_UL2
 PD11.Locked=true
 PD11.Signal=GPIO_Output
 PD14.GPIOParameters=GPIO_Label
-PD14.GPIO_Label=LED_FAIL
+PD14.GPIO_Label=LED_ACT
 PD14.Locked=true
 PD14.Signal=GPIO_Output
+PD15.GPIOParameters=GPIO_Label
+PD15.GPIO_Label=LED_FAIL
 PD15.Locked=true
 PD15.Signal=GPIO_Output
 PD2.GPIOParameters=GPIO_Label
@@ -330,7 +332,7 @@ PE15.GPIO_Label=PATH_EN_UL4
 PE15.Locked=true
 PE15.Signal=GPIO_Output
 PE3.GPIOParameters=GPIO_Label
-PE3.GPIO_Label=LED_ACT
+PE3.GPIO_Label=LED_FAIL2
 PE3.Locked=true
 PE3.Signal=GPIO_Output
 PE4.GPIOParameters=GPIO_Label

STM32F103ZE_FLASH.ld

@@ -62,7 +62,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 MEMORY
 {
 RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 64K
-FLASH (rx)      : ORIGIN = 0x8004000, LENGTH = 512K - 16K
+FLASH (rx)      : ORIGIN = 0x8005000, LENGTH = 64K
 }
 
 /* Define output sections */

Src/main.c

@@ -162,7 +162,7 @@ uint16_t adc3cnt = 0 ;
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
 {
 //?��?��?�� 코드 ?��?��
-//만약 ?��?�� adc?���?????????? �???????????��?�� ?�� ?��?���?????????? ?��?���?????????? ?��?��?? 같이 조건�?????????? ?��?��
+//諤嵸烄 ?嚙踝蕭?嚙踝蕭 adc?嚙踝蕭嚙??????????? 嚙????????????嚙踝蕭?嚙踝蕭 ?嚙踝蕭 ?嚙踝蕭?嚙踝蕭嚙??????????? ?嚙踝蕭?嚙踝蕭嚙??????????? ?嚙踝蕭?嚙踝蕭?? 穈軤𦚯 魽國探嚙??????????? ?嚙踝蕭?嚙踝蕭
 
     if(hadc->Instance == hadc1.Instance)
     {
@@ -311,12 +311,10 @@ extern void Booting_LED_Check(void);
 
 /**
   * @brief  The application entry point.
-  *
   * @retval int
   */
 int main(void)
-
-  {
+{
   /* USER CODE BEGIN 1 */
 
   /* USER CODE END 1 */
@@ -805,7 +803,7 @@ static void MX_GPIO_Init(void)
   __HAL_RCC_GPIOD_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOE, LED_ACT_Pin|FAIL_MBIC_Pin|ATT_CLOCK4_Pin|ATT_DATA4_Pin 
+  HAL_GPIO_WritePin(GPIOE, LED_FAIL2_Pin|FAIL_MBIC_Pin|ATT_CLOCK4_Pin|ATT_DATA4_Pin 
                           |ATT_EN_DL4_Pin|ATT_EN_UL4_Pin|PATH_EN_DL4_Pin|PATH_EN_UL4_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
@@ -822,12 +820,12 @@ static void MX_GPIO_Init(void)
                           |ATT_EN_DL1_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOD, PATH_EN_DL2_Pin|PATH_EN_UL2_Pin|LED_FAIL_Pin|GPIO_PIN_15 
+  HAL_GPIO_WritePin(GPIOD, PATH_EN_DL2_Pin|PATH_EN_UL2_Pin|LED_ACT_Pin|LED_FAIL_Pin 
                           |ATT_CLOCK2_Pin|ATT_DATA2_Pin|ATT_EN_DL2_Pin|ATT_EN_UL2_Pin, GPIO_PIN_RESET);
 
-  /*Configure GPIO pins : LED_ACT_Pin FAIL_MBIC_Pin ATT_CLOCK4_Pin ATT_DATA4_Pin 
+  /*Configure GPIO pins : LED_FAIL2_Pin FAIL_MBIC_Pin ATT_CLOCK4_Pin ATT_DATA4_Pin 
                            ATT_EN_DL4_Pin ATT_EN_UL4_Pin PATH_EN_DL4_Pin PATH_EN_UL4_Pin */
-  GPIO_InitStruct.Pin = LED_ACT_Pin|FAIL_MBIC_Pin|ATT_CLOCK4_Pin|ATT_DATA4_Pin 
+  GPIO_InitStruct.Pin = LED_FAIL2_Pin|FAIL_MBIC_Pin|ATT_CLOCK4_Pin|ATT_DATA4_Pin 
                           |ATT_EN_DL4_Pin|ATT_EN_UL4_Pin|PATH_EN_DL4_Pin|PATH_EN_UL4_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -863,9 +861,9 @@ static void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PATH_EN_DL2_Pin PATH_EN_UL2_Pin LED_FAIL_Pin PD15 
+  /*Configure GPIO pins : PATH_EN_DL2_Pin PATH_EN_UL2_Pin LED_ACT_Pin LED_FAIL_Pin 
                            ATT_CLOCK2_Pin ATT_DATA2_Pin ATT_EN_DL2_Pin ATT_EN_UL2_Pin */
-  GPIO_InitStruct.Pin = PATH_EN_DL2_Pin|PATH_EN_UL2_Pin|LED_FAIL_Pin|GPIO_PIN_15 
+  GPIO_InitStruct.Pin = PATH_EN_DL2_Pin|PATH_EN_UL2_Pin|LED_ACT_Pin|LED_FAIL_Pin 
                           |ATT_CLOCK2_Pin|ATT_DATA2_Pin|ATT_EN_DL2_Pin|ATT_EN_UL2_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

Src/system_stm32f1xx.c

@@ -92,7 +92,7 @@
 /*!< Uncomment the following line if you need to relocate your vector Table in
      Internal SRAM. */ 
 /* #define VECT_TAB_SRAM */
-#define VECT_TAB_OFFSET  0x4000 /* Original Value : 0x00000000U*/ /*!< Vector Table base offset field.
+#define VECT_TAB_OFFSET  0x5000 /* Original Value : 0x00000000U*/ /*!< Vector Table base offset field.
                                   This value must be a multiple of 0x200. */