huahua/RP-01
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

座椅按摩调试OK

Browse Source
This commit is contained in:
sunbeam 2025-04-23 16:46:44 +08:00
parent 8e974b6d7e
commit 46e986b913
5 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cva_asw_m0146/settings/cva_asw_m0146.Debug.cspy.bat
View File

@ -25,7 +25,7 @@ if not "%~1" == "" goto debugFile
@echo on
"D:\Program Files\IAR Systems\Embedded Workbench 9.2\common\bin\cspybat" -f "F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.general.xcl" --backend -f "F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.driver.xcl"
"C:\Program Files\IAR Systems\Embedded Workbench 9.2\common\bin\cspybat" -f "C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.general.xcl" --backend -f "C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.driver.xcl"
@echo off
goto end
@ -34,7 +34,7 @@ goto end
@echo on
"D:\Program Files\IAR Systems\Embedded Workbench 9.2\common\bin\cspybat" -f "F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.general.xcl" "--debug_file=%~1" --backend -f "F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.driver.xcl"
"C:\Program Files\IAR Systems\Embedded Workbench 9.2\common\bin\cspybat" -f "C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.general.xcl" "--debug_file=%~1" --backend -f "C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.driver.xcl"
@echo off
:end

4
cva_asw_m0146/settings/cva_asw_m0146.Debug.cspy.ps1
View File

@ -23,9 +23,9 @@
if ($debugfile -eq "")
{
& "D:\Program Files\IAR Systems\Embedded Workbench 9.2\common\bin\cspybat" -f "F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.general.xcl" --backend -f "F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.driver.xcl"
& "C:\Program Files\IAR Systems\Embedded Workbench 9.2\common\bin\cspybat" -f "C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.general.xcl" --backend -f "C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.driver.xcl"
}
else
{
& "D:\Program Files\IAR Systems\Embedded Workbench 9.2\common\bin\cspybat" -f "F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.general.xcl" --debug_file=$debugfile --backend -f "F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.driver.xcl"
& "C:\Program Files\IAR Systems\Embedded Workbench 9.2\common\bin\cspybat" -f "C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.general.xcl" --debug_file=$debugfile --backend -f "C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\settings\cva_asw_m0146.Debug.driver.xcl"
}

2
cva_asw_m0146/settings/cva_asw_m0146.Debug.driver.xcl
View File

@ -6,7 +6,7 @@
"-p"
"D:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\config\debugger\CVAChip\CVM0144.ddf"
"C:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\config\debugger\CVAChip\CVM0144.ddf"
"--semihosting"

8
cva_asw_m0146/settings/cva_asw_m0146.Debug.general.xcl
View File

@ -1,10 +1,10 @@
"D:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\bin\armPROC.dll"
"C:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\bin\armPROC.dll"
"D:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\bin\armJLINK.dll"
"C:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\bin\armJLINK.dll"
"F:\FCBproject\DMK-RP-01\RP-01\cva_asw_m0146\Debug_FLASH\Exe\app_m146.out"
"C:\Users\sunbeam\Desktop\work\RP-01\RP-01\cva_asw_m0146\Debug_FLASH\Exe\app_m146.out"
--plugin="D:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\bin\armbat.dll"
--plugin="C:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\bin\armbat.dll"

50
cva_asw_m0146/src/LIN_Master/SeatMassage.c
View File

@ -158,7 +158,7 @@ static void SM_KB_RUN1_task(void)//50ms
kb_run_state = 0;
}
run_counter++;
if (run_counter >= 100)
if (run_counter >= 80)
{
run_counter = 0;
@ -178,16 +178,16 @@ static void SM_KB_RUN1_task(void)//50ms
switch (kb_run_state)
{
case 0:
KB_DATA_L[2] = 1;
KB_DATA_L[1] = 1;
break;
case 1:
KB_DATA_R[2] = 1;
KB_DATA_R[1] = 1;
break;
case 2:
KB_DATA_R[3] = 1;
KB_DATA_R[2] = 1;
break;
case 3:
KB_DATA_L[3] = 1;
KB_DATA_L[2] = 1;
break;
default:
kb_run_state = 0;
@ -207,7 +207,7 @@ static void SM_KB_RUN2_task(void)
kb_run_state = 0;
}
run_counter++;
if (run_counter >= 100)
if (run_counter >= 80)
{
run_counter = 0;
@ -227,16 +227,16 @@ static void SM_KB_RUN2_task(void)
switch (kb_run_state)
{
case 0:
KB_DATA_L[0] = 1;
KB_DATA_L[3] = 1;
break;
case 1:
KB_DATA_R[0] = 1;
KB_DATA_R[3] = 1;
break;
case 2:
KB_DATA_R[1] = 1;
KB_DATA_R[4] = 1;
break;
case 3:
KB_DATA_L[1] = 1;
KB_DATA_L[4] = 1;
break;
default:
kb_run_state = 0;
@ -255,12 +255,12 @@ static void SM_KB_RUN3_task(void)
kb_run_state = 0;
}
run_counter++;
if (run_counter >= 100)
if (run_counter >= 160)
{
run_counter = 0;
kb_run_state++;
if (kb_run_state >= 5)
if (kb_run_state >= 8)
{
kb_run_state = 0;
}
@ -268,16 +268,8 @@ static void SM_KB_RUN3_task(void)
for (uint8_t i = 0; i < 5; i++)
{
if (i == kb_run_state)
{
KB_DATA_L[i] = 1;
KB_DATA_R[i] = 1;
}
else
{
KB_DATA_L[i] = 0;
KB_DATA_R[i] = 0;
}
KB_DATA_L[i] = 0;
KB_DATA_R[i] = 0;
}
switch (kb_run_state)
@ -371,7 +363,7 @@ static void SM_ZD_RUN1_task(void)
zd_run_state = 0;
}
run_counter++;
if (run_counter >= 100)
if (run_counter >= 160)
{
run_counter = 0;
@ -460,7 +452,7 @@ static void LinSendSeatMassage_task(void)
SM_CTRL_data.msg.KB_V2_12V = 0;
#endif
SM_CTRL_data.msg.ZD_AP = (SM_KB_state>SM_OFF&&SM_ZD_state>SM_OFF)?1:0;
SM_CTRL_data.msg.ZD_AP = (SM_KB_state>SM_OFF||SM_ZD_state>SM_OFF)?1:0;
UpdateLinMsg(&SM_CTRL_data);
}
@ -500,6 +492,11 @@ void SeatMassageKB_ReqNext(void)
{
SM_KB_state = SM_OFF;
SM_KB_last_state = SM_KB_state;
for (uint8_t i = 0; i < 5; i++)
{
KB_DATA_L[i] = 0;
KB_DATA_R[i] = 0;
}
}
}
void SeatMassageZD_ReqNext(void)
@ -512,6 +509,11 @@ void SeatMassageZD_ReqNext(void)
{
SM_ZD_state = SM_OFF;
SM_ZD_last_state = SM_OFF;
for (uint8_t i = 0; i < 3; i++)
{
ZD_DATA_L[i] = 0;
ZD_DATA_R[i] = 0;
}
}
}