zhyinch
2019-06-06 4a64e6c81db587706d9c92a9badf321d31264254
用户测试1
已修改5个文件
39 ■■■■■ 文件已修改
源码/核心板/Src/ExternalDevices/led.h 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/Src/application/beep_logic_app.c 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/Src/application/dw_app.c 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/Src/application/global_param.c 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/Src/main.c 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Ô´Âë/ºËÐİå/Src/ExternalDevices/led.h
@@ -8,8 +8,8 @@
#define LED0_GPIO                    GPIOA
#define LED_BLINK(...)                GPIO_Toggle(__VA_ARGS__)
#define LED0_BLINK                    LED_BLINK(LED0_GPIO, LED0_PIN)
#define LED0_ON                        GPIO_WriteBit(LED0_GPIO, LED0_PIN, Bit_RESET)
#define LED0_OFF                    GPIO_WriteBit(LED0_GPIO, LED0_PIN, Bit_SET)
#define LED0_OFF                        GPIO_WriteBit(LED0_GPIO, LED0_PIN, Bit_RESET)
#define LED0_ON                    GPIO_WriteBit(LED0_GPIO, LED0_PIN, Bit_SET)
void Led_Init(void);
Ô´Âë/ºËÐİå/Src/application/beep_logic_app.c
@@ -37,17 +37,21 @@
            beep_ontime = ONTIME1;
            beep_offtime = OFFTIME1;
            beep_state=1;
        }else if (min_dist <= g_com_map[ALARM_DISTANCE2])
        {
            beep_ontime = ONTIME2;
            beep_offtime = OFFTIME2;
            beep_state=1;
        }else if (min_dist <= g_com_map[ALARM_DISTANCE3])
        {
            beep_ontime = ONTIME3;
            beep_offtime = OFFTIME3;
            beep_state=1;
        }else{
            LED0_ON;
        }
//        else if (min_dist <= g_com_map[ALARM_DISTANCE2])
//        {
//            beep_ontime = ONTIME2;
//            beep_offtime = OFFTIME2;
//            beep_state=1;
//        }else if (min_dist <= g_com_map[ALARM_DISTANCE3])
//        {
//            beep_ontime = ONTIME3;
//            beep_offtime = OFFTIME3;
//            beep_state=1;
//        }
        else{
            LED0_OFF;
            beep_state=0;
        }
        
Ô´Âë/ºËÐİå/Src/application/dw_app.c
@@ -493,7 +493,7 @@
//                    dist[TAG_ID] = LP(dis, TAG_ID); //LP ä¸ºä½Žé€šæ»¤æ³¢å™¨ï¼Œè®©æ•°æ®æ›´ç¨³å®š
                    
                    /*--------------------------以下为非测距逻辑------------------------*/
                    LED0_BLINK; //每成功一次通讯则闪烁一次
            //        LED0_BLINK; //每成功一次通讯则闪烁一次
                    g_UWB_com_interval = 0;
                    dis_after_filter=dist_cm;
                    g_Tagdist[tag_id_recv]=dist_cm;
Ô´Âë/ºËÐİå/Src/application/global_param.c
@@ -25,11 +25,11 @@
    if(g_com_map[0] != 0x55AA)
    {
        g_com_map[0] = 0x55AA;
        g_com_map[ALARM_DISTANCE1] = 300;    //默认报警距离50cm
        g_com_map[ALARM_DISTANCE1] = 100;    //默认报警距离50cm
        g_com_map[ALARM_DISTANCE2] = 600;    //默认报警距离50cm
        g_com_map[ALARM_DISTANCE3] = 900;    //默认报警距离50cm
        g_com_map[ALARM_DEV] = 1;
        g_com_map[DEV_ID] = 1;//DEFAULT_DEV_ID;    //默认设备ID
        g_com_map[DEV_ID] =10;//DEFAULT_DEV_ID;    //默认设备ID
        g_com_map[COM_INTERVAL]=500;
        save_com_map_to_flash();
    }
Ô´Âë/ºËÐİå/Src/main.c
@@ -42,6 +42,7 @@
    printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
    printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
    #endif
    for(i=0;i<255;i++)
    {
        g_Tagdist[i]=0xffff;
@@ -81,7 +82,7 @@
        Tag_App();
    }
//    UART_CheckReceive();
    PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);
//    PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);
#else 
        Anchor_App();
#endif