Skip to content

L
LE19
Commit b70256c7 authored by 时昊's avatar 时昊
Browse files
Options

✨ feat:修改超速报警车速取整数,不要小数

parent fe92c656
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 0 deletions
le19源码/Source/Application/Alarm/Popups.c
View file @ b70256c7
...@@ -445,6 +445,8 @@ void Popups_Polling(void) ...@@ -445,6 +445,8 @@ void Popups_Polling(void)
//超速报警 //超速报警
if(IGstPopup1 == IGN_ON) if(IGstPopup1 == IGN_ON)
{ {
m_Vspeed /= 10;
m_Vspeed *= 10;
if ( m_Vspeed > Over_Speed_Config ) if ( m_Vspeed > Over_Speed_Config )
{ {
Popup_Request(POPUP_Over_Speed); Popup_Request(POPUP_Over_Speed);
...@@ -504,6 +506,7 @@ void Popups_Polling(void) ...@@ -504,6 +506,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_Radar_4HZ); PopupAndSound_Delete(POPUP_Radar_4HZ);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Request(POPUP_Radar_1HZ); Popup_Request(POPUP_Radar_1HZ);
Popup_Clear(POPUP_Radar_Changming);
} }
else if ( RADAR_SOUND == POPUP_Radar_2HZ ) else if ( RADAR_SOUND == POPUP_Radar_2HZ )
{ {
...@@ -512,6 +515,7 @@ void Popups_Polling(void) ...@@ -512,6 +515,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_Radar_4HZ); PopupAndSound_Delete(POPUP_Radar_4HZ);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Request(POPUP_Radar_2HZ); Popup_Request(POPUP_Radar_2HZ);
Popup_Clear(POPUP_Radar_Changming);
} }
else if ( RADAR_SOUND == POPUP_Radar_4HZ ) else if ( RADAR_SOUND == POPUP_Radar_4HZ )
{ {
...@@ -520,6 +524,7 @@ void Popups_Polling(void) ...@@ -520,6 +524,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_Radar_1HZ); PopupAndSound_Delete(POPUP_Radar_1HZ);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Request(POPUP_Radar_4HZ); Popup_Request(POPUP_Radar_4HZ);
Popup_Clear(POPUP_Radar_Changming);
} }
else if ( RADAR_SOUND == POPUP_Radar_Changming ) else if ( RADAR_SOUND == POPUP_Radar_Changming )
{ {
...@@ -536,6 +541,7 @@ void Popups_Polling(void) ...@@ -536,6 +541,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_Radar_4HZ); PopupAndSound_Delete(POPUP_Radar_4HZ);
PopupAndSound_Delete(POPUP_Radar_1HZ); PopupAndSound_Delete(POPUP_Radar_1HZ);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Clear(POPUP_Radar_Changming);
} }
} }
else else
...@@ -544,6 +550,7 @@ void Popups_Polling(void) ...@@ -544,6 +550,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_Radar_4HZ); PopupAndSound_Delete(POPUP_Radar_4HZ);
PopupAndSound_Delete(POPUP_Radar_1HZ); PopupAndSound_Delete(POPUP_Radar_1HZ);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Clear(POPUP_Radar_Changming);
} }
} }
else else
...@@ -552,6 +559,7 @@ void Popups_Polling(void) ...@@ -552,6 +559,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_Radar_4HZ); PopupAndSound_Delete(POPUP_Radar_4HZ);
PopupAndSound_Delete(POPUP_Radar_1HZ); PopupAndSound_Delete(POPUP_Radar_1HZ);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Clear(POPUP_Radar_Changming);
} }
} }
else if(Val_EOL_F102_RadarType() == 3) else if(Val_EOL_F102_RadarType() == 3)
...@@ -566,6 +574,7 @@ void Popups_Polling(void) ...@@ -566,6 +574,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE); PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Request(POPUP_Radar_2HZ); Popup_Request(POPUP_Radar_2HZ);
Popup_Clear(POPUP_Radar_Changming);
break; break;
case 2://4hz case 2://4hz
PopupAndSound_Delete(POPUP_Radar_2HZ); PopupAndSound_Delete(POPUP_Radar_2HZ);
...@@ -573,6 +582,7 @@ void Popups_Polling(void) ...@@ -573,6 +582,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_RADAR_CHECK_OK); PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE); PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
Popup_Request(POPUP_Radar_4HZ); Popup_Request(POPUP_Radar_4HZ);
Popup_Clear(POPUP_Radar_Changming);
break; break;
case 3://长鸣 case 3://长鸣
PopupAndSound_Delete(POPUP_Radar_2HZ); PopupAndSound_Delete(POPUP_Radar_2HZ);
...@@ -587,6 +597,7 @@ void Popups_Polling(void) ...@@ -587,6 +597,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE); PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
Popup_Request(POPUP_RADAR_CHECK_OK); Popup_Request(POPUP_RADAR_CHECK_OK);
Popup_Clear(POPUP_Radar_Changming);
break; break;
case 5://雷达故障 长鸣2s case 5://雷达故障 长鸣2s
PopupAndSound_Delete(POPUP_Radar_2HZ); PopupAndSound_Delete(POPUP_Radar_2HZ);
...@@ -594,6 +605,7 @@ void Popups_Polling(void) ...@@ -594,6 +605,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_RADAR_CHECK_OK); PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Request(POPUP_RADAR_SENSOR_FAILURE); Popup_Request(POPUP_RADAR_SENSOR_FAILURE);
Popup_Clear(POPUP_Radar_Changming);
break; break;
case 6://雷达数据超时 长鸣2s case 6://雷达数据超时 长鸣2s
PopupAndSound_Delete(POPUP_Radar_2HZ); PopupAndSound_Delete(POPUP_Radar_2HZ);
...@@ -601,6 +613,7 @@ void Popups_Polling(void) ...@@ -601,6 +613,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_RADAR_CHECK_OK); PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
Popup_Request(POPUP_RADAR_SENSOR_FAILURE); Popup_Request(POPUP_RADAR_SENSOR_FAILURE);
Popup_Clear(POPUP_Radar_Changming);
break; break;
default://0 不报警 default://0 不报警
PopupAndSound_Delete(POPUP_Radar_2HZ); PopupAndSound_Delete(POPUP_Radar_2HZ);
...@@ -608,6 +621,7 @@ void Popups_Polling(void) ...@@ -608,6 +621,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_RADAR_CHECK_OK); PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE); PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
Popup_Clear(POPUP_Radar_Changming);
break; break;
} }
} }
...@@ -618,6 +632,7 @@ void Popups_Polling(void) ...@@ -618,6 +632,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_RADAR_CHECK_OK); PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
PopupAndSound_Delete(POPUP_Radar_Changming); PopupAndSound_Delete(POPUP_Radar_Changming);
PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE); PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
Popup_Clear(POPUP_Radar_Changming);
} }
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment