Skip to content

TianYing_ty100
TianYing_ty100
Commit a6142f16 authored by 高士达's avatar 高士达
Browse files
Options

Merge branch 'CJL' into 'dev' 

Cjl

See merge request !109
parents 181083bc 3452e236
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ a6142f16
...@@ -51,21 +51,21 @@ __align(4) ...@@ -51,21 +51,21 @@ __align(4)
const LED_Attribute_st LED_Attribute [ LED_Max ] = { const LED_Attribute_st LED_Attribute [ LED_Max ] = {
/* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */ /* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */
{em_LED_High_Beam, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_High_Beam_Judgement, LED_High_Beam_Execution}, {em_LED_High_Beam, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_High_Beam_Judgement, LED_High_Beam_Execution},
{em_LED_FAULT_ELECTROSPRAY, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_FAULT_ELECTROSPRAY_Judgement, LED_FAULT_ELECTROSPRAY_Execution}, {em_LED_FAULT_ELECTROSPRAY, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_FAULT_ELECTROSPRAY_Judgement, LED_FAULT_ELECTROSPRAY_Execution},
{em_LED_ABS, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_ABS_Judgement, LED_ABS_Execution}, {em_LED_ABS, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_ABS_Judgement, LED_ABS_Execution},
{em_LED_Oil_Pressure, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Oil_Pressure_Judgement, LED_Oil_Pressure_Execution}, {em_LED_Oil_Pressure, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Oil_Pressure_Judgement, LED_Oil_Pressure_Execution},
{em_LED_Fuel, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fuel_Judgement, LED_Fuel_Execution}, {em_LED_Fuel, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Fuel_Judgement, LED_Fuel_Execution},
{em_LED_Coolant, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Coolant_Judgement, LED_Coolant_Execution}, {em_LED_Coolant, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Coolant_Judgement, LED_Coolant_Execution},
{em_LED_Bluetooth, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Bluetooth_Judgement, LED_Bluetooth_Execution}, {em_LED_Bluetooth, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Bluetooth_Judgement, LED_Bluetooth_Execution},
{em_LED_TCS, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_TCS_Judgement, LED_TCS_Execution}, {em_LED_TCS, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_TCS_Judgement, LED_TCS_Execution},
{em_LED_Auto_Start_Stop, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Auto_Start_Judgement, LED_Auto_Start_Execution}, {em_LED_Auto_Start_Stop, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Auto_Start_Judgement, LED_Auto_Start_Execution},
//{em_LED_Keys, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Keys_Judgement, LED_Keys_Execution}, //{em_LED_Keys, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Keys_Judgement, LED_Keys_Execution},
{em_LED_Maintain, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Maintain_Judgement, LED_Maintain_Execution}, {em_LED_Maintain, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Maintain_Judgement, LED_Maintain_Execution},
{em_LED_Low_Batt_Vol, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Low_Batt_Judgement, LED_Low_Batt_Execution}, {em_LED_Low_Batt_Vol, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Low_Batt_Judgement, LED_Low_Batt_Execution},
{em_LED_Lateral_Strut, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Lateral_Strut_Judgement, LED_Lateral_Strut_Execution}, {em_LED_Lateral_Strut, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Lateral_Strut_Judgement, LED_Lateral_Strut_Execution},
#if(IC_Current == TY200_080000b_ty) #if(IC_Current == TY200_080000b_ty)
{em_LED_Tire_Pressure_Alarm, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Tire_Pressure_Judgement, LED_Tire_Pressure_Execution}, {em_LED_Tire_Pressure_Alarm, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3030ul, LED_Tire_Pressure_Judgement, LED_Tire_Pressure_Execution},
#endif #endif
//{em_LED_Navigator, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Navigato_Judgement, LED_Navigato_Execution}, //{em_LED_Navigator, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Navigato_Judgement, LED_Navigato_Execution},
......
Firmware/utility/程序释放/20241008/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.25_241008/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.25_241008.srec
View file @ a6142f16
...@@ -1735,7 +1735,7 @@ S1136C400649087100BF00BF00BF00BF00BF034872 ...@@ -1735,7 +1735,7 @@ S1136C400649087100BF00BF00BF00BF00BF034872
S1136C500079402108400028F9D17047000402401F S1136C500079402108400028F9D17047000402401F
S1136C60000C024055660100000000000000000016 S1136C60000C024055660100000000000000000016
S1136C700000000BFFFFFFFFFFFFFFFFFFFFFFFF11 S1136C700000000BFFFFFFFFFFFFFFFFFFFFFFFF11
S1137000722BB601000078000001AF60FFFFFFFFA4 S1137000EA6FEBD6000078000001AF60FFFFFFFFDE
S1137010FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C S1137010FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C
S1137020FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C S1137020FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C
S1137030FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5C S1137030FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5C
...@@ -8588,25 +8588,25 @@ S214021C10794B0100C94C01005D4D01000000581BC4 ...@@ -8588,25 +8588,25 @@ S214021C10794B0100C94C01005D4D01000000581BC4
S214021C204C1D2823102760EA60EA60EA60EAFFFF9C S214021C204C1D2823102760EA60EA60EA60EAFFFF9C
S214021C30C40932000000581B4C1D2823102760EAF6 S214021C30C40932000000581B4C1D2823102760EAF6
S214021C4060EA60EA60EAFFFF0200020002000000AB S214021C4060EA60EA60EAFFFF0200020002000000AB
S214021C50000001000000010000000000B80B0000B8 S214021C50000001000000010000000000D60B00009A
S214021C60A1400100714001000100010000000100D6 S214021C60A1400100714001000100010000000100D6
S214021C7000000000B80B0000893F0100593F010038 S214021C7000000000D60B0000893F0100593F01001A
S214021C80020001000000010000000000B80B000086 S214021C80020001000000010000000000D60B000068
S214021C90793501004935010003000100000001000A S214021C90793501004935010003000100000001000A
S214021CA000000000B80B00004F4201001F42010076 S214021CA000000000D60B00004F4201001F42010058
S214021CB0040001000000010000000000B80B000054 S214021CB0040001000000010000000000D60B000036
S214021CC03D400100A13F01000500010000000100A7 S214021CC03D400100A13F01000500010000000100A7
S214021CD000000000B80B000019370100353601007D S214021CD000000000D60B000019370100353601005F
S214021CE0060001000000010000000000B80B000022 S214021CE0060001000000010000000000D60B000004
S214021CF01D360100ED35010007000100000001005D S214021CF01D360100ED35010007000100000001005D
S214021D0000000000B80B000001430100674201001A S214021D0000000000D60B00000143010067420100FC
S214021D10080001000000010000000000B80B0000EF S214021D10080001000000010000000000D60B0000D1
S214021D20D5350100A53501000900010000000100BB S214021D20D5350100A53501000900010000000100BB
S214021D3000000000B80B000009420100D941010072 S214021D3000000000D60B000009420100D941010054
S214021D400A0001000000010000000000B80B0000BD S214021D400A0001000000010000000000D60B00009F
S214021D5055410100254101000B0001000000010071 S214021D5055410100254101000B0001000000010071
S214021D6000000000B80B0000E9400100B940010085 S214021D6000000000D60B0000E9400100B940010067
S214021D700C0001000000010000000000B80B00008B S214021D700C0001000000010000000000D60B00006D
S214021D8089440100214401000000010623000001ED S214021D8089440100214401000000010623000001ED
S214021D9055CD0000010002082500000401CD000018 S214021D9055CD0000010002082500000401CD000018
S214021DA0050006082500000401CD0000060007090C S214021DA0050006082500000401CD0000060007090C
......
Firmware/utility/程序释放/20241008/TY_TY200.080000b_ty_BAT32G139GK64FB_BootApp_S1.25_241008/TY_TY200.080000b_ty_BAT32G139GK64FB_UpdateApp_S1.25_241008.srec
View file @ a6142f16
S0030000FC S0030000FC
S1137000722BB601000078000001AF60FFFFFFFFA4 S1137000EA6FEBD6000078000001AF60FFFFFFFFDE
S1137010FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C S1137010FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C
S1137020FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C S1137020FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C
S1137030FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5C S1137030FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5C
...@@ -6852,25 +6852,25 @@ S214021C10794B0100C94C01005D4D01000000581BC4 ...@@ -6852,25 +6852,25 @@ S214021C10794B0100C94C01005D4D01000000581BC4
S214021C204C1D2823102760EA60EA60EA60EAFFFF9C S214021C204C1D2823102760EA60EA60EA60EAFFFF9C
S214021C30C40932000000581B4C1D2823102760EAF6 S214021C30C40932000000581B4C1D2823102760EAF6
S214021C4060EA60EA60EAFFFF0200020002000000AB S214021C4060EA60EA60EAFFFF0200020002000000AB
S214021C50000001000000010000000000B80B0000B8 S214021C50000001000000010000000000D60B00009A
S214021C60A1400100714001000100010000000100D6 S214021C60A1400100714001000100010000000100D6
S214021C7000000000B80B0000893F0100593F010038 S214021C7000000000D60B0000893F0100593F01001A
S214021C80020001000000010000000000B80B000086 S214021C80020001000000010000000000D60B000068
S214021C90793501004935010003000100000001000A S214021C90793501004935010003000100000001000A
S214021CA000000000B80B00004F4201001F42010076 S214021CA000000000D60B00004F4201001F42010058
S214021CB0040001000000010000000000B80B000054 S214021CB0040001000000010000000000D60B000036
S214021CC03D400100A13F01000500010000000100A7 S214021CC03D400100A13F01000500010000000100A7
S214021CD000000000B80B000019370100353601007D S214021CD000000000D60B000019370100353601005F
S214021CE0060001000000010000000000B80B000022 S214021CE0060001000000010000000000D60B000004
S214021CF01D360100ED35010007000100000001005D S214021CF01D360100ED35010007000100000001005D
S214021D0000000000B80B000001430100674201001A S214021D0000000000D60B00000143010067420100FC
S214021D10080001000000010000000000B80B0000EF S214021D10080001000000010000000000D60B0000D1
S214021D20D5350100A53501000900010000000100BB S214021D20D5350100A53501000900010000000100BB
S214021D3000000000B80B000009420100D941010072 S214021D3000000000D60B000009420100D941010054
S214021D400A0001000000010000000000B80B0000BD S214021D400A0001000000010000000000D60B00009F
S214021D5055410100254101000B0001000000010071 S214021D5055410100254101000B0001000000010071
S214021D6000000000B80B0000E9400100B940010085 S214021D6000000000D60B0000E9400100B940010067
S214021D700C0001000000010000000000B80B00008B S214021D700C0001000000010000000000D60B00006D
S214021D8089440100214401000000010623000001ED S214021D8089440100214401000000010623000001ED
S214021D9055CD0000010002082500000401CD000018 S214021D9055CD0000010002082500000401CD000018
S214021DA0050006082500000401CD0000060007090C S214021DA0050006082500000401CD0000060007090C
......
Firmware/utility/程序释放/20241008/TianYing.hex
View file @ a6142f16
...@@ -6606,25 +6606,25 @@ ...@@ -6606,25 +6606,25 @@
:101C20004C1D2823102760EA60EA60EA60EAFFFFA3 :101C20004C1D2823102760EA60EA60EA60EAFFFFA3
:101C3000C40932000000581B4C1D2823102760EAFD :101C3000C40932000000581B4C1D2823102760EAFD
:101C400060EA60EA60EAFFFF0200020002000000B2 :101C400060EA60EA60EAFFFF0200020002000000B2
:101C5000000001000000010000000000B80B0000BF :101C5000000001000000010000000000D60B0000A1
:101C6000A1400100714001000100010000000100DD :101C6000A1400100714001000100010000000100DD
:101C700000000000B80B0000893F0100593F01003F :101C700000000000D60B0000893F0100593F010021
:101C8000020001000000010000000000B80B00008D :101C8000020001000000010000000000D60B00006F
:101C90007935010049350100030001000000010011 :101C90007935010049350100030001000000010011
:101CA00000000000B80B00004F4201001F4201007D :101CA00000000000D60B00004F4201001F4201005F
:101CB000040001000000010000000000B80B00005B :101CB000040001000000010000000000D60B00003D
:101CC0003D400100A13F01000500010000000100AE :101CC0003D400100A13F01000500010000000100AE
:101CD00000000000B80B0000193701003536010084 :101CD00000000000D60B0000193701003536010066
:101CE000060001000000010000000000B80B000029 :101CE000060001000000010000000000D60B00000B
:101CF0001D360100ED350100070001000000010064 :101CF0001D360100ED350100070001000000010064
:101D000000000000B80B0000014301006742010021 :101D000000000000D60B0000014301006742010003
:101D1000080001000000010000000000B80B0000F6 :101D1000080001000000010000000000D60B0000D8
:101D2000D5350100A53501000900010000000100C2 :101D2000D5350100A53501000900010000000100C2
:101D300000000000B80B000009420100D941010079 :101D300000000000D60B000009420100D94101005B
:101D40000A0001000000010000000000B80B0000C4 :101D40000A0001000000010000000000D60B0000A6
:101D500055410100254101000B0001000000010078 :101D500055410100254101000B0001000000010078
:101D600000000000B80B0000E9400100B94001008C :101D600000000000D60B0000E9400100B94001006E
:101D70000C0001000000010000000000B80B000092 :101D70000C0001000000010000000000D60B000074
:101D800089440100214401000000010623000001F4 :101D800089440100214401000000010623000001F4
:101D900055CD0000010002082500000401CD00001F :101D900055CD0000010002082500000401CD00001F
:101DA000050006082500000401CD00000600070913 :101DA000050006082500000401CD00000600070913
......
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