diff --git a/main/Receiver.c b/main/Receiver.c index a87bb32..cf5362a 100644 --- a/main/Receiver.c +++ b/main/Receiver.c @@ -72,11 +72,24 @@ uint16_t crc16_modbus(const uint8_t *data, uint16_t len) { 例:0xAA 0x55 + 0x01 + 0x01 + 0x0008 + 数据内容 + CRC校验 */ + + +uint8_t Device_SN[12]; +uint8_t Device_MAC_WIFI[6]; +uint8_t Device_MAC_BLE[6]; +uint8_t Flash_ID[4]; +uint32_t flash_id; + void Connection_test(uint8_t *buffer) { + uint8_t send_buff[128] = {0x55, 0xAA, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00}; ESP_LOGI(TAG,"Connection_test"); + send_buff[5] = sizeof(Device_info_t) + 2; + send_buff[(6 + sizeof(Device_info_t) + 2)] = '\r'; + send_buff[(6 + sizeof(Device_info_t) + 2)+1] = '\n'; + memcpy(&send_buff[6],&off_line_tool,sizeof(Device_info_t)); if (buffer[0] == 0x01) { - + usb_serial_jtag_write_bytes(&send_buff[0],(6 + sizeof(Device_info_t) + 2 + 2),20 / portTICK_PERIOD_MS); } } diff --git a/main/main.c b/main/main.c index 7da37db..41a98f0 100755 --- a/main/main.c +++ b/main/main.c @@ -38,6 +38,7 @@ #include "stream.h" #include "esp_efuse.h" #include "public.h" +#include "esp_flash.h" #define WRITE_BLOCK 64 @@ -63,6 +64,7 @@ uint8_t* load_html2Ram(wifi_html_t html) extern uint8_t* home_html_data; stream_data_t wifi_interface_data; stream_data_t uart_interface_data; +Device_info_t off_line_tool; void app_main(void) { @@ -125,7 +127,13 @@ void app_main(void) // fclose(f); // printf("Read from file: '%s'\n", line); - + esp_flash_t *chip = esp_flash_default_chip; + esp_err_t ret = esp_flash_read_id(chip, &off_line_tool.flash_id); + if (ret == ESP_OK) { + ESP_LOGI("FLASH", "Flash ID: 0x%lX", off_line_tool.flash_id); + } else { + ESP_LOGE("FLASH", "Failed to read flash ID, error=0x%x", ret); + } uint8_t mac_wifi[6]; @@ -135,7 +143,8 @@ void app_main(void) esp_efuse_mac_get_default(mac_wifi); ESP_LOGI("MAC Address", "Wi-Fi MAC: %02x:%02x:%02x:%02x:%02x:%02x", mac_wifi[0], mac_wifi[1], mac_wifi[2], mac_wifi[3], mac_wifi[4], mac_wifi[5]); - + + memcpy(&off_line_tool.Device_MAC_WIFI[0],&mac_wifi[0],6); // 获取蓝牙 MAC 地址 // esp_bt_dev_get_address(mac_bt); // ESP_LOGI("MAC Address", "Bluetooth MAC: %02x:%02x:%02x:%02x:%02x:%02x", diff --git a/main/public.h b/main/public.h index 0b8b33c..72e2b2a 100644 --- a/main/public.h +++ b/main/public.h @@ -37,6 +37,16 @@ #include "esp_efuse.h" #include "stream.h" +typedef struct Device_info_ +{ + uint8_t Device_SN[12]; + uint8_t Device_MAC_WIFI[6]; + uint8_t Device_MAC_BLE[6]; + uint32_t flash_id; +}Device_info_t; + +extern Device_info_t off_line_tool; + extern stream_data_t uart_interface_data;