1.11

yincheng.zhong

2024-03-26 fc785f07b58e88a15cabddef20ba9cfb2d0507c3

 Src/main.c

@@ -125,7 +125,7 @@
uint8_t anjian_flag;
uint8_t  stationary_flag;
uint16_t stationary_num;
uint8_t recv_end_time;
uint16_t recv_end_time;
u16 GetLPTime(void)
{
   u16 count=HAL_LPTIM_ReadCounter(&hlptim1);
@@ -306,7 +306,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)|10;
   g_com_map[VERSION] = (1<<8)|11;
//    g_com_map[DEV_ID]=1158;
//    #ifdef DEBUG_MODE
//   // g_com_map[GROUP_ID]=21;
@@ -345,6 +345,10 @@
      if(g_com_map[COM_INTERVAL]==0)
   {
     g_com_map[COM_INTERVAL]=1000;
   }
        if(g_com_map[LORA_POWER]>22)
    {
        g_com_map[LORA_POWER] = 22;
   }
    if(module_power>67)
      {module_power=67;}
@@ -705,12 +709,12 @@
      if(gotosleep_flag==1)
      {
          Jingzhi_Poll();
          HAL_IWDG_Refresh(&hiwdg);
//          HAL_IWDG_Refresh(&hiwdg);
          HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
      }
      else
      {
      HAL_IWDG_Refresh(&hiwdg);
//      HAL_IWDG_Refresh(&hiwdg);
      Lpuart_rx_Poll();
      OneSecondTask();
      IdleTask();   
@@ -1275,6 +1279,7 @@
    yuyin_no_sleep_flag=0;
    }
}
#define NOGPS_RESET_TIME 300
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
 if(chongqi_flag==0&&shengji_flag==0)
@@ -1287,8 +1292,8 @@
    if(yuyin_no_sleep_flag==0)
    {
    recv_end_time++;
//    if(recv_end_time>3)
//    {HAL_NVIC_SystemReset();}
    if(recv_end_time>NOGPS_RESET_TIME)
    {HAL_NVIC_SystemReset();}
    }
    Yuying_Poll();
    Lora_send_flag=1;