From 9ff25be6f85a1dc8a04470437d6597399a45d11f Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 15 九月 2023 17:08:29 +0800
Subject: [PATCH] 1

---
 Src/main.c |  200 +++++++++++++++++++-------------------------------
 1 files changed, 76 insertions(+), 124 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 93720ec..c4d7f05 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -30,10 +30,15 @@
 #include "TrackingDiff.h"
 #include "dw_app.h"
 #include "Flash.h"
+#include "user.h"
+#include "sx126x-board.h"
+#include "string.h"
+#include "stdio.h"
+#include "delay.h"
 #define NSH1 0x0001
 #define GP   0x0002
 #define FLASH_HARDWARE_VERSION_MAP		(uint32_t)0x08004F00    //硬件版本号和批次信息位置
-//#define DEBUG_MODE
+#define DEBUG_MODE
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -61,8 +66,6 @@
 
 SPI_HandleTypeDef hspi1;
 
-TIM_HandleTypeDef htim2;
-
 UART_HandleTypeDef huart1;
 DMA_HandleTypeDef hdma_usart1_rx;
 DMA_HandleTypeDef hdma_usart1_tx;
@@ -79,7 +82,6 @@
 static void MX_SPI1_Init(void);
 void MX_ADC_Init(void);
 static void MX_DMA_Init(void);
-static void MX_TIM2_Init(void);
 static void MX_IWDG_Init(void);
 /* USER CODE BEGIN PFP */
 
@@ -213,30 +215,6 @@
 	__HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount);
 
 }
-
-void HardWareTypeDiffConfig(void)
-{
-    GPIO_InitTypeDef GPIO_InitStruct = {0};
-    //hardware_type=2;
-    if(hardware_type == 0)
-        hardware_type = 1;
-	switch(hardware_type)
-		{
-        case 1:
-	  
-		 HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
-          GPIO_InitStruct.Pin = MOTOR_Pin;
-          GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-          GPIO_InitStruct.Pull = GPIO_NOPULL;
-          GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-          HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-			break;
-		case 2:
-			MX_TIM2_Init();
-		//BarInit();
-			break;
-		}
-}
 u8 active_flag,nomovesleeptime;
 void Program_Init(void)
 {	float temp;
@@ -248,16 +226,16 @@
 	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)|64;
+	g_com_map[VERSION] = (1<<8)|68;
     
     #ifdef DEBUG_MODE
    // g_com_map[GROUP_ID]=21;
-//    		g_com_map[DEV_ID]=4;
+    		g_com_map[DEV_ID]=0x6777;
     //	g_com_map[COM_INTERVAL]=100;
     //	g_com_map[MAX_REPORT_ANC_NUM]=1;
     //	g_com_map[NOMOVESLEEP_TIME]=10;
     #endif
-//    g_com_map[GROUP_ID]=2;
+    g_com_map[GROUP_ID]=3;
     g_com_map[COM_INTERVAL] = 1000;
     active_flag = g_com_map[ACTIVE_INDEX];
     module_power = g_com_map[POWER];
@@ -366,6 +344,20 @@
     HAL_ADC_DeInit(&hadc);
     HAL_ADCEx_DisableVREFINT();
 }
+extern uint8_t TX_Buffer;
+void Uwb_Lora_Switch(uint8_t uwb, uint8_t lora)
+{
+if(uwb)
+HAL_GPIO_WritePin(SPI_CS_GPIO_Port, SPI_CS_Pin, GPIO_PIN_SET);
+else
+HAL_GPIO_WritePin(SPI_CS_GPIO_Port, SPI_CS_Pin, GPIO_PIN_RESET);    
+
+if(lora)
+HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_SET);
+else
+HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_RESET); 
+}
+uint8_t tx_num;
 /* USER CODE END 0 */
 
 /**
@@ -395,21 +387,22 @@
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
-    MX_GPIO_Init();
-    MX_LPTIM1_Init();
-    MX_DMA_Init();
-    MX_USART1_UART_Init();
-    MX_SPI1_Init();
-    MX_ADC_Init();
-
-    //  MX_TIM2_Init();
-    MX_IWDG_Init();
-    /* USER CODE BEGIN 2 */
+  MX_GPIO_Init();
+  MX_LPTIM1_Init();
+  MX_USART1_UART_Init();
+  MX_SPI1_Init();
+  MX_ADC_Init();
+  MX_DMA_Init();
+//  MX_IWDG_Init();
+  /* USER CODE BEGIN 2 */
     LED_LG_ON;
     Program_Init();
     //	LIS3DH_Data_Init();	
+//    Uwb_Lora_Switch(1,0);
     Dw1000_Init();
     Dw1000_App_Init();
+    Delay_Ms(10);
+//    Uwb_Lora_Switch(0,0);
     //	HardWareTypeDiffConfig();
     dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
     dwt_entersleep();
@@ -419,12 +412,16 @@
      Error_Handler();
     }
     HAL_Delay(2000);
+//    Uwb_Lora_Switch(0,1);
+    Lora_Init();
+    Delay_Ms(10);
+//    Uwb_Lora_Switch(0,0);
 //	mcu_sleep();
 	//LED0_BLINK;		
 //	SystemPower_Config();
 //HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);   
   /* USER CODE END 2 */
-
+        HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_RESET);
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
@@ -437,15 +434,18 @@
 		SystemClock_Config();
 		g_start_send_flag = 0;	
 		HAL_IWDG_Refresh(&hiwdg);
