v1.9 增加蜂鸣，测试1标签对10基站稳定

yincheng.zhong

2024-03-08 d67d922c6345042cb3dfaedd621a2120fe808b70

 Src/main.c

@@ -105,7 +105,6 @@
uint16_t heartbeat_timer,poll_timer,sync_timer;
uint8_t aRxBuffer[1],group_id;
uint8_t bat_percent=0,g_start_send_flag;
extern u8 motor_state;
uint16_t tyncpoll_time,lpsettime;
uint16_t slottime,max_slotpos;
uint16_t lastpoll_count,interval_count,slot_startcount,tag_frequency,lastpoll_time;
@@ -159,9 +158,10 @@
uint8_t state5v = 1;
extern uint8_t du_flag;
extern uint8_t xie_flag;
float motor_keeptime;
uint16_t motor_keeptime;
void IdleTask(void)
{

    if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
    {
        UART_CheckReceive();
@@ -175,11 +175,11 @@
        }
        if(bat_percent>99)
        {
            LED2_TR_OFF;
            LED2_TB_ON;
            LED_TR_OFF;
            LED_TB_ON;
        } else {
            LED2_TR_ON;
            LED2_TB_OFF;
            LED_TR_ON;
            LED_TB_OFF;
        }
    } else {
        if(state5v==1)
@@ -199,41 +199,6 @@
}



/* 返回ch字符在sign数组中的序号 */
int getIndexOfSigns(char ch)
{
    if(ch >= '0' && ch <= '9')
    {
        return ch - '0';
    }
    if(ch >= 'A' && ch <='F')
    {
        return ch - 'A' + 10;
    }
    if(ch >= 'a' && ch <= 'f')
    {
        return ch - 'a' + 10;
    }
    return -1;
}
/* 十六进制数转换为十进制数 */
long hexToDec(char *source)
{
    long sum = 0;
    long t = 1;
    int i, len;

    len = strlen(source);
    for(i=len-1; i>=0; i--)
    {
        sum += t * getIndexOfSigns(*(source + i));
        t *= 16;
    }

    return sum;
}

//u32 Loratx_frequency;
u8 active_flag,nomovesleeptime;

@@ -248,9 +213,9 @@
    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)|6;
    g_com_map[VERSION] = (1<<8)|9;
//    g_com_map[DEV_ID]=1158;
    g_com_map[GROUP_ID]=1;
    g_com_map[GROUP_ID]=0;
//    g_com_map[COM_INTERVAL] = 1000;
    if(g_com_map[COM_INTERVAL]<1000)
    {
@@ -445,49 +410,27 @@
}

uint8_t usart5_state,flag_onesecond;
void BeepTask(void)
{
    if(1)//g_com_map[MOTOR_ENABLE])
    {
        if(motor_keeptime>0)
        {
            motor_keeptime--;
            HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_4);
        }else{
            HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_4);
        }       
    }
}
void OneSecondTask(void)
{
    if(flag_onesecond==1)
    {
        flag_onesecond = 0;
        BeepTask();
    }
}
uint8_t Lora_send_flag;
void Lora_Send_Poll(void)
{
        if(Lora_send_flag)
        {
        Lora_send_flag=0;    
        LedTask();
        LoraReportPoll();
        flag_onesecond = 1;
        
    LED_TB_OFF;
    LED_TR_OFF;
    LED2_TB_OFF;
    LED2_TR_OFF;    
        }
#ifndef DEBUG_MODE
        if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
        {
            if(sleep_flag==0)
            {
                Radio.Standby();
                Radio.Sleep();
                sleep_flag = 1;
            }

        } else {
            if(sleep_flag)
            {
                SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
            }

        }
        
#endif
}

/* USER CODE END 0 */

/**
@@ -521,7 +464,7 @@
    MX_USART1_UART_Init();
    MX_SPI1_Init();
    MX_ADC_Init();
// MX_DMA_Init();
  MX_DMA_Init();
    MX_IWDG_Init();
    MX_TIM2_Init();
    MX_LPUART1_UART_Init();
@@ -908,7 +851,7 @@
        Error_Handler();
    }
    sConfigOC.OCMode = TIM_OCMODE_PWM1;
    sConfigOC.Pulse = 0;
  sConfigOC.Pulse = 125;
    sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
    sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
    if (HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_4) != HAL_OK)
@@ -1079,33 +1022,7 @@
uint16_t anchor_send_num;
uint8_t no_yingdatime,tflag1,tflag2;
extern uint16_t tagdist_list[ANC_MAX_NUM];
void LedTask(void)
{
    if(report_ancnum>0)
    {
        LED2_TB_ON;
#ifdef _SMT_TEST
        tflag1 = 1;
        printf("测距值%d\r\n",tagdist_list[0]);
#endif
    }
    if(wg_lost_count<=1)
    {
#ifdef _SMT_TEST
        tflag2 = 1;
        printf("网关通讯正常\r\n");
#endif
        LED_TB_ON;
    }
    if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
        if(bat_percent<15)
        {
            LED_TR_ON;
        } else {
            LED2_TB_ON;
        }

}
extern uint8_t Lora_send_flag;
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
//    uint8_t pinlv;
@@ -1149,7 +1066,24 @@
    } else {
        if(!sleep_flag)
        {
            flag_onesecond = 1;
        Lora_send_flag=1;
#ifndef DEBUG_MODE
            if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
            {
                if(sleep_flag==0)
                {
                    Radio.Standby();
                    Radio.Sleep();
                    sleep_flag = 1;
                }
            } else {
                if(sleep_flag)
                {
                    SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
                }
            }
#endif
        if(nomove_count++>g_com_map[STATIONARY_TIME])
        {
            stationary_flag = 1;