Skip to content

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

✨ feat:增加超速报警配置和雷达配置

parent c03c402b
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 301 deletions
.gitignore 0 → 100644
View file @ 63b55aff
/le19源码/IAR_EWARM/Application/settings
le19源码/IAR_EWARM/Application/settings/Application.Debug.cspy.bat deleted 100644 → 0
View file @ c03c402b
@REM This batch file has been generated by the IAR Embedded Workbench
@REM C-SPY Debugger, as an aid to preparing a command line for running
@REM the cspybat command line utility using the appropriate settings.
@REM
@REM Note that this file is generated every time a new debug session
@REM is initialized, so you may want to move or rename the file before
@REM making changes.
@REM
@REM You can launch cspybat by typing the name of this batch file followed
@REM by the name of the debug file (usually an ELF/DWARF or UBROF file).
@REM
@REM Read about available command line parameters in the C-SPY Debugging
@REM Guide. Hints about additional command line parameters that may be
@REM useful in specific cases:
@REM --download_only Downloads a code image without starting a debug
@REM session afterwards.
@REM --silent Omits the sign-on message.
@REM --timeout Limits the maximum allowed execution time.
@REM
@echo off
if not "%~1" == "" goto debugFile
@echo on
"C:\Program Files (x86)\IAR Systems\Embedded Workbench 7.5\common\bin\cspybat" -f "E:\work\GIT\lg02y\IAR_EWARM\Application\settings\Application.Debug.general.xcl" --backend -f "E:\work\GIT\lg02y\IAR_EWARM\Application\settings\Application.Debug.driver.xcl"
@echo off
goto end
:debugFile
@echo on
"C:\Program Files (x86)\IAR Systems\Embedded Workbench 7.5\common\bin\cspybat" -f "E:\work\GIT\lg02y\IAR_EWARM\Application\settings\Application.Debug.general.xcl" "--debug_file=%~1" --backend -f "E:\work\GIT\lg02y\IAR_EWARM\Application\settings\Application.Debug.driver.xcl"
@echo off
:end
\ No newline at end of file
le19源码/IAR_EWARM/Application/settings/Application.DebugWithoutBootloader.cspy.bat deleted 100644 → 0
View file @ c03c402b
@REM This batch file has been generated by the IAR Embedded Workbench
@REM C-SPY Debugger, as an aid to preparing a command line for running
@REM the cspybat command line utility using the appropriate settings.
@REM
@REM Note that this file is generated every time a new debug session
@REM is initialized, so you may want to move or rename the file before
@REM making changes.
@REM
@REM You can launch cspybat by typing the name of this batch file followed
@REM by the name of the debug file (usually an ELF/DWARF or UBROF file).
@REM
@REM Read about available command line parameters in the C-SPY Debugging
@REM Guide. Hints about additional command line parameters that may be
@REM useful in specific cases:
@REM --download_only Downloads a code image without starting a debug
@REM session afterwards.
@REM --silent Omits the sign-on message.
@REM --timeout Limits the maximum allowed execution time.
@REM
@echo off
if not "%~1" == "" goto debugFile
@echo on
"E:\Program Files (x86)\IAR Systems\Embedded Workbench 7.5\common\bin\cspybat" -f "D:\A_Work\A_PROJECT\LE19\le19\le19Ô´Âë\IAR_EWARM\Application\settings\Application.DebugWithoutBootloader.general.xcl" --backend -f "D:\A_Work\A_PROJECT\LE19\le19\le19Ô´Âë\IAR_EWARM\Application\settings\Application.DebugWithoutBootloader.driver.xcl"
@echo off
goto end
:debugFile
@echo on
"E:\Program Files (x86)\IAR Systems\Embedded Workbench 7.5\common\bin\cspybat" -f "D:\A_Work\A_PROJECT\LE19\le19\le19Ô´Âë\IAR_EWARM\Application\settings\Application.DebugWithoutBootloader.general.xcl" "--debug_file=%~1" --backend -f "D:\A_Work\A_PROJECT\LE19\le19\le19Ô´Âë\IAR_EWARM\Application\settings\Application.DebugWithoutBootloader.driver.xcl"
@echo off
:end
\ No newline at end of file
le19源码/IAR_EWARM/Application/settings/Application.DebugWithoutBootloader.cspy.ps1 deleted 100644 → 0
View file @ c03c402b
param([String]$debugfile = "");
# This powershell file has been generated by the IAR Embedded Workbench
# C - SPY Debugger, as an aid to preparing a command line for running
# the cspybat command line utility using the appropriate settings.
#
# Note that this file is generated every time a new debug session
# is initialized, so you may want to move or rename the file before
# making changes.
#
# You can launch cspybat by typing Powershell.exe -File followed by the name of this batch file, followed
# by the name of the debug file (usually an ELF / DWARF or UBROF file).
#
# Read about available command line parameters in the C - SPY Debugging
# Guide. Hints about additional command line parameters that may be
# useful in specific cases :
# --download_only Downloads a code image without starting a debug
# session afterwards.
# --silent Omits the sign - on message.
# --timeout Limits the maximum allowed execution time.
#
if ($debugfile -eq "")
{
& "C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\诊断项目\吉利\LG02Y\App\IAR_EWARM\Application\settings\Application.DebugWithoutBootloader.general.xcl" --backend -f "E:\诊断项目\吉利\LG02Y\App\IAR_EWARM\Application\settings\Application.DebugWithoutBootloader.driver.xcl"
}
else
{
& "C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\诊断项目\吉利\LG02Y\App\IAR_EWARM\Application\settings\Application.DebugWithoutBootloader.general.xcl" --debug_file=$debugfile --backend -f "E:\诊断项目\吉利\LG02Y\App\IAR_EWARM\Application\settings\Application.DebugWithoutBootloader.driver.xcl"
}
le19源码/IAR_EWARM/Application/settings/Application.Release.cspy.bat deleted 100644 → 0
View file @ c03c402b
@REM This batch file has been generated by the IAR Embedded Workbench
@REM C-SPY Debugger, as an aid to preparing a command line for running
@REM the cspybat command line utility using the appropriate settings.
@REM
@REM Note that this file is generated every time a new debug session
@REM is initialized, so you may want to move or rename the file before
@REM making changes.
@REM
@REM You can launch cspybat by typing the name of this batch file followed
@REM by the name of the debug file (usually an ELF/DWARF or UBROF file).
@REM
@REM Read about available command line parameters in the C-SPY Debugging
@REM Guide. Hints about additional command line parameters that may be
@REM useful in specific cases:
@REM --download_only Downloads a code image without starting a debug
@REM session afterwards.
@REM --silent Omits the sign-on message.
@REM --timeout Limits the maximum allowed execution time.
@REM
@echo off
if not "%~1" == "" goto debugFile
@echo on
"C:\Program Files (x86)\IAR Systems\Embedded Workbench 7.5\common\bin\cspybat" -f "E:\work\GIT\lg02y\IAR_EWARM\Application\settings\Application.Release.general.xcl" --backend -f "E:\work\GIT\lg02y\IAR_EWARM\Application\settings\Application.Release.driver.xcl"
@echo off
goto end
:debugFile
@echo on
"C:\Program Files (x86)\IAR Systems\Embedded Workbench 7.5\common\bin\cspybat" -f "E:\work\GIT\lg02y\IAR_EWARM\Application\settings\Application.Release.general.xcl" "--debug_file=%~1" --backend -f "E:\work\GIT\lg02y\IAR_EWARM\Application\settings\Application.Release.driver.xcl"
@echo off
:end
\ No newline at end of file
le19源码/IAR_EWARM/Application/settings/Application.crun deleted 100644 → 0
View file @ c03c402b
<?xml version="1.0" encoding="iso-8859-1"?>
<crun>
<version>1</version>
<filter_entries>
<filter index="0" type="default">
<type>*</type>
<start_file>*</start_file>
<end_file>*</end_file>
<action_debugger>0</action_debugger>
<action_log>1</action_log>
</filter>
</filter_entries>
</crun>
le19源码/IAR_EWARM/Application/settings/Application.dnx deleted 100644 → 0
View file @ c03c402b
<?xml version="1.0"?>
<settings>
<Stack>
<FillEnabled>0</FillEnabled>
<OverflowWarningsEnabled>1</OverflowWarningsEnabled>
<WarningThreshold>90</WarningThreshold>
<SpWarningsEnabled>1</SpWarningsEnabled>
<WarnLogOnly>1</WarnLogOnly>
<UseTrigger>1</UseTrigger>
<TriggerName>main</TriggerName>
<LimitSize>0</LimitSize>
<ByteLimit>50</ByteLimit>
</Stack>
<JLinkDriver>
<WatchCond>_ 0</WatchCond>
<Watch0>_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0</Watch0>
<Watch1>_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0</Watch1>
<CStepIntDis>_ 0</CStepIntDis>
<LeaveTargetRunning>_ 0</LeaveTargetRunning>
</JLinkDriver>
<DebugChecksum>
<Checksum>503555919</Checksum>
</DebugChecksum>
<Exceptions>
<StopOnUncaught>_ 0</StopOnUncaught>
<StopOnThrow>_ 0</StopOnThrow>
</Exceptions>
<CallStack>
<ShowArgs>0</ShowArgs>
</CallStack>
<Disassembly>
<MixedMode>1</MixedMode>
</Disassembly>
<CallStackLog>
<Enabled>0</Enabled>
</CallStackLog>
<CallStackStripe>
<ShowTiming>1</ShowTiming>
</CallStackStripe>
<TermIOLog>
<LoggingEnabled>_ 0</LoggingEnabled>
<LogFile>_ ""</LogFile>
</TermIOLog>
<Log_file>
<LoggingEnabled>_ 0</LoggingEnabled>
<LogFile>_ ""</LogFile>
<Category>_ 0</Category>
</Log_file>
<Disassemble_mode>
<mode>0</mode>
</Disassemble_mode>
<DisassembleMode>
<mode>0</mode>
</DisassembleMode>
<Breakpoints2>
<Count>0</Count>
</Breakpoints2>
<Aliases>
<Count>0</Count>
<SuppressDialog>0</SuppressDialog>
</Aliases>
</settings>
le19源码/IAR_EWARM/Application/settings/Application_DebugWithoutBootloader.jlink deleted 100644 → 0
View file @ c03c402b
[BREAKPOINTS]
ForceImpTypeAny = 0
ShowInfoWin = 1
EnableFlashBP = 2
BPDuringExecution = 0
[CFI]
CFISize = 0x00
CFIAddr = 0x00
[CPU]
MonModeVTableAddr = 0xFFFFFFFF
MonModeDebug = 0
MaxNumAPs = 0
LowPowerHandlingMode = 0
OverrideMemMap = 0
AllowSimulation = 1
ScriptFile="..\..\debugger_scripts\Default.JLinkScript"
[FLASH]
CacheExcludeSize = 0x00
CacheExcludeAddr = 0x00
MinNumBytesFlashDL = 0
SkipProgOnCRCMatch = 1
VerifyDownload = 1
AllowCaching = 1
EnableFlashDL = 2
Override = 1
Device="Cortex-R5"
[GENERAL]
WorkRAMSize = 0x00
WorkRAMAddr = 0x00
RAMUsageLimit = 0x00
[SWO]
SWOLogFile=""
[MEM]
RdOverrideOrMask = 0x00
RdOverrideAndMask = 0xFFFFFFFF
RdOverrideAddr = 0xFFFFFFFF
WrOverrideOrMask = 0x00
WrOverrideAndMask = 0xFFFFFFFF
WrOverrideAddr = 0xFFFFFFFF
le19源码/Source/Application/Alarm/Popups.c
View file @ 63b55aff
......@@ -40,7 +40,7 @@ uint16_t SelfCheck_time = 50;
uint16_t Door_Warningtimer;
extern uint16_t Over_Speed_Config;
void SetRADAR_SOUND(uint8_t Level)
......@@ -445,11 +445,11 @@ void Popups_Polling(void)
//超速报警
if(IGstPopup1 == IGN_ON)
{
if ( m_Vspeed >= 810 )
if ( m_Vspeed > Over_Speed_Config )
{
Popup_Request(POPUP_Over_Speed);
}
if(m_Vspeed < 780)
if(m_Vspeed <= (Over_Speed_Config - 30))
{
PopupAndSound_Delete(POPUP_Over_Speed);
}
......@@ -460,7 +460,7 @@ void Popups_Polling(void)
}
/*雷达距离声音提示*/
if(/*EOL_GetF101() == */2)//can雷达
if(Val_EOL_F102_RadarType() == 2)//can雷达
{
if(IGstPopup1 == IGN_ON)
{
......@@ -547,7 +547,7 @@ void Popups_Polling(void)
PopupAndSound_Delete(POPUP_Radar_Changming);
}
}
else if(/*EOL_GetF101() ==*/ 3)
else if(Val_EOL_F102_RadarType() == 3)
{
if(IGstPopup1 == IGN_ON)
{
......@@ -750,31 +750,31 @@ void Popups_Sound_Playing(uint8_t PopupSnd)
case SND_RADAR:
if ( RADAR_SOUND == RADAR_SND_CONTINUOUS )
{
// Sound_Delete(SND_RADAR_1HZ);
// Sound_Delete(SND_RADAR_2HZ);
// Sound_Delete(SND_RADAR_4HZ);
// Sound_Request(SND_RADAR_Changming, ReqCode);
Sound_Delete(SND_RADAR_1HZ);
Sound_Delete(SND_RADAR_2HZ);
Sound_Delete(SND_RADAR_4HZ);
Sound_Request(SND_RADAR_Changming, ReqCode);
}
else if ( RADAR_SOUND == RADAR_SND_2Hz )
{
// Sound_Delete(SND_RADAR_1HZ);
// Sound_Delete(SND_RADAR_4HZ);
// Sound_Delete(SND_RADAR_Changming);
// Sound_Request(SND_RADAR_2HZ, ReqCode);
Sound_Delete(SND_RADAR_1HZ);
Sound_Delete(SND_RADAR_4HZ);
Sound_Delete(SND_RADAR_Changming);
Sound_Request(SND_RADAR_2HZ, ReqCode);
}
else if ( RADAR_SOUND == RADAR_SND_4Hz )
{
// Sound_Delete(SND_RADAR_1HZ);
// Sound_Delete(SND_RADAR_2HZ);
// Sound_Delete(SND_RADAR_Changming);
// Sound_Request(SND_RADAR_4HZ, ReqCode);
Sound_Delete(SND_RADAR_1HZ);
Sound_Delete(SND_RADAR_2HZ);
Sound_Delete(SND_RADAR_Changming);
Sound_Request(SND_RADAR_4HZ, ReqCode);
}
else
{
// Sound_Delete(SND_RADAR_1HZ);
// Sound_Delete(SND_RADAR_2HZ);
// Sound_Delete(SND_RADAR_4HZ);
// Sound_Delete(SND_RADAR_Changming);
Sound_Delete(SND_RADAR_1HZ);
Sound_Delete(SND_RADAR_2HZ);
Sound_Delete(SND_RADAR_4HZ);
Sound_Delete(SND_RADAR_Changming);
}
break;
default:
......
le19源码/Source/Application/Alarm/Sound_List.h
View file @ 63b55aff
......@@ -21,7 +21,7 @@ enum SoundName
SND_RADAR_2S, /* 雷达 2S */
SND_RADAR_4S, /* 雷达 4S */
SND_RADAR_0S, /* 雷达 0.5S */
SND_RADAR_OK0S, /* 雷达 自检ok长鸣0.5S */
SND_RADAR_OK0S, /* 雷达 0.5S */
SND_EPB_Status, /* 制动液位低 */
SND_SEATBELT_DR_1HZ, /* 安全带未系 1HZ */
SND_SEATBELT_DR_2HZ, /* 安全带未系 2HZ */
......
le19源码/Source/Application/Alarm/Sound_Scheduler.c
View file @ 63b55aff
......@@ -24,7 +24,7 @@ const SoundAttributeStruct SoundList [ SND_TOTAL_NUM ] = {
{/*雷达 2S */ SND_SRC_Radar_2S, SND_TYPE_RADAR, },
{/*雷达 4S */ SND_SRC_Radar_4S, SND_TYPE_RADAR, },
{/*雷达 0.5S */ SND_SRC_Radar_0S, SND_TYPE_RADAR, },
{/*雷达自检ok长鸣0.5S */ SND_SRC_Radar_OK0S, SND_TYPE_RADAR, },
{/*雷达 0.5S */ SND_SRC_Radar_OK0S, SND_TYPE_RADAR, },
{/*制动液位低 */ SND_SRC_EPB_Status, SND_TYPE_NORMAL, },
{/*安全带未系 */ SND_SRC_SEATBELT_DR_1HZ, SND_TYPE_NORMAL, },
{/*安全带未系 */ SND_SRC_SEATBELT_DR_2HZ, SND_TYPE_NORMAL, },
......@@ -78,7 +78,7 @@ const SndAttributeStruct SndAttributeTable [ SND_SRC_TOTAL_NUM ] = {
{ /* 雷达 1HZ */ 0x03, 12u, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },
{ /* 雷达 2HZ */ 0x03, 12u, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },
{ /* 雷达 4HZ */ 0x04, 12u, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },
{ /* 雷达 2S */ 0x02, 12u, 1u, SND_MODE_SINGLE, 2000u, },
{ /* 雷达 2S */ 0x02, 12u, 1u, SND_MODE_LOOP, 2000u, },
{ /* 雷达 4S */ 0x02, 3u, 1u, SND_MODE_SINGLE, 4000u, },
{ /* 雷达 0.5S */ 0x02, 3u, 1u, SND_MODE_SINGLE, 500u, },
{ /* 雷达自检ok长鸣0.5S */ 0x02, 12u, 1u, SND_MODE_SINGLE, 500u, },
......
le19源码/Source/Application/Alarm/Sound_Source.h
View file @ 63b55aff
......@@ -21,7 +21,7 @@ enum
SND_SRC_Radar_2S, /* 雷达 2S */
SND_SRC_Radar_4S, /* 雷达 4S */
SND_SRC_Radar_0S, /* 雷达 0S */
SND_SRC_Radar_OK0S, /* 雷达自检ok长鸣0.5S */
SND_SRC_Radar_OK0S, /* 雷达 0S */
SND_SRC_EPB_Status, /* 制动液位低 */
SND_SRC_SEATBELT_DR_1HZ, /* 安全带未系 1HZ */
SND_SRC_SEATBELT_DR_2HZ, /* 安全带未系 2HZ */
......
le19源码/Source/Application/Device/Radar_R3.c
View file @ 63b55aff
......@@ -109,7 +109,7 @@ static void Recv_Byte(void)
/*DataDecoding*/
void Recv_New(void)
{
uint8_t Condition_EOL = 0x06u; // Val_EOL_F101_Radar();
uint8_t Condition_EOL = 0x07u; // Val_EOL_F101_Radar();
uint8_t Condition_Frame = (PDC_R3.Frame_T > 2U) ? 1U : 0U;
/*PDC_Standby */
if ( Condition_Frame == 1U )
......
le19源码/Source/Application/Display/Gauge_Display.c
View file @ 63b55aff
......@@ -76,6 +76,7 @@ uint16_t PowerOn_Scan_Timing = 0;
uint16_t PowerOn_Scan_Flag = 1;
//uint16_t Gauge_VSpeed_Display_Flag = 0;
uint16_t Gauge_VSpeed_Display_Flag = 0;
uint16_t Over_Speed_Config = 0;
/**************************************************************************
* \brief ���ٱ���ʾ����
* \attention �÷��������뱻ʵʱ����
......@@ -85,8 +86,7 @@ void Gauge_VSpeed_Display(void)
{
uint16_t VSpeedDisplayValue = 0;
// static uint16_t refresh_timer=0;
uint16_t Over_Speed_Config = 0;
Over_Speed_Config = Get_Over_Speed_Config(0);
Over_Speed_Config = Get_Over_Speed_Config(Val_EOL_F102_MaximumSpeedLimit());
if ( SYS_OPR_STAT_IGN_ON )
{
if ( Common_Get_Disp_V_Speed_Valid( ) == 1u )
......
le19源码/Source/Application/UDS/APP/Common/EOL_Para.c
View file @ 63b55aff
......@@ -43,7 +43,7 @@ void EOL_InitVal(void)
{
EOL_F102.F102_Byte[i] = 0x00u;
}
EOL_F102.F102_Byte[21] = 0x60;
EOL_F102.F102_Byte[21] = 0x50;
}
......
le19源码/Source/Library/Driver/inc/Work_Flash.h
View file @ 63b55aff
......@@ -8,7 +8,7 @@
#define WFLASH_BLOCK_01_SIZE (24U)
#define WFLASH_BLOCK_02_SIZE (20U)
#define WFLASH_BLOCK_03_SIZE (116u)
#define WFLASH_BLOCK_04_SIZE (356U)
#define WFLASH_BLOCK_04_SIZE (400U)
#define WFLASH_BLOCK_05_SIZE (400+4)
#define WFLASH_BLOCK_06_SIZE (20U)
......
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