From 027bc1bbfe61d1c28617340b7886586c38ac4eec Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 07 十一月 2023 09:17:58 +0800
Subject: [PATCH] lora免布线标签5hz版本  没有调试好  先提交  目前不用

---
 Src/main.c |  170 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 114 insertions(+), 56 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index f3d8ea1..602e100 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -38,7 +38,7 @@
 #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 -----------------------------------------------------------*/
@@ -100,6 +100,11 @@
 extern uint8_t module_power;
 extern float nomove_count;
 uint8_t imu_enable,motor_enable;	
+uint32_t lp_time;
+extern  uint32_t lora_txtime_old;
+uint8_t lora_tx_flag;
+extern uint16_t Lora_tx_ancid[50];
+extern uint16_t Lora_tx_ancdist[50];
 u16 GetLPTime(void)
 {
 	u16 count=HAL_LPTIM_ReadCounter(&hlptim1);
@@ -161,10 +166,10 @@
 		}
 		if(bat_percent>99)
 		{
-			LED_LR_OFF;
+//			LED_LR_OFF;
 			LED_LG_ON;
 		}else{
-			LED_LR_ON;
+//			LED_LR_ON;
 			LED_LG_OFF;		
 		}		
 	}else{
@@ -173,7 +178,7 @@
             state5v=0;
             UsartDeInit();
         }
-		LED_LR_OFF;
+//		LED_LR_OFF;
 		LED_LG_OFF;
 //	}
 }
@@ -227,7 +232,7 @@
 	hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
 	//deca_sleep(1000);
 	g_com_map[VERSION] = (1<<8)|68;
-    g_com_map[DEV_ID]=1158;
+//    g_com_map[DEV_ID]=1158;
     #ifdef DEBUG_MODE
    // g_com_map[GROUP_ID]=21;
 //    		g_com_map[DEV_ID]=4;
@@ -236,7 +241,7 @@
     //	g_com_map[NOMOVESLEEP_TIME]=10;
     #endif
     g_com_map[GROUP_ID]=3;
-    g_com_map[COM_INTERVAL] = 1000;
+    g_com_map[COM_INTERVAL] = 200;
     active_flag = g_com_map[ACTIVE_INDEX];
     module_power = g_com_map[POWER];
     g_com_map[IMU_ENABLE] = 0;
@@ -260,10 +265,10 @@
 	}
 
  //   g_com_map[COM_INTERVAL]=100;
-		if(g_com_map[COM_INTERVAL]==0)
-	{
-	  g_com_map[COM_INTERVAL]=100;
-	}
+//		if(g_com_map[COM_INTERVAL]==0)
+//	{
+//	  g_com_map[COM_INTERVAL]=100;
+//	}
 	 if(module_power>67)
 		{module_power=67;}
 		if(module_power<0)
@@ -271,10 +276,12 @@
 
 	current_slotnum=1;
 //	current_time=GetLPTime();
-		if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, slot_startcount) != HAL_OK)  //system time is 1010ms   1 puls=30.518us
-  {
-    Error_Handler();
-  }
+//        g_com_map[COM_INTERVAL]=200;
+//		if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, (float)(32768/1000)*g_com_map[COM_INTERVAL]) != HAL_OK)  //system time is 1010ms   1 puls=30.518us
+//  {
+//    Error_Handler();
+//  }
+  HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT,32767);
 //g_com_map[NOMOVESLEEP_TIME]=5;
     printf("固件版本: 免布线基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
 	memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
@@ -347,7 +354,7 @@
 uint16_t irq_num;
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
-    if(GPIO_Pin == GPIO_PIN_11)
+    if(GPIO_Pin == GPIO_PIN_3)
     {
         SystemClock_Config();
 //        l_bIsVibration = HIDO_TRUE;
@@ -372,6 +379,45 @@
 HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_SET);
 else
 HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_RESET); 
+}
+extern void Lora_tx_zubao( void );
+extern void Lora_tx_mode( void );
+extern     uint8_t Lora_tx_ancnum;
+extern   u8 lora_seq_nb2;
+extern uint16_t lora_yingda_num;
+uint16_t Lora_Txcount;
+uint16_t Old_Lora_Txcount;
+void Lora_Tx_Poll()
+{
+    if(lora_tx_flag)
+    {
+//    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
+    lora_tx_flag=0;
+    LED_TB_ON;    
+    lora_seq_nb2++;
+    Lora_tx_zubao();
+    Lora_tx_mode();            
+    Radio.Send( usart_send, 12+Lora_tx_ancnum*4);
+    Lora_tx_ancnum=0;    
+    memset(Lora_tx_ancdist,0,sizeof(Lora_tx_ancdist));
+    memset(Lora_tx_ancid,0,sizeof(Lora_tx_ancid));
+    }
+        
+    
+//    Lora_Txcount=HAL_LPTIM_ReadCounter(&hlptim1);
+//    
+//    if(Lora_Txcount-Old_Lora_Txcount>=6554)
+//    {
+//    Old_Lora_Txcount=Lora_Txcount;
+//    LED_TB_ON;    
+//    lora_seq_nb2++;
+//    Lora_tx_zubao();
+//    Lora_tx_mode();            
+//    Radio.Send( usart_send, 12+Lora_tx_ancnum*4);
+//    Lora_tx_ancnum=0;    
+//    memset(Lora_tx_ancdist,0,sizeof(Lora_tx_ancdist));
+//    memset(Lora_tx_ancid,0,sizeof(Lora_tx_ancid));
+//    }
 }
 /* USER CODE END 0 */
 
