Commit 46899d54 authored by ๆ—ถๆ˜Š's avatar ๆ—ถๆ˜Š

๐ŸŽ‰ init:้…็ฝฎ็”ตๆบ้‡‡้›†,็”ต้˜ป้‡‡้›†

parent e550853a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* \attention * \attention
* *
* This file is automatically generated by analog signals configuration tool. * This file is automatically generated by analog signals configuration tool.
* Date : 2023/9/23 14:09:24 * Date : 2024/2/19 9:49:52
* Cfg Tool Ver : 1.1.0 * Cfg Tool Ver : 1.1.0
* Engineer : LQY * Engineer : LQY
* (c) Heilongjiang TYW electronics co., LTD * (c) Heilongjiang TYW electronics co., LTD
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* \attention * \attention
* *
* This file is automatically generated by analog signals configuration tool. * This file is automatically generated by analog signals configuration tool.
* Date : 2023/9/23 14:09:24 * Date : 2024/2/19 9:49:52
* Cfg Tool Ver : 1.1.0 * Cfg Tool Ver : 1.1.0
* Engineer : LQY * Engineer : LQY
* (c) Heilongjiang TYW electronics co., LTD * (c) Heilongjiang TYW electronics co., LTD
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
/* Includes -----------------------------------------------------------------*/ /* Includes -----------------------------------------------------------------*/
#include "Analog_Signals.h" #include "Analog_Signals.h"
/* Private typedef ----------------------------------------------------------*/ /* Private typedef ----------------------------------------------------------*/
typedef struct typedef struct
{ {
...@@ -75,7 +74,7 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER]; ...@@ -75,7 +74,7 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] = const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] =
{ {
2U, 3U, 4U, 5U, 2U, 3U, 7U, 5U,
}; };
const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] = const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
...@@ -88,10 +87,10 @@ const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] = ...@@ -88,10 +87,10 @@ const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] = const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] =
{ {
{ 330000U, 100000U, 0U, 0U,}, { 33U, 10U, 0U, 0U,},
{ 330000U, 100000U, 0U, 0U,}, { 33U, 10U, 0U, 0U,},
{ 0U, 100000U, 0U, 0U,}, { 0U, 0U, 0U, 0U,},
{ 0U, 180000U, 1550U, 300U,}, { 0U, 0U, 670U, 300U,},
}; };
/* Private function prototypes ----------------------------------------------*/ /* Private function prototypes ----------------------------------------------*/
...@@ -101,7 +100,10 @@ void Analog_Signal_Conv_Init(void) ...@@ -101,7 +100,10 @@ void Analog_Signal_Conv_Init(void)
{ {
uint8_t i; uint8_t i;
ADC_Stop_Conversion(); //while(ADC_Get_Conversion_Status())//shi ่ทŸ้’ฑๆฑŸไฟๆŒไธ€่‡ด,่‡ชๅŠจ็”ŸๆˆๅŽ,ๅฑ่”ฝwhile
//{
ADC_Stop_Conversion();
//}
ADC_Init(); ADC_Init();
...@@ -139,7 +141,6 @@ void Analog_Signal_Conv_Stop(void) ...@@ -139,7 +141,6 @@ void Analog_Signal_Conv_Stop(void)
void Analog_Signal_Conv_Service(void) void Analog_Signal_Conv_Service(void)
{ {
uint8_t u8Valid; uint8_t u8Valid;
uint16_t u16Voltage; uint16_t u16Voltage;
uint16_t u16Reference; uint16_t u16Reference;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment