Skip to content

TianYing_ty100
TianYing_ty100
Commit 62a56ea0 authored by 李俭双's avatar 李俭双
Browse files
Options

🐞 fix:44861,更改蓝牙导航显示

parent 9b993cfb
Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 23 deletions
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ 62a56ea0
......@@ -366,7 +366,9 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
{
switch(m_Code)
{
case NaviIconType_LEFT:
case EC_NAVI_ICON_LEFT:
case EC_NAVI_ICON_ENTRY_RING_LEFT:
case EC_NAVI_ICON_ENTRY_LEFT_RING_LEFT:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_ON;
......@@ -387,7 +389,9 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_RIGHT:
case EC_NAVI_ICON_RIGHT:
case EC_NAVI_ICON_ENTRY_RING_RIGHT:
case EC_NAVI_ICON_ENTRY_LEFT_RING_RIGHT:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_ON;
......@@ -408,7 +412,9 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_LEFT_FRONT:
case EC_NAVI_ICON_LEFT_FRONT:
case EC_NAVI_ICON_MERGE_LEFT:
case EC_NAVI_ICON_ROTARY_SLIGHT_LEFT:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_ON;
IC2_SEG169 = IC_SEG_ON;
......@@ -429,7 +435,9 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_RIGHT_FRONT:
case EC_NAVI_ICON_RIGHT_FRONT:
case EC_NAVI_ICON_MERGE_RIGHT:
case EC_NAVI_ICON_ROTARY_SLIGHT_RIGHT:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_ON;
IC2_SEG169 = IC_SEG_ON;
......@@ -450,7 +458,8 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_LEFT_BACK:
case EC_NAVI_ICON_LEFT_BACK:
case EC_NAVI_ICON_ROTARY_SHARP_LEFT:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_OFF;
......@@ -471,7 +480,8 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_RIGHT_BACK:
case EC_NAVI_ICON_RIGHT_BACK:
case EC_NAVI_ICON_ROTARY_SHARP_RIGHT:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_OFF;
......@@ -492,7 +502,9 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_STRAIGHT:
case EC_NAVI_ICON_STRAIGHT:
case EC_NAVI_ICON_ENTRY_RING_CONTINUE:
case EC_NAVI_ICON_ENTRY_LEFT_RING_CONTINUE:
IC2_SEG164 = IC_SEG_ON;
IC2_SEG165 = IC_SEG_ON;
IC2_SEG169 = IC_SEG_ON;
......@@ -513,7 +525,73 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_ARRIVED_SERVICE_AREA:
case EC_NAVI_ICON_LEFT_TURN_AROUND:
case EC_NAVI_ICON_ENTRY_RING_UTURN:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_OFF;
IC2_SEG170 = IC_SEG_ON;
IC2_SEG166 = IC_SEG_OFF;
IC2_SEG167 = IC_SEG_OFF;
IC2_SEG168 = IC_SEG_ON;
IC2_SEG163 = IC_SEG_OFF;
IC2_SEG171 = IC_SEG_OFF;
IC2_SEG172 = IC_SEG_OFF;
IC2_SEG162 = IC_SEG_OFF;
IC2_SEG161 = IC_SEG_OFF;
IC2_SEG160 = IC_SEG_OFF;
LED_Driver_Channel_Set(LampChannel_0, LampCh0_10_Navigator1, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_19_Navigator2, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_14_ARRIVED_SERVICE_AREA, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case EC_NAVI_ICON_UTURN_RIGHT:
case EC_NAVI_ICON_ENTRY_LEFT_RING_UTURN:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_OFF;
IC2_SEG170 = IC_SEG_ON;
IC2_SEG166 = IC_SEG_OFF;
IC2_SEG167 = IC_SEG_OFF;
IC2_SEG168 = IC_SEG_OFF;
IC2_SEG163 = IC_SEG_OFF;
IC2_SEG171 = IC_SEG_OFF;
IC2_SEG172 = IC_SEG_ON;
IC2_SEG162 = IC_SEG_OFF;
IC2_SEG161 = IC_SEG_OFF;
IC2_SEG160 = IC_SEG_OFF;
LED_Driver_Channel_Set(LampChannel_0, LampCh0_10_Navigator1, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_19_Navigator2, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_14_ARRIVED_SERVICE_AREA, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case EC_NAVI_ICON_SPECIAL_CONTINUE:
IC2_SEG164 = IC_SEG_ON;
IC2_SEG165 = IC_SEG_ON;
IC2_SEG169 = IC_SEG_ON;
IC2_SEG170 = IC_SEG_OFF;
IC2_SEG166 = IC_SEG_OFF;
IC2_SEG167 = IC_SEG_OFF;
IC2_SEG168 = IC_SEG_OFF;
IC2_SEG163 = IC_SEG_OFF;
IC2_SEG171 = IC_SEG_OFF;
IC2_SEG172 = IC_SEG_OFF;
IC2_SEG162 = IC_SEG_OFF;
IC2_SEG161 = IC_SEG_OFF;
IC2_SEG160 = IC_SEG_OFF;
LED_Driver_Channel_Set(LampChannel_0, LampCh0_10_Navigator1, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_19_Navigator2, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_14_ARRIVED_SERVICE_AREA, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case EC_NAVI_ICON_ARRIVED_SERVICE_AREA:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_OFF;
......@@ -534,7 +612,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_ARRIVED_TOLLGATE:
case EC_NAVI_ICON_ARRIVED_TOLLGATE:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_OFF;
......@@ -555,7 +633,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
break;
case NaviIconType_ARRIVED_TUNNEL:
case EC_NAVI_ICON_ARRIVED_TUNNEL:
IC2_SEG164 = IC_SEG_OFF;
IC2_SEG165 = IC_SEG_OFF;
IC2_SEG169 = IC_SEG_OFF;
......@@ -709,7 +787,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
}
else
{
Num = (m_Mileage / 100) % 1000 / 100;
Num = ((m_Mileage + 50) / 100) % 1000 / 100;
if (m_Mileage >= 10000)
{
m8 = SEG_DISPLAY_NUMBER0[Num];
......@@ -796,7 +874,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
}
else
{
Num = ((m_Mileage / 100) / 10) % 10;
Num = (((m_Mileage + 50) / 100) / 10) % 10;
m8 = SEG_DISPLAY_NUMBER0[Num];
}
if((ClearODO_Flag == 1) || (Common_GetIgnOnTime() < 3000))
......@@ -868,7 +946,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
}
else
{
Num = (m_Mileage / 100) % 10;
Num = ((m_Mileage + 50) / 100) % 10;
m8 = SEG_DISPLAY_NUMBER0[Num];
}
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h
View file @ 62a56ea0
......@@ -28,16 +28,73 @@ typedef enum
SEG_LED_MAX,
} SEG_LED_Idx_t;
#define NaviIconType_LEFT 0x02
#define NaviIconType_RIGHT 0x03
#define NaviIconType_LEFT_FRONT 0x04
#define NaviIconType_RIGHT_FRONT 0x05
#define NaviIconType_LEFT_BACK 0x06
#define NaviIconType_RIGHT_BACK 0x07
#define NaviIconType_STRAIGHT 0x09
#define NaviIconType_ARRIVED_SERVICE_AREA 0x0D
#define NaviIconType_ARRIVED_TOLLGATE 0x0E
#define NaviIconType_ARRIVED_TUNNEL 0x10
enum ECNaviIcon
{
EC_NAVI_ICON_NONE = 0,
EC_NAVI_ICON_DEFAULT = 1,
EC_NAVI_ICON_LEFT = 2,
EC_NAVI_ICON_RIGHT = 3,
EC_NAVI_ICON_LEFT_FRONT = 4,
EC_NAVI_ICON_RIGHT_FRONT = 5,
EC_NAVI_ICON_LEFT_BACK = 6,
EC_NAVI_ICON_RIGHT_BACK = 7,
EC_NAVI_ICON_LEFT_TURN_AROUND = 8,
EC_NAVI_ICON_STRAIGHT = 9,
EC_NAVI_ICON_ARRIVED_WAYPOINT = 10,
EC_NAVI_ICON_ENTER_ROUNDABOUT = 11,
EC_NAVI_ICON_OUT_ROUNDABOUT = 12,
EC_NAVI_ICON_ARRIVED_SERVICE_AREA = 13,
EC_NAVI_ICON_ARRIVED_TOLLGATE = 14,
EC_NAVI_ICON_ARRIVED_DESTINATION = 15,
EC_NAVI_ICON_ARRIVED_TUNNEL = 16,
EC_NAVI_ICON_CROSSWALK = 17,
EC_NAVI_ICON_OVERPASS = 18,
EC_NAVI_ICON_UNDERPASS = 19,
EC_NAVI_ICON_SQUARE = 20,
EC_NAVI_ICON_PARK = 21,
EC_NAVI_ICON_STAIRCASE = 22,
EC_NAVI_ICON_LIFT = 23,
EC_NAVI_ICON_CABLEWAY = 24,
EC_NAVI_ICON_SKY_CHANNEL = 25,
EC_NAVI_ICON_CHANNEL = 26,
EC_NAVI_ICON_WALK_ROAD = 27,
EC_NAVI_ICON_CRUISE_ROUTE = 28,
EC_NAVI_ICON_SIGHTSEEING_BUSLINE = 29,
EC_NAVI_ICON_SLIDEWAY = 30,
EC_NAVI_ICON_LADDER = 31,
EC_NAVI_ICON_MERGE_LEFT = 51,
EC_NAVI_ICON_MERGE_RIGHT = 52,
EC_NAVI_ICON_SLOW = 53,
EC_NAVI_ICON_ENTRY_RING_LEFT = 54,
EC_NAVI_ICON_ENTRY_RING_RIGHT = 55,
EC_NAVI_ICON_ENTRY_RING_CONTINUE = 56,
EC_NAVI_ICON_ENTRY_RING_UTURN = 57,
EC_NAVI_ICON_ENTRY_LEFT_RING = 58,
EC_NAVI_ICON_LEAVE_LEFT_RING = 59,
EC_NAVI_ICON_UTURN_RIGHT = 60,
EC_NAVI_ICON_SPECIAL_CONTINUE = 61,
EC_NAVI_ICON_ENTRY_LEFT_RING_LEFT = 62,
EC_NAVI_ICON_ENTRY_LEFT_RING_RIGHT = 63,
EC_NAVI_ICON_ENTRY_LEFT_RING_CONTINUE = 64,
EC_NAVI_ICON_ENTRY_LEFT_RING_UTURN = 65,
EC_NAVI_ICON_SLOPE = 66,
EC_NAVI_ICON_BRIDGE = 67,
EC_NAVI_ICON_FERRYBOAT = 68,
EC_NAVI_ICON_SUBWAY = 69,
EC_NAVI_ICON_ENTER_BUILDING = 70,
EC_NAVI_ICON_LEAVE_BUILDING = 71,
EC_NAVI_ICON_BY_ELEVATOR = 72,
EC_NAVI_ICON_BY_STAIR = 73,
EC_NAVI_ICON_ESCALATOR = 74,
EC_NAVI_ICON_LOW_TRAFFIC_CROSS = 75,
EC_NAVI_ICON_LOW_CROSS = 76,
EC_NAVI_ICON_ROTARY_SHARP_LEFT = 77,
EC_NAVI_ICON_ROTARY_SHARP_RIGHT = 78,
EC_NAVI_ICON_ROTARY_SLIGHT_LEFT = 79,
EC_NAVI_ICON_ROTARY_SLIGHT_RIGHT = 80,
EC_NAVI_ICON_MAX
};
......
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