@@ -404,10 +450,11 @@
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
   MX_LPTIM1_Init();
+  MX_DMA_Init();
   MX_USART1_UART_Init();
   MX_SPI1_Init();
   MX_ADC_Init();
-  MX_DMA_Init();
+  
 //  MX_IWDG_Init();
   /* USER CODE BEGIN 2 */
 //    LED_LG_ON;
@@ -425,7 +472,7 @@
     {
      Error_Handler();
     }
-    HAL_Delay(2000);
+    Delay_Ms(2);
 //    Uwb_Lora_Switch(0,1);
     Lora_Init();
 //    Radio.Sleep( );
@@ -438,6 +485,7 @@
 	//LED0_BLINK;		
 //	SystemPower_Config();
 //HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);   
+    
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -449,11 +497,12 @@
     /* USER CODE BEGIN 3 */
 Lora_rx_open();
       
-      
-//    HAL_IWDG_Refresh(&hiwdg);
-//    IdleTask();	
+      Lora_Tx_Poll();
+    HAL_IWDG_Refresh(&hiwdg);
+    IdleTask();	
 //	Radio.IrqProcess( ); // Process Radio IRQ
 //     Anchor_App();
+
     #ifndef DEBUG_MODE	
     if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))				
     HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
@@ -761,14 +810,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|RADIO_nRESET_Pin
-                          |RADIO_NSS_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_10|LED1_G_Pin|LED1_R_Pin|RADIO_nRESET_Pin
+                          |RADIO_NSS_Pin|GPIO_PIN_7, 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 pins : PA0 RADIO_DIO1_Pin */
-  GPIO_InitStruct.Pin = GPIO_PIN_0|RADIO_DIO1_Pin;
+  /*Configure GPIO pin : PA0 */
+  GPIO_InitStruct.Pin = GPIO_PIN_0;
   GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@@ -800,20 +849,26 @@
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(USER_KEY_GPIO_Port, &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 pins : PB10 LED1_G_Pin LED1_R_Pin RADIO_nRESET_Pin
+                           RADIO_NSS_Pin PB7 PWR_CTL_Pin */
+  GPIO_InitStruct.Pin = GPIO_PIN_10|LED1_G_Pin|LED1_R_Pin|RADIO_nRESET_Pin
+                          |RADIO_NSS_Pin|GPIO_PIN_7|PWR_CTL_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);
+
   /*Configure GPIO pin : INPUT_5V_Pin */
   GPIO_InitStruct.Pin = INPUT_5V_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   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 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;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
   /*Configure GPIO pins : DW_WKUP_Pin DW_CTRL_Pin LED2_G_Pin */
   GPIO_InitStruct.Pin = DW_WKUP_Pin|DW_CTRL_Pin|LED2_G_Pin;
@@ -822,24 +877,18 @@
   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;
+  /*Configure GPIO pin : RADIO_DIO1_Pin */
+  GPIO_InitStruct.Pin = RADIO_DIO1_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
   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;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-  GPIO_InitStruct.Pull = GPIO_PULLUP;
-  HAL_GPIO_Init(PWR_ON_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init(RADIO_DIO1_GPIO_Port, &GPIO_InitStruct);
 
   /* EXTI interrupt init*/
   HAL_NVIC_SetPriority(EXTI0_1_IRQn, 1, 0);
   HAL_NVIC_EnableIRQ(EXTI0_1_IRQn);
 
-  HAL_NVIC_SetPriority(EXTI4_15_IRQn, 1, 0);
-  HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
+  HAL_NVIC_SetPriority(EXTI2_3_IRQn, 1, 0);
+  HAL_NVIC_EnableIRQ(EXTI2_3_IRQn);
 
 }
 
@@ -871,24 +920,33 @@
 extern uint8_t tx_near_msg[80],stationary_flag;
 float key_keeptime;
 extern float freqlost_count,range_lost_time;
-uint32_t lp_time;
 extern uint8_t lora_yingda_flag;
 uint8_t lora_yingdatime;
 extern uint8_t lora_chongfuyingda_flag;
+uint8_t no_data_chongqi_num;
 void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
 {
     SystemClock_Config();
     lp_time++;
-    if(lora_yingda_flag)
-    {
-    lora_yingdatime++;
-        if(lora_yingdatime>=2)
-        {lora_yingdatime=0;
-        lora_yingda_flag=0;            
-          Lora_tx_mode();
-            Radio.Send( usart_send, 2);
-        }
-    }
+    no_data_chongqi_num++;
+    lora_tx_flag=1;
+    Lora_Txcount=HAL_LPTIM_ReadCounter(&hlptim1);
+    Lora_Txcount=Lora_Txcount+32768/10*2;
+    if(Lora_Txcount>32768)
+    {Lora_Txcount=Lora_Txcount-32768;}
+    __HAL_LPTIM_COMPARE_SET(&hlptim1, Lora_Txcount);
+//    if( no_data_chongqi_num>60)
+//    {NVIC_SystemReset();}
+//    if(lora_yingda_flag)
+//    {
+//    lora_yingdatime++;
+//        if(lora_yingdatime>=2)
+//        {lora_yingdatime=0;
+//        lora_yingda_flag=0;            
+//          Lora_tx_mode();
+//            Radio.Send( usart_send, 2);
+//        }
+//    }
 }
 /* USER CODE END 4 */
 

--
Gitblit v1.9.3