Commit ebf39b46 authored by 何锐's avatar 何锐

feat:完成老化台初版

parent d98fb4fa
...@@ -48,7 +48,7 @@ File2=D:\ ...@@ -48,7 +48,7 @@ File2=D:\
[HI-WAVE] [HI-WAVE]
MainFrame=2,3,-32000,-32000,-1,-1,583,155,1229,904 MainFrame=2,3,-1,-1,-1,-1,-1220,265,-574,1014
TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806 TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
Target=TBDML Target=TBDML
CPU=HC12 CPU=HC12
...@@ -91,18 +91,20 @@ File2= ...@@ -91,18 +91,20 @@ File2=
File3= File3=
[Recent HI-WAVE FindProcedure Search] [Recent HI-WAVE FindProcedure Search]
Search0=app_Can_handle Search0=GJ_CS10_JS_ECUOUT_N
Search1=bsp_CANSendFrame Search1=app_Can_handle
Search2=Gui_ButtonProc Search2=bsp_CANSendFrame
Search3=bsp_API_isr Search3=Gui_ButtonProc
Search4=main Search4=bsp_API_isr
Search5=bsp_RTC_isr Search5=main
Search6=KeyProgIn Search6=bsp_RTC_isr
Search7=app_Can_handle Search7=KeyProgIn
Search8=UnlockPro Search8=app_Can_handle
Search9=App_Uds_Calc_Key Search9=UnlockPro
Search10=bsp_CAN_Rev_isr Search10=App_Uds_Calc_Key
Search11=TP_TransmitPDU Search11=bsp_CAN_Rev_isr
Search12=TP_TransmitPDU
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
EXTERN_VAR volatile _CanMsg g_Msg18DA17F9; EXTERN_VAR volatile _CanMsg g_Msg18DA17F9;
EXTERN_VAR volatile _CanMsg g_Msg101; //ˮ�� ���� EXTERN_VAR volatile _CanMsg g_Msg101; //ˮ�� ����
EXTERN_VAR volatile _CanMsg g_Msg402; //������ָʾ�� EXTERN_VAR volatile _CanMsg g_Msg402; //������ָʾ��
EXTERN_VAR volatile _CanMsg g_Msg1B5;
EXTERN_VAR volatile __RevCanMsg g_Msg18DAF917; EXTERN_VAR volatile __RevCanMsg g_Msg18DAF917;
EXTERN_VAR volatile INT16U g_frStep; EXTERN_VAR volatile INT16U g_frStep;
......
This diff is collapsed.
No preview for this file type
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -10,4 +10,5 @@ Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg240" ...@@ -10,4 +10,5 @@ Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg240"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg101" Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg101"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg402" Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg402"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg08FFF00B" Data:1 < ADDXPR ONLY_ADD_IF_NEW "g_Msg08FFF00B"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "ZS_OUT_N" Data:1 < ADDXPR ONLY_ADD_IF_NEW "CS_FR"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "CS_OUT_CC"
...@@ -22,9 +22,6 @@ interrupt void bsp_RTC_isr(void) ...@@ -22,9 +22,6 @@ interrupt void bsp_RTC_isr(void)
} }
if(KeyAddIn == PushDown) if(KeyAddIn == PushDown)
{ {
if(G_Button.PushTime1 <= T_10s) if(G_Button.PushTime1 <= T_10s)
...@@ -39,8 +36,6 @@ interrupt void bsp_RTC_isr(void) ...@@ -39,8 +36,6 @@ interrupt void bsp_RTC_isr(void)
G_Button.PushTime2 ++; G_Button.PushTime2 ++;
} }
} }
if(XUN_HUAN == 1) if(XUN_HUAN == 1)
{ {
AutoTime++; AutoTime++;
......
...@@ -110,41 +110,38 @@ void GJ_CS10_JS_ECUOUT_N(void) ...@@ -110,41 +110,38 @@ void GJ_CS10_JS_ECUOUT_N(void)
//glz--20170428 ����PWM //glz--20170428 ����PWM
if(g_FRStep==0) if(g_FRStep==0)
{ {
ZS_FR=7812; //1HZ CS_FR = 7812;
} }
if(g_FRStep==1) if(g_FRStep==1)
{ {
ZS_FR=475;//16.5Hz CS_FR = 200;//156Hz
} }
if(g_FRStep==2) if(g_FRStep==2)
{ {
ZS_FR=163;//50Hz CS_FR = 102;//312Hz
} }
if(g_FRStep==3) if(g_FRStep==3)
{ {
ZS_FR=96;//33.1Hz CS_FR = 68;//468Hz
} }
if(g_FRStep==4) if(g_FRStep==4)
{ {
ZS_FR=70;//50Hz CS_FR = 50;//624Hz
} }
if(g_FRStep==5) if(g_FRStep==5)
{ {
ZS_FR=54;//83Hz CS_FR = 50;//83Hz
} }
if(g_FRStep==6) if(g_FRStep==6)
{ {
// CS_FR=54; //120KM CS_FR=44;//6000
ZS_FR=44;//6000
} }
if(g_FRStep==7) if(g_FRStep==7)
{ {
// CS_FR=47; //140KM
ZS_FR=39;//7000 ZS_FR=39;//7000
} }
if(g_FRStep==8) if(g_FRStep==8)
{ {
// CS_FR=30; //160KM
ZS_FR=39;//8000 ZS_FR=39;//8000
} }
if(g_FRStep==9) if(g_FRStep==9)
...@@ -227,9 +224,9 @@ void Api_API_Init(INT8U tog) ...@@ -227,9 +224,9 @@ void Api_API_Init(INT8U tog)
//���������ж�ʱ�� //���������ж�ʱ��
CPMUAPICTL_APICLK=1; //Bus Clock ��Ϊ ���������жϵ�ʱ��Դ CPMUAPICTL_APICLK=1; //Bus Clock ��Ϊ ���������жϵ�ʱ��Դ
CPMUAPIR=1023; //�������������=2*(1023+1)*(1/32M)=64US +++++++++ CPMUAPIR=255; //�������������=2*(1023+1)*(1/32M)=64US +++++++++
CPMUAPICTL_APIFE=1; //ʹ�����������жϹ���,����ʼ��ʱ CPMUAPICTL_APIFE=1; //ʹ�����������жϹ���,����ʼ��ʱzheg
//----------------------------- //306ҳ //----------------------------- //306ҳ
if(tog) CPMUAPICTL_APIE=1; //�����������ж� if(tog) CPMUAPICTL_APIE=1; //�����������ж�
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#define HIGH 1 #define HIGH 1
#define LOW 0 #define LOW 0
#define MenuCn 8 #define MenuCn 5
#define Auto 1 #define Auto 1
#define Manu 0 #define Manu 0
......
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