huangjiayu
/
H_SafeExperienceDrivingSystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: huangjiayu:4f4581f3949b5be77d8698a01126006cb949bf75
Branches Tags
huangjiayu:master
huangjiayu:ModelFile
...
compare: huangjiayu:79d3eab0fbffed43577efe0ac7bdfad5ee7acde2
Branches Tags
huangjiayu:master
huangjiayu:ModelFile

2 Commits
4f4581f394 ... 79d3eab0fb

Author SHA1 Message Date
yzx 79d3eab0fb Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 08:55:49 +08:00
yzx 9865bce7c7 tijiao 2023-12-25 08:55:44 +08:00
4 changed files with 24 additions and 21 deletions
Show Stats Expand all files Collapse all files

5
U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleController.cs
View File

@ -627,7 +627,10 @@ public class VehicleController : MonoBehaviour
float forwardSpeed = m_speed * steeringLimitRatio * speedFactor;
float maxEspAngle = Mathf.Asin(Mathf.Clamp01(3.0f / forwardSpeed)) * Mathf.Rad2Deg;
float steerAngleLimit = Mathf.Min(maxSteerAngle, Mathf.Max(maxEspAngle, Mathf.Abs(m_speedAngle)));
inputSteerAngle = Mathf.Clamp(inputSteerAngle, -steerAngleLimit, +steerAngleLimit);
//Debug.Log(inputSteerAngle);
}
float assistedSteerAngle = 0.0f;
@ -638,7 +641,7 @@ public class VehicleController : MonoBehaviour
// Debug.Log(m_steerAngle);
// Debug.Log(m_steerAngle);
}

12
U3D_DrivingSystem/Assets/Scenes/menu.unity
View File

@ -358,7 +358,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &76095179
RectTransform:
m_ObjectHideFlags: 0
@ -973,7 +973,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &570311457
RectTransform:
m_ObjectHideFlags: 0
@ -1106,7 +1106,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &574599288
RectTransform:
m_ObjectHideFlags: 0
@ -1509,7 +1509,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &748011624
RectTransform:
m_ObjectHideFlags: 0
@ -1642,7 +1642,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &867050206
RectTransform:
m_ObjectHideFlags: 0
@ -4057,7 +4057,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1952163225
RectTransform:
m_ObjectHideFlags: 0

24
U3D_DrivingSystem/Assets/Script/CarGearControl.cs
View File

@ -24,8 +24,8 @@ namespace Script
private CarStatusData carData;
float minValue = -900f; // 范围的最小值
float maxValue = 900; // 范围的最大值
float minValue = -1500f; // 范围的最小值
float maxValue = 1500; // 范围的最大值
public CarInfoManager carInfoManager;
private ModbusTcpClient client;
@ -66,14 +66,14 @@ namespace Script
}
// public void HHHHHH()
// {
// client.SendModbusRequest12();
// }
// void OnDestroy()
// {
// client.CloseConnection();
// }
public void HHHHHH()
{
client.SendModbusRequest12();
}
void OnDestroy()
{
client.CloseConnection();
}
async Task ModBusQueue()
{
@ -82,14 +82,14 @@ namespace Script
// Debug.Log(client.modbusQueue.Count);
// if (client.modbusQueue.Count > 0)
// {
// Debug.Log(client.modbusQueue.Count);
// // Debug.Log(client.modbusQueue.Count);
//
// carData = client.modbusQueue.Dequeue();
if (ModbusTcpClient.modbusTcpClient.modbusQueue.Count > 0)
{
// Debug.Log(ModbusTcpClient.modbusTcpClient.modbusQueue.Count);
carData = ModbusTcpClient.modbusTcpClient.modbusQueue.Dequeue();

4
U3D_DrivingSystem/Assets/Script/ModbusTcpClient.cs
View File

@ -168,7 +168,7 @@ namespace ModbusManager
carStatusData.IgnitionSwitch = dataValue;
break;
case 1://左打方向盘为负数，右打方向盘为正数，打方向盘打死一圈半，数值1500。
// Debug.Log($"方向盘数据: {(short)dataValue}");
Debug.Log($"方向盘数据: {(short)dataValue}");
carStatusData.SteeringWheelAngle = (short)dataValue;
break;
case 2://01为喇叭按下
@ -200,7 +200,7 @@ namespace ModbusManager
carStatusData.WiperStatus = dataValue;
break;
case 9://00是未开灯，1是示廓灯，2是近光远光。。没有找到远光信号。
Debug.Log($"灯光状态: {dataValue}");
// Debug.Log($"灯光状态: {dataValue}");
carStatusData.LightStatus = dataValue;
break;
case 10://00是未开转向灯，1是左转向灯，2是右转向灯