1.35,采集基站电量上传

WXK

7 天以前 2a7bd8d1fd712d96a573c7377b16f2b0a09aa726

 Src/radio/Lora.c

@@ -191,7 +191,7 @@
extern LPTIM_HandleTypeDef hlptim1;
uint16_t current_time,start_time,end_time;
uint8_t power_and_key=0;
extern u8 battary,button;
extern u8 button;
u8 lora_seq_nb2;
extern uint8_t stationary_flag;
extern uint8_t anjian_flag;
@@ -239,6 +239,7 @@
    Radio.Send(lora_sendbuffer,data_length+11);
  //  Delay_Ms(100);
}
extern uint8_t lora_busy_flag;
extern uint8_t imu_enable,motor_enable;
extern u8 lora_jianting_flag,report_ancnum;
static uint16_t delaytime = 771;
@@ -279,7 +280,7 @@
            if(!memcmp(&wg_report_id,&RX_Buffer[SOURCE_ID_IDX],2))
            {
                wg_lost_count = 0;
                HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
//                HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
                switch(RX_Buffer[PWTAG_RW_FLAG_IDX])
                {
                    case WGRSP_RWTAG_NONE:
@@ -350,6 +351,7 @@
                        break; 
                }
            }
            lora_busy_flag=0;
        }
    }
//    if(!no_rx_flag)
@@ -367,6 +369,7 @@
    Radio.Standby();
//    if(lora_jianting_flag)
//    SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
    lora_busy_flag=0;
}
    uint8_t tm;
uint16_t Lora_rece_error;
@@ -381,18 +384,20 @@
            target_count+=32768;
        __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
    }
    HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
//    HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
    if(lora_jianting_flag)
    {
//        SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
//        Radio.Rx(0);
    }
    lora_busy_flag=0;
}

void OnRxError( void )
{

    Radio.Standby();
    lora_busy_flag=0;
//    if(lora_jianting_flag)
//    SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
}
@@ -434,12 +439,12 @@

    Radio.Init( &RadioEvents );
    SwitchLoraSettings(REPORT_MANGE_CHANNEL_FRQ,7,22); //切换lora接收频点  
    if(active_flag)
    {
    Radio.Rx( 0 ); 
    }else{
        Radio.Sleep();
    }        
//    if(active_flag)
//    {
//    Radio.Rx( 0 ); 
//    }else{
//        Radio.Sleep();
//    }        
//        Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
                                   
}