From 133b8344743400e7bf622099ea1689190a188a4b Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 06 三月 2024 16:15:43 +0800
Subject: [PATCH] 1
---
Src/main.c | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index d92495c..a01087a 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -71,7 +71,6 @@
/* Private variables ---------------------------------------------------------*/
ADC_HandleTypeDef hadc;
-DMA_HandleTypeDef hdma_adc;
IWDG_HandleTypeDef hiwdg;
@@ -601,17 +600,23 @@
flag_onesecond = 0;
}
}
+uint8_t debugnum;
uint8_t Lora_send_flag;
void Lora_Send_Poll(void)
{
if(Lora_send_flag)
{
+ debugnum++;
Lora_send_flag=0;
// LedTask();
loraled=BLUE;
LoraReportPoll();
flag_onesecond = 1;
+ powerled=LEDOFF;
+ loraled=LEDOFF;
+ gpsled=LEDOFF;
+ uwbled=LEDOFF;
Set4LEDColor_Off();
}
@@ -823,7 +828,7 @@
hadc.Init.OversamplingMode = DISABLE;
hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2;
hadc.Init.Resolution = ADC_RESOLUTION_12B;
- hadc.Init.SamplingTime = ADC_SAMPLETIME_1CYCLE_5;
+ hadc.Init.SamplingTime = ADC_SAMPLETIME_160CYCLES_5;
hadc.Init.ScanConvMode = ADC_SCAN_DIRECTION_FORWARD;
hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
hadc.Init.ContinuousConvMode = DISABLE;
@@ -845,14 +850,6 @@
*/
sConfig.Channel = ADC_CHANNEL_1;
sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
- if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
- {
- Error_Handler();
- }
-
- /** Configure for the selected ADC regular channel to be converted.
- */
- sConfig.Channel = ADC_CHANNEL_VREFINT;
if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
{
Error_Handler();
@@ -1091,9 +1088,6 @@
__HAL_RCC_DMA1_CLK_ENABLE();
/* DMA interrupt init */
- /* DMA1_Channel1_IRQn interrupt configuration */
- HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
- HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
/* DMA1_Channel2_3_IRQn interrupt configuration */
HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 1, 0);
HAL_NVIC_EnableIRQ(DMA1_Channel2_3_IRQn);
--
Gitblit v1.9.3