1.42 修改重启和单片机电压检测

yincheng.zhong

2022-11-07 6e39707d1deda59da8b133fb73b1632d75fef03d

 Src/application/dw_app.c

@@ -30,7 +30,7 @@
#include "beep.h"
#include "modbus.h"

#define USART_INTEGRATE_OUTPUT
//#define USART_INTEGRATE_OUTPUT
/*------------------------------------ Marcos ------------------------------------------*/
/* Inter-ranging delay period, in milliseconds. */
#define RNG_DELAY_MS 100
@@ -296,6 +296,7 @@
u32 rec_tagpos_binary;
int16_t offset=2700;
u8 motor_state,rec_remotepara_state,rec_remotepara[80];
extern u16 last_lpcount;
void NearPoll(void)
{
   
@@ -336,7 +337,7 @@
   flag_getresponse=0;
   start_count=HAL_LPTIM_ReadCounter(&hlptim1);
   recbase_num=0;
   timeout=ceil((float)nearbase_num*SLOT_SCALE)+3;
   timeout=nearbase_num*SLOT_SCALE+4;
   end_count=start_count+(timeout<<5);
   if(end_count>=32768)
   {end_count-=32768;}
@@ -446,18 +447,18 @@
                           {flag_getresponse=1;}
                           lastsync_timer=sync_timer;
                           offsettimeus=ancsync_time-current_count*LPTIMER_LSB+offset;
                           SetNextPollTime(tyncpoll_time);
                           if(rec_remotepara_state==1)
                           {
                                      memcpy(rec_remotepara,&rx_buffer[REMOTEPARA_INDEX],REMOTEPARA_LEN);
                              memcpy(&g_com_map[COM_INTERVAL],&rec_remotepara[0],8);
                              memcpy(&g_com_map[POWER],&rec_remotepara[8],10);
                                        if(g_com_map[COM_INTERVAL]>0&&g_com_map[COM_INTERVAL]<1000&&g_com_map[POWER]<67&&g_com_map[POWER]>0)
                              {save_com_map_to_flash();
                              delay_ms(100);										
                                        }
                                        NVIC_SystemReset();
                           } 
//                           SetNextPollTime(tyncpoll_time);
//                           if(rec_remotepara_state==1)
//                           {
//                                      memcpy(rec_remotepara,&rx_buffer[REMOTEPARA_INDEX],REMOTEPARA_LEN);
//                              memcpy(&g_com_map[COM_INTERVAL],&rec_remotepara[0],8);
//                              memcpy(&g_com_map[POWER],&rec_remotepara[8],10);
//                                        if(g_com_map[COM_INTERVAL]>0&&g_com_map[COM_INTERVAL]<1000&&g_com_map[POWER]<67&&g_com_map[POWER]>0)
//                              {save_com_map_to_flash();
//                              delay_ms(100);										
//                                        }
//                                        NVIC_SystemReset();
//                           } 
                        }else{
                           rec_nearbasepos=FindNearBasePos(rec_nearbaseid);
                           
@@ -498,23 +499,10 @@
         if(mainbase_lost_count>tag_frequency*BASELOST_STOPMOTOR_TIME)
         {motor_state=0; }
            dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR);
         nearbase_num=recbase_num;
            j=0;
         if(exsistbase_list[0]==0)
         {
//          u8 temp_adc,random_value;
//            random_value=0;
//            for(i=0;i<8;i++)
//            {
//               temp_adc=Get_ADC_Value();
//               random_value=random_value|((temp_adc&0x01)<<i);
//            }
            tagslotpos=GetRandomSlotPos(rec_tagpos_binary);
            tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;	
            SetNextPollTime(tyncpoll_time);
         }
            nearbase_num=recbase_num;
      //   tyncpoll_time=0;
         next_nearbase_num=0;
            j = 0;
         for(i=0;i<last_nearbase_num+get_newbase;i++)
         {
            if(exsistbase_list[i]>0)
@@ -526,10 +514,11 @@
               exsistbase_list[i]--;
            }
         }

         if(recbase_num<3)
         {next_nearbase_num=next_nearbase_num;}
               last_nearbase_num = next_nearbase_num;
            if(mainbase_lost_count>1&&exsistbase_list[0] != 0)
         {
                last_lpcount+= HAL_LPTIM_ReadCounter(&hlptim1)%(g_com_map[COM_INTERVAL]*16);
         }
            last_nearbase_num = next_nearbase_num;
         for(i=0;i<last_nearbase_num-1;i++)
         {
            for(j=0;j<last_nearbase_num-1;j++)
@@ -659,4 +648,5 @@
         break;
   }
   dwt_entersleep();
    bat_percent=Get_VDDVlotage();
}