huahua/M12-05P
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
sunbeam 2024-05-25 14:03:16 +08:00
commit 5c381cff96
5 changed files with 1126 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

508
app/M12.fcb19.mtud Normal file
View File

File diff suppressed because one or more lines are too long

508
app/M12.sunbeam.mtud Normal file
View File

File diff suppressed because one or more lines are too long

100
app/OUTPUT/M12-05P_SW0201.mot Normal file
View File

@ -0,0 +1,100 @@
S00E00004D313220202020206D6F7451
S1130000CE0000000000000000000000000000001E
S113001000000000000000000000000000000000DC
S11300205E017801000000002801000000000000CB
S113003000000000000000000000000000000000BC
S113004000000000000000000000000000000000AC
S1130050000000000000000000000000000000009C
S1130060000000000000000000000000000000008C
S1130070000000000000000000000000000000007C
S1130082000000000000000000000000000000006A
S111009200000000000000000000000000005C
S10700C07A47E00493
S10D00C4000000000000000000002E
S11300CECBF820FE303EFCFC7A0100FCF301003636
S11300DE00FC3020FCEF04CC0000A747DFF93620EB
S11300EEFE3020FEEF04CC0000A747DFF9410032BA
S11300FE1E00EF08B3114982004820FCF643DFF4DA
S113010E4100320000EF08B3114980004820FEF68A
S113011E43DFF4FCBE0100F6EFFEC1C3C5C78EFD7E
S113012E708EFCC18E31D1DD1291DD18CE3101C03D
S113013E9EFC609EFDC6C4C2C061FC3002FCFC760F
S113014E0200EFE83000FCFC760200CE3100EFDF57
S113015EC1C3C5C78EFD708EFCC1FC370400C09EA2
S10F016EFC609EFDC6C4C2C061FC61FCC4
S113017A16C80300AEF82761D339315E12F643DD9F
S113018A27BBBC02BC04BC06BC08BC0ABC0CBC0E23
S113019ABC10BC12BC14BC16BC18BC1ABC1CBC1EB9
S11301AA3704200037B3EFD6AEF847DD06F6BBA70F
S11301BAA7EFF5D7717AFAFC470300FC610300FC48
S11301CAFA0300EFFA717AFAD7CF770002FC090230
S11301DA00FCF80100FC0C0200FC220200FC7D0277
S11301EA00FC3C0300F57800D7717BFAEFDB36A1FB
S11301FAFFCEA00071F2714BA4F5F3007183D78E80
S113020AA8D7343400CD010ECA0000CA2DE0CA4270
S113021A04CE21E1CE22FFD730100004E0001634C8
S113022A100071D2CE3000712AE6712BE2712AEEE7
S113023A712AEA51036F22FF9E22CE3008CE32A0E1
S113024ACA0000CA01FFCA0200CE3101710A30D7BE
S113025A712BE2712BE6717A30D7717B30712AE601
S113026A712BE2D7710A30D7710B30D714AD1E3116
S113027A6EB9D734F00036F000F67182BAC6300F80
S113028A0ABAC4716AE5716BE1717AE5717BE1714D
S113029A3AE5713BE1710AE6710BE2711AE6711BE8
S11302AAE2714AE5714BE1716AED716AE9717AEDBD
S11302BA717AE9F6BAA0C918BF5DAAC8085CFE0833
S11302CABAC8AACA085CFE08BACAF6BAA2C91ABF48
S11302DA5DAACE085CFD08BACEAACC085CFD08BAB1
S11302EACCAAC8085CFD08BAC8AACA085CFD08BA40
S11302FACAD734B201716BE1716BE5A9086C0108C4
S113030AB9D734B401A9086C0108B9716AE5716BEB
S113031AE1D734B201717BE1717BE5A9086C02086B
S113032AB9D734B401A9086C0208B9717AE5717BAA
S113033AE1D7710AE4710BE0D7CEABACD7FCFC026F
S113034A00FC5A0200FC6E0200FC1C0300F1FCC211
S113035A0400F1ECE30400EC120500D1DD0491DDA4
S113036A07D7E0F1EC2305005002EFF7D1DD049141
S113037A61E8D7F6EC230500F1FCAC04004C01DF7C
S113038A20D520FCDF1BE6022AFCBF2AFC442900F4
S113039ADC23E520FC302800BF2AFCF1FEBCFFEF79
S11303AA14D1DF114020FC01DF04F1FEBEFFF52069
S11303BAFCF6BF2AFCE1FCAC04004C01DF1DD5218C
S11303CAFCDF18E6022CFCBF2CFC442900DC20E5E7
S11303DA21FC302800BF2CFCE1EF80D1DF11402141
S11303EAFC01DF04E1FE84FFF521FCF6BF2CFCD7F7
S11303FA4008FC01DF07F508FCFCC005004009FCC5
S113040A01DF06F509FCFE6FFF400AFC01DF07F570
S113041A0AFCFC360500400DFC01DF07F50DFCFC67
S113042A430300400EFC0161F8F50EFCD7A206FC5A
S113043AE508FCAF06FC320500FCEB0500F7436156
S113044AF8E509FCAF06FC520AFCEB0500F7436128
S113045AF8E50AFCAF06FC5214FCEB0500F743610D
S113046AF8E50BFCAF06FC5232FCEB0500F74361DE
S113047AF8E50CFCAF06FC5264FCEB0500F743619B
S113048AF8E50DFCAF06FC32E803FCEB0500F74384
S113049A61F8E50EFCAF06FC4460EADC04F6BF062C
S11304AAFCD7D1DD0591DD08F1D7E15B017C01D7E9
S11304BA8D02313A5C01EFF5D1DD0791DD1391DD4F
S11304CA09D73601FF719371A3D73601FF7192EFF1
S11304DAF63601FF719371A2D7D1DD0791DD13912D
S11304EADD09D73601FF71B371C3D73601FF71B283
S11304FAEFF63601FF71B371C2D74C04DE0850021D
S113050AD6127900FCD7F6D7F1731910FC00191624
S113051AFC0083634C06DFF1D773604C03DE0C6383
S113052A4C06DE07601810FCF51FFCD78F10FCD1AF
S113053ADD4291DD4A91DF2E8F1FFCD1DD6F91DF01
S113054A47401EFC01DF1FF51EFCF517FCCF16FC05
S113055A02EF54401EFC01DF0DF51EFCF516FCF5F6
S113056A17FCCF1FFC038F16FCFCC204008F17FC78
S113057AECE30400F516FCF517FCF51EFCEFE78F17
S113058A1FFCD1DD0891DD1091DDC8EFD9E516FC19
S113059AF517FCE51FFCEFCE401EFC01DFC8F51E73
S11305AAFCF516FCE517FCCF1FFC02EFB9CF17FCCC
S11305BA02F516FCEFDDE1FC040500BF1CFC443324
S11305CA00DC19D51EFCDF14E6023CFCBF3CFC44EB
S11305DAC800DC07F6BF3CFCE51EFCD7F6BF3CFCB2
S10405EAD735
S11305EB14F64315DD2261DD717BFACFE80080BE82
S11305FBF013BEF6F6BEF2BEF4CFE800818FE8002E
S10C060B3103FAAFE00061CDD720
S9030000FC

