From 21834035950feaadac9d4c7cad82b90ee624c984 Mon Sep 17 00:00:00 2001 From: yy1717 <fctom1215@outlook.com> Date: 星期一, 17 八月 2020 19:30:06 +0800 Subject: [PATCH] 传感器变更 --- lib/src/main/cpp/rtk_platform/platform.cpp | 80 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 75 insertions(+), 5 deletions(-) diff --git a/lib/src/main/cpp/rtk_platform/platform.cpp b/lib/src/main/cpp/rtk_platform/platform.cpp index c47a98e..25b8f82 100644 --- a/lib/src/main/cpp/rtk_platform/platform.cpp +++ b/lib/src/main/cpp/rtk_platform/platform.cpp @@ -408,14 +408,84 @@ ConvertHex2String(brief.version, data, x); brief.selftest = BUILD_UINT16(data[33], data[32]); - brief.gpio = BUILD_UINT16(data[35], data[34]); - brief.speed = BUILD_UINT16(data[37], data[36]); - brief.engine = BUILD_UINT16(data[39], data[38]); - memcpy(brief.sn, data+40, 16); +// brief.gpio = BUILD_UINT16(data[35], data[34]); +// brief.speed = BUILD_UINT16(data[37], data[36]); +// brief.engine = BUILD_UINT16(data[39], data[38]); +// memcpy(brief.sn, data+40, 16); + memcpy(brief.sn, data+34, 16); MA_SendMcuBrief(&brief); - UpdateSensor(brief.gpio, brief.speed, brief.engine); +// UpdateSensor(brief.gpio, brief.speed, brief.engine); + } + if (events & CAR_SENSOR_UPDATE_EVT) { + struct carSensorBrief brief; + int x = 20; + + brief.odo = BUILD_UINT32(data[3], data[2], data[1], data[0]); + brief.trip = BUILD_UINT32(data[7], data[6], data[5], data[4]); + brief.tripTime = BUILD_UINT32(data[11], data[10], data[9], data[8]); + brief.cellVolt = (double)(BUILD_UINT16(data[13], data[12])) / 10.0; + brief.speed = (double)(BUILD_UINT16(data[15], data[14])) / 10.0; + brief.engine = BUILD_UINT16(data[17], data[16]); + brief.sas = (short)BUILD_UINT16(data[19], data[18]); + brief.key = data[x++]; + brief.gear = data[x++]; + brief.aps = data[x++]; + brief.lock = data[x++]; + brief.seatBelt = data[x++]; + brief.clutch = data[x++]; + brief.horn = data[x++]; + brief.wiper = data[x++]; + brief.handBreak = data[x++]; + brief.mainBreak = data[x++]; + brief.leftTurnLamp = data[x++]; + brief.rightTurnLamp = data[x++]; + brief.clearanceLamp = data[x++]; + brief.dippedBeamLamp = data[x++]; + brief.mainBeamLamp = data[x++]; + brief.fogLamp = data[x++]; + brief.assBreak = data[x++]; + brief.surround1 = data[x++]; + brief.surround2 = data[x++]; + brief.surround3 = data[x++]; + brief.surround4 = data[x++]; + + MA_SendCarSensorBrief(&brief); + + car_sensor_t sensor; + x = 20; + + sensor.odo = BUILD_UINT32(data[3], data[2], data[1], data[0]); + sensor.trip = BUILD_UINT32(data[7], data[6], data[5], data[4]); + sensor.tripTime = BUILD_UINT32(data[11], data[10], data[9], data[8]); + sensor.cellVolt = (double)(BUILD_UINT16(data[13], data[12])) / 10.0; + sensor.speed = (double)(BUILD_UINT16(data[15], data[14])) / 10.0; + sensor.engine = BUILD_UINT16(data[17], data[16]); + sensor.sas = (short)BUILD_UINT16(data[19], data[18]); + sensor.key = data[x++]; + sensor.gear = data[x++]; + sensor.aps = data[x++]; + sensor.lock = data[x++]; + sensor.seatBelt = data[x++]; + sensor.clutch = data[x++]; + sensor.horn = data[x++]; + sensor.wiper = data[x++]; + sensor.handBreak = data[x++]; + sensor.mainBreak = data[x++]; + sensor.leftTurnLamp = data[x++]; + sensor.rightTurnLamp = data[x++]; + sensor.clearanceLamp = data[x++]; + sensor.dippedBeamLamp = data[x++]; + sensor.mainBeamLamp = data[x++]; + sensor.fogLamp = data[x++]; + sensor.assBreak = data[x++]; + sensor.surround1 = data[x++]; + sensor.surround2 = data[x++]; + sensor.surround3 = data[x++]; + sensor.surround4 = data[x++]; + + UpdateSensor(&sensor); } if (events & CARD_UPDATE_EVT) { DEBUG("CARD_UPDATE_EVT length %d", length); -- Gitblit v1.8.0