Skip to content

J
jiancetai
Commit c4090e9e authored by 王佳伟's avatar 王佳伟
Browse files
Options

✨ feat:硕上传

parent 0ed24376
Hide whitespace changes
Inline Side-by-side
Showing with 374 additions and 286 deletions
Project.abs.s19 0 → 100644
View file @ c4090e9e
S0330000453A5CC0CFBBAFCCA85C3735307661C0CFBBAFCCA85C546573745F42656E63685C62696E5C50726F6A6563742E616273E1
S123C000FEC033FDC031270E35ED31EC3169700434FB310326F2FEC035EC31270BED3118C8
S123C0200A30700434F920F13DCF310007D206C0BD0001C037D2153100011F31AE0200085E
S123C0400000010001000131E80031AE0100100000010064001931EB0031AE050010011130
S123C06000000A000131EE0031CA0302010000010001000131F10031CA0304040000010065
S123C08001000131F40031BC0401010000010001000131F70031BC04020100000100010061
S123C0A00131FA0031BC0404020000010001000131FD00D706E3A736B5F507F7B73679314C
S123C0C09A16C10116C7C616C7C716C5E216CD3116CFF76980E6808716D04F6280E680C1E2
S123C0E00925F21D025802C6555B3F585B3F16D0A616CD4616CD9916C60C16CB2D20E420B1
S123C100FE141016C11F16C26816C1D216C29AC716C4AA16C6FC16CAF416C4E010EF3D1BA0
S123C1209C16C1C1C6805B0B5A11437A01201C02FA80201216C1C86E80260726098C27105C
S123C1402304077D20044F3701EA4C1C80CC40267B02FB5A35C6475B3479003679003AC6B6
S123C160875B394C39801C02FA80201C075A6E80C6555B3F585B3F04650A04650BEC828CF0
S123C18027102304073B20044F3701E04C39404C39024C39084D39014D3904C6017B02FB47
S123C1A07902F04D38024D38104C3B80963B84808A035A3B4C38801D02F10279001E1B84AA
S123C1C03DC7876C846C823DEC84EE8216D1196C843DCC70405B0C7A0273C60E7B0277C648
S123C1E0FF5B025B037B02927902947902957A02827902847902857B029A79029C79029D10
S123C2007B026279026479026579024A79024C79024D79024BC6107B024F79024E79028AF2
S123C22079028B7900D8C6015BD9CE00067E025EC6F27B025A79025C79025DC6FF7B024234
S123C240790244790245790271790000790001790240790260790290790258790280790292
S123C26048790298875C7C3D790104790105F601072705C6037B01071E010080171F01007A
S123C28040041D010040F60100C4C0CA207B01001C0100403DB745E6003D1C0140011F01E0
S123C2A04101FBC6887B01411D014104B6014384F08A047A0143B60143848F8A107A0143B0
S123C2C01D0142C01D0143801D01423F1D014B301D014B0779015079015179015279015383
S123C2E079015879015979015A79015B86FF7A01547A01557A01567A01577A015C7A015D76
S123C3007A015E7A015F7901471D0140011E014101FB1C0144011C0145011D0147071C019C
S123C32040081D0140201C0140043D6CAAC7876C846C821A82ED80E6406B00E6416B01E640
S123C340426B02E6436B03EE84EC82C4078749B7C54656CD00003BEC84C4E03BC60334EEBE
S123C3608216D0EFEA85AA846C8AB7C5EA81AA806C88B7C51B861B863D1B963BC7876C89A0
S123C3806B8BEE80E6046B86EC006C82EC026C84F60146270CEC842604EC822704E60526EE
S123C3A004C706C476F601467B014AF6014A6B88EE82261FED848D08002418C60316D0EFA2
S123C3C07B0170C620A685127B01717901727901732057B754C4E0841F4949494949CD0081
S123C3E0007B0170B754C41C873BC60D3016D0EF7B0171EC84C78480B746EC82C40387B730
S123C40045C60F16D0EFFA01717B01711C017118EC84C480847F3BC607B7653116D0EF7BCE
S123C4200172E685C47F587B0173E686C1082304C6086B866987201287B745C30174B7469B
S123C440EC801AE6E6066B406287E687E18625E8E6867B017CE68B7B017DA6887A0146202E
S123C4600AEE89086E898EC3502209F60146E488E18826EDC6011B8C3D36CC016016C32B35
S123C480B746F6016CC40F6B80CCF9173BCC18DA3BB76416D100260CE680C1082606CC010E
S123C4A06416C8281C014401320B374C46404D46404C46204D46104D4608D64DE8B0C4071D
S123C4C0D84D5B4D4D4D0879004779004879004979004A79004B4C4F804C46804C4D803D9C
S123C4E01D01C0601C01C0101D01C0081D01C0041C01C0011C01C1801C01C101CC05AE7C2F
S123C50001C21D01D0C01D01D0301D01D0031D01D1C01D01D1301D01D1031D01D2C01D0109
S123C520D2301D01D2031D01D3C01D01D3301D01D3031D01D4C01D01D4301D01D4031D0155
S123C540D5C01D01D5301D01D5031D01D6C01D01D6301D01D6031D01D7C01D01D7301D0162
S123C560D703CE01E034C7873759E381B745690169003352C10825EF3A3D1C01C0010B1E09
S123C580014430071E01440C02201BFC3187260AC660877C31871C014D01FC31872707FE5F
S123C5A03187097E31874C4F800BF631182702C78FC6017B31183D6CAD6982200DE68287B4
S123C5C0B745EC801AE669066282E68287EE80B746E6048300013BADB12FE2C6016B051BD8
S123C5E0833DCC01017C31B0C7877C31AECE01117E31BE7C31BCCD037B7D31CC7C31CA862B
S123C60008527C31B27C31C07C31CE3D69AFC60FA68012B7451B911AE2C03B1980C60F877F
S123C62016D1F916CF021B8F6280E680C10825DEC716C6ED8C000A2528C716C6F1CC31AEBF
S123C64016C6F5CC31AE16C5B7CC31BC16C6F5CC31BC16C5B7CC31CA16C6F5CC31CA16C5B9
S123C660B7C60116C6ED8C00142505C60116C6F1C60207798C00322504C6020774C60307CF
S123C6806C8C00642504C6030767C604075F8C00C82504C604075AC60507528C01F4250731
S123C6A016C5AAC605074AC60607428C03E82504C606073DC60707358C27102504C6070747
S123C6C030C7877C31EB7C31EE7C31F17C31F47C31FA7C31FD527B31EA7B31ED7B31F07B7D
S123C6E031F37B31F67B31FC7B31FF323D8706D07E8706D06C16C3797B31443D4DCA804CA8
S123C700CA404DCA104CCA084DCA024DCC204DC9804DC9024DC9017900CA4CC8604DC88063
S123C720DCC8C784E0CA145CC84DCB804DCB404DCB104CCB044CCB084DCB024DCB014CCB88
S123C740203D4FCC2041F6317A96CFCE31196AE572317AF63119C1EB262DF6311AC190267B
S123C76026F6317ACE3118A6E581AA261AF6317ACE3117A6E58155260EF6317AC17E250789
S123C78079317A1C318010F63119C1EB270379317AF6317AC12B250379317A4CCC200B6CD2
S123C7A0ACC7876C822016EC88E38216C29537EC87E383B745336B00EE82086E82EC82ACE5
S123C7C08025E41B843D3D8608C73BCE318934B70416C79FCC318A6CA1F6318937C60616D3
S123C7E0C8081B837B3191F63189C1552608F63191F131902711C628877C318ECE02387EBE
S123C800318AC6047C318C3D6BAEE684516B81C7200E8737E386B745E600E8826B8233527F
S123C820E18025EEE681303D3BF631E6C105182200AD8716D20106A7062B3C6E7E9716C9CB
S123C8401CC1622604E602C1022604E603C11F1826008CF631E5E10418270083C6017B31DD
S123C860E6207A16C91CC1502604E602C1032609C602205616C91CC167265FE60204215AD6
S123C880E60387B746C77C31E17D31E3FC31E1FD31E3B7D6077AE644075AE6450756E646D5
S123C8A0075DC60320240774C167262EE602C1022628C60420140764C16E261EE602C1028C
S123C8C02618E603C11F2612C6057B31E62013074BC1512605E6020401057231E7200679DB
S123C8E031E67931E7F631E7C10525067931E67931E73A3D0709FC31E1FE31E307123D87E8
S123C900FE31E1FA31E4BA31E37E31E17C31E33D34373032C77E31E17C31E33DEE82E60181
S123C9203DFE3100087E3100FE3102087E3102FE3104087E3104FE3106087E3106FE3108CF
S123C940087E3108FE310A087E310AFE310C087E310CFE310E087E310EFE3110087E311014
S123C960FE3112087E31121E02710207FE3193087E31931E02710407FE3195087E3195FC5B
S123C98031008C000A251DF63197C1092207F63197C1012405C6017B3197C6017B31D8C714
S123C9A0877C3100FC31028C0014250AC6017B31D9C7877C3102FC31048C0019250AC6012C
S123C9C07B31DAC7877C3104FC31068C0032250AC6017B31DBC7877C3106FC31088C003C62
S123C9E0250AC6017B31DCC7877C3108FC310A8C0064250AC6017B31DDC7877C310AFC31DA
S123CA000C8C00C8250AC6017B31DEC7877C310CFC310E8C01F4250AC6017B31DFC7877C24
S123CA20310EFC31108C03E82523C6017B31E0FC31162614FE3114087E31148E000223081E
S123CA40C7877C3114723197C7877C311016D08DF6316C270FFC316FBC316D2407FE316F83
S123CA60087E316FF63167270FFC316ABC31682407FE316A087E316AF63162270FFC3165A6
S123CA80BC31632407FE3165087E3165F6315D270FFC3160BC315E2407FE3160087E316004
S123CAA0F63158270FFC315BBC31592407FE315B087E315BF63153270FFC3156BC31542490
S123CAC007FE3156087E3156F6314E270FFC3151BC314F2407FE3151087E3151F63149270A
S123CAE00FFC314CBC314A2407FE314C087E314C4C37800B1D0201021D020003F60200C4BC
S123CB00C7CA087B0200CC02083BC7EE80690052C11425F7CCFFF07B02027A0203447A0290
S123CB20047902057902061C0200803A3DF63197860A16D0C9B701860A16D0D3CEC0B31682
S123CB40CD2A7A31A216CD22B701860A16D0D3A6E57A31A316CD2216CD2A7A31A416CD2248
S123CB60A6E57A31A5F63192C1172344F6319787830018CE000A1815B754CE000A1815CE1B
S123CB80C0B316CD2A7A31AA16CD15B754CE000A1815CEC0B3A6E57A31AB16CD15CEC0B359
S123CBA016CD2A7A31AC16CD15CEC0B3A6E5200CCCD70D7B31AA7A31AB7B31AC7A31AD1CF5
S123CBC031A9081C31AB081C31AD081C319C0F1C319D011C319E0D1C319F071C31A0021C94
S123CBE031A60E1C31A7E31C31A8071C31A90EF6020AF8319BC40FF8020A7B020AF6319C8E
S123CC00861012F8020AC4F0F8020A7B020AF6020BF8319DC40FF8020B7B020BF6319E86B1
S123CC201012F8020BC4F0F8020B7B020BF6020CF8319FC40FF8020C7B020CF631A08610FD
S123CC4012F8020CC4F0F8020C7B020CF6020DF831A1C40FF8020D7B020DF631A2861012D1
S123CC60F8020DC4F0F8020D7B020DF6020EF831A3C40FF8020E7B020EF631A4861012F8C1
S123CC80020EC4F0F8020E7B020EF6020FF831A5C40FF8020F7B020FF631A6861012F8028D
S123CCA00FC4F0F8020F7B020FF60210F831A7C40FF802107B0210F631A8861012F8021055
S123CCC0C4F0F802107B0210F60211F831A9C40FF802117B0211F631AA861012F80211C476
S123CCE0F0F802117B0211F60212F831ABC40FF802127B0212F631AC861012F80212C4F020
S123CD00F802127B0212F60213F831ADC40FF802137B02133DF6319787830018CE000A1816
S123CD20153DF63197860A06D0C9A6E5444444443D793198793197793197C6017B31E57943
S123CD4031E67931E73DFC31958C07D02315FC31938C07D0230DFC31162702C78FC601872A
S123CD607C31161F02710215FC31938C00322308FC31162703723197C7877C31931F0271D3
S123CD800416FC31958C00322309FC3116042403733197C7877C31953DC7076A7C31EBF68D
S123CDA03197C109225F5316D2010959091019222B343D464FC7074E7C31EB3DC61E074617
S123CDC0CE03E8203DC63C073DCE09C42034C65A0734CE0FA0202BC678072BCE157C2022D0
S123CDE0C6960722CE17702019C6B40719CE1F402010C6C70710CE27102007C6C70707CEEC
S123CE002EE07E31EB3D877C31E83D6BACE6876B81E6886B82E680270504011C2034698312
S123CE20200E073125086A81E682272663826283E683E18625EC201A698320100717250A6D
S123CE406A81E682C107240A62826283E683E18625EA1B843DC6555B3F585B3FE68487B7B2
S123CE6045EC8B1AE6C601A68316D0C151E4066B066283E683C1083D6CAB34E68B6B84A60A
S123CE808C6A85ED8216D0DE6C826E80E689270504011E2038698620100735250A6A84E690
S123CEA085272A6385074D6286E686E18A25EA201C698620120719250C6A84E685C107249B
S123CEC00C6285072F6286E686E18A25E81B873DC6555B3F585B3FE68787B745EC8F1AE668
S123CEE0C601A68616D0C1E485EA066B066286E686C1083DEC84EE8236343330876E846CDE
S123CF00823D1BF1ECECF0166C8AE6F0186B89E6F0196B88E6F01A6B84E6F01D6BF013A6C4
S123CF20F0246A87EEF01B6E85EDF01E6DF011EDF0206D8FEDF022EC403BE642876C8F3A50
S123CF406C82C7876C80044557E6F0132631EC8D261BEC82AC852306C7876C82200DB754CF
S123CF60A3826C82CC0000E281A2802031042430B754E3826C82CC0000E981A980201F04A0
S123CF80211EEC80260CEC82AC852406C7876C82200CEC82A3856C82EC80C20082006C805F
S123CFA0EDF011EC82EE8016D11EED8F35B746C7873BB76416D1EB6C826E80E68454545438
S123CFC06B8CE684C4072702628CEC8A3BE68B37E68B37E68837E68C16CE0B1B85EC8A3BB2
S123CFE0E68B37E68B37E68837E68C37EC88EE8616CE781BF01A3DC737C603A68012B745EE
S123D000CD00006DE2320069E232023352C10925E77D321B7D321D3D6CAD6982C603A6821C
S123D02012B745E6E232022715ECE232008C3A982412EC80E3E232006CE232002006C787BB
S123D0406CE232006282E682C10925D01B833D3BC60387ED8013B745E6E23202260CC6016A
S123D0606BE23202C7876CE232003A3D3BC60387ED8013B745CD00006DE232003A3D3BC619
S123D0800387ED8013B745ECE23200303DFE321D8E13882204087E321DFE321B8E13882212
S123D0A004087E321B3DFC321B8C0002251249593BB745FC321BA3B17C321BB75416D01802
S123D0C03D972704580430FC3D34B785871810B750303D34B705B7141815B750303D87D73B
S123D0E0B7C6270A59B7C55545B7C50436F63D87D7B7C6270AB7C549B7C546560436F63DD0
S123D100AC84270E34B7C5E285A284B7C510FB302002AE82311B84054004A401083D35B771
S123D120C513B7D43113B7E41AE6B7E43D87C76C82EC8C261FEE8EED86EC8811280DEC86BD
S123D140CD0000116D82B746EC88116D846C8887C76C863D972709EE86B7C5CD000020086E
S123D160EE8DE686ED87B7C61135ECF010133B35ECF012ED8413E3B130B7C5CD0000356505
S123D18081A38CB7C5E28BA28A310446113669AF3137323433EEF01011B76532201F252A10
S123D1A0046403044539E78E2706EE8E87C7200BB7C5363469AFEEF013313A1810083A34EF
S123D1C0A3B1B74620A33102209F4151B7C5415104A40108AE8E22EE2505ACF01024E73196
S123D1E06D84698369826C886E863D3B341B9C16D12D30ECB5EDB50540180A30700434F959
S11AD2003D3037E1310460022504E61F2002E6E51AE53305000000A5
S123FF80C0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC57AC0FFC0FFC0FFC0FFED
S123FFA0C0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC479C0FFC0FFC0FFC0FFC0FFC0FFCF
S123FFC0C0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC742C0FFC0FFC0FFC57F5E
S123FFE0C0FFC0FFC0FFC0FFC0FFC0FFC0FFC0FFC921C0FFC0FFC0FFC0FFC0FFC0FFC029B8
S9030000FC
Test_Bench/Api_Sources/API_RTC.c
View file @ c4090e9e
...@@ -348,7 +348,8 @@ INT16U direction_espeed = 1; ...@@ -348,7 +348,8 @@ INT16U direction_espeed = 1;
INT16U kseenSeven = 0; INT16U kseenSeven = 0;
INT16U speed_count = 0; INT16U speed_count = 0;
INT16U water_temp[]= {55,65,75,85,95,119,125}; INT16U water_temp[]= {55,65,75,85,95,119,125};
interrupt void Api_RTC_isr(void) INT16U time_3s = 0;
interrupt void Api_RTC_isr(void)
{ {
RT_10ms++; RT_10ms++;
...@@ -369,83 +370,11 @@ interrupt void Api_RTC_isr(void) ...@@ -369,83 +370,11 @@ interrupt void Api_RTC_isr(void)
if(pSB2 == 0){ if(pSB2 == 0){
Key.PushTime_2++; Key.PushTime_2++;
} }
if(count_flag_a==1) if(RT_10ms >= 10){
{ if(Key.CAN_Step>9||Key.CAN_Step<1)
a++;
if(a>=300)
{ {
Key.CAN_Step = 1;
if(direction_speed == 1)
{
speed_count++;
if(speed_count>199)
{
direction_speed = 0;
}
}
else
{
speed_count--;
if(speed_count < 1)
{
direction_speed = 1;
}
}
c++;
if(c>4)
{
c = 0;
i++;
if(i>=11)
{
i = 0;
if(direction_water==1)
{
j++;
if(j>6)
{
direction_water = 0;
}
}
else
{
j--;
if(j==1)
{
direction_water = 1;
}
}
}
if(direction_espeed==1)
{
k++;
if(k>12)
{
direction_espeed = 0;
}
}
else
{
k--;
if(k==2)
{
direction_espeed = 1;
}
}
}
water_value = water_temp[j-1];
speed_value = speed_count;
Key.CAN_Step = k-1;
a = 0;
} }
}
if(RT_10ms >= 10){
RT_10ms_En = 1; RT_10ms_En = 1;
RT_10ms = null; RT_10ms = null;
} }
...@@ -489,21 +418,17 @@ interrupt void Api_RTC_isr(void) ...@@ -489,21 +418,17 @@ interrupt void Api_RTC_isr(void)
if(RT_1s >= T_1s){ if(RT_1s >= T_1s){
RT_1s_En = 1; RT_1s_En = 1;
RT_1s = null; if(Key_Dodging_flag==0)
} {
time_3s++;
if(Key.StepAuto == 1){ if(time_3s>2)
if(RT_2s >= T_2s){ {
RT_2s = null; time_3s = 0;
Key.CAN_Step++;
//Key.CAN_Step++; }
} }
RT_1s = null;
} }
else
{
RT_2s = null;
}
Timer_1ms_Base(); Timer_1ms_Base();
......
Test_Bench/Api_Sources/APP_Test.c
View file @ c4090e9e
...@@ -34,7 +34,8 @@ void APP_Test_Init(void){ ...@@ -34,7 +34,8 @@ void APP_Test_Init(void){
EOLStep = 0; EOLStep = 0;
EOLError = 0; EOLError = 0;
} }
unsigned int count_flag_a =1; unsigned int Self_propelled_flag = 0;//
unsigned int Key_Dodging_flag = 0;//
unsigned int speed_value = 0; unsigned int speed_value = 0;
void APP_Button_Proc(void){ void APP_Button_Proc(void){
/*if(Key.PushTime_1 > T_3s){ /*if(Key.PushTime_1 > T_3s){
...@@ -44,13 +45,25 @@ void APP_Button_Proc(void){ ...@@ -44,13 +45,25 @@ void APP_Button_Proc(void){
Key.StepAuto = 2; Key.StepAuto = 2;
}*/ }*/
if((Key.PushTime_2 > T_2s) || (Key.PushTime_1 > T_2s)){ if((Key.PushTime_2 > T_2s) && (Key.PushTime_1 > T_2s)){
Key.StepAuto = 1; if(Key_Dodging_flag)
{
Key_Dodging_flag = 0;
}
else
{
Key_Dodging_flag = 1;
}
} }
if(pSB1 == 1){ if(pSB1 == 1){
if((Key.PushTime_1 > T_50ms) && (!Key.StepAuto)){ if(Key.PushTime_1 > T_50ms){
count_flag_a = 1; if(Key_Dodging_flag)
{
Key.CAN_Step++;
}
// Key.CAN_Step++; // Key.CAN_Step++;
// if(Key.CAN_Step > STEP_MAX){ // if(Key.CAN_Step > STEP_MAX){
// Key.CAN_Step = 0; // Key.CAN_Step = 0;
...@@ -60,13 +73,12 @@ void APP_Button_Proc(void){ ...@@ -60,13 +73,12 @@ void APP_Button_Proc(void){
} }
if(pSB2 == 1){ if(pSB2 == 1){
if((Key.PushTime_2 > T_50ms) && (!Key.StepAuto)){ if(Key.PushTime_2 > T_50ms){
count_flag_a = 0; if(Key_Dodging_flag==1)
// if(Key.CAN_Step > 0){ {
// Key.CAN_Step--; Key.CAN_Step--;
// }else{ }
// Key.CAN_Step = STEP_MAX;
// }
} }
Key.PushTime_2 = null; Key.PushTime_2 = null;
} }
...@@ -86,221 +98,221 @@ unsigned int water_value = 0; ...@@ -86,221 +98,221 @@ unsigned int water_value = 0;
void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
{ {
//if(count_flag_a==1) //if(Self_propelled_flag==1)
{ {
{ {
CurValueStr[ENUM_VSpeed ].val = 199;// CurValueStr[ENUM_VSpeed ].val = 0;//
CurValueStr[ENUM_RSpeed ].val = 12000;//ת CurValueStr[ENUM_RSpeed ].val = 0;//ת
CurValueStr[ENUM_WaterTemp ].val = 122;//ˮ // CurValueStr[ENUM_WaterTemp ].val = 0;//ˮ
CurValueStr[ISG_Ready ].val = 1; // CurValueStr[ISG_Ready ].val = 0;
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 0;
CurValueStr[ISG_Power_Enable ].val = 1; // CurValueStr[ISG_Power_Enable ].val =0;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 0;
#if 0 #if 1
switch(Key.CAN_Step) switch(Key.CAN_Step)
{ {
case 1: case 1:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 0;//
CurValueStr[ENUM_RSpeed ].val = 1000;//ת CurValueStr[ENUM_RSpeed ].val = 0;//ת
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Ready ].val = 1; // CurValueStr[ISG_Ready ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
else // else
{ // {
CurValueStr[ISG_Power ].val = 0; // CurValueStr[ISG_Power ].val = 0;
CurValueStr[ISG_Power_Enable ].val = 0; // CurValueStr[ISG_Power_Enable ].val = 0;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
}break; }break;
case 2: case 2:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 30;//
CurValueStr[ENUM_RSpeed ].val = 2000;//ת CurValueStr[ENUM_RSpeed ].val = 1000;//ת
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 1; // CurValueStr[ISG_Power_Enable ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
else // else
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 2; // CurValueStr[ISG_Power_Enable ].val = 2;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
}break; }break;
case 3: case 3:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 60;//
CurValueStr[ENUM_RSpeed ].val = 3000;//ת CurValueStr[ENUM_RSpeed ].val = 2500;//ת
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 2; // CurValueStr[ISG_Power_Enable ].val = 2;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
else // else
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 1; // CurValueStr[ISG_Power_Enable ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
}break; }break;
case 4: case 4:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 90;//
CurValueStr[ENUM_RSpeed ].val = 4000; CurValueStr[ENUM_RSpeed ].val = 4000;
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Power ].val = 0; // CurValueStr[ISG_Power ].val = 0;
CurValueStr[ISG_Power_Enable ].val = 0; // CurValueStr[ISG_Power_Enable ].val = 0;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
else // else
{ // {
CurValueStr[ISG_Ready ].val = 1; // CurValueStr[ISG_Ready ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
}break; }break;
case 5: case 5:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 120;//
CurValueStr[ENUM_RSpeed ].val = 5000; CurValueStr[ENUM_RSpeed ].val = 5500;
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Ready ].val = 1; // CurValueStr[ISG_Ready ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
else // else
{ // {
CurValueStr[ISG_Power ].val = 0; // CurValueStr[ISG_Power ].val = 0;
CurValueStr[ISG_Power_Enable ].val = 0; // CurValueStr[ISG_Power_Enable ].val = 0;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
}break; }break;
case 6: case 6:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 150;//
CurValueStr[ENUM_RSpeed ].val = 6000; CurValueStr[ENUM_RSpeed ].val = 6000;
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 1; // CurValueStr[ISG_Power_Enable ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
else // else
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 2; // CurValueStr[ISG_Power_Enable ].val = 2;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
}break; }break;
case 7: case 7:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 180;//
CurValueStr[ENUM_RSpeed ].val = 7000; CurValueStr[ENUM_RSpeed ].val = 8000;
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 2; // CurValueStr[ISG_Power_Enable ].val = 2;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
else // else
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 1; // CurValueStr[ISG_Power_Enable ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
}break; }break;
case 8: case 8:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 199;//
CurValueStr[ENUM_RSpeed ].val = 8000; CurValueStr[ENUM_RSpeed ].val = 10000;
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Power ].val = 0; // CurValueStr[ISG_Power ].val = 0;
CurValueStr[ISG_Power_Enable ].val = 0; // CurValueStr[ISG_Power_Enable ].val = 0;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
else // else
{ // {
CurValueStr[ISG_Ready ].val = 1; // CurValueStr[ISG_Ready ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
}break; }break;
case 9: case 9:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = 199;//
CurValueStr[ENUM_RSpeed ].val = 9000; CurValueStr[ENUM_RSpeed ].val = 12000;
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Ready ].val = 1; // CurValueStr[ISG_Ready ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
else // else
{ // {
CurValueStr[ISG_Power ].val = 0; // CurValueStr[ISG_Power ].val = 0;
CurValueStr[ISG_Power_Enable ].val = 0; // CurValueStr[ISG_Power_Enable ].val = 0;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
}break; }break;
#if 0
case 10: case 10:
{ {
CurValueStr[ENUM_VSpeed ].val = speed_value;// CurValueStr[ENUM_VSpeed ].val = speed_value;//
CurValueStr[ENUM_RSpeed ].val = 10000; CurValueStr[ENUM_RSpeed ].val = 10000;
CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ // CurValueStr[ENUM_WaterTemp ].val = water_value;//ˮ
if(direction_espeed==1) // if(direction_espeed==1)
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 1; // CurValueStr[ISG_Power_Enable ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 1; // CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Work_Mode ].val = 0; // CurValueStr[TCS_Work_Mode ].val = 0;
} // }
else // else
{ // {
CurValueStr[ISG_Power ].val = 1; // CurValueStr[ISG_Power ].val = 1;
CurValueStr[ISG_Power_Enable ].val = 2; // CurValueStr[ISG_Power_Enable ].val = 2;
CurValueStr[TCS_Warning_Lamp ].val = 0; // CurValueStr[TCS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Work_Mode ].val = 1; // CurValueStr[TCS_Work_Mode ].val = 1;
} // }
}break; }break;
case 11: case 11:
{ {
...@@ -341,6 +353,7 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/ ...@@ -341,6 +353,7 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
CurValueStr[TCS_Work_Mode ].val = 1; CurValueStr[TCS_Work_Mode ].val = 1;
} }
}break; }break;
#endif
} }
#endif #endif
} }
......
Test_Bench/App_Headers/APP_Test.h
View file @ c4090e9e
...@@ -40,7 +40,7 @@ typedef struct{ ...@@ -40,7 +40,7 @@ typedef struct{
enum enum
{ {
ENUM_VSpeed = 0,//锟斤拷锟斤拷 ENUM_VSpeed = 0,//锟斤拷锟斤拷
ENUM_RSpeed ,//�??�?? ENUM_RSpeed ,//锟???锟???
ENUM_WaterTemp ,// 娓╁害 ENUM_WaterTemp ,// 娓╁害
TCS_Warning_Lamp ,//鍓嶈疆鑳庡帇 TCS_Warning_Lamp ,//鍓嶈疆鑳庡帇
TCS_Work_Mode ,//鍚庤疆鑳庡帇 TCS_Work_Mode ,//鍚庤疆鑳庡帇
...@@ -68,7 +68,7 @@ static const s_CAN_List CAN_List[] = ...@@ -68,7 +68,7 @@ static const s_CAN_List CAN_List[] =
}; };
extern unsigned int Key_Dodging_flag;
extern unsigned int lost_flag; extern unsigned int lost_flag;
extern unsigned int CAN_init_flag; extern unsigned int CAN_init_flag;
extern unsigned int water_value; extern unsigned int water_value;
......
Test_Bench/C_Layout.hwl
View file @ c4090e9e
OPEN source 0 0 60 39 OPEN source 0 0 60 70
Source < attributes TOOLTIP on,TOOLTIP_FORMAT signed,TOOLTIP_MODE details,FREEZE off,MARKS off Source < attributes TOOLTIP on,TOOLTIP_FORMAT signed,TOOLTIP_MODE details,FREEZE off,MARKS off
OPEN assembly 60 0 40 31 OPEN assembly 60 0 40 31
Assembly < attributes ADR on,CODE off,ABSADR on,SYMB off,FORMAT Auto,FREEZE off,TOPPC 0xC054 Assembly < attributes ADR on,CODE off,ABSADR on,SYMB off,FORMAT Auto,FREEZE off,TOPPC 0x49F8
OPEN procedure 0 39 60 17 OPEN procedure 0 39 60 17
Procedure < attributes VALUES on,TYPES off Procedure < attributes VALUES on,TYPES off
OPEN register 60 31 40 25 OPEN register 60 31 40 25
......
Test_Bench/Sources/main.c
View file @ c4090e9e
...@@ -8,7 +8,6 @@ void main(void) { ...@@ -8,7 +8,6 @@ void main(void) {
unsigned char i; unsigned char i;
step_cycle = 0; step_cycle = 0;
count_flag_a = 0;
Api_Sys_Init(); Api_Sys_Init();
App_State_Init(); App_State_Init();
App_Load_Data(); App_Load_Data();
......
Test_Bench/TBDML.ini
View file @ c4090e9e
...@@ -10,7 +10,7 @@ Target=TBDML ...@@ -10,7 +10,7 @@ Target=TBDML
Layout=C_layout.hwl Layout=C_layout.hwl
LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU=HC12 CPU=HC12
MainFrame=0,1,-1,-1,-1,-1,508,143,1438,860 MainFrame=0,1,-1,-1,-1,-1,412,144,1341,862
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
AEFWarningDialog=FALSE AEFWarningDialog=FALSE
Configuration=TBDML.hwc Configuration=TBDML.hwc
...@@ -65,14 +65,14 @@ NV_AUTO_ID=1 ...@@ -65,14 +65,14 @@ NV_AUTO_ID=1
[Recent Applications File List] [Recent Applications File List]
File0=D:\GIT\일뺏憩\列떴쇱꿎憩\Test_Bench\bin\Project.abs.s19 File0=E:\일뺏憩\긍陋匡숭\750va_key_9_6.s19
File1=C:\Users\葺屢퓻\Desktop\莖團일뺏憩\Project.abs.s19 File1=E:\일뺏憩\긍陋匡숭\750va_Can_AllLight.s19
File2=D:\TYW1\列떴쇱꿎憩\Test_Bench\bin\Project.abs File2=E:\일뺏憩\750va일뺏憩\Project.abs.s19
File3=C:\Users\葺屢퓻\Desktop\TYW\列떴쇱꿎憩\Test_Bench\bin\Project.abs File3=D:\GIT\일뺏憩\列떴쇱꿎憩\Test_Bench\bin\Project.abs.s19
LoadFlags0=CODEONLY AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags3=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadFlags3=CODEONLY AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
[Recent Layout File List] [Recent Layout File List]
......
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