This commit is contained in:
qiyongshuang
2023-12-01 10:33:09 +08:00
parent de6d68c654
commit ec059e0b18
395 changed files with 37947 additions and 28760 deletions
+1 -1
View File
@@ -149,7 +149,7 @@ void DMA_Tx_Init(DMA_Channel_TypeDef *DMA_CHx, u32 ppadr, u32 memadr, u16 bufsiz
*/
u16 Get_ConversionVal(s16 val)
{
if((val + Calibrattion_Val) < 0)
if((val + Calibrattion_Val) < 0 || val==0)
return 0;
if((Calibrattion_Val + val) > 4095||val==4095)
return 4095;
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
+2 -1
View File
@@ -54,6 +54,7 @@ void ADC_Function_Init(void)
ADC_InitStructure.ADC_NbrOfChannel = 1;
ADC_Init(ADC1, &ADC_InitStructure);
ADC_InjectedSequencerLengthConfig(ADC1, 1);
ADC_RegularChannelConfig(ADC1, ADC_Channel_1, 1, ADC_SampleTime_239Cycles5);
ADC_InjectedChannelConfig(ADC1, ADC_Channel_3, 1, ADC_SampleTime_239Cycles5);
ADC_AutoInjectedConvCmd(ADC1, ENABLE);
@@ -119,7 +120,7 @@ u16 Get_ADC_Val(u8 ch)
*/
u16 Get_ConversionVal(s16 val)
{
if((val + Calibrattion_Val) < 0)
if((val + Calibrattion_Val) < 0||val==0)
return 0;
if((Calibrattion_Val + val) > 4095||val==4095)
return 4095;
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
+2 -2
View File
@@ -57,7 +57,7 @@ void ADC_Function_Init(void)
ADC_InitStructure.ADC_ContinuousConvMode = DISABLE;
ADC_InitStructure.ADC_ExternalTrigConv = ADC_ExternalTrigInjecConv_T1_CC4;
ADC_InitStructure.ADC_DataAlign = ADC_DataAlign_Right;
ADC_InitStructure.ADC_NbrOfChannel = 3;
ADC_InitStructure.ADC_NbrOfChannel = 1;
ADC_Init(ADC1, &ADC_InitStructure);
ADC_InjectedSequencerLengthConfig(ADC1, 3);
@@ -133,7 +133,7 @@ void TIM1_PWM_In(u16 arr, u16 psc, u16 ccp)
*/
u16 Get_ConversionVal(s16 val)
{
if((val + Calibrattion_Val) < 0)
if((val + Calibrattion_Val) < 0||val==0)
return 0;
if((Calibrattion_Val + val) > 4095||val==4095)
return 4095;
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
@@ -151,7 +151,7 @@ void TIM2_PWM_In(u16 arr, u16 psc, u16 ccp)
*/
u16 Get_ConversionVal1(s16 val)
{
if((val + Calibrattion_Val1) < 0)
if((val + Calibrattion_Val1) < 0|| val==0)
return 0;
if((Calibrattion_Val1 + val) > 4095)
return 4095;
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
@@ -166,7 +166,7 @@ void DMA_Tx_Init(DMA_Channel_TypeDef *DMA_CHx, u32 ppadr, u32 memadr, u16 bufsiz
*/
u16 Get_ConversionVal1(s16 val)
{
if((val + Calibrattion_Val1) < 0)
if((val + Calibrattion_Val1) < 0|| val==0)
return 0;
if((Calibrattion_Val1 + val) > 4095||val==4095)
return 4095;
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
@@ -110,7 +110,7 @@ void ADC_Function_Init(void)
*/
u16 Get_ConversionVal1(s16 val)
{
if((val + Calibrattion_Val1) < 0)
if((val + Calibrattion_Val1) < 0|| val==0)
return 0;
if((Calibrattion_Val1 + val) > 4095||val==4095)
return 4095;
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
@@ -101,9 +101,9 @@ void ADC_Function_Init(void)
*/
u16 Get_ConversionVal1(s16 val)
{
if((val + Calibrattion_Val1) < 0)
if((val + Calibrattion_Val1) < 0|| val==0)
return 0;
if((Calibrattion_Val1 + val) > 4095)
if((Calibrattion_Val1 + val) > 4095|| val==4095)
return 4095;
return (val + Calibrattion_Val1);
}
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
+3 -3
View File
@@ -16,7 +16,7 @@
*ADC1 channel 1 (PA1), ADC2 channel 3 (PA3)), and the rule group channel obtains
*dual ADC conversion data through DMA interrupt.
*
*Note��only applied toCH32V203
*Note:only applied toCH32V203
*/
#include "debug.h"
@@ -162,9 +162,9 @@ u16 Get_ConversionVal1(s16 val)
*/
u16 Get_ConversionVal2(s16 val)
{
if((val + Calibrattion_Val2) < 0)
if((val + Calibrattion_Val2) < 0||val==0)
return 0;
if((Calibrattion_Val2 + val) > 4095)
if((Calibrattion_Val2 + val) > 4095||val==4095)
return 4095;
return (val + Calibrattion_Val2);
}
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
@@ -111,7 +111,7 @@ void ADC_Function_Init(void)
*/
u16 Get_ConversionVal1(s16 val)
{
if((val + Calibrattion_Val1) < 0)
if((val + Calibrattion_Val1) < 0|| val==0)
return 0;
if((Calibrattion_Val1 + val) > 4095 || val == 4095)
return 4095;
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
+1 -1
View File
@@ -116,7 +116,7 @@ void EXTI_Event_Init(void)
*/
u16 Get_ConversionVal(s16 val)
{
if((val + Calibrattion_Val) < 0)
if((val + Calibrattion_Val) < 0|| val==0)
return 0;
if((Calibrattion_Val + val) > 4095 || val==4095)
return 4095;
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE
@@ -161,9 +161,9 @@ u16 Get_ADC_Average(u8 ch, u8 times)
*/
u16 Get_ConversionVal(s16 val)
{
if((val + Calibrattion_Val) < 0)
if((val + Calibrattion_Val) < 0|| val==0)
return 0;
if((Calibrattion_Val + val) > 4095)
if((Calibrattion_Val + val) > 4095|| val==4095)
return 4095;
return (val + Calibrattion_Val);
}
@@ -205,6 +205,7 @@ void SystemCoreClockUpdate (void)
*/
static void SetSysClock(void)
{
//GPIO_IPD_Unused();
#ifdef SYSCLK_FREQ_HSE
SetSysClockToHSE();
#elif defined SYSCLK_FREQ_48MHz_HSE