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 */
@@ -103,7 +103,7 @@
void LedTask(void);
uint32_t dev_id;
uint16_t heartbeat_timer,poll_timer,sync_timer;
uint8_t aRxBuffer[1],group_id;
uint8_t aRxBuffer[1],group_id = 1;
uint8_t bat_percent=0,g_start_send_flag;
uint16_t tyncpoll_time,lpsettime;
uint16_t slottime,max_slotpos;
@@ -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,9 +217,10 @@
    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)|14;
    g_com_map[VERSION] = (2<<8)|8;
//     g_com_map[VERSION] = (3<<8)|2;
//    g_com_map[DEV_ID]=1158;
    g_com_map[GROUP_ID]=0;
    g_com_map[GROUP_ID]=1;
//    g_com_map[COM_INTERVAL] = 1000;
    if(g_com_map[COM_INTERVAL]<1000)
    {
@@ -322,6 +323,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)
{
@@ -335,6 +337,18 @@
    {
        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)//加速度
    {
@@ -416,6 +430,7 @@
}
uint8_t usart5_state,flag_onesecond;
uint8_t beep_flag;
void BeepTask(void)
{
    if(1)//g_com_map[MOTOR_ENABLE])
@@ -424,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;
        }       
    }
}
@@ -437,6 +454,7 @@
        BeepTask();
    }
}
/* USER CODE END 0 */
/**
@@ -519,11 +537,19 @@
//    HAL_IWDG_Refresh(&hiwdg);
        OneSecondTask();
        IdleTask();
//        if(g_com_map[LORA_SEND_INDEX])
//        {
        Lora_Send_Poll();
//        }
        LoraUp_Poll();
#ifndef DEBUG_MODE
        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
    }
@@ -1035,6 +1061,9 @@
//    uint8_t pinlv;
    SystemClock_Config();
    HAL_IWDG_Refresh(&hiwdg);
    anjian_num=0;
//    if(++g_com_map[GROUP_ID]>2)
//        g_com_map[GROUP_ID] = 0;
    if(active_flag==0)  //未激活状态
    {
        if(!GET_USERKEY)