|
@@ -18,13 +18,13 @@ func (r *MQTTReporter) loopRecvOneEnvData() {
|
|
|
select {
|
|
select {
|
|
|
case envData := <-mcu.Board.EnvDataOneCh:
|
|
case envData := <-mcu.Board.EnvDataOneCh:
|
|
|
mcu.MCBSetEnvStateBit(mcu.ParsingEnvData)
|
|
mcu.MCBSetEnvStateBit(mcu.ParsingEnvData)
|
|
|
- var strEnv StrEnv
|
|
|
|
|
- strEnv.Timestamp, strEnv.Temperature, strEnv.Humidity,
|
|
|
|
|
- strEnv.Illuminance, strEnv.Voltage = envData.StringWithoutUnit()
|
|
|
|
|
|
|
+ var strEnvOne StrEnv
|
|
|
|
|
+ strEnvOne.Timestamp, strEnvOne.Temperature, strEnvOne.Humidity,
|
|
|
|
|
+ strEnvOne.Illuminance, strEnvOne.Voltage = envData.StringWithoutUnit()
|
|
|
baseapp.Logger.Infof("[%s] 收到一条环境数据: %s", MODULE_NAME, envData.LogString())
|
|
baseapp.Logger.Infof("[%s] 收到一条环境数据: %s", MODULE_NAME, envData.LogString())
|
|
|
mcu.MCBSetEnvStateBit(mcu.Idle)
|
|
mcu.MCBSetEnvStateBit(mcu.Idle)
|
|
|
|
|
|
|
|
- r.reportSensorData(strEnv) // 开始执行上报
|
|
|
|
|
|
|
+ r.reportSensorData(strEnvOne) // 开始执行上报
|
|
|
case <-r.ctx.Done():
|
|
case <-r.ctx.Done():
|
|
|
return
|
|
return
|
|
|
} // end select
|
|
} // end select
|