修复Yoda条件(常量右置)与函数定义括号同行
- net_select.c/net_socket.c 共 62 处 Yoda 条件改为常量在右(规范 6.3.1) - 11 个文件 58 处函数定义左大括号由换行改为与右括号同行(规范 4.4.2)
This commit is contained in:
@@ -40,8 +40,7 @@ rs485_handle_t g_rs485;
|
||||
void rs485_init(rs485_handle_t *p_handle,
|
||||
UART_HandleTypeDef *p_huart,
|
||||
GPIO_TypeDef *p_dir_port,
|
||||
uint16_t dir_pin)
|
||||
{
|
||||
uint16_t dir_pin) {
|
||||
p_handle->huart = p_huart;
|
||||
p_handle->dir_port = p_dir_port;
|
||||
p_handle->dir_pin = dir_pin;
|
||||
@@ -71,8 +70,7 @@ void rs485_init(rs485_handle_t *p_handle,
|
||||
HAL_StatusTypeDef rs485_transmit(rs485_handle_t *p_handle,
|
||||
const uint8_t *p_data,
|
||||
uint16_t len,
|
||||
uint32_t timeout)
|
||||
{
|
||||
uint32_t timeout) {
|
||||
HAL_StatusTypeDef status = HAL_OK;
|
||||
|
||||
if (timeout == 0U) {
|
||||
@@ -106,8 +104,7 @@ HAL_StatusTypeDef rs485_transmit(rs485_handle_t *p_handle,
|
||||
* HAL 自动调用 HAL_UARTEx_RxEventCallback 并返回已接收字节数。
|
||||
* 用户须在回调中重新调用本函数重新开启接收。
|
||||
*/
|
||||
HAL_StatusTypeDef rs485_receive_start(rs485_handle_t *p_handle)
|
||||
{
|
||||
HAL_StatusTypeDef rs485_receive_start(rs485_handle_t *p_handle) {
|
||||
p_handle->rx_size = 0;
|
||||
return HAL_UARTEx_ReceiveToIdle_IT(p_handle->huart, p_handle->rx_buf, RS485_RX_BUF_SIZE);
|
||||
}
|
||||
@@ -120,8 +117,7 @@ HAL_StatusTypeDef rs485_receive_start(rs485_handle_t *p_handle)
|
||||
* 限定条件:须在 HAL_UARTEx_RxEventCallback 中调用
|
||||
* 函数说明:将 HAL 回调中接收到的数据大小回写到句柄的 rx_size 字段
|
||||
*/
|
||||
void rs485_rx_set_size(rs485_handle_t *p_handle, uint16_t size)
|
||||
{
|
||||
void rs485_rx_set_size(rs485_handle_t *p_handle, uint16_t size) {
|
||||
p_handle->rx_size = size;
|
||||
}
|
||||
|
||||
@@ -132,8 +128,7 @@ void rs485_rx_set_size(rs485_handle_t *p_handle, uint16_t size)
|
||||
* 限定条件:须在 HAL_UARTEx_RxEventCallback 触发后调用
|
||||
* 函数说明:获取 rx_size 字段中缓存的接收字节数
|
||||
*/
|
||||
uint16_t rs485_rx_get_size(const rs485_handle_t *p_handle)
|
||||
{
|
||||
uint16_t rs485_rx_get_size(const rs485_handle_t *p_handle) {
|
||||
return p_handle->rx_size;
|
||||
}
|
||||
|
||||
@@ -143,8 +138,7 @@ uint16_t rs485_rx_get_size(const rs485_handle_t *p_handle)
|
||||
* 应用层接收钩子默认实现(弱符号,可被应用重定义)。
|
||||
* 在中断上下文调用,仅做占位,业务解析由应用提供。
|
||||
*/
|
||||
__weak void rs485_on_rx(uint8_t *buf, uint16_t size)
|
||||
{
|
||||
__weak void rs485_on_rx(uint8_t *buf, uint16_t size) {
|
||||
(void)buf;
|
||||
(void)size;
|
||||
}
|
||||
@@ -154,8 +148,7 @@ __weak void rs485_on_rx(uint8_t *buf, uint16_t size)
|
||||
* 当 RS-485 总线空闲超过 1 个字符时间后触发,由 HAL 自动调用。
|
||||
* 注意:回调按实例分发,仅处理本驱动绑定的 UART,不写死 UART5。
|
||||
*/
|
||||
void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
|
||||
{
|
||||
void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size) {
|
||||
if (huart == g_rs485.huart) {
|
||||
rs485_rx_set_size(&g_rs485, Size);
|
||||
|
||||
@@ -171,8 +164,7 @@ void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
|
||||
* HAL UART 错误回调(ORE/NE/FE/PE 等)。
|
||||
* 读 SR + DR 清除错误标志后重新开启接收,避免中断锁死。
|
||||
*/
|
||||
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
|
||||
{
|
||||
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
|
||||
if (huart == g_rs485.huart) {
|
||||
/* STM32F4 通过读 SR + DR 清除 ORE/NE/FE/PE 错误标志 */
|
||||
(void)huart->Instance->SR;
|
||||
|
||||
Reference in New Issue
Block a user