This commit is contained in:
MoYue 2023-07-13 10:41:33 +08:00
parent 8e5c058dd2
commit 0724da820e

View File

@ -457,11 +457,11 @@ namespace MonitoringTechnology.Ble
if (X > 0)
{
monitoringSensorModel.degrees_x = X * 1.058F;
monitoringSensorModel.degrees_x = X * 1.0439F;
}
else
{
monitoringSensorModel.degrees_x = X * 1.104F;
monitoringSensorModel.degrees_x = X * 1.137F;
}
//monitoringSensorModel.degrees_x = tools.bytetofloat(byteList, 48) * 1.02F;
@ -474,23 +474,23 @@ namespace MonitoringTechnology.Ble
{
if (Y < 90)
{
monitoringSensorModel.degrees_y = Y * 1.0624F;
monitoringSensorModel.degrees_y = Y * 1.0787F;
}
else if ( Y >= 173)
else if (Y >= 174)
{
monitoringSensorModel.degrees_y = Y * (-1.0353F);
monitoringSensorModel.degrees_y = Y * (-1.029F);
}
else if (Y < 173)
else if (Y < 174)
{
monitoringSensorModel.degrees_y = Y * 1.0411F;
monitoringSensorModel.degrees_y = Y * 1.0351F;
}
}
else
{
monitoringSensorModel.degrees_y = Y;
monitoringSensorModel.degrees_y = Y * 1.0186F;
}
//角度Z 56,57,58,59
@ -499,7 +499,7 @@ namespace MonitoringTechnology.Ble
float Z = tools.bytetofloat(byteList, 56);
monitoringSensorModel.degrees_z = Z;
//电池电压 60,61,62,63
monitoringSensorModel._batteryVoltage = tools.bytetofloat(byteList, 60);
@ -852,11 +852,11 @@ namespace MonitoringTechnology.Ble
if (X_history > 0)
{
monitoringSensorModel.degrees_x = X_history * 1.058F;
monitoringSensorModel.degrees_x = X_history * 1.0439F;
}
else
{
monitoringSensorModel.degrees_x = X_history * 1.104F;
monitoringSensorModel.degrees_x = X_history * 1.137F;
}
//monitoringSensorModel.degrees_x = tools.bytetofloat(byteList, 48) * 1.02F;
@ -869,20 +869,20 @@ namespace MonitoringTechnology.Ble
{
if (Y_history < 90)
{
monitoringSensorModel.degrees_y = Y_history * 1.0624F;
monitoringSensorModel.degrees_y = Y_history * 1.0787F;
}
else if (Y_history >= 173)
else if (Y_history >= 174)
{
monitoringSensorModel.degrees_y = Y_history * (-1.0353F);
monitoringSensorModel.degrees_y = Y_history * (-1.029F);
}
else if (Y_history < 173)
else if (Y_history < 174)
{
monitoringSensorModel.degrees_y = Y_history * 1.0411F;
monitoringSensorModel.degrees_y = Y_history * 1.0351F;
}
}
else
{
monitoringSensorModel.degrees_y = Y_history;
monitoringSensorModel.degrees_y = Y_history * 1.0186F;
}