From 15204acab5c5567574b732e3a280bfb34f3edec2 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 18 三月 2024 09:26:57 +0800
Subject: [PATCH] V1.1
---
Src/main.c | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index d92495c..bd66ef4 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;
@@ -291,7 +290,7 @@
hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = (1<<8)|0;
+ g_com_map[VERSION] = (1<<8)|1;
// g_com_map[DEV_ID]=1158;
// #ifdef DEBUG_MODE
// // g_com_map[GROUP_ID]=21;
@@ -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();
}
@@ -662,15 +667,27 @@
//delay_ms(1000);
Program_Init();
+ if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
+ {
+ Error_Handler();
+ }
+ g_com_map[POWER]=67;
+ Dw1000_Init();
+// Dw1000_App_Init();
+ Delay_Ms(10);
+ dwt_configcontinuousframemode(124800);
+ dwt_writetxfctrl(13, 0);
+
+ while(1)
+ {
+ IdleTask();
+ }
LIS3DH_Data_Init();
Dw1000_Init();
// HardWareTypeDiffConfig();
dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
dwt_entersleep();
- if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
- {
- Error_Handler();
- }
+
delay_ms(1000);
GPS_Close_Init();
HAL_UART_Receive_IT(&hlpuart1, (uint8_t *)GPSRxBuffer, 1);
@@ -823,7 +840,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 +862,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 +1100,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