-//		if(current_count>slot_startcount&&current_count<slot_startcount+interval_count)
-//		{
-//		HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_SET);
-//		}else{
-//		HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
-//		}
-//		LED_TR_BLINK;s
-		
-			
+
+
+//        Uwb_Lora_Switch(0,1);
+//        HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_SET);
+        memcpy(&TX_Buffer+3,&tx_num,1);
+	    Radio.Send( &TX_Buffer, 4);
+        tx_num++;
+//                delay_ms(10);
+//        HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_RESET);
+        delay_ms(9);
+//        Uwb_Lora_Switch(1,0);
+
 		if(bat_percent>15)
 		{	LED_TB_ON;
 			Tag_App();
@@ -455,13 +455,14 @@
 			Tag_App();
 			LED_TR_OFF;		
 		}
+//        Uwb_Lora_Switch(0,0);
 		//LED0_BLINK;		
 		IdleTask();	
 		if(waitusart_timer>0)
 		{
 			waitusart_timer--;
 		}		 
-	}else{
+	}else{  
 	IdleTask();	
 	}
     if(m_bEUARTTxEn==0&&waitusart_timer==0)
@@ -562,7 +563,7 @@
   hadc.Init.OversamplingMode = DISABLE;
   hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2;
   hadc.Init.Resolution = ADC_RESOLUTION_12B;
-  hadc.Init.SamplingTime = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.SamplingTime = ADC_SAMPLETIME_1CYCLE_5;
   hadc.Init.ScanConvMode = ADC_SCAN_DIRECTION_FORWARD;
   hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
   hadc.Init.ContinuousConvMode = DISABLE;
@@ -581,7 +582,7 @@
   }
   /** Configure for the selected ADC regular channel to be converted.
   */
-  sConfig.Channel = ADC_CHANNEL_1;
+  sConfig.Channel = ADC_CHANNEL_VREFINT;
   sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
   if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
   {
@@ -697,69 +698,6 @@
 }
 
 /**
-  * @brief TIM2 Initialization Function
-  * @param None
-  * @retval None
-  */
-static void MX_TIM2_Init(void)
-{
-
-  /* USER CODE BEGIN TIM2_Init 0 */
-
-  /* USER CODE END TIM2_Init 0 */
-
-  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
-  TIM_MasterConfigTypeDef sMasterConfig = {0};
-  TIM_OC_InitTypeDef sConfigOC = {0};
-
-  /* USER CODE BEGIN TIM2_Init 1 */
-
-  /* USER CODE END TIM2_Init 1 */
-  htim2.Instance = TIM2;
-  htim2.Init.Prescaler = 9;
-  htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim2.Init.Period = 1171;
-  htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
-  htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  if (HAL_TIM_Base_Init(&htim2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  if (HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  if (HAL_TIM_PWM_Init(&htim2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
-  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  if (HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 599;
-  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
-  sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
-  if (HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN TIM2_Init 2 */
-//if(HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3) != HAL_OK)
-//  {
-//    /* Starting Error */
-//    Error_Handler();
-//  }
-  /* USER CODE END TIM2_Init 2 */
-  HAL_TIM_MspPostInit(&htim2);
-
-}
-
-/**
   * @brief USART1 Initialization Function
   * @param None
   * @retval None
@@ -844,13 +782,14 @@
   HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, LED1_G_Pin|LED1_R_Pin|LED2_R_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOB, LED1_G_Pin|LED1_R_Pin|LED2_R_Pin|RADIO_nRESET_Pin
+                          |RADIO_NSS_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOA, DW_WKUP_Pin|DW_CTRL_Pin|LED2_G_Pin, GPIO_PIN_RESET);
 
-  /*Configure GPIO pin : PA0 */
-  GPIO_InitStruct.Pin = GPIO_PIN_0;
+  /*Configure GPIO pins : PA0 RADIO_DIO1_Pin */
+  GPIO_InitStruct.Pin = GPIO_PIN_0|RADIO_DIO1_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@@ -868,7 +807,12 @@
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
   HAL_GPIO_Init(SPI_CS_GPIO_Port, &GPIO_InitStruct);
-
+  
+  GPIO_InitStruct.Pin = GPIO_PIN_2;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
   /*Configure GPIO pin : BAT_MEAS_GND_Pin */
   GPIO_InitStruct.Pin = BAT_MEAS_GND_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
@@ -888,8 +832,10 @@
   GPIO_InitStruct.Pull = GPIO_PULLDOWN;
   HAL_GPIO_Init(INPUT_5V_GPIO_Port, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : LED1_G_Pin LED1_R_Pin LED2_R_Pin PWR_CTL_Pin */
-  GPIO_InitStruct.Pin = LED1_G_Pin|LED1_R_Pin|LED2_R_Pin|PWR_CTL_Pin;
+  /*Configure GPIO pins : LED1_G_Pin LED1_R_Pin LED2_R_Pin RADIO_nRESET_Pin
+                           RADIO_NSS_Pin PWR_CTL_Pin */
+  GPIO_InitStruct.Pin = LED1_G_Pin|LED1_R_Pin|LED2_R_Pin|RADIO_nRESET_Pin
+                          |RADIO_NSS_Pin|PWR_CTL_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@@ -901,6 +847,12 @@
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /*Configure GPIO pin : RADIO_BUSY_Pin */
+  GPIO_InitStruct.Pin = RADIO_BUSY_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(RADIO_BUSY_GPIO_Port, &GPIO_InitStruct);
 
   /*Configure GPIO pin : PWR_ON_Pin */
   GPIO_InitStruct.Pin = PWR_ON_Pin;
@@ -954,7 +906,7 @@
     if(freqlost_count>FREQ_LOST_TIME)
     {
         tag_frequency = NOTAG_FREQ;
-        if(lost_jumpcount++>=4) //无测距情况下,每5秒发一次;
+        if(lost_jumpcount++>=0) //无测距情况下,每5秒发一次;
         {
             lost_jumpcount = 0;
             g_start_send_flag=1;

--
Gitblit v1.9.3