From 85e6dfae17cdbc86a7a5e34fc90ef338d1680051 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 29 Apr 2024 16:07:49 +0800 Subject: [PATCH] V2 --- Core/Src/iwdg.c | 2 +- Core/Src/usart.c | 2 +- dbdb_power_control_mini_board.ioc | 7 ++++--- usrc/base/hardware.cpp | 1 + usrc/project_configs.h | 4 ++-- usrc/protocol_impl/protocol_impl_service.cpp | 8 ++++---- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Core/Src/iwdg.c b/Core/Src/iwdg.c index 9e087f9..cfa1094 100644 --- a/Core/Src/iwdg.c +++ b/Core/Src/iwdg.c @@ -39,7 +39,7 @@ void MX_IWDG_Init(void) /* USER CODE END IWDG_Init 1 */ hiwdg.Instance = IWDG; hiwdg.Init.Prescaler = IWDG_PRESCALER_256; - hiwdg.Init.Reload = 500; + hiwdg.Init.Reload = 501; if (HAL_IWDG_Init(&hiwdg) != HAL_OK) { Error_Handler(); diff --git a/Core/Src/usart.c b/Core/Src/usart.c index 6a8cdfd..e7b3bfc 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -74,7 +74,7 @@ void MX_USART2_UART_Init(void) /* USER CODE END USART2_Init 1 */ huart2.Instance = USART2; - huart2.Init.BaudRate = 115200; + huart2.Init.BaudRate = 19200; huart2.Init.WordLength = UART_WORDLENGTH_8B; huart2.Init.StopBits = UART_STOPBITS_1; huart2.Init.Parity = UART_PARITY_NONE; diff --git a/dbdb_power_control_mini_board.ioc b/dbdb_power_control_mini_board.ioc index c996f69..de2eb25 100644 --- a/dbdb_power_control_mini_board.ioc +++ b/dbdb_power_control_mini_board.ioc @@ -89,7 +89,7 @@ File.Version=6 GPIO.groupedBy=Group By Peripherals IWDG.IPParameters=Prescaler,Reload IWDG.Prescaler=IWDG_PRESCALER_256 -IWDG.Reload=500 +IWDG.Reload=501 KeepUserPlacement=false Mcu.CPN=STM32F407VET6 Mcu.Family=STM32F4 @@ -274,7 +274,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=true -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_CRC_Init-CRC-false-HAL-true,7-MX_RNG_Init-RNG-false-HAL-true,8-MX_TIM7_Init-TIM7-false-HAL-true,9-MX_TIM6_Init-TIM6-false-HAL-true,10-MX_TIM1_Init-TIM1-false-HAL-true,11-MX_USART3_UART_Init-USART3-false-HAL-true,12-MX_CAN1_Init-CAN1-false-HAL-true,13-MX_SPI1_Init-SPI1-false-HAL-true,14-MX_ADC1_Init-ADC1-false-HAL-true,15-MX_USART2_UART_Init-USART2-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_CRC_Init-CRC-false-HAL-true,7-MX_RNG_Init-RNG-false-HAL-true,8-MX_TIM7_Init-TIM7-false-HAL-true,9-MX_TIM6_Init-TIM6-false-HAL-true,10-MX_TIM1_Init-TIM1-false-HAL-true,11-MX_USART3_UART_Init-USART3-false-HAL-true,12-MX_CAN1_Init-CAN1-false-HAL-true,13-MX_SPI1_Init-SPI1-false-HAL-true,14-MX_ADC1_Init-ADC1-false-HAL-true,15-MX_USART2_UART_Init-USART2-false-HAL-true,16-MX_IWDG_Init-IWDG-false-HAL-true RCC.48MHZClocksFreq_Value=48000000 RCC.AHBFreq_Value=144000000 RCC.APB1CLKDivider=RCC_HCLK_DIV4 @@ -353,7 +353,8 @@ TIM7.Prescaler=81 USART1.BaudRate=460800 USART1.IPParameters=VirtualMode,BaudRate USART1.VirtualMode=VM_ASYNC -USART2.IPParameters=VirtualMode +USART2.BaudRate=19200 +USART2.IPParameters=VirtualMode,BaudRate USART2.VirtualMode=VM_ASYNC USART3.BaudRate=9600 USART3.IPParameters=VirtualMode,BaudRate diff --git a/usrc/base/hardware.cpp b/usrc/base/hardware.cpp index 1916374..e6f7310 100644 --- a/usrc/base/hardware.cpp +++ b/usrc/base/hardware.cpp @@ -65,6 +65,7 @@ void Hardware::init() { // m_Heater_electricCurrentAdc.initialize(&hadc1, ADC_CHANNEL_0); //暂时注释掉，板子少了一个ADC，该ADC用于H2O2浓度 m_Heater_temperatureAdc.initialize(&hadc1, ADC_CHANNEL_1); // PA0 + ZASSERT(huart2.Init.BaudRate == 19200); m_H2o2Sensor_TempSensorModbusBlockHost.initialize(&huart2); m_H2o2Sensor_H2O2Adc.initialize(&hadc1, ADC_CHANNEL_0); // PA0 m_H2o2Sensor_HMP110.init(&m_H2o2Sensor_TempSensorModbusBlockHost); diff --git a/usrc/project_configs.h b/usrc/project_configs.h index ea93f39..1fe6536 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -11,9 +11,9 @@ */ #define SOFTWARE_VERSION 2 #define HARDWARE_VERSION 1 -#define PROJECT "dbdb_liquid_path_control" +#define PROJECT "dbdb_power_control_mini_board" #define SN_HEADER "SN" -#define DEVICE_ID (kFixBoardId_LiquidCtrl) +#define DEVICE_ID (kFixBoardId_PowerControlMiniBoard) #define DEBUG_UART huart1 // 调试串口 #define DEBUG_LIGHT_GPIO PE8 // 调试指示灯 diff --git a/usrc/protocol_impl/protocol_impl_service.cpp b/usrc/protocol_impl/protocol_impl_service.cpp index 9bdc2fb..1b1efa1 100644 --- a/usrc/protocol_impl/protocol_impl_service.cpp +++ b/usrc/protocol_impl/protocol_impl_service.cpp @@ -24,8 +24,8 @@ using namespace iflytop; } #define GET_PARAM(buff, off) ((((int32_t*)(buff))[off])) -#define CLEAR_BIT(val, bit) (val &= ~(1 << bit)) -#define SET_BIT(val, bit) (val |= (1 << bit)) +#define ZCLEAR_BIT(val, bit) (val &= ~(1 << bit)) +#define ZSET_BIT(val, bit) (val |= (1 << bit)) /*********************************************************************************************************************** * VAR_LIST * @@ -95,7 +95,7 @@ static void basic_func_impl(uint8_t from, uint8_t to, uint8_t* rawpacket, size_t } else if (packet->function_id == kcmd_clear_reset_flag) { - CLEAR_BIT(m_dflag, 0); + ZCLEAR_BIT(m_dflag, 0); zcanbus_send_ack(packet, NULL, 0); } // 触发一次强制上报事件 @@ -217,7 +217,7 @@ void protocol_impl_service_init() { // Hardware::ins().init(); ForceReportFlagMgr::ins()->init(); m_dflag = 0x00; - SET_BIT(m_dflag, 0); + ZSET_BIT(m_dflag, 0); zcanbus_init(deviceInfo_getBoardId()); zcanbus_reglistener(zcanbus_on_rx);