Timer Start / Clock 변경 /Warning 수정

Bluecell_Src/Bluecell_operate.c

@@ -11,8 +11,9 @@ extern volatile uint32_t LedTimerCnt;
 extern volatile uint32_t AdcTimerCnt;
 extern void PE43711_atten_ctrl(PE43711_st ATT ,uint8_t data);
 extern void Uart1_Data_Send(uint8_t* data,uint8_t size);
-nt8_t AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t size);
-
+int8_t AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t size);
+void Bluecell_StructCpy(uint8_t* dst,uint8_t* src,uint16_t size);
+void DataStatusSet(void);
 uint8_t Alarm_Status[MAX_ALARM_Len] = {0,};
 //uint8_t data123[10000];
 uint8_t ResultData[1024] = {0,};
@@ -272,29 +273,30 @@ void Boot_LED_Toggle(void){
 
 
 uint8_t PE43711_Calc(uint8_t* Table,uint8_t high_bit,uint8_t low_bit,uint8_t offset_h,uint8_t offset_l){
-    uint8_t tmp_h = high_bit,tmp_l = low_bit;
+
     double ret = 0;
-    uint8_t val = 0;
+
     ret = PE43711_Double(high_bit,low_bit);
     ret += PE43711_Double(offset_h,offset_l);
 //    printf("ret1 : %f \r\n",ret); // 2
     ret = TableAtteGuarantee(Table,ret);//Table Guarantee
 //    printf("ret2 : %f \r\n",ret);
-    val = PE43711_DataToHexConvert(ret);
+     PE43711_DataToHexConvert(ret);
+    return 0;
 }
 uint8_t PE43711_Calc_NoTable(uint8_t high_bit,uint8_t low_bit){
-    uint16_t tmp_h = high_bit,tmp_l = low_bit;
+
     double ret = 0;
-    uint8_t val = 0;
-    ret = PE43711_Double(high_bit,low_bit);
 
-    val = PE43711_DataToHexConvert(ret);
+    ret = PE43711_Double(high_bit,low_bit);
 
+    PE43711_DataToHexConvert(ret);
+    return 0;
 }
 double PE43711_Double(uint8_t high_bit,uint8_t low_bit){
     uint16_t tmp_h = 0,tmp_l = 0;
     double ret = 0;
-    uint8_t val = 0;
+
     tmp_h = high_bit;
     tmp_l = low_bit;
     ret = ((tmp_h << 8) & 0xFF00);
@@ -316,7 +318,7 @@ double PE43711_Double(uint8_t high_bit,uint8_t low_bit){
 uint8_t GuaranteeData[256];
 double TableAtteGuarantee(uint8_t* Table,double AttenValue){
     double ret = 0;
-    double ref = 0;
+    //double ref = 0;
     uint8_t cnt = 0;
     for(double ref = 0; ref < AttenValue; ref += 0.5){
         cnt++;       
@@ -666,6 +668,7 @@ void Bluecell_StructCopyFunction(uint16_t* dst,uint8_t* src,uint16_t size){
     dst[i]  += src[i * 2 + 1] & 0x00FF;
   }
 }
+
 void Bluecell_StructCpy(uint8_t* dst,uint8_t* src,uint16_t size){
   for(int i = 0; i < size; i++){
     dst[i]  = src[i];
@@ -984,9 +987,9 @@ extern HAL_StatusTypeDef EEPROM_M24C08_Zerowrite(uint8_t devid,uint16_t Address)
 bool Bluecell_Operate(uint8_t* data){
   uint8_t datatype = data[BLUECELL_TYPE];
 
-  uint16_t tmp_h = 0,tmp_l = 0;
-  double ret = 0 ,tmp = 0.1;
-  uint8_t val = 0;
+
+  //double ret = 0 ,tmp = 0.1;
+
   uint8_t i = 0;
   switch(datatype){
     case BLUECELL_SOFTWARERESET:
@@ -1593,15 +1596,15 @@ bool MBIC_Operate(uint8_t* data){
               |((data[MBIC_PROT_SUB_DATA_INDEX + 1] << 8) & 0x00FF) );
     uint8_t Length = (data[MBIC_PROT_SUB_DATA_INDEX + 2]);
     uint8_t cmd = 0;
-    uint8_t SubData[256] = {0,};
+
     uint16_t Temp_ADC = 0;
     uint16_t i = 0;
     double temp = 0;
     int16_t Level = 0;
     /*AID*/
-    for(int i = 0; i < Length; i++){
+  /* for(int i = 0; i < Length; i++){
         SubData[i] = (data[MBIC_PROT_SUB_DATA_INDEX + 3 + i]);
-    }
+    }*/
     //    SubData     임시 데이터 변수 선언 Subdata로 데이터 전송 
     if(cmd == MBIC_GET){
         /*ALARM FLAG*/
@@ -1660,7 +1663,7 @@ bool MBIC_Operate(uint8_t* data){
         data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime6;
 
         for(int a = 0; a < 32; a++){
-            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank1_Image_Name[i];        
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank1_Image_Name[a];
         }
 
         data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank2_Image_Version1;
@@ -1675,7 +1678,7 @@ bool MBIC_Operate(uint8_t* data){
         data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime6;
 
        for(int a = 0; a < 32; a++){
-            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank2_Image_Name[i];        
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank2_Image_Name[a];
        }
 
         data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.S_W_Reset;
@@ -1694,7 +1697,7 @@ bool MBIC_Operate(uint8_t* data){
         data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.PCB_Version[0];
         data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.PCB_Version[1];
         for(int a = 0; a < 20; a++){
-            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Serial_Number[i];
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Serial_Number[a];
         }
 
         
@@ -2464,9 +2467,9 @@ uint16_t ADC1Ret[4];
 uint16_t ADC3Ret[5];
 
 void ADC_Check(void){
-    static uint8_t Cnt = 0;
-    double Volt_Calc_val = 3.3 / 4095;
-    double ret = 0;
+    //static uint8_t Cnt = 0;
+
+   // double ret = 0;
     uint16_t MIN_ADC[ADC3_CNT] = {0,};
     uint16_t cnt[ADC3_CNT] = {0,};
 //    if(AdcTimerCnt > 10){
@@ -2736,7 +2739,7 @@ int32_t MinusConvert(uint8_t Temp_h, int32_t Value){
 void ALC_Function(){ //DL 
     double Volt_Calc_val = 3.3 / 4095;
     double ret = 0;
-    double CurrnALCValue = 0;
+   // double CurrnALCValue = 0;
     double CurrentATTENVALUE = 0;
     int32_t CurrnALC_MAX_SettingValue = 0;    
     int32_t CurrnALC_MIN_SettingValue = 0;        

Bluecell_Src/eeprom.c

@@ -4,6 +4,7 @@
  *  Created on: 2020. 4. 22.
  *      Author: parkyj
  */
+#include <stdio.h>
 #include "main.h"
 #include "eeprom.h"
 #include "Bluecell_operate.h"
@@ -109,8 +110,9 @@ void eepromtest(){
 
 HAL_StatusTypeDef EEPROM_M24C08_Read(uint8_t devid,uint16_t Address,uint8_t* data,uint16_t size){
    HAL_StatusTypeDef ret = HAL_ERROR;
-   uint16_t sizecnt = 0,sizeremain = 0; 
-   uint16_t addrees_inc = 0;
+ //  uint16_t sizecnt = 0,
+   //uint16_t sizeremain = 0;
+  // uint16_t addrees_inc = 0;
 //   ret = HAL_I2C_Mem_Read(&hi2c2, devid | ((Address & 0x0300) >> 7),((Address )),  I2C_MEMADD_SIZE_8BIT, &data[0], size, 1024);
 
    ret = HAL_I2C_Mem_Read(&hi2c2, devid ,((Address )),  I2C_MEMADD_SIZE_16BIT, &data[0], size, 1024);
@@ -181,7 +183,7 @@ HAL_StatusTypeDef EEPROM_M24C08_write(uint8_t devid,uint16_t Address,uint8_t* da
 
 HAL_StatusTypeDef EEPROM_M24C08_Zerowrite(uint8_t devid,uint16_t Address){
     HAL_StatusTypeDef ret = HAL_ERROR;
-    uint8_t sizecnt = 0,sizeremain = 0; 
+   // uint8_t sizeremain = 0;
     uint16_t addrees_inc = 0;
     addrees_inc = 0;
     uint8_t data[4096] = {0,};
@@ -286,6 +288,7 @@ bool		EEPROM24XX_Save(uint16_t Address,void *data,size_t size_of_data)
 	else
 	{
 	}
+	return 0;
 }
 //##########################################################################
 bool		EEPROM24XX_Load(uint16_t Address,void *data,size_t size_of_data)

STM32F103ZET_JDASMBIC.ioc

@@ -489,7 +489,7 @@ SH.ADCx_IN6.0=ADC1_IN6,IN6
 SH.ADCx_IN6.ConfNb=1
 TIM6.IPParameters=Prescaler,Period
 TIM6.Period=10
-TIM6.Prescaler=5600 - 1
+TIM6.Prescaler=7200 - 1
 USART1.BaudRate=921600
 USART1.IPParameters=VirtualMode,BaudRate
 USART1.VirtualMode=VM_ASYNC

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 = 0x8000000, LENGTH = 512K
 }
 
 /* Define output sections */

Src/main.c

@@ -118,7 +118,7 @@ uint16_t adc3cnt = 0 ;
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
 {
 //?��?��?�� 코드 ?��?��
-//만약 ?��?�� adc?���???????? �?????????��?�� ?�� ?��?���???????? ?��?���???????? ?��?��?? 같이 조건�???????? ?��?��
+//만약 ?��?�� adc?���????????? �??????????��?�� ?�� ?��?���????????? ?��?���????????? ?��?��?? 같이 조건�????????? ?��?��
 
     if(hadc->Instance == hadc1.Instance)
     {
@@ -274,7 +274,8 @@ void eepromtest_j1(){
 #endif // PYJ.2020.04.23_END -- 
 
 extern void ALC_Function();
-
+extern void Boot_LED_Toggle(void);
+extern void ADC_Check(void);
 /* USER CODE END 0 */
 
 /**
@@ -320,12 +321,12 @@ int main(void)
   while(!(HAL_ADCEx_Calibration_Start(&hadc1)==HAL_OK));
   HAL_ADC_Start_DMA(&hadc3, (uint16_t*)ADC3value, 5);
   HAL_ADC_Start_DMA(&hadc1, (uint16_t*)ADC1value, 4);
+  HAL_TIM_Base_Start_IT(&htim6);
   InitUartQueue(&TerminalQueue);
   setbuf(stdout, NULL);
   PE43711_PinInit();
   EEPROM_M24C08_Init();
   Bluecell_DataInit();
-
 #if 0 // PYJ.2020.04.22_BEGIN -- 
   EEPROM_M24C08_write(0xA0,0,i2cTestData,1);
   printf("i2c Test Data1 %d\r\n",i2ctest[0]);
@@ -353,6 +354,8 @@ int main(void)
   while (1)
   {
 //	  HAL_GPIO_TogglePin(GPIOG,GPIO_PIN_14);
+  //   printf("data %d\r\n",LedTimerCnt);
+
     Boot_LED_Toggle();
     Uart_Check();
     ADC_Check();
@@ -645,7 +648,7 @@ static void MX_TIM6_Init(void)
 
   /* USER CODE END TIM6_Init 1 */
   htim6.Instance = TIM6;
-  htim6.Init.Prescaler = 5600 - 1;
+  htim6.Init.Prescaler = 7200 - 1;
   htim6.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim6.Init.Period = 10;
   htim6.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;

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  0x0000 /* Original Value : 0x00000000U*/ /*!< Vector Table base offset field.
                                   This value must be a multiple of 0x200. */