Merge remote-tracking branch 'origin/feature-ldc1602' into feature-ldc1602

# Conflicts:
#	inc/LDC1612.h
#	src/main.c

inc/LDC1612.h

@@ -58,8 +58,6 @@ typedef enum {
 void I2C_config(void);
 void I2C_scan(void);
 
-int LDC1612_IIC_read_16bits(void);
+int LDC1612_IIC_read_16bits(uint8_t reg, uint16_t *data);
-
-
 
 #endif //LDC1612_H

inc/main.h

@@ -43,7 +43,5 @@ OF SUCH DAMAGE.
 #define LED_IRQ             TIMER16_IRQn
 
 void led_config(void);
-void iicSendData(void);
-void iicReceiveData(void);
 
 #endif /* MAIN_H */

src/LDC1612.c

@@ -4,8 +4,6 @@
 
 #include "LDC1612.h"
 
-
-
 void I2C_config(void) {
     rcu_periph_clock_enable(RCU_IR_GPIO);
     rcu_periph_clock_enable(RCU_I2C);
@@ -26,17 +24,6 @@ void I2C_config(void) {
     i2c_ack_config(I2C0, I2C_ACK_ENABLE);
 }
 
-// void LDC1612_Init(void) {
-//     uint8_t RCOUNT0_ALL[3]={SET_CONVERSION_TIME_REG_START,0x05,0x36};//csdn
-//     uint8_t SETTLECOUNT0_ALL[3]={SET_LC_STABILIZE_REG_START,0x00,0x0a};
-//     uint8_t CLOCK_DIVIDERS0_ALL[3]={SET_FREQ_REG_START,0x10,0x02};
-//     uint8_t ERROR_CONFIG_ALL[3]={ERROR_CONFIG_REG,0x00,0x00};
-//     uint8_t MUX_CONFIG_ALL[3]={MUL_CONFIG_REG,0x82,0x0c};
-//     uint8_t DRIVE_CURRENT0_ALL[3]={SET_DRIVER_CURRENT_REG,0x90,0x00};
-//     uint8_t CONFIG_ALL[3]={SENSOR_CONFIG_REG,0x14,0x01};//csdn
-//
-// }
-
 /**
  * @brief 扫描I2C总线，查找连接的设备
  *
@@ -97,9 +84,7 @@ void I2C_scan(void) {
     }
 }
 
-int LDC1612_IIC_read_16bits(void) {
+int LDC1612_IIC_read_16bits(uint8_t reg, uint16_t *data) {
-    uint8_t data[2] = {0};
-    uint16_t raw_temp = 0;
     uint16_t timeout = 0;
 
     i2c_ack_config(I2C0, I2C_ACK_ENABLE);
@@ -135,13 +120,15 @@ int LDC1612_IIC_read_16bits(void) {
     while (!i2c_flag_get(I2C0, I2C_FLAG_TBE) && (timeout < I2C_TIME_OUT)) //判断地址是否发送完成，然后发送寄存器地址
         timeout++;
     if (timeout < I2C_TIME_OUT) {
-        i2c_data_transmit(I2C0, READ_DEVICE_ID);
+        i2c_data_transmit(I2C0, reg);
         timeout = 0;
         // i2c_start_on_bus(I2C0);
     } else {
         return -4; // 超时返回错误
     }
 
+    delay_us(10);
+
     while (i2c_flag_get(I2C0, I2C_FLAG_BTC) && (timeout < I2C_TIME_OUT)) //判断发送缓冲器是否为空，为空后（发送完毕）重新发送开始信号
         timeout++;
     if (timeout < I2C_TIME_OUT) {
@@ -175,20 +162,20 @@ int LDC1612_IIC_read_16bits(void) {
         timeout++;
     }
     if (timeout < I2C_TIME_OUT) {
-        data[0] = i2c_data_receive(I2C0);
+        *data = i2c_data_receive(I2C0) << 8;
         timeout = 0;
     } else {
         return -8; // 超时返回错误
     }
 
-    // i2c_ack_config(I2C0, I2C_ACK_DISABLE); // 关闭发送ACK，它会在下一个字节完成后发送NAK
+    i2c_ack_config(I2C0, I2C_ACK_DISABLE); // 关闭发送ACK，它会在下一个字节完成后发送NAK
 
     // 读取第二个字节的数据
     while (!i2c_flag_get(I2C0, I2C_FLAG_RBNE) && (timeout < I2C_TIME_OUT)) {
         timeout++;
     }
     if (timeout < I2C_TIME_OUT) {
-        data[1] = i2c_data_receive(I2C0);
+        *data |= i2c_data_receive(I2C0);
         timeout = 0;
     } else {
         return -9; // 超时返回错误
@@ -196,6 +183,6 @@ int LDC1612_IIC_read_16bits(void) {
 
     i2c_stop_on_bus(I2C0);
 
-    printf("device id = %x\r\n", (data[0] <<8 | data[1]));
+    // printf("device id = %x\r\n", (data[0] <<8 | data[1]));
     return 0;
 }

src/main.c

@@ -12,8 +12,7 @@
 #include "RS485.h"
 #include "LDC1612.h"
 
-void led_config(void)
+void led_config(void) {
-{
     rcu_periph_clock_enable(LED_RCU);
 
     gpio_mode_set(LED_PORT, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, LED_PIN);
@@ -40,127 +39,50 @@ void led_config(void)
     nvic_irq_enable(LED_IRQ, 2);
 }
 
-void iicSendData(void)
-{
-    while (i2c_flag_get(I2C0, I2C_FLAG_I2CBSY));
-    i2c_start_on_bus(I2C0);
-    printf("1\r\n");
-    while (!i2c_flag_get(I2C0, I2C_FLAG_SBSEND));
-    i2c_master_addressing(I2C0, LDC1612_ADDR, I2C_TRANSMITTER);
-    printf("2\r\n");
-    while (!i2c_flag_get(I2C0, I2C_FLAG_ADDSEND));
-    i2c_flag_clear(I2C0, I2C_FLAG_ADDSEND);
-    printf("3\r\n");
-    while (!i2c_flag_get(I2C0, I2C_FLAG_TBE));
-    i2c_data_transmit(I2C0, 0x7E);
-    printf("4\r\n");
-    i2c_start_on_bus(I2C0);
-}
-
-void iicReceiveData(void)
-{
-    uint16_t data[3] = {0};
-    i2c_start_on_bus(I2C0);
-    // i2c_stop_on_bus(I2C0);
-    printf("5\r\n");
-    while (!i2c_flag_get(I2C0, I2C_FLAG_SBSEND));
-    i2c_master_addressing(I2C0, LDC1612_ADDR, I2C_RECEIVER);
-    printf("6\r\n");
-    while (!i2c_flag_get(I2C0, I2C_FLAG_ADDSEND));
-    i2c_flag_clear(I2C0, I2C_FLAG_ADDSEND);
-    printf("7\r\n");
-    i2c_ack_config(I2C0, I2C_ACK_DISABLE);
-    while (!i2c_flag_get(I2C0, I2C_FLAG_RBNE));
-    data[0] = i2c_data_receive(I2C0);
-    while (!i2c_flag_get(I2C0, I2C_FLAG_RBNE));
-    data[1] = i2c_data_receive(I2C0);
-    while (!i2c_flag_get(I2C0, I2C_FLAG_RBNE));
-    data[2] = i2c_data_receive(I2C0);
-
-    i2c_stop_on_bus(I2C0);
-    i2c_ack_config(I2C0, I2C_ACK_ENABLE);
-
-    printf("data[0] = %x\r\n", data[0]);
-    printf("data[1] = %x\r\n", data[1]);
-    printf("data[2] = %x\r\n", data[2]);
-}
-
 /*!
     \brief      main function
     \param[in]  none
     \param[out] none
     \retval     none
 */
-int main(void)
+int main(void) {
-{
     /* configure systick */
     systick_config();
     RS485_config();
     led_config();
     I2C_config();
 
-    // delay_ms(5000);
     printf("\r\n");
     printf("XLSW-3DP-LDC1612! V0.0.1\r\n");
     printf("\r\n");
 
-    // uint16_t data[3] = {0};
+    delay_ms(500);
 
-    // I2C_scan();
+    // int result = 0;
-
+    uint16_t data = 0;
-    delay_ms(1000);
+    uint16_t device_id = 0;
-
+    LDC1612_IIC_read_16bits(READ_DEVICE_ID, &data);
-    // while (i2c_flag_get(I2C0, I2C_FLAG_I2CBSY));
+    // printf("result = %d\r\n", result);
-    // i2c_start_on_bus(I2C0);
-    // printf("1\r\n");
-    // while (!i2c_flag_get(I2C0, I2C_FLAG_SBSEND));
-    // i2c_master_addressing(I2C0, LDC1612_ADDR, I2C_TRANSMITTER);
-    // printf("2\r\n");
-    // while (!i2c_flag_get(I2C0, I2C_FLAG_ADDSEND));
-    // i2c_flag_clear(I2C0, I2C_FLAG_ADDSEND);
-    // printf("3\r\n");
-    // while (!i2c_flag_get(I2C0, I2C_FLAG_TBE));
-    // i2c_data_transmit(I2C0, 0x7E);
-    // printf("4\r\n");
-    // i2c_start_on_bus(I2C0);
-    // // i2c_stop_on_bus(I2C0);
 
 
-    // delay_ms(100);
+    // delay_ms(1000);
-    // i2c_start_on_bus(I2C0);
-    // delay_ms(100);
-    // i2c_stop_on_bus(I2C0);
 
 
-    // i2c_stop_on_bus(I2C0);
+    LDC1612_IIC_read_16bits(READ_DEVICE_ID, &device_id);
-    // i2c_ack_config(I2C0, I2C_ACK_ENABLE);
+    printf("Manufacturer: 0x%x\r\n", data);
-
+    printf("Device: 0x%x\r\n", device_id);
-    // iicSendData();
-    // iicReceiveData();
-
-    int result = 0;
-    result = LDC1612_IIC_read_16bits();
-    printf("result = %d\r\n", result);
-
-    while(1){
-
 
+    while (1) {
         delay_ms(1000);
         printf("OK!!!\r\n");
-        // iicSendData();
-
-        // i2c_flag_clear(I2C0, I2C_FLAG_I2CBSY);
-
     }
 }
 
 /* retarget the C library printf function to the USART */
-int _write (int fd, char *pBuffer, int size)
+int _write(int fd, char *pBuffer, int size) {
-{
+    for (int i = 0; i < size; i++) {
-    for (int i = 0; i < size; i++)
+        usart_data_transmit(USART0, (uint8_t) pBuffer[i]);
-    {
+        while (RESET == usart_flag_get(USART0, USART_FLAG_TBE));
-        usart_data_transmit(USART0, (uint8_t)pBuffer[i]);
-        while(RESET == usart_flag_get(USART0, USART_FLAG_TBE));
     }
     return size;
 }