From 58b790f4d23214d3ab8e145c38df2ef8e5bed67c Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期日, 29 九月 2024 10:30:58 +0800 Subject: [PATCH] 1,删除无用代码,提高整齐度 --- keil/include/main/main.c | 451 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 339 insertions(+), 112 deletions(-) diff --git a/keil/include/main/main.c b/keil/include/main/main.c index 40a5010..84f4d6d 100644 --- a/keil/include/main/main.c +++ b/keil/include/main/main.c @@ -61,8 +61,12 @@ #include "HIDO_ATLite.h" #include "HIDO_Timer.h" #include "TCPClient.h" - -//#define DEBUG_MODE +#include "mk_spi.h" +#include "pan_port.h" +//#include "pan_param.h" +//#include "pan_rf.h" +#include "lora_3029.h" +#define DEBUG_MODE extern int simple_main(void); extern int temp_main(void); #define TEST_UART_POLL_MODE 0 @@ -91,12 +95,13 @@ uint8_t bat_percent,g_start_send_flag=1; uint8_t link_success_flag,motor_count; uint16_t gps_wait_count; -uint8_t state5v; +uint8_t state5v = 1; uint8_t motor_power_state=1,uwb_state,air780_power_state,gps_success_state,chaging_state,changed_state,air780_success_state,first_motor_in_flag; float nomove_count=0; static uint32_t sample[NUM_SAMPLES] = {0}; uint8_t recev_error_num,send_messgae_count,send_flag,control_state; uint8_t flag_4g_usart_rx_state = 1; //4G 串口RX当前是 RX状态,不是GPIO状态 +int input_5v_flag,air780e_flag1,air780e_flag2,air780e_flag3,air780e_flag4; typedef enum { UN_BIND=0, LINK_SUCCESS, @@ -142,7 +147,7 @@ .int_tx = false, #endif }; -static void uart_receive_callback(void *dev, uint32_t err_code) +void uart_receive_callback(void *dev, uint32_t err_code) { uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); } @@ -168,7 +173,7 @@ bat_percent = ((fVoltage_mv - 3300) /8); } } - LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent); + // LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent); } //void UartInit(void) //{ @@ -177,8 +182,8 @@ //board_debug_console_open(TRACE_PORT_UART0); //uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); //} -extern gps_uwb_flag; -uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1; +extern uint8_t gps_uwb_flag; +uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1,flag_alam_state = 0; uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag; int need_open_gps_count; void MotorPoll(void) @@ -190,6 +195,11 @@ } else { //绑定状态下 if(anchordata_num==1) { if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离 + if(flag_alam_state) + { + flag_alam_state = 0; + _4GAlarmUpload(2); + } need_open_gps_count=0; moter_open_uwb_flag=0;//关闭震动 gps_uwb_flag=0;//关闭GPS @@ -197,6 +207,11 @@ need_open_gps_count++; moter_open_uwb_flag=1;//开启震动 if(need_open_gps_count>=20) { + if(!flag_alam_state) + { + flag_alam_state = 1; + _4GAlarmUpload(1); + } gps_uwb_flag=1;//开启gps测距流程 need_open_gps_count=0; } @@ -204,25 +219,43 @@ need_open_gps_count++; moter_open_uwb_flag=1;//开启震动 if(need_open_gps_count>=20) { + if(!flag_alam_state) + { + flag_alam_state = 1; + _4GAlarmUpload(1); + } gps_uwb_flag=1;//开启gps测距流程 need_open_gps_count=0; } } } else if(anchordata_num==0) { - + if(!flag_alam_state) + { + flag_alam_state = 1; + _4GAlarmUpload(1); + } + distance = -1; gps_uwb_flag=1;//开启gps测距流程 moter_open_uwb_flag=1;//开启震动 need_open_gps_count=0; } } } -void SecondTask(void) +void MinuteTask(void) { + adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样 +} +void SecondTask(void) +{static uint8_t second_count; + if(second_count++>60) + { + second_count = 0; + MinuteTask(); + } //UWB更新列表 TagListUpdate(); - GPS_Poll(); - g_com_map[ALARM_DISTANCE1]=30;//测试 - g_com_map[ALARM_DISTANCE2]=40; + //GPS_Poll(); + gps_power_state=1;//测试gps长开 //UWB状态检测 if(IfTCPConnected()) @@ -250,7 +283,10 @@ { IO_control_init(); UWBPoll(); - // MotorPoll(); + + + MotorPoll(); + if(secondtask_count++%2==0) { flag_secondtask = 1; @@ -261,18 +297,23 @@ flag_sleeptimer = 1; //马达震动逻辑 - if(motor_open_air_flag||moter_open_uwb_flag) + if(g_com_map[MOTOR_ENABLE]) { - if (motor_count++%2==0) - { - motor_power_state = 1; - }else{ - motor_power_state = 0; - } - } else { + if(motor_open_air_flag||moter_open_uwb_flag) + { + if (motor_count++%2==0) + { + motor_power_state = 1; + }else{ + motor_power_state = 0; + } + } else { + motor_power_state=1; + } + }else{ motor_power_state=1; } - + //GPS工作逻辑 } @@ -291,6 +332,8 @@ // flag_4G_recdata = 1; // AIR780EUartInit(); } +extern uint16_t ip0,ip1,ip2,ip3,port; +extern uint8_t gps_4g_flag; void Program_Init(void) { Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理,UsartParseDataHandler为升级处理当调试时候改为 @@ -299,21 +342,33 @@ group_id=g_com_map[GROUP_ID];//组ID tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间 memcpy(&disoffset,&g_com_map[DIST_OFFSET],2); - g_com_map[ALARM_DISTANCE1] = 40; - g_com_map[ALARM_DISTANCE2] = 40; +// g_com_map[ALARM_DISTANCE1] = 40; +// g_com_map[ALARM_DISTANCE2] = 40; warning_distance=g_com_map[ALARM_DISTANCE1]; prewarning_distance=g_com_map[ALARM_DISTANCE2]; send_struct.warnDistence=warning_distance; send_struct.alarmDistence=prewarning_distance;//更新报警距离 memcpy(&send_struct.gunLableId,&g_com_map[BIND_DEV_ID],2);//更新绑定ID send_struct.tagId=dev_id;//更新设备ID - g_com_map[BIND_DEV_ID] = 0x1234; + if(g_com_map[BIND_DEV_ID]==0) { UWB_work_state = UN_BIND; }else{ UWB_work_state = SEARCH_DEV; } + if(g_com_map[SEND_4G_SECOND]<60) + g_com_map[SEND_4G_SECOND]=60; + g_com_map[MODBUS_MODE] = 0; + ip0 = (g_com_map[TCP_IP_0]>>12&0xf)*1000+(g_com_map[TCP_IP_0]>>8&0xf)*100+(g_com_map[TCP_IP_0]>>4&0xf)*10+(g_com_map[TCP_IP_0]&0xf); + ip1 = (g_com_map[TCP_IP_1]>>12&0xf)*1000+(g_com_map[TCP_IP_1]>>8&0xf)*100+(g_com_map[TCP_IP_1]>>4&0xf)*10+(g_com_map[TCP_IP_1]&0xf); + ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf); + ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf); + port = g_com_map[TCP_PORT]; + g_com_map[VERSION] = (1<<8)|11; + LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id); + LOG_INFO(TRACE_MODULE_APP,"固件版本:UWB-4G手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff); + LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port); } @@ -328,8 +383,8 @@ state5v=1; state5V_prase_flag=state5v; gps_prase_flag=0;//解除gps解析 - uart1_change_from_gps_to_debug(); - uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma + uart1_change_from_gps_to_debug();//测试 + // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma //UartInit(); } @@ -337,11 +392,12 @@ } else { if(state5v==1) { + g_com_map[MODBUS_MODE] = 0; state5v=0; state5V_prase_flag=state5v; gps_prase_flag=1;//恢复gps解析 - uart1_change_from_debug_to_gps(); - uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma + uart1_change_from_debug_to_gps();//测试 + // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma //UartDeinit(); } } @@ -368,123 +424,294 @@ first_search_flag=1; } } - +void boot_deinit(void) +{ + //将boot中串口返回普通gpio +// UART0 TX/RX + io_pin_mux_set(IO_PIN_5, IO_FUNC0); + io_pin_mux_set(IO_PIN_6, IO_FUNC0); + // UART1 RX/TX + io_pin_mux_set(IO_PIN_10, IO_FUNC0); + io_pin_mux_set(IO_PIN_9, IO_FUNC0); + uart_close(UART_ID1);//解绑原来串口1 + uart_close(UART_ID0);//解绑原来串口0 +} +#define TEST_SPI_MASTER 0 +#define TEST_SPI_POLL_MODE 0 +#define TEST_SPI_INTERUPT_MODE 1 +#define TEST_SPI_DMA_MODE 2 +#define TEST_SPI_MODE TEST_SPI_POLL_MODE +void spi_gpio_init() +{ + // SPI0 MOSI/MISO/CLK/CS + io_pin_mux_set(LORA_CS, IO_FUNC0); + gpio_pin_set_dir(LORA_CS , GPIO_DIR_OUT, 0); + io_pull_set(LORA_CS, IO_HIGH_Z, IO_PULL_UP_NONE); + + io_pin_mux_set(LORA_MOSI, IO_FUNC2); + io_pin_mux_set(LORA_MISO, IO_FUNC2); + io_pin_mux_set(LORA_CLK, IO_FUNC2); + io_pin_mux_set(LORA_DIO, IO_FUNC0);//spi中断 +} +void spi_init() +{ + struct SPI_CFG_T usr_spi_cfg = + { + .bit_rate = 1000000, + .data_bits = 8, +//#if TEST_SPI_MASTER + .slave = 0, +//#else +// .slave = 1, +//#endif + .clk_phase = 0, + .clk_polarity = 0, + .ti_mode = 0, +//#if (TEST_SPI_MODE == TEST_SPI_POLL_MODE) + .dma_rx = false, + .dma_tx = false, + .int_rx = false, + .int_tx = false, +//#elif (TEST_SPI_MODE == TEST_SPI_INTERUPT_MODE) +// .dma_rx = false, +// .dma_tx = false, +// .int_rx = true, +// .int_tx = true, +//#elif (TEST_SPI_MODE == TEST_SPI_DMA_MODE) +// .dma_rx = true, +// .dma_tx = true, +// .int_rx = false, +// .int_tx = false, +//#endif + }; + + spi_open(SPI_ID0, &usr_spi_cfg); +} +uint8_t ceshi; +uint32_t error_cnt=0; +uint32_t successful_cnt=0; uint8_t flag_4guart_needinit=0; +#define TX_LEN 10 +uint8_t tx_test_buf[TX_LEN] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; +extern struct RxDoneMsg RxDoneParams; +static void Lora_irq_handler(enum IO_PIN_T pin) +{ + ceshi++; + rf_irq_process(); + if(rf_get_transmit_flag() == RADIO_FLAG_TXDONE) + { + rf_set_transmit_flag(RADIO_FLAG_IDLE); + rf_enter_continous_rx(); +// rf_delay_ms(1000); +// if(rf_continous_tx_send_data(tx_test_buf, TX_LEN) != OK) +// { +//// rf_enter_continous_rx(); +// } +// else +// { +// error_cnt ++; +// } + } + if(rf_get_recv_flag() == RADIO_FLAG_RXDONE) + { + rf_set_recv_flag(RADIO_FLAG_IDLE); +// DDL_Printf("Rx : SNR: %f ,RSSI: %d \r\n", RxDoneParams.Snr, RxDoneParams.Rssi); + int i=0; +// for(i = 0; i < RxDoneParams.Size; i++) +// { +// printf("0x%02x ", RxDoneParams.Payload[i]); +// } + error_cnt ++; + } + if((rf_get_recv_flag() == RADIO_FLAG_RXTIMEOUT) || (rf_get_recv_flag() == RADIO_FLAG_RXERR)) + { + rf_set_recv_flag(RADIO_FLAG_IDLE); + } +} +void Board_LORA_NVIC_Init(GPIO_IRQ_HANDLER_T irq_handler) //LORA 中断配置 +{ +// io_pin_mux_set(_4G_USART_RX_Pin,IO_FUNC0);//把原先io 变为普通GPIO + gpio_pin_set_dir(LORA_DIO , GPIO_DIR_IN, 0); + io_pull_set(LORA_DIO, IO_HIGH_Z, IO_PULL_UP_NONE); + gpio_enable_irq(LORA_DIO, GPIO_IRQ_TYPE_RISING_EDGE, irq_handler); +} +uint8_t io14_state; int main(void) { board_clock_run(); - board_pins_config(); - board_debug_console_open(TRACE_PORT_UART0); +// boot_deinit(); +// board_pins_config(); + board_debug_console_open(TRACE_PORT_UART1); // Reset reason reset_cause_get(); reset_cause_clear(); - + // Load calibration parameters from NVM - uint32_t internal_flash = (REG_READ(0x40000018) >> 17) & 0x1; - uint32_t external_flash = (REG_READ(0x40010030) >> 28) & 0x3; - if (internal_flash || external_flash == 1) - { - WsfNvmInit(); - board_calibration_params_load(); - flash_close(FLASH_ID0); - } - else - { - board_calibration_params_default(); - } - +// uint32_t internal_flash = (REG_READ(0x40000018) >> 17) & 0x1; +// uint32_t external_flash = (REG_READ(0x40010030) >> 28) & 0x3; +// if (internal_flash || external_flash == 1) +// { +// WsfNvmInit(); +// board_calibration_params_load(); +// flash_close(FLASH_ID0); +// } +// else +// { +// board_calibration_params_default(); +// } + // Chip calibration calib_chip(); // Disable watchdog timer wdt_close(WDT_ID0); - // LOG_INFO(TRACE_MODULE_APP, "UWB simple example\r\n"); +// LOG_INFO(TRACE_MODULE_APP, "UWB simple example\r\n"); // open system timer //sys_timer_open(); - // TODO 4G - Uart_Register(UART_ID_4G, UART_ID0); - Internet_Init(); - TCPClient_Init(); +// // TODO 4G +// Uart_Register(UART_ID_4G, UART_ID0); +// Internet_Init(); +// TCPClient_Init(); gpio_open(); + + spi_gpio_init(); //board_led_init(); -// adc_open(&usr_adc_cfg); - IIC2_Init(); - Accelerometer_Init(); - IO_control_init(); - io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形 - gpio_pin_set_dir(SCL_PIN , GPIO_DIR_OUT, 0); - io_pull_set(SCL_PIN , IO_PULL_DOWN, IO_PULL_UP_LEVEL4); - gps_air780_power_change(1,1);//开启gps,4G -//加速度计初始化必须在IO_control_init之前因为复用SDA引脚 - adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样 - uart_open(UART_ID1, &test_uart_cfg); - Program_Init(); - uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); -// Initialize low power mode - power_init(); - // LOG_INFO(TRACE_MODULE_APP, "测试数据"); - + spi_init(); + Board_LORA_NVIC_Init(Lora_irq_handler); + Lora_init(); + rf_set_default_para(); + + rf_enter_continous_tx(); +// rf_set_transmit_flag(RADIO_FLAG_TXDONE); +// rf_set_transmit_flag(RADIO_FLAG_TXDONE); + if(rf_continous_tx_send_data(tx_test_buf, TX_LEN) != 0) + { + error_cnt++; + } + else + { + successful_cnt ++; + } +// while (rf_get_transmit_flag() == RADIO_FLAG_IDLE) ; +// +// rf_set_transmit_flag(RADIO_FLAG_IDLE); + +// adc_open(&usr_adc_cfg); +// IIC2_Init(); +// Accelerometer_Init(); +// IO_control_init(); +// io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形 +// gpio_pin_set_dir(SCL_PIN , GPIO_DIR_OUT, 0); +// io_pull_set(SCL_PIN , IO_PULL_DOWN, IO_PULL_UP_LEVEL4); +// gps_air780_power_change(0,1);//开启gps,4G +////加速度计初始化必须在IO_control_init之前因为复用SDA引脚 +// adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样 +// Program_Init(); +// uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); +// +//// Initialize low power mode +// power_init(); +// AIR780E_Reset(); //4G模块重启,耗时1.5秒,这个是无法同步的关键 +// sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback); - sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback); - //sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试 - sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试 - board_5V_input_init(voltage_input_handler); - board_acceleration_detection_init(move_handler); -// LOG_INFO(TRACE_MODULE_APP, "测试进入app"); - //AIR780E_Reset(); //4G模块重启,耗时1.5秒,这个是无法同步的关键 +// sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试 + +// board_acceleration_detection_init(move_handler); + + + while (1) { - if(flag_TCP_reconnectting||IfTCPConnected()) - { - // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n"); - if(flag_4guart_needinit) +// rf_irq_process(); +// if(rf_get_transmit_flag() == RADIO_FLAG_TXDONE) +// { +// rf_set_transmit_flag(RADIO_FLAG_IDLE); +// rf_delay_ms(1000); +// if(rf_continous_tx_send_data(tx_test_buf, TX_LEN) != 0) +// { +// error_cnt++; +// } +// else +// { +// successful_cnt ++; +//// DDL_Printf("Tx cnt %d\r\n", cnt ); +// } +// } + + +// + +// io14_state=gpio_pin_get_val(LORA_DIO); + rf_set_transmit_flag(RADIO_FLAG_IDLE); + rf_delay_ms(1000); + rf_enter_continous_tx(); +// rf_set_transmit_flag(RADIO_FLAG_TXDONE); + if(rf_continous_tx_send_data(tx_test_buf, TX_LEN) != OK) { - flag_4guart_needinit = 0; - AIR780EUartInit(); +// rf_enter_continous_rx(); } - Internet_Poll(); - HIDO_ATLitePoll(); - HIDO_TimerPoll(); - TCPClient_Poll(); - } - if(flag_secondtask) - { - flag_secondtask = 0; - SecondTask(); - } - IdleTask(); - //3种情况后都要发包和休眠 - //if(send_flag){ - //message_construct(); - //send_udp; - //air780_success_state=0;//关闭4G成功发送灯 - //blink_led(&air780_success_state);//成功测距闪烁4G状态灯 - //air780_success_state=0; - //} -#ifndef DEBUG_MODE -//if(flag_sleeptimer) - // if(!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())&&!flag_4G_recdata) //进入休眠条件(与关系,全满足才进):1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。 - { - // if(!flag_4guart_needinit) + else { - // LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n"); - // board_4GUsart_detection_init(_4gUsart_handler); -// + successful_cnt ++; } +// while (rf_get_transmit_flag() == RADIO_FLAG_IDLE) ; +// +// rf_set_transmit_flag(RADIO_FLAG_IDLE); + +// if(flag_TCP_reconnectting||IfTCPConnected()) +// { +// +// // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n"); +// air780_led_on(); +// if(flag_4guart_needinit) +// { +// flag_4guart_needinit = 0; +// AIR780EUartInit(); +// } +// Internet_Poll(); +// HIDO_ATLitePoll(); +// HIDO_TimerPoll(); +// TCPClient_Poll(); +// air780_led_off(); +// } +// if(flag_secondtask) +// { +// flag_secondtask = 0; +// SecondTask(); +// } +// IdleTask(); +// //3种情况后都要发包和休眠 +// //if(send_flag){ +// //message_construct(); +// //send_udp; +// //air780_success_state=0;//关闭4G成功发送灯 +// //blink_led(&air780_success_state);//成功测距闪烁4G状态灯 +// //air780_success_state=0; +// //} +//#ifndef DEBUG_MODE +////if(flag_sleeptimer) +// if(!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件(与关系,全满足才进):1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。 +// { +// if(!flag_4guart_needinit) +// { +// LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n"); +// board_4GUsart_detection_init(_4gUsart_handler); + +// } // flag_sleeptimer =0; // LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n"); - // flag_4guart_needinit = 1; -// +// flag_4guart_needinit = 1; + // trace_flush(); // uint32_t lock = int_lock(); // //LOG_INFO(TRACE_MODULE_APP, "进入低功耗"); // power_enter_power_down_mode(0); // int_unlock(lock); - } -#endif +// } +//#endif } } -- Gitblit v1.9.3