From e8fae59212dd962e2f13137f53d70bd1625891fb Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期五, 28 二月 2025 13:56:50 +0800 Subject: [PATCH] 修改串口蓝牙转发 --- keil/include/main/main.c | 142 +++++++++++++++-------------------------------- 1 files changed, 45 insertions(+), 97 deletions(-) diff --git a/keil/include/main/main.c b/keil/include/main/main.c index de4d716..ffe4fed 100644 --- a/keil/include/main/main.c +++ b/keil/include/main/main.c @@ -353,18 +353,13 @@ { lora_tx_flag++; } -uint8_t DMA_RXBuf_BT[200]={0}; + void uart0_receive_callback() { - uint8_t buff[200]={0}; - memcpy(buff,m_EUART_DMA_RXBuf,100); - if(buff[0]==0x55||buff[1]==0xAA||buff[2]==0x41) - { - uint8_t lenth=0; - lenth=((buff[4]*2)+(buff[4]*2)+1); - memcpy(DMA_RXBuf_BT,&buff[4],lenth); - } + uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart0_receive_callback); } + + static void voltage_input_handler(enum IO_PIN_T pin) { @@ -383,7 +378,7 @@ { Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理,UsartParseDataHandler为升级处理当调试时候改为 parameter_init_anchor();//g_com_map表初始化角色默认为基站 - g_com_map[DEV_ID]=0x1234; + g_com_map[DEV_ID]=0x1131; // g_com_map[GROUP_ID]=1; dev_id=g_com_map[DEV_ID];//这里不太对 group_id=g_com_map[GROUP_ID];//组ID @@ -414,42 +409,19 @@ 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,"固件版本:BGK-mk+蓝牙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); } void IdleTask(void) -{ - if(gpio_pin_get_val(INPUT_5V_Pin)) - { - - if(state5v==0) - { - 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 - //UartInit(); - } - - //UART_CheckSend(); - } 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 - //UartDeinit(); - } - } - UART_CheckReceive(); +{ +// BT_LED_ON; + UART0_CheckReceive(); +// BT_LED_OFF; } + int bind_check(void) { if(g_com_map[BIND_DEV_ID]!=0x00) @@ -499,14 +471,10 @@ #define TEST_SPI_INTERUPT_MODE 1 #define TEST_SPI_DMA_MODE 2 #define TEST_SPI_MODE TEST_SPI_POLL_MODE -//#define ADC_PIN IO_PIN_0 -//#define UART0_TX IO_PIN_5 -//#define UART0_RX IO_PIN_6 -//#define UART1_TX IO_PIN_1 -//#define UART1_RX + void Board_gpio_init() { - // SPI0 MOSI/MISO/CLK/CS + //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); @@ -516,27 +484,21 @@ io_pin_mux_set(LORA_CLK, IO_FUNC2); io_pin_mux_set(LORA_DIO, IO_FUNC0); -// io_pin_mux_set(LORA_DIO, IO_FUNC0); -// gpio_pin_set_dir(LORA_DIO , GPIO_DIR_OUT, 0); -// io_pull_set(LORA_DIO, IO_HIGH_Z, IO_PULL_UP_NONE); - - -// io_pin_mux_set(LORA_CS2, IO_FUNC0); -// gpio_pin_set_dir(LORA_CS2 , GPIO_DIR_OUT, 0); -// io_pull_set(LORA_CS2, IO_HIGH_Z, IO_PULL_UP_NONE); // //ADC // io_pin_mux_set(ADC_PIN, IO_FUNC1); // io_pull_set(ADC_PIN, IO_HIGH_Z, IO_PULL_UP_NONE); -// //串口0 -// io_pin_mux_set(UART0_RX, IO_FUNC4); -// io_pin_mux_set(UART0_TX, IO_FUNC4); -// board_debug_console_open(TRACE_PORT_UART0); -// uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart0_receive_callback);//开启dma -// -// //串口1 -// io_pin_mux_set(UART1_RX, IO_FUNC4); -// io_pin_mux_set(UART1_TX, IO_FUNC4); + + //串口0 + io_pin_mux_set(UART0_RX, IO_FUNC4); + io_pin_mux_set(UART0_TX, IO_FUNC4); + + board_debug_console_open(TRACE_PORT_UART0); + uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart0_receive_callback);//开启dma + + //串口1 + io_pin_mux_set(UART1_RX, IO_FUNC4); + io_pin_mux_set(UART1_TX, IO_FUNC4); } void spi_init() { @@ -578,7 +540,7 @@ uint8_t flag_4guart_needinit=0; #define TX_LEN 10 #define RX_LEN 200 -uint8_t tx_test_buf[TX_LEN] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + extern uint8_t RX_Buffer[RX_LEN]; extern uint16_t BufferSize; static uint16_t source_id; @@ -618,17 +580,13 @@ uint8_t tx_buf[5]={0,1,0,1,1}; uint32_t sleep_time_count=0; uint32_t uwb_ceju_count=0; - -//ceshi -//uint8_t no_rx_flag=0; -//xtal_38m4_off_time(sleep_time_count); /********************************************************************************************************/ static void Lora_irq_handler(enum IO_PIN_T pin) { uint16_t checksum1; rf_irq_process(); -// gpio_pin_set(IO_PIN_5);//测试 + LORA_LED_OFF; no_rx_flag=0; tx_flag=rf_get_transmit_flag(); recv_flag=rf_get_recv_flag(); @@ -642,9 +600,8 @@ if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL) { -// time_flag_lorarx=phy_timer_count_get(); uwb_open(); - //gpio_pin_clr(IO_PIN_5);//测试 + UwbRange(); uwb_ceju_count++; @@ -682,8 +639,6 @@ switch(RX_Buffer[PWTAG_RW_FLAG_IDX]) { case WGRSP_RWTAG_NONE: -// current_count = HAL_LPTIM_ReadCounter(&hlptim1); - // sleep_time_count=xtal_38m4_off_time(); wg_report_freq = RX_Buffer[POLL_FREQ_IDX]+400; memcpy(&rec_delaytime,&RX_Buffer[NEXTPOLL_TIME_IDX],2); if(report_ancnum<2) @@ -695,18 +650,13 @@ rec_secdelay = RX_Buffer[PWTAG_SECDELAY_IDX]; if(BufferSize!=13||rec_secdelay>20) { - rec_secdelay = 0; + rec_secdelay = 0; } - - sleep_time_count = rec_delaytime*3.2768 - delaytime-datalen_offset; - while(sleep_time_count>=32768) - sleep_time_count-=32768; + sleep_time_count = rec_delaytime - delaytime-datalen_offset; + while(sleep_time_count>=1000) + sleep_time_count-=1000; sleep_timer_start(sleep_time_count); - //sleep_timer_start(sleep_time_count);sleep_timer_start(__MS_TO_32K_CNT(1000));//测试 -// #define __MS_TO_32K_CNT(ms) ((uint32_t)((float)(ms)*32768.0f / 1000.0f)) - // __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count); - // rx_count = HAL_LPTIM_ReadCounter(&hlptim1); - // printf("tx %d,rx %d,delay %d",current_count>>5,rx_count>>5,rec_delaytime); + break; case WGRSP_RWTAG_READ: no_rx_flag = 1; @@ -776,7 +726,9 @@ //rf_set_mode(RF_MODE_STB3); rf_set_transmit_flag(RADIO_FLAG_IDLE); Loratx_flag++; + LORA_LED_ON; rf_enter_single_timeout_rx(100); + } if((recv_flag == RADIO_FLAG_RXTIMEOUT)) { @@ -826,7 +778,7 @@ { // 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_LEVEL4); + io_pull_set(LORA_DIO, IO_HIGH_Z, IO_PULL_UP_NONE); gpio_enable_irq(LORA_DIO, GPIO_IRQ_TYPE_RISING_EDGE, irq_handler); } extern uint8_t pca9555writedata_input[10];//暂存输入寄存器所有配置的数组 @@ -843,8 +795,8 @@ int main(void) { board_clock_run(); - // boot_deinit(); - board_debug_console_open(TRACE_PORT_UART1); + // boot_deinit(); + // board_debug_console_open(TRACE_PORT_UART1); // Reset reason reset_cause_get(); reset_cause_clear(); @@ -869,10 +821,10 @@ Board_LORA_NVIC_Init(Lora_irq_handler); Lora_init(); rf_set_default_para(DEFAULT_WG_SET_FREQ,DEFAULT_WG_SET_SF); -// IIC2_Init(); -// Accelerometer_Init(); + IIC2_Init(); + Accelerometer_Init(); //LIS3DH_Data_Init(); -// PCA9555_init(); + PCA9555_init(); // adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样 Program_Init(); @@ -883,7 +835,7 @@ //#endif // rf_single_tx_data(TXBuffer,10,2); -// uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); +// uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart0_receive_callback); // //// Initialize low power mode // power_init(); @@ -894,12 +846,7 @@ -// pca_input_detection_init(pca_handler); -//#ifdef DEBUG_BOXING -// io_pin_mux_set(IO_PIN_5,IO_FUNC0); -// gpio_pin_set_dir(IO_PIN_5,GPIO_DIR_OUT,0); -// io_pull_set(IO_PIN_5,IO_PULL_DOWN,IO_PULL_UP_LEVEL4); -//#endif + Uwbinit(); while (1) @@ -907,8 +854,9 @@ // RED_LED_OFF; // BT_LED_OFF; // // gpio_pin_clr(IO_PIN_5); + Lora_Tx_Poll(); - + IdleTask(); // UwbRange(); // if(flag_TCP_reconnectting||IfTCPConnected()) @@ -932,7 +880,7 @@ // flag_secondtask = 0; // SecondTask(); // } -// IdleTask(); + // //3种情况后都要发包和休眠 // //if(send_flag){ // //message_construct(); -- Gitblit v1.9.3