Zhou/20211124_ZNZT_upperpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/zhou-linqiang/monitoring-technology

Browse Source
This commit is contained in:
MoYue 2023-07-21 15:13:58 +08:00
commit dd59d95304
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
MonitoringTechnology/Ble/BleDevice.cs
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,20 +474,20 @@ 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;
}
@ -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;
}