添加位移监测传感器结构体及解包
This commit is contained in:
@@ -298,8 +298,8 @@ int CommUintOrgData(GateWayPara GateWay, CommUnitPara CUPara, CommUnitData CUDat
|
||||
case FORCE_3D:
|
||||
break;
|
||||
case LASER_TRACING:
|
||||
memcpy(&sData[Len], CUData->Data[i], sizeof(LaserTracingType_t));
|
||||
Len += sizeof(LaserTracingType_t);
|
||||
memcpy(&sData[Len], CUData->Data[i], sizeof(LaserTracingType_T));
|
||||
Len += sizeof(LaserTracingType_T);
|
||||
break;
|
||||
case WATER_LEVEL:
|
||||
break;
|
||||
@@ -327,6 +327,10 @@ int CommUintOrgData(GateWayPara GateWay, CommUnitPara CUPara, CommUnitData CUDat
|
||||
break;
|
||||
case MICROWAVE_DISPLACE:
|
||||
break;
|
||||
case DISPLACEMENT:
|
||||
memcpy(&sData[Len], CUData->Data[i], sizeof(Displacement_T));
|
||||
Len += sizeof(Displacement_T);
|
||||
break;
|
||||
}
|
||||
SensorN++;
|
||||
}
|
||||
@@ -374,8 +378,8 @@ void DebugDisplaySensorData(int SensorIdx, uint16_t SensorType, uint8_t *SensorD
|
||||
break;
|
||||
}
|
||||
case LASER_TRACING: {
|
||||
LaserTracingType_t Sensor;
|
||||
memcpy((uint8_t *)&Sensor, SensorData, sizeof(LaserTracingType_t));
|
||||
LaserTracingType_T Sensor;
|
||||
memcpy((uint8_t *)&Sensor, SensorData, sizeof(LaserTracingType_T));
|
||||
MAIN_DBG_LOG("Sensor%d Type %04x: PitchAngle=%04d, RollAngle=%04d, YawAngle=%04d\r\n",
|
||||
SensorIdx, SensorType, Sensor.PitchAngle, Sensor.RollAngle, Sensor.YawAngle);
|
||||
break;
|
||||
@@ -419,6 +423,13 @@ void DebugDisplaySensorData(int SensorIdx, uint16_t SensorType, uint8_t *SensorD
|
||||
case MICROWAVE_DISPLACE: {
|
||||
break;
|
||||
}
|
||||
case DISPLACEMENT: {
|
||||
Displacement_T Sensor;
|
||||
memcpy((uint8_t *)&Sensor, SensorData, sizeof(Displacement_T));
|
||||
MAIN_DBG_LOG("Sensor%d Type %04x: PitchAngle=%04d, RollAngle=%04d, YawAngle=%04d, Altitude=%06f, Distance=%04d\r\n",
|
||||
SensorIdx, SensorType, Sensor.PitchAngle, Sensor.RollAngle, Sensor.YawAngle, Sensor.Altitude, Sensor.Distance);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user