|
|
@@ -25,7 +25,7 @@ var (
|
|
|
)
|
|
|
|
|
|
// 采集的环境数据
|
|
|
-type SensorEnvData struct { // 小端序
|
|
|
+type EnvSensorData struct { // 小端序
|
|
|
Timestamp [4]byte // 时间戳(秒, 存在"2038-01-19 03:14:07 UTC"溢出风险)
|
|
|
Temperature [2]byte // 温度(0.1°C)
|
|
|
Humidity [2]byte // 湿度(0.1%RH)
|
|
|
@@ -33,7 +33,7 @@ type SensorEnvData struct { // 小端序
|
|
|
Voltage [2]byte // 电压(0.1V)
|
|
|
}
|
|
|
|
|
|
-type EnvData = SensorEnvData
|
|
|
+type EnvData = EnvSensorData
|
|
|
|
|
|
// MCU 控制板对象
|
|
|
type MCUCtrlBoard struct {
|
|
|
@@ -129,7 +129,7 @@ func (d EnvData) LogString() string {
|
|
|
// 导出Go函数给C用
|
|
|
|
|
|
//export RTU_SendGrpEnvData
|
|
|
-func RTU_SendGrpEnvData(pGrpData *C.SensorEnvData, cnt C.int) C.int {
|
|
|
+func RTU_SendGrpEnvData(pGrpData *C.EnvSensorData, cnt C.int) C.int {
|
|
|
if Board == nil || Board.EnvDataGrpCh == nil || pGrpData == nil || cnt <= 0 {
|
|
|
return -1
|
|
|
}
|
|
|
@@ -159,7 +159,7 @@ func RTU_SendGrpEnvData(pGrpData *C.SensorEnvData, cnt C.int) C.int {
|
|
|
}
|
|
|
|
|
|
//export RTU_SendOneEnvData
|
|
|
-func RTU_SendOneEnvData(pOneData *C.SensorEnvData) C.int {
|
|
|
+func RTU_SendOneEnvData(pOneData *C.EnvSensorData) C.int {
|
|
|
if Board == nil || Board.EnvDataOneCh == nil || pOneData == nil {
|
|
|
return -1
|
|
|
}
|