alpha version

CMakeLists.txt

@@ -6,8 +6,8 @@ set(PROJECT_NAME "XLSW_3DP_US-IR")
 project(${PROJECT_NAME})
 
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
+set(VERSION_MINOR 1)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 0)
 set(VERSION "V${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 
@@ -16,7 +16,7 @@ set(OPT1 "_[12V]")
 #set(OPT1 "_[SW_IIC]")
 
 # Options 2
-set(OPT2 "")
+set(OPT2 "_[HW_IIC]")
 #set(OPT2 "_[NO_LED]")
 
 enable_language(C)
@@ -41,6 +41,8 @@ set(TARGET_C_SRC
         ${CMAKE_SOURCE_DIR}/src/fwdgt.c
         ${CMAKE_SOURCE_DIR}/src/rs485_protocol.c
         ${CMAKE_SOURCE_DIR}/src/ultrasonic_analog.c
+        ${CMAKE_SOURCE_DIR}/src/gd60914.c
+        ${CMAKE_SOURCE_DIR}/src/ultrasonic_analog.c
 )
 
 add_executable(${PROJECT_NAME} ${TARGET_C_SRC})

cmake/toolchain.cmake

@@ -94,12 +94,12 @@ set(TARGET_CFLAGS_HARDWARE "-mcpu=cortex-m23 -mfloat-abi=soft -mthumb -mthumb-in
 #set(CMAKE_C_FLAGS_DEBUG     "-DDEBUG=0 -O0 -g")
 #set(CMAKE_CXX_FLAGS_DEBUG   "-DDEBUG=0 -O0 -g")
 #set(CMAKE_ASM_FLAGS_DEBUG   "-DDEBUG=0 -O0 -g")
-set(CMAKE_C_FLAGS_DEBUG     "-DDEBUG=0 -O2 -g")
+#set(CMAKE_C_FLAGS_DEBUG     "-DDEBUG=0 -O2 -g")
-set(CMAKE_CXX_FLAGS_DEBUG   "-DDEBUG=0 -O2 -g")
+#set(CMAKE_CXX_FLAGS_DEBUG   "-DDEBUG=0 -O2 -g")
-set(CMAKE_ASM_FLAGS_DEBUG   "-DDEBUG=0 -O2 -g")
+#set(CMAKE_ASM_FLAGS_DEBUG   "-DDEBUG=0 -O2 -g")
-#set(CMAKE_C_FLAGS_DEBUG     "-DDEBUG=0 -Os -g")
+set(CMAKE_C_FLAGS_DEBUG     "-DDEBUG=0 -Os -g")
-#set(CMAKE_CXX_FLAGS_DEBUG   "-DDEBUG=0 -Os -g")
+set(CMAKE_CXX_FLAGS_DEBUG   "-DDEBUG=0 -Os -g")
-#set(CMAKE_ASM_FLAGS_DEBUG   "-DDEBUG=0 -Os -g")
+set(CMAKE_ASM_FLAGS_DEBUG   "-DDEBUG=0 -Os -g")
 
 # RELEASE
 set(CMAKE_C_FLAGS_RELEASE        "-DNDEBUG -O3") #  -flto

inc/gd60914.h

@@ -0,0 +1,34 @@
+//
+// Created by dell on 25-1-7.
+//
+
+#ifndef GD60914_H
+#define GD60914_H
+
+#include "gd32e23x_it.h"
+#include "gd32e23x.h"
+
+#include "board_config.h"
+
+#ifdef SOFTWARE_IIC
+#include "soft_i2c.h"
+#else
+#include "i2c.h"
+#endif
+
+/******************************************************************************/
+
+#define GD60914_ADDR         (0x18 << 1)
+
+/******************************************************************************/
+
+#define GD60914_HUM_TEMP     0x1A
+#define GD60914_OBJ_TEMP     0x1F
+#define GD60914_AMB_TEMP     0x1E
+#define GD60914_TEMP_REG     0x1C
+
+void gd60914_get_object_tempture(void);
+
+void gd60914_read_temp(void);
+
+#endif //GD60914_H

inc/i2c.h

@@ -19,7 +19,7 @@
 
 /******************************************************************************/
 
-#define I2C_SPEED       20000
+#define I2C_SPEED       100000
 
 #define I2C_TIME_OUT    (uint16_t)(5000)
 #define I2C_OK          1

inc/main.h

@@ -44,6 +44,8 @@ OF SUCH DAMAGE.
 #include "fwdgt.h"
 #include "board_config.h"
 #include "ultrasonic_analog.h"
+#include "gd60914.h"
+#include "ultrasonic_analog.h"
 
 #ifdef SOFTWARE_IIC
 #include "soft_i2c.h"

inc/rs485_protocol.h

@@ -21,7 +21,7 @@
 #define RX_BUFFER_SIZE            32
 
 #define PROTOCOL_PACKAGE_HEADER   0xD5
-#define PROTOCOL_BOARD_TYPE       0x03
+#define PROTOCOL_BOARD_TYPE       0x04
 #define PROTOCOL_PACKAGE_LENGTH   0x02
 
 /******************************************************************************/
@@ -49,7 +49,7 @@ validation_result_t validate_package_type(uint8_t* data);
 
 validation_result_t validate_data_length(uint8_t* data);
 
-
+void gd60914_tempture_report(void);
 
 void ultrasonic_distance_report(void);
 

inc/ultrasonic_analog.h

@@ -37,7 +37,7 @@ void ultrasonic_echo_timer_config(void);
 
 void ultrasonic_config(void);
 
-uint32_t ultrasonic_calc_distance(void);
+uint16_t ultrasonic_calc_distance(void);
 
 
 #endif //ULTRASONIC_ANALOG_H

src/gd32e23x_it.c

@@ -34,7 +34,7 @@ OF SUCH DAMAGE.
 
 #include "gd32e23x_it.h"
 
-__IO uint32_t g_capture_value;
+__IO uint16_t g_capture_value;
 
 /*!
     \brief      this function handles NMI exception

src/gd60914.c

@@ -0,0 +1,51 @@
+//
+// Created by dell on 25-1-7.
+//
+
+#include "gd60914.h"
+
+void gd60914_get_object_tempture(void) {
+    #ifdef SOFTWARE_IIC
+    soft_i2c_config();
+    #else
+    i2c_config();
+    #endif
+
+    static uint8_t sensor_validation_data[2];
+    extern uint8_t g_temperature_uint8[2];
+
+#ifdef SOFTWARE_IIC
+    soft_i2c_read_16bits(GD60914_ADDR, GD60914_OBJ_TEMP, data);
+#else
+    i2c_read_16bits(GD60914_ADDR, GD60914_OBJ_TEMP, sensor_validation_data);
+#endif
+
+    if (sensor_validation_data[0] != 0xAA || sensor_validation_data[1] != 0x55) {
+#ifdef DEBUG_VERBOES
+        printf("sensor error\r\n");
+#endif
+        return;
+    }
+
+    delay_ms(350);
+
+#ifdef SOFTWARE_IIC
+    soft_i2c_read_16bits(GD60914_ADDR, GD60914_TEMP_REG, g_temperature_uint8);
+#else
+    i2c_read_16bits(GD60914_ADDR, GD60914_TEMP_REG, g_temperature_uint8);
+#endif
+
+    // printf("%d\r\n", g_temperature_uint8[1] << 8 | g_temperature_uint8[0]);
+}
+
+void gd60914_read_temp(void) {
+
+    uint8_t value[2] = {0};
+    #ifdef SOFTWARE_IIC
+    soft_i2c_read_16bits(GD60914_ADDR, GD60914_OBJ_TEMP, value);
+    #else
+    i2c_read_16bits(GD60914_ADDR, GD60914_TEMP_REG, value);
+    #endif
+
+    printf("%x %x\r\n", value[1], value[0]);
+}

src/main.c

@@ -6,7 +6,9 @@
 */
 #include "main.h"
 
-extern uint32_t g_capture_value;
+volatile uint8_t g_temperature_uint8[2] = {0};
+
+extern uint16_t g_capture_value;
 uint16_t g_distance_uint16;
 
 /*!
@@ -27,21 +29,24 @@ int main(void)
     /* configure FWDGT */
     watchdog_init();
 
+#ifdef SOFTWARE_IIC
+    soft_i2c_config();
+#else
+    i2c_config();
+#endif
+
     printf("system start!\r\n");
 
     ultrasonic_config();
 
     // gpio_bit_write(RS485_EN_PORT, RS485_EN_PIN, RESET);
     while(1){
-        // printf("hello world!\r\n");
+        gd60914_get_object_tempture();
+
         delay_ms(50);
 
         ultrasonic_pwm_out_cycles(ULTRASONIC_TX_CYCLES);
-        // delay_ms(2);
 
-
-        // g_distance_uint16 = ultrasonic_calc_distance();
-        // printf("Distance: %d cm\r\n", g_distance_uint16);
         watchdog_reload();
     }
 }

src/rs485_protocol.c

@@ -4,6 +4,8 @@
 
 #include "rs485_protocol.h"
 
+extern uint8_t g_temperature_uint8[2];
+
 void process_command(uint8_t *cmd, size_t length) {
     char combined_str[3];
     validation_result_t validate = VALIDATION_SUCCESS;
@@ -18,11 +20,9 @@ void process_command(uint8_t *cmd, size_t length) {
         // printf("%d", length);
             sprintf(combined_str, "%c%c", cmd[3], cmd[4]);
         if (strcmp(combined_str, "M1") == 0) {
-
             ultrasonic_distance_report();
         } else if (strcmp(combined_str, "M2") == 0) {
-            printf("%c%c%c%c%c%c%c", 0xB5, 0xF1, 0x02, 0x6F, 0x6B, 0x6B, 0xCC);
+            gd60914_tempture_report();
-            // tempture_value_report();
         } else if (strcmp(combined_str, "M3") == 0)
         {
             printf("%c%c%c%c%c%c", 0xB5, 0xF1, 0x02, 0x6F, 0x6B, 0xCC);
@@ -91,6 +91,17 @@ validation_result_t validate_data_length(uint8_t *data) {
     }
 }
 
+void gd60914_tempture_report(void) {
+    static uint8_t package_header[3] = {0xB5, 0xF0, 0x02};
+
+    uint8_t combined_data[5];
+    memcpy(combined_data, package_header, 3);
+    memcpy(combined_data + 3, g_temperature_uint8, 2);
+
+    printf("%c%c%c", package_header[0], package_header[1], package_header[2]);
+    printf("%c%c", g_temperature_uint8[1], g_temperature_uint8[0]);
+    printf("%c", calculate_crc(combined_data, 6));
+}
 // void eddy_current_value_report(void) {
 //     static uint32_t eddy_current_value_uint32 = 0;
 //
@@ -111,22 +122,20 @@ validation_result_t validate_data_length(uint8_t *data) {
 // }
 
 void ultrasonic_distance_report(void) {
-    static uint32_t distance_uint32 = 0;
+    static uint16_t distance_uint16 = 0;
-    static uint8_t package_header[3] = {0xB5, 0xF0, 0x04};
+    static uint8_t package_header[3] = {0xB5, 0xF0, 0x02};
     static uint8_t package_data[4] = {0};
 
-    distance_uint32 = ultrasonic_calc_distance();
+    distance_uint16 = ultrasonic_calc_distance();
 
-    package_data[0] = (distance_uint32 >> 24) & 0xFF;
+    package_data[0] = (distance_uint16 >> 8) & 0xFF;
-    package_data[1] = (distance_uint32 >> 16) & 0xFF;
+    package_data[1] = distance_uint16 & 0xFF;
-    package_data[2] = (distance_uint32 >> 8) & 0xFF;
-    package_data[3] = distance_uint32 & 0xFF;
 
     uint8_t combined_data[7];
     memcpy(combined_data, package_header, 3);
-    memcpy(combined_data + 3, package_data, 4);
+    memcpy(combined_data + 3, package_data, 2);
 
     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%c", package_data[0], package_data[1]);
-    printf("%c", calculate_crc(combined_data, 8));
+    printf("%c", calculate_crc(combined_data, 6));
 }

src/soft_i2c.c

@@ -11,7 +11,7 @@
     \retval     none
 */
 void soft_i2c_delay(void) {
-    delay_us(20); // Adjust delay as needed
+    delay_us(1); // Adjust delay as needed
     /* delay to freq
      *  15KHz: delay_us(20);
      *  65KHz: delay_us(1);

src/ultrasonic_analog.c

@@ -139,10 +139,10 @@ void ultrasonic_config(void) {
     ultrasonic_echo_timer_config();
 }
 
-uint32_t ultrasonic_calc_distance(void) {
+uint16_t ultrasonic_calc_distance(void) {
     while (!ultrasonicMeasurementDone);
     // uint32_t us_value = timer_channel_capture_value_register_read(US_ECHO_TIMER, US_ECHO_CH);
-    uint32_t distance = (TIME_CORRECTION_US + g_capture_value) * 17;
+    uint16_t distance = (TIME_CORRECTION_US + g_capture_value) * 17;
     /*
      *  (TIME_CORRECTION_US + us_value) * 340 m/s
      *  -----------------------------------------