Skip to content

J
jiancetai
Commit 239ec458 authored by 张金硕's avatar 张金硕
Browse files
Options

✨ feat:新增NUM6显示程序日期

parent b9f67f9b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 18204 additions and 18177 deletions
source/app/api_can/can.c
View file @ 239ec458
......@@ -482,7 +482,7 @@ void CheckRecvCan0Frame(stc_canfd_msg_t *stc_msg)//C CAN ��Ϣ���ջص
memcpy(MultiplePack.Data, data.Data + 5, 3);
MyRecvCount+=3;
}
if(data.Data[2] == 0x62 && data.Data[3] == 0x00 && data.Data[4] == 0x05)
if(data.Data[2] == 0x62 && data.Data[3] == 0x10 && data.Data[4] == 0x24)
{
memcpy(MultiplePack.Data, data.Data + 5, 3);
MyRecvCount+=3;
......
source/app/app_tft/app_tft.c
View file @ 239ec458
......@@ -2983,7 +2983,7 @@ void HJ_OtherDisplay()
uint8_t uiDspInfoFuel[16+1];
uiDspInfoFuel[0]=0;
sprintf(uiDspInfoFuel,"%4d /5",HJ_CurFuelNum);
sprintf(uiDspInfoFuel,"%4d /8",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoFuel, 80, 150);
switch (HJ_CurFuelNum) {
......@@ -3076,39 +3076,47 @@ void HJ_OtherDisplay()
//SetDisplayStaticItemW2(HJ_Lightout, 150, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 3:
SetDisplayStaticItemW2(HJ_Distancelight, 70, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_ABS , 150, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_TCS , 100, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_Distancelight, 70, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_ABS , 150, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 4:
SetDisplayStaticItemW2(HJ_DianPen , 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_DianPen , 90, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_JiYou , 120, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_E, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 5:
SetDisplayStaticItemW2(HJ_JiYou , 70, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_S , 150, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_HEV, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_JiYou , 70, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_S , 150, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 6:
SetDisplayStaticItemW2(HJ_NGear , 70, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_TCS , 100, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_ZiDong , 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_NGear , 70, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_TCS , 100, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 7:
SetDisplayStaticItemW2(HJ_ZiDong , 90, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_Distancelight, 70, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_ZiDong , 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_rightlight, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 8:
SetDisplayStaticItemW2(HJ_ABS , 160, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_DianPen , 80, 225, DRAW_LUMIN_ICOM_WINDOW);
//SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
//SetDisplayStaticItemW2( HJ_Engine, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2( HJ_Engine, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 9:
SetDisplayStaticItemW2(HJ_E, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_E, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 10:
SetDisplayStaticItemW2(HJ_HEV, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJ_HEV, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
......
source/bsp_source/bsp_button/bsp_app_AUTO.c
View file @ 239ec458
......@@ -642,8 +642,8 @@ void build_number6(void)
MyRecvCount = 0;
Send_7CE_Data.Byte0Data = 0x03;
Send_7CE_Data.Byte1Data = 0x22;
Send_7CE_Data.Byte2Data = 0x00;
Send_7CE_Data.Byte3Data = 0x06;
Send_7CE_Data.Byte2Data = 0x10;
Send_7CE_Data.Byte3Data = 0x24;
Send_7CE_Data.Byte4Data = 0x00;
Send_7CE_Data.Byte5Data = 0x00;
Send_7CE_Data.Byte6Data = 0x00;
......@@ -654,7 +654,7 @@ void build_number6(void)
}
if (BetweenTime(100,200) && RxFinish == FINISH ) { //???????
GetNUM6(0);GetNUM6(1);GetNUM6(2);GetNUM6(3);GetNUM6(4);GetNUM6(5);GetNUM6(6);GetNUM6(7);
GetNUM6(5);GetNUM6(6);GetNUM6(7);GetNUM6(8);GetNUM6(9);GetNUM6(10);GetNUM6(11);GetNUM6(12);
}
else if (BetweenTime(200,300) && MultiplePack.Data[0] != 0x0){
CANSendEnable = ON; //??????????????
......@@ -2476,7 +2476,7 @@ void APP_AUTO(void)
case 4:
if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
//ButtomCurrent.count++;
ButtomCurrent.count = 0;
ButtomCurrent.count ++;
}
else {
......@@ -2486,9 +2486,16 @@ void APP_AUTO(void)
}
break;
case 5:
ErrorCode = 99;//??????
SetStartTime(0);
ButtomCurrent.enable = 0;
if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
ButtomCurrent.count++;
}
else {
build_number6();
//CanOutPutLowBrakeCheck();
}
// ErrorCode = 99;//??????
// SetStartTime(0);
// ButtomCurrent.enable = 0;
//if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
// ButtomCurrent.count++;
//}
......
tools/iar_ewarm/S6J3360_template_iar_ewarm.dep
View file @ 239ec458
This source diff could not be displayed because it is too large. You can view the blob instead.
tools/iar_ewarm/settings/S6J3360_template_iar_ewarm.dni
View file @ 239ec458
......@@ -10,12 +10,12 @@ LimitSize=0
ByteLimit=50
[JLinkDriver]
WatchCond=_ 0
Watch0=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
Watch1=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
Watch0=_ 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 4 0 0
Watch1=_ 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 "0x00000000" 0 4 0 0
CStepIntDis=_ 0
LeaveTargetRunning=_ 0
[DebugChecksum]
Checksum=-396021827
Checksum=578298380
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0
......@@ -27,29 +27,31 @@ MixedMode=1
Path=D:\git\jiancetai\jiancetai\豪进750VA检测台0819_V101.srec
[watch_formats]
Fmt0={W}42:FrontOilNum 4 0
[CallStackLog]
Enabled=0
[CallStackStripe]
ShowTiming=1
[Log file]
LoggingEnabled=_ 0
LogFile=_ ""
Category=_ 0
[TermIOLog]
LoggingEnabled=_ 0
LogFile=_ ""
[Disassemble mode]
mode=0
[Breakpoints2]
Bp0=_ 0 "EMUL_CODE" "{}.2928.8" 0 0 1 "" 0 "" 0
Bp1=_ 0 "EMUL_CODE" "{$TOOLKIT_DIR$\inc\c}.228.1" 0 0 1 "" 0 "" 0
Count=2
Bp2=_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\..\source\app\api_can\can.c}.493.6" 0 0 1 "" 0 "" 0
Count=3
[Log file]
LoggingEnabled=_ 0
LogFile=_ ""
Category=_ 0
[Aliases]
A0=_ "D:\WorkSpace\Testing\250-8\大运_250_8_10步检测台_20240606\source\main.c" ""
A1=_ "D:\Work\10\Hyundai_SJ3360_Empty-20240413\Hyundai_SJ3360_Empty\source\main.c" ""
A2=_ "D:\新建文件夹 (2)\Hyundai_SJ3360_Empty-20240417\Hyundai_SJ3360_Empty\source\main.c" ""
A3=_ "D:\新建文件夹 (2)\dayun\新建文件夹\大运_250_8_10步检测台_20240606\source\main.c" ""
A4=_ "E:\项目资料\------软件封装库函数-------\历史备份\api_tft V1.07-宽度600-SYSTEM RAM\source\api_tft.c" ""
A5=_ "E:\项目资料\软件封装库函数\S6J336C_BSP_EEPROM_Module V1.0\project\source\bsp_eeprom.c" ""
Count=6
A2=_ "D:\git\jiancetai\jiancetai\source\main.c" ""
A3=_ "D:\新建文件夹 (2)\Hyundai_SJ3360_Empty-20240417\Hyundai_SJ3360_Empty\source\main.c" ""
A4=_ "D:\新建文件夹 (2)\dayun\新建文件夹\大运_250_8_10步检测台_20240606\source\main.c" ""
A5=_ "E:\项目资料\------软件封装库函数-------\历史备份\api_tft V1.07-宽度600-SYSTEM RAM\source\api_tft.c" ""
A6=_ "E:\项目资料\软件封装库函数\S6J336C_BSP_EEPROM_Module V1.0\project\source\bsp_eeprom.c" ""
Count=7
SuppressDialog=1
[CallStackLog]
Enabled=0
[CallStackStripe]
ShowTiming=1
[TermIOLog]
LoggingEnabled=_ 0
LogFile=_ ""
tools/iar_ewarm/settings/S6J3360_template_iar_ewarm.wsdt
View file @ 239ec458
......@@ -29,7 +29,7 @@
<Windows>
<Wnd3>
<Wnd0>
<Tabs>
<Tab>
<Identity>TabID-16836-15033</Identity>
......@@ -41,7 +41,7 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd3><Wnd4>
<SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<Tabs>
<Tab>
<Identity>TabID-27585-15036</Identity>
......@@ -57,20 +57,20 @@
</Tab>
</Tabs>
<SelectedTab>1</SelectedTab></Wnd4><Wnd5><Tabs><Tab><Identity>TabID-6292-1335</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5></Windows>
<SelectedTab>1</SelectedTab></Wnd1><Wnd2><Tabs><Tab><Identity>TabID-6292-1335</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd2></Windows>
<Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\app\app_tft\app_tft.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>2065</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_port\bsp_port.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>296</YPos2><SelStart2>15417</SelStart2><SelEnd2>15417</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_button\bsp_app_AUTO.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>297</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\app\api_can\2ND\api_can_2nd.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>0</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_button\bsp_app_led_output.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>392</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_can\canfd_320_driver.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>34</YPos2><SelStart2>1837</SelStart2><SelEnd2>1837</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>765</YPos2><SelStart2>24199</SelStart2><SelEnd2>24199</SelEnd2></Tab><ActiveTab>6</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\app\api_can\can.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>454</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_button\bsp_button.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>2606</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_port\bsp_port.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>296</YPos2><SelStart2>15417</SelStart2><SelEnd2>15417</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\app\api_can\2ND\api_can_2nd.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>0</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_button\bsp_app_led_output.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>413</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_can\canfd_320_driver.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>34</YPos2><SelStart2>1837</SelStart2><SelEnd2>1837</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_button\bsp_app_AUTO.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>2408</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>761</YPos2><SelStart2>24162</SelStart2><SelEnd2>24162</SelEnd2></Tab><ActiveTab>5</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\app\api_can\can.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>457</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\bsp_source\bsp_button\bsp_button.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>2955</YPos2><SelStart2>93372</SelStart2><SelEnd2>93372</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\source\app\app_tft\app_tft.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>2070</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
<Top><Row0><Sizes><Toolbar-0474D9F8><key>iaridepm.enu1</key></Toolbar-0474D9F8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>549</Bottom><Right>247</Right><x>-2</x><y>-2</y><xscreen>249</xscreen><yscreen>229</yscreen><sizeHorzCX>129688</sizeHorzCX><sizeHorzCY>227408</sizeHorzCY><sizeVertCX>129688</sizeVertCX><sizeVertCY>547170</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>215</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>217</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>215492</sizeHorzCY><sizeVertCX>129688</sizeVertCX><sizeVertCY>227408</sizeVertCY></Rect></Wnd4></Sizes></Row0><Row1><Sizes><Wnd5><Rect><Top>213</Top><Left>-2</Left><Bottom>413</Bottom><Right>1922</Right><x>-2</x><y>213</y><xscreen>1924</xscreen><yscreen>200</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>198610</sizeHorzCY><sizeVertCX>104167</sizeVertCX><sizeVertCY>198610</sizeVertCY></Rect></Wnd5></Sizes></Row1></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-073ADB38><key>iaridepm.enu1</key></Toolbar-073ADB38></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>747</Bottom><Right>247</Right><x>-2</x><y>-2</y><xscreen>249</xscreen><yscreen>229</yscreen><sizeHorzCX>129688</sizeHorzCX><sizeHorzCY>227408</sizeHorzCY><sizeVertCX>129688</sizeVertCX><sizeVertCY>523337</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>215</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>217</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>215492</sizeHorzCY><sizeVertCX>129688</sizeVertCX><sizeVertCY>227408</sizeVertCY></Rect></Wnd1></Sizes></Row0><Row1><Sizes><Wnd2><Rect><Top>0</Top><Left>0</Left><Bottom>0</Bottom><Right>0</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>200</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>198610</sizeHorzCY><sizeVertCX>104167</sizeVertCX><sizeVertCY>198610</sizeVertCY></Rect></Wnd2></Sizes></Row1></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>
......
tools/iar_ewarm/standalone_tcflash/objs/standalone_tcflash.map
View file @ 239ec458
This source diff could not be displayed because it is too large. You can view the blob instead.
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