|
@@ -5,6 +5,8 @@
|
|
extern setupConfig_t setupConfig;
|
|
extern setupConfig_t setupConfig;
|
|
extern iv::msgunit shmSonar;
|
|
extern iv::msgunit shmSonar;
|
|
|
|
|
|
|
|
+//#define RESULT_OUTPUT_ENABLE
|
|
|
|
+
|
|
CANRecv_Consumer::CANRecv_Consumer(CAN_Producer_Consumer *pBuf)
|
|
CANRecv_Consumer::CANRecv_Consumer(CAN_Producer_Consumer *pBuf)
|
|
{
|
|
{
|
|
pBuffer = pBuf;
|
|
pBuffer = pBuf;
|
|
@@ -105,7 +107,7 @@ void CANRecv_Consumer::run()
|
|
{
|
|
{
|
|
this->Trans_From_CANRaw(tempCANRaw);
|
|
this->Trans_From_CANRaw(tempCANRaw);
|
|
tempDist = (CAN_data[0] << 8) | CAN_data[1];
|
|
tempDist = (CAN_data[0] << 8) | CAN_data[1];
|
|
- if(tempDist <= 5800 && tempDist >= 135)
|
|
|
|
|
|
+ if(tempDist <= setupConfig.sonarRange_Max && tempDist >= setupConfig.sonarRange_Min)
|
|
{
|
|
{
|
|
decodeEnableFlag = false;
|
|
decodeEnableFlag = false;
|
|
objDist[decodeSensorID] = tempDist;
|
|
objDist[decodeSensorID] = tempDist;
|
|
@@ -159,17 +161,21 @@ void CANRecv_Consumer::Enable_DecodeResult_Slot(bool enableFlag,uint8_t sensorID
|
|
{
|
|
{
|
|
decodeEnableFlag = enableFlag;
|
|
decodeEnableFlag = enableFlag;
|
|
decodeSensorID = sensorID;
|
|
decodeSensorID = sensorID;
|
|
|
|
+#ifdef RESULT_OUTPUT_ENABLE
|
|
if(decodeSensorID == 0)
|
|
if(decodeSensorID == 0)
|
|
gLastTime = QDateTime::currentMSecsSinceEpoch();
|
|
gLastTime = QDateTime::currentMSecsSinceEpoch();
|
|
|
|
+#endif
|
|
decodeTimer.restart();
|
|
decodeTimer.restart();
|
|
}
|
|
}
|
|
|
|
|
|
void CANRecv_Consumer::UltrasonicData_Ready_Slot(void)
|
|
void CANRecv_Consumer::UltrasonicData_Ready_Slot(void)
|
|
{
|
|
{
|
|
iv::ultrasonic::ultrasonic xmsg;
|
|
iv::ultrasonic::ultrasonic xmsg;
|
|
|
|
+#ifdef RESULT_OUTPUT_ENABLE
|
|
uint64_t tempLastTime = QDateTime::currentMSecsSinceEpoch();
|
|
uint64_t tempLastTime = QDateTime::currentMSecsSinceEpoch();
|
|
std::cout<<"interval time is "<<tempLastTime - gLastTime<<std::endl;
|
|
std::cout<<"interval time is "<<tempLastTime - gLastTime<<std::endl;
|
|
gLastTime = tempLastTime;
|
|
gLastTime = tempLastTime;
|
|
|
|
+#endif
|
|
sonarSend_Lock.lock();
|
|
sonarSend_Lock.lock();
|
|
xmsg.set_sigobjdist_flside(objDist_Send[0]);
|
|
xmsg.set_sigobjdist_flside(objDist_Send[0]);
|
|
xmsg.set_sigobjdist_flcorner(objDist_Send[1]);
|
|
xmsg.set_sigobjdist_flcorner(objDist_Send[1]);
|
|
@@ -196,6 +202,12 @@ void CANRecv_Consumer::UltrasonicData_Ready_Slot(void)
|
|
xmsg.set_sigsensor_rear_lm(sensorStatus_Send[9]);
|
|
xmsg.set_sigsensor_rear_lm(sensorStatus_Send[9]);
|
|
xmsg.set_sigsensor_rear_l(sensorStatus_Send[10]);
|
|
xmsg.set_sigsensor_rear_l(sensorStatus_Send[10]);
|
|
xmsg.set_sigsensor_rear_ls(sensorStatus_Send[11]);
|
|
xmsg.set_sigsensor_rear_ls(sensorStatus_Send[11]);
|
|
|
|
+#ifdef RESULT_OUTPUT_ENABLE
|
|
|
|
+ for(int i=0;i<12;i++)
|
|
|
|
+ {
|
|
|
|
+ std::cout<<"sonsor: "<<i+1<<" status: "<<sensorStatus_Send[i]<<" Dist: "<<objDist_Send[i]<<std::endl;
|
|
|
|
+ }
|
|
|
|
+#endif
|
|
sonarSend_Lock.unlock();
|
|
sonarSend_Lock.unlock();
|
|
|
|
|
|
xmsg.set_timestamp(QDateTime::currentMSecsSinceEpoch());
|
|
xmsg.set_timestamp(QDateTime::currentMSecsSinceEpoch());
|