From 6702703031188db8ed1a4cf01ccc842ad6d0ee96 Mon Sep 17 00:00:00 2001 From: yelvlab Date: Wed, 25 Dec 2024 00:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BE=8E=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/i2c.h | 8 ++++++++ inc/ldc1612.h | 1 + inc/led.h | 4 ++++ inc/rs485.h | 11 +++++++++-- inc/tmp112.h | 4 ++++ src/rs485.c | 12 ------------ 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/inc/i2c.h b/inc/i2c.h index d285e4c..db43602 100644 --- a/inc/i2c.h +++ b/inc/i2c.h @@ -14,6 +14,8 @@ #include #include +/******************************************************************************/ + #define I2C_SPEED 20000 #define RCU_GPIO_I2C RCU_GPIOF #define RCU_I2C RCU_I2C0 @@ -23,11 +25,15 @@ #define I2C_SDA_PIN GPIO_PIN_0 #define I2C_GPIO_AF GPIO_AF_1 +/******************************************************************************/ + #define I2C_TIME_OUT (uint16_t)(10000) #define I2C_OK 1 #define I2C_FAIL 0 #define I2C_END 1 +/******************************************************************************/ + typedef enum { I2C_START = 0, I2C_SEND_ADDRESS, @@ -36,6 +42,8 @@ typedef enum { I2C_STOP } i2c_process_enum; +/******************************************************************************/ + void i2c_gpio_config(void); void i2c_config(void); diff --git a/inc/ldc1612.h b/inc/ldc1612.h index 595020d..6722785 100644 --- a/inc/ldc1612.h +++ b/inc/ldc1612.h @@ -19,6 +19,7 @@ /*Register Rddr*/ /***************************************************************************/ + #define CONVERTION_RESULT_REG_START 0X00 #define SET_CONVERSION_TIME_REG_START 0X08 #define SET_CONVERSION_OFFSET_REG_START 0X0C diff --git a/inc/led.h b/inc/led.h index 09f9b26..b3fb0c9 100644 --- a/inc/led.h +++ b/inc/led.h @@ -14,6 +14,8 @@ #include #include +/******************************************************************************/ + #define LED_PORT GPIOA #define LED_PIN GPIO_PIN_7 #define LED_RCU RCU_GPIOA @@ -21,6 +23,8 @@ #define LED_TIMER TIMER16 #define LED_IRQ TIMER16_IRQn +/******************************************************************************/ + void led_config(void); #endif //LED_H diff --git a/inc/rs485.h b/inc/rs485.h index 1607e48..b24f233 100644 --- a/inc/rs485.h +++ b/inc/rs485.h @@ -14,6 +14,8 @@ #include #include +/******************************************************************************/ + #define RS485_RCU RCU_USART0 #define RS485_GPIO_RCU RCU_GPIOA #define RS485_GPIO_PORT GPIOA @@ -21,15 +23,18 @@ #define RS485_RX_PIN GPIO_PIN_3 #define RS485_PHY USART0 #define RS485_BAUDRATE 115200U - #define RS485_EN_PIN GPIO_PIN_1 -#define RX_BUFFER_SIZE 32 +/******************************************************************************/ + +#define RX_BUFFER_SIZE 32 #define LDC1612_PACKAGE_HEADER 0xD5 #define LDC1612_BOARD_TYPE 0x03 #define LDC1612_PACKAGE_LENGTH 0x02 +/******************************************************************************/ + typedef enum { VALIDATION_SUCCESS = 0, @@ -39,6 +44,8 @@ typedef enum VALIDATION_LENGTH_ERROR = 8 } validation_result_t; +/******************************************************************************/ + void rs485_config(void); void process_command(uint8_t* cmd, size_t length); uint8_t calculate_crc(uint8_t data[], uint8_t data_length); diff --git a/inc/tmp112.h b/inc/tmp112.h index 4a09b66..659a3d6 100644 --- a/inc/tmp112.h +++ b/inc/tmp112.h @@ -15,8 +15,12 @@ #include #include "i2c.h" +/******************************************************************************/ + #define TMP112A_ADDR (0x49 << 1) +/******************************************************************************/ + uint32_t tmp112a_get_raw_channel_result(void); #endif //TMP112_H diff --git a/src/rs485.c b/src/rs485.c index d0fd84b..2033c77 100644 --- a/src/rs485.c +++ b/src/rs485.c @@ -89,8 +89,6 @@ uint8_t calculate_crc(uint8_t data[], uint8_t data_length) { uint8_t crc = 0; - // printf("%d", data_length); - for (uint8_t i = 1; i < data_length - 1; i++) { crc += data[i]; @@ -107,7 +105,6 @@ validation_result_t validate_package_crc(uint8_t* data, uint8_t data_length) } else { - // printf("%c%c%c%c", 0xB5, 0xF3, 0x00, 0xF3); return VALIDATION_CRC_ERROR; } } @@ -120,7 +117,6 @@ validation_result_t validate_package_header(uint8_t* data) } else { - // printf("%c%c%c%c", 0xB5, 0xF3, 0x00, 0xF3); return VALIDATION_HEADER_ERROR; } } @@ -133,7 +129,6 @@ validation_result_t validate_package_type(uint8_t* data) } else { - // printf("%c%c%c%c", 0xB5, 0xF3, 0x00, 0xF3); return VALIDATION_TYPE_ERROR; } } @@ -146,15 +141,12 @@ validation_result_t validate_data_length(uint8_t* data) } else { - // printf("%c%c%c%c", 0xB5, 0xF3, 0x00, 0xF3); return VALIDATION_LENGTH_ERROR; } } void eddy_current_value_report(void) { - // package_header[1] = 0xF0; //eddy current - package_data[0] = (g_eddy_current_value_uint32 >> 24) & 0xFF; package_data[1] = (g_eddy_current_value_uint32 >> 16) & 0xFF; package_data[2] = (g_eddy_current_value_uint32 >> 8) & 0xFF; @@ -164,7 +156,6 @@ void eddy_current_value_report(void) memcpy(combined_data, package_header, 3); memcpy(combined_data + 3, package_data, 4); - // printf("EddyCurrent: %x\r\n", g_eddy_current_value_uint32); printf("%c%c%c", package_header[0], package_header[1], package_header[2]); printf("%c%c%c%c", package_data[0], package_data[1], package_data[2], package_data[3]); printf("%c", calculate_crc(combined_data, 7)); @@ -172,8 +163,6 @@ void eddy_current_value_report(void) void tempture_value_report(void) { - // package_header[1] = 0xF1; //temperature - package_data[0] = (g_temperature_uint32 >> 24) & 0xFF; package_data[1] = (g_temperature_uint32 >> 16) & 0xFF; package_data[2] = (g_temperature_uint32 >> 8) & 0xFF; @@ -183,7 +172,6 @@ void tempture_value_report(void) memcpy(combined_data, package_header, 3); memcpy(combined_data + 3, package_data, 4); - // printf("Temperature: %x\r\n", g_temperature_uint32); printf("%c%c%c", package_header[0], package_header[1], package_header[2]); printf("%c%c%c%c", package_data[0], package_data[1], package_data[2], package_data[3]); printf("%c", calculate_crc(combined_data, 7));