Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag ...

WXK

2024-11-13 2b07faacf6d1ce3de7ace73af366e5b84e652c14

 Src/main.c

@@ -43,7 +43,7 @@
#define NSH1 0x0001
#define GP   0x0002
#define FLASH_HARDWARE_VERSION_MAP      (uint32_t)0x08004F00    //硬件版本号和批次信息位置
//#define DEBUG_MODE
#define DEBUG_MODE
UART_WakeUpTypeDef Selection;
/* USER CODE END Includes */

@@ -195,7 +195,7 @@
    {
        SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
    }
    if(memcmp(g_com_map2,g_com_map,200)!=0)
    if(memcmp(g_com_map2,g_com_map,100)!=0)
     {
        SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
     }
@@ -217,7 +217,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)|12;
    g_com_map[VERSION] = (2<<8)|3;
//    g_com_map[DEV_ID]=1158;
    g_com_map[GROUP_ID]=0;
//    g_com_map[COM_INTERVAL] = 1000;
@@ -226,6 +226,8 @@
        g_com_map[COM_INTERVAL] = 1000;
    }
    g_com_map[STATIONARY_TIME] = 10;
    g_com_map[LORA_POWER] = 22;
    g_com_map[POWER] = 67;
    active_flag = g_com_map[ACTIVE_INDEX];
    module_power = g_com_map[POWER];
//    g_com_map[IMU_ENABLE] = 0;
@@ -320,6 +322,7 @@
    HAL_ADC_DeInit(&hadc);
    HAL_ADCEx_DisableVREFINT();
}
uint8_t anjian_num;
uint16_t irq_num;
void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
{
@@ -327,12 +330,25 @@
    {
        SystemClock_Config();
        irq_num++;
        HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_SET);
        RadioIrqProcess();
    }
    if(GPIO_Pin == GPIO_PIN_1)//按键
    {
        SystemClock_Config();
        anjian_flag=1;
//        anjian_num++;
//        if(anjian_num==2)
//        {                        
//            g_com_map[LORA_SEND_INDEX] = !g_com_map[LORA_SEND_INDEX];
//            save_com_map_to_flash();
//            LED_TB_ON;
//            LED_TR_ON;
//            LED2_TB_ON;
//            LED2_TR_ON;
//            delay_ms(100);
//            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
//        }
    }
    if(GPIO_Pin == GPIO_PIN_0)//加速度
    {
@@ -414,6 +430,7 @@
}

uint8_t usart5_state,flag_onesecond;
uint8_t beep_flag;
void BeepTask(void)
{
    if(1)//g_com_map[MOTOR_ENABLE])
@@ -422,8 +439,10 @@
        {
            motor_keeptime--;
            HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_4);
            beep_flag=1;
        }else{
            HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_4);
            beep_flag=0;
        }       
    }
}
@@ -474,6 +493,20 @@
  MX_LPUART1_UART_Init();
  MX_LPTIM1_Init();
  /* USER CODE BEGIN 2 */
  
  GPIO_InitTypeDef GPIO_InitStruct = {0};
  /*Configure GPIO pin Output Level */
  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);

  /*Configure GPIO pins : PA2 PA8 */
  GPIO_InitStruct.Pin = GPIO_PIN_12;
  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
  GPIO_InitStruct.Pull = GPIO_NOPULL;
  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
  
    
    
    LED2_TB_ON;
    Program_Init();
    LIS3DH_Data_Init();
@@ -517,11 +550,17 @@
//    HAL_IWDG_Refresh(&hiwdg);
        OneSecondTask();
        IdleTask();
//        if(g_com_map[LORA_SEND_INDEX])
//        {
        Lora_Send_Poll();
//        }
        LoraUp_Poll();
#ifndef DEBUG_MODE
        if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
        if(beep_flag==0)
        {
        if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)&&motor_keeptime==0)
            HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
        }
#endif

    }
@@ -1033,6 +1072,7 @@
//    uint8_t pinlv;
    SystemClock_Config();
    HAL_IWDG_Refresh(&hiwdg);
    anjian_num=0;
    if(active_flag==0)  //未激活状态
    {
        if(!GET_USERKEY)
@@ -1074,13 +1114,14 @@
            flag_onesecond = 1;
            Lora_send_flag=1;
#ifndef DEBUG_MODE
            if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
            if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable&&motor_keeptime==0)
            {
                if(sleep_flag==0)
                {
                    Radio.Standby();
                    Radio.Sleep();
                    sleep_flag = 1;
                    LedOff_task();
                }
            } 
#endif