3
app/OUTPUT/更改履历.txt
View File

@ -1 +1,2 @@
SW0101:初版
SW0101:初版
SW0201:改PCB，增加堵转检测

8
app/user/MotorCtrl.c
View File

@ -56,17 +56,20 @@ void MotorCtrl(void)//10ms
MotorRunCount = 0;
MotorStateReal[MOTOR1] = ACT_NOACT;
MotorStateReal[MOTOR2] = ACT_NOACT;
OC1flag = 0;
break;
case ACT_XQ://先1再2
switch (act_step)
{
case 0:
MotorStateReal[MOTOR1] = ACT_XQ;
MotorStateReal[MOTOR2] = ACT_NOACT;
act_step = 1;
break;
case 1:
if (OC1flag == 1)
{
OC1flag = 0;
MotorStateReal[MOTOR1] = ACT_NOACT;
MotorStateReal[MOTOR2] = ACT_XQ;
act_step = 2;
@ -76,6 +79,7 @@ void MotorCtrl(void)//10ms
case 2:
if (OC1flag == 1)
{
OC1flag = 0;
MotorStateReal[MOTOR1] = ACT_NOACT;
MotorStateReal[MOTOR2] = ACT_NOACT;
act_step = 3;
@ -95,11 +99,13 @@ void MotorCtrl(void)//10ms
{
case 0:
MotorStateReal[MOTOR2] = ACT_XH;
MotorStateReal[MOTOR1] = ACT_NOACT;
act_step = 1;
break;
case 1:
if (OC1flag == 1)
{
OC1flag = 0;
MotorStateReal[MOTOR2] = ACT_NOACT;
MotorStateReal[MOTOR1] = ACT_XH;
act_step = 2;
@ -109,6 +115,7 @@ void MotorCtrl(void)//10ms
case 2:
if (OC1flag == 1)
{
OC1flag = 0;
MotorStateReal[MOTOR1] = ACT_NOACT;
MotorStateReal[MOTOR2] = ACT_NOACT;
act_step = 3;
@ -130,6 +137,7 @@ void MotorCtrl(void)//10ms
MOTOR1Ctrl(MotorStateReal[MOTOR1]);
MOTOR2Ctrl(MotorStateReal[MOTOR2]);
//MOTOR1Ctrl(MotorState[MOTOR1]);
}
uint16_t getOC_th(void)