diff --git a/myis11/src/is11/IS11_INST.cpp b/myis11/src/is11/IS11_INST.cpp index 2ba5bfe..2d814b0 100644 --- a/myis11/src/is11/IS11_INST.cpp +++ b/myis11/src/is11/IS11_INST.cpp @@ -15,7 +15,7 @@ #include "IS11_INST.h" #include "iostream" #include "cstring" - +#include // 对于 snprintf SensorIS11 *thissensorIS11; int IS11SensorInit() { @@ -34,10 +34,12 @@ STRsensorinfo_C Get_SensorInfo() { STRSensorInfo sensorinfo= thissensorIS11->SensorInfo; STRsensorinfo_C sensorinfo_c; //把sensorname 拷贝到sensorinfo_c - strcpy_s(sensorinfo_c.SensorName,sensorinfo.SensorName.c_str()); + //strcpy_s(sensorinfo_c.SensorName,sensorinfo.SensorName.c_str()); + snprintf(sensorinfo_c.SensorName, sizeof(sensorinfo_c.SensorName), "%s", sensorinfo.SensorName.c_str()); sensorinfo_c.BandNum = sensorinfo.BandNum; sensorinfo_c.maxValue = sensorinfo.maxValue; - strcpy_s(sensorinfo_c.serialnumber,sensorinfo.serialnumber.c_str()); + //strcpy_s(sensorinfo_c.serialnumber,sensorinfo.serialnumber.c_str()); + snprintf(sensorinfo_c.serialnumber, sizeof(sensorinfo_c.serialnumber), "%s", sensorinfo.serialnumber.c_str()); sensorinfo_c.a1 = sensorinfo.a1; sensorinfo_c.a2 = sensorinfo.a2; sensorinfo_c.a3 = sensorinfo.a3;