Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
5edb68af06 | |||
2123375f41 | |||
14c3b38c04 |
@ -111,10 +111,10 @@ S11306D206736140DD1C8802318E1605B8001704CA
|
|||||||
S11306E2D806168B72C6C7629B8802817098026311
|
S11306E2D806168B72C6C7629B8802817098026311
|
||||||
S11306F2EFE08A011004D7C1C3C664318EA104FF9E
|
S11306F2EFE08A011004D7C1C3C664318EA104FF9E
|
||||||
S1130702FF12DD0BC4C5899BA7A5C0C513EFEFC0BB
|
S1130702FF12DD0BC4C5899BA7A5C0C513EFEFC0BB
|
||||||
S1130712D74066E701DF1DF566E7FC4F0B00FC8D51
|
S1130712D74066E701DF1DF566E7FC4F0B00FC23BB
|
||||||
S11307221700FCD21600FE4F03AF6CE7F743DD045B
|
S11307221800FC681700FE4F03AF6CE7F743DD04C3
|
||||||
S1130732B1BF6CE74067E70161F8F567E74068E736
|
S1130732B1BF6CE74067E701DF06F567E7FEBD017D
|
||||||
S113074201DF0DF568E7FEB401FC5F1400FE220030
|
S11307424068E701DF0AF568E7FCE91400FE2200CD
|
||||||
S11307524069E70161F8F569E7406AE701DF09F5F5
|
S11307524069E70161F8F569E7406AE701DF09F5F5
|
||||||
S11307626AE7FEF402FE4A03406BE70161F8F56BA7
|
S11307626AE7FEF402FE4A03406BE70161F8F56BA7
|
||||||
S1130772E7D78FBCE8D1DD0E91DD3A91DD3B91DD07
|
S1130772E7D78FBCE8D1DD0E91DD3A91DD3B91DD07
|
||||||
@ -132,20 +132,20 @@ S1130822DF698F83E7819F83E74C04F582E7DC5B12
|
|||||||
S1130832F583E7D7E0F1EF215002EFF9E0E1EF1998
|
S1130832F583E7D7E0F1EF215002EFF9E0E1EF1998
|
||||||
S11308425002EFF9E05102EF105002EFF8E05103C9
|
S11308425002EFF9E05102EF105002EFF8E05103C9
|
||||||
S1130852EF075002EFF8E05104EC2D0F005002EFC5
|
S1130852EF075002EFF8E05104EC2D0F005002EFC5
|
||||||
S1130862F6E05105EFF35002EFF8ECFD1200EC292B
|
S1130862F6E05105EFF35002EFF8EC871300ECB316
|
||||||
S11308721300EC9B1300ECFD13008F82E7819F822F
|
S11308721300EC251400EC8714008F82E7819F8219
|
||||||
S1130882E74C04F583E761C8F582E7D7C79800917E
|
S1130882E74C04F583E761C8F582E7D7C79800917E
|
||||||
S1130892DD3B91DD3891DD3E91DD3B91DD3C91DD27
|
S1130892DD3B91DD3891DD3E91DD3B91DD3C91DD27
|
||||||
S11308A24B91DD4291DD3991DD1B91DD1C91DD1906
|
S11308A24B91DD4291DD3991DD1B91DD1C91DD1906
|
||||||
S11308B291DD1291DD0991DD0991DD0691DF31F1BE
|
S11308B291DD1291DD0991DD0991DD0691DF31F1BE
|
||||||
S11308C2EF0DE1EF0A5102EF065103EF025104F07A
|
S11308C2EF0DE1EF0A5102EF065103EF025104F07A
|
||||||
S11308D2FC2D0F00EF1A5105EFF5FC051300EF1084
|
S11308D2FC2D0F00EF1A5105EFF5FC8F1300EF10FA
|
||||||
S11308E2FC2D1300EF0AFC9F1300EF04FC0114001B
|
S11308E2FCB71300EF0AFC291400EF04FC8B14007C
|
||||||
S11308F288004C05DF02C0D7F570E8EFF9C7F1981C
|
S11308F288004C05DF02C0D7F570E8EFF9C7F1981C
|
||||||
S113090200FC2D0B00D1DD0A880081FEDDFEFC5FB8
|
S113090200FC2D0B00D1DD0A880081FEDDFEFC5FB8
|
||||||
S11309120F008800FC3E0B00D1DD06880081FE6BCF
|
S11309120F008800FC3E0B00D1DD06880081FE6BCF
|
||||||
S1130922FF88008198004C14DFD7C0D7300F00C174
|
S1130922FF88008198004C14DFD7C0D7300F00C174
|
||||||
S1130932300010C13432E7321200510FFC1B1A008E
|
S1130932300010C13432E7321200510FFCB11A00F8
|
||||||
S113094210043032E7BF80E7AF3CE7023AE7023EE9
|
S113094210043032E7BF80E7AF3CE7023AE7023EE9
|
||||||
S1130952E70234E70236E70238E712AF32E744AA85
|
S1130952E70234E70236E70238E712AF32E744AA85
|
||||||
S113096255DF1CAF42E74455AADF14134240E7DFC8
|
S113096255DF1CAF42E74455AADF14134240E7DFC8
|
||||||
@ -224,9 +224,9 @@ S1130DE2B80014130422E81204260016A9BB150441
|
|||||||
S1130DF20C00141304320016A9BBA8000418001432
|
S1130DF20C00141304320016A9BBA8000418001432
|
||||||
S1130E0213043E0016A9BB88048198044C06DF9B98
|
S1130E0213043E0016A9BB88048198044C06DF9B98
|
||||||
S1130E1252243024E8FE5BFFBF6CE8304E00C1343C
|
S1130E1252243024E8FE5BFFBF6CE8304E00C1343C
|
||||||
S1130E220F003200103022E8FC3F18004C11C06160
|
S1130E220F003200103022E8FCD518004C11C061CA
|
||||||
S1130E32F8F5D3E71006D72006304E00C1340F0070
|
S1130E32F8F5D3E71006D72006304E00C1340F0070
|
||||||
S1130E423200103022E8FC1B1A00C052243024E87D
|
S1130E423200103022E8FCB11A00C052243024E8E7
|
||||||
S1130E52FE20FF12AF22E844AA55DD33F177500297
|
S1130E52FE20FF12AF22E844AA55DD33F177500297
|
||||||
S1130E62D612300080789CE7F178A8E778B4E713CB
|
S1130E62D612300080789CE7F178A8E778B4E713CB
|
||||||
S1130E7204FEE7B80014F6B915040C0014F6B9A878
|
S1130E7204FEE7B80014F6B915040C0014F6B9A878
|
||||||
@ -249,178 +249,188 @@ S1130F72B9FF300002FEB3FF300003FEADFF3000C4
|
|||||||
S1130F8204FEA7FF300005FEA1FF8800755002D6BB
|
S1130F8204FEA7FF300005FEA1FF8800755002D6BB
|
||||||
S1130F92127922E96168DD07F67822E9E52EE9850E
|
S1130F92127922E96168DD07F67822E9E52EE9850E
|
||||||
S1130FA26598004C06DFE3C0D7C78FD2E7D161F85A
|
S1130FA26598004C06DFE3C0D7C78FD2E7D161F85A
|
||||||
S1130FB2EE3D0391DD4291DF3DD58AE8DF38D58BE2
|
S1130FB2EEC70391DD4291DF3DD58AE8DF38D58B58
|
||||||
S1130FC2E8DF33D58CE8DF2EF198008800755002F3
|
S1130FC2E8DF33D58CE8DF71F198008800755002B0
|
||||||
S1130FD2D61204A8E71679B4E761090016F661D8B7
|
S1130FD2D61204A8E71679B4E761090016F661D8B7
|
||||||
S1130FE2A131FD1217311E031265FE4EFF880081E6
|
S1130FE2A131FD1217311E031265FE4EFF880081E6
|
||||||
S1130FF298004C06DFD5EF44E58AE8E58BE8E58CFA
|
S1130FF298004C06DFD5EF41E58AE8E58BE8E58CFD
|
||||||
S1131002E8E69800F1FE23FF300102FE1DFF3001E5
|
S1131002E8E69800F1FE23FFF58DE8F58EE8F58F0A
|
||||||
S113101204FE17FFF6BF84E8BF86E8BF88E8A0D2C3
|
S1131012E8F6BF84E8BF86E8BF88E8A0D2E7880084
|
||||||
S1131022E78800755002D612F678A8E778B4E7513B
|
S1131022755002D612F678A8E778B4E75180789C16
|
||||||
S113103280789CE7856598004C06DFE5E98AE863D9
|
S1131032E7856598004C06DFE5E98AE86391DD3EC1
|
||||||
S113104291DD3A91DD3F91DD5091DD7A9161F8EEC7
|
S113104291DD6891DD799161F8EE9B009161F8EE92
|
||||||
S1131052D6009161F8EEF50091DF20A284E8AFB6E4
|
S113105203019161F8EE220191DF20A284E8AFB688
|
||||||
S1131062E7F74361F8EED700F58AE8EEC900D5C781
|
S1131062E7F74361F8EE0401F58AE8EEF600D5C726
|
||||||
S1131072E7DD47F58AE8E1F0FEB0FEEF62A284E81C
|
S1131072E7DD2CF58AE8E1F0FEB0FEEE8200A28400
|
||||||
S1131082AFA8E7EF1A8F8DE8819F8DE84C33DC4FD0
|
S1131082E8AFA8E76168DD0C83639F8AE8F58DE821
|
||||||
S113109283639F8AE8E6A1EF3FA284E8AFB4E761E5
|
S1131092F6FE97FEAF84E844B90BDE05D5C6E7DD5C
|
||||||
S11310A268DD0C83639F8AE8F58DE8F6FE7CFEAF6B
|
S11310A25FCF8AE804F58DE8F1EFCC8F8DE8819F5C
|
||||||
S11310B284E844B90BDE05D5C6E7DD23CF8AE8040C
|
S11310B28DE84C33DC4A83639F8AE8E6A1EF3AA2C7
|
||||||
S11310C2F58DE8F1EFB18F8DE8819F8DE84C33DC2B
|
S11310C284E8AFB4E76168DD0C83639F8AE8F58D39
|
||||||
S11310D20EE083639F8AE8E1FE50FEF6BF84E8E9EE
|
S11310D2E8F6FE56FEAF84E844B90BDE05D5C6E752
|
||||||
S11310E28BE86391DD7791DD7C9161F8EE8B009161
|
S11310E2DD1EA08AE8EFBE8F8DE8819F8DE84C3328
|
||||||
S11310F261F8EEB6009161F8EE1D019161F8EE3DE2
|
S11310F2DC0EE083639F8AE8E1FE2FFEF6BF84E8FC
|
||||||
S11311020191DF21A286E8AFBAE7F74361F8EE1F47
|
S1131102E98BE8639161F8EE83009161F8EE9B004C
|
||||||
S113111201F58BE8EE1001D5C9E7DD09F58BE8513D
|
S11311129161F8EEC7009161F8EED6009161F8EEA4
|
||||||
S113112203F0FE06FEEE9D00A284E8AFAAE7616822
|
S1131122FA009161F8EE10019161F8EE7B0191DF12
|
||||||
S1131132DD0D83639F8AE8F58DE8F0E1FEECFDAFF7
|
S113113221A286E8AFBAE7F74361F8EE1201F58B14
|
||||||
S113114284E844B90B61D8EE24FFEE26FF8F8DE8C4
|
S1131142E8EE0301D5C9E7DD09F58BE8300003FEBB
|
||||||
S1131152819F8DE84C335002DC85EE75FFA286E850
|
S1131152D9FDEE0C01A284E8AFAAE76168DD0D8334
|
||||||
S1131162AFACE7EF1B8F8EE8819F8EE84C33DC55E2
|
S1131162639F8AE8F58DE8F0E1FEBFFDAF84E844B1
|
||||||
S113117283639F8BE8300202EF44A286E8AFB8E7AC
|
S1131172B90B61D8EEF7FEEEF9FE8F8DE8819F8DF3
|
||||||
S11311826168DD0E83639F8BE8F58EE8300002FE12
|
S1131182E84C33500261C8EE69FFEE73FFD58AE87A
|
||||||
S113119299FDAF86E844B90BDE05D5C8E7DD26CF55
|
S113119261E8EEC9008F8EE8819F8EE84C33DC460D
|
||||||
S11311A28BE804F58EE85102EE76FF8F8EE8819F7C
|
S11311A2F58EE883639F8BE8E0EF2DA286E8AFAC6F
|
||||||
S11311B28EE84C33DC0FE083639F8BE85103FE6AB5
|
S11311B2E76168DD0E83639F8BE8F58EE8300002F9
|
||||||
S11311C2FDF6BF86E8E98CE8639161F8EE8200914E
|
S11311C2FE68FDAF86E844B90BDE05D5C8E7DD66E7
|
||||||
S11311D261F8EE84009161F8EE93009161F8EEBE3D
|
S11311D2CF8BE805F58EE8F05102EE72FF8F8EE8B0
|
||||||
S11311E2009161F8EED4009161F8EEF4009161E8A7
|
S11311E2819F8EE84C33DC4E83639F8BE83002028E
|
||||||
S11311F2EE0601A288E8AFBEE7F74361F8EED3003A
|
S11311F2EF3DA286E8AFB8E76168DD0E83639F8B9B
|
||||||
S1131202F58CE8EEC400D5CBE761F8EEEB00F58C83
|
S1131202E8F58EE8300002FE21FDAF86E844B90B12
|
||||||
S1131212E85105F0C2EE13FDA286E8AFAEE76168BD
|
S1131212DE05D5C8E7DD4AA08BE8EFB88F8EE881FA
|
||||||
S1131222DD0E83639F8BE8F58EE8300003FEFBFC42
|
S11312229F8EE84C33DC3AE083639F8BE85103FEE4
|
||||||
S1131232AF86E844B90B61D8EEDCFEEEDEFE8F8E9B
|
S1131232F9FCF6BF86E8EF29A286E8AFAEE761685B
|
||||||
S1131242E8819F8EE84C33500261C8EE69FFEE7468
|
S1131242DD0E83639F8BE8F58EE8300003FEDBFC42
|
||||||
S1131252FFA288E8AFB0E7EF1B8F8FE8819F8FE88A
|
S1131252AF86E844B90B61D8EEE9FEEEEBFEF58EFB
|
||||||
S11312624C33DC5583639F8CE8300204EF44A2883C
|
S1131262E8E98CE86391DD5191DD6E91DD73916162
|
||||||
S1131272E8AFBCE76168DD0E83639F8CE8F58FE815
|
S1131272F8EE82009161F8EEAF009161F8EEC500DC
|
||||||
S1131282300004FEA5FCAF88E844B90BDE05D5CADC
|
S11312829161F8EEE50091DF4EA288E8AFBEE7F780
|
||||||
S1131292E7DD66CF8CE804F58FE85104EE74FF8F26
|
S11312924361F8EEC700F58CE8EEB800D5CBE7DD84
|
||||||
S11312A28FE8819F8FE84C33DC4FE083639F8CE8A7
|
S11312A236F58CE8300005EF7C8F8EE8819F8EE85E
|
||||||
S11312B25105FE76FCF6BF88E8EF3EA288E8AFB29D
|
S11312B24C335002DCABEE6FFFD58BE8DF168F8F19
|
||||||
S11312C2E76168DD0E83639F8CE8F58FE8300005E3
|
S11312C2E8819F8FE84C33DC69F58FE883639F8C58
|
||||||
S11312D2FE58FCAF88E844B90B61D8EE28FFEE2D26
|
S11312D2E8E0EF4FF58FE8EF6AA288E8AFB0E7EFF6
|
||||||
S11312E2FF8F8FE8819F8FE84C335002DEBDEF09F8
|
S11312E21B8F8FE8819F8FE84C33DC5783639F8C7D
|
||||||
S11312F2F58AE8F58BE8F58CE8C0D7E571E8F6BF26
|
S11312F2E8300204EF46A288E8AFBCE76168DD0E7D
|
||||||
S113130276E8D7AF76E8442C01DC0ECF71E80230E0
|
S113130283639F8CE8F58FE8300004FE1DFCAF88F0
|
||||||
S1131312F401BF76E8F572E8D7E570E8F6BF74E841
|
S1131312E844B90BDE05D5CAE7DD68CF8CE805F5EC
|
||||||
S1131322BF76E8F571E8D7F52EE9D7C74071E80230
|
S11313228FE8F05104C2EE02FC8F8FE8819F8FE8B0
|
||||||
S1131332DF0E8F72E8819F72E84C0361C8E5D2E741
|
S11313324C33DC4FE083639F8CE85105FEECFBF6F3
|
||||||
S11313424070E801DF2EF570E8F1755002D612798B
|
S1131342BF88E8EF3EA288E8AFB2E76168DD0E83AA
|
||||||
S1131352A8E76168DD0D79B4E76168DD06799CE789
|
S1131352639F8CE8F58FE8300005FECEFBAF88E88A
|
||||||
S113136278FEE730E803BFD4E7E5D3E785654C06AA
|
S113136244B90B61D8EE34FFEE36FF8F8FE8819FCC
|
||||||
S1131372DFD8C0D7D52EE9DF1BF19800880075505D
|
S11313728FE84C335002DEBDEF09F58AE8F58BE8BD
|
||||||
S113138202D61279FEE71265FEB0FB88008198004E
|
S1131382F58CE8C0D7E571E8F6BF76E8D7AF76E822
|
||||||
S11313924C06DFE8F52EE9EFD9F52EE9D7C7407000
|
S1131392442C01DC0ECF71E80230F401BF76E8F58B
|
||||||
S11313A2E801DF31F570E8F1755002D61279A8E749
|
S11313A272E8D7E570E8F6BF74E8BF76E8F571E84D
|
||||||
S11313B26168DD1079B4E76168DD0913040AE8168F
|
S11313B2D7F52EE9D7C74071E802DF0E8F72E881B4
|
||||||
S11313C2799CE7BB85654C06DFDE30E803BFD4E7D2
|
S11313C29F72E84C0361C8E5D2E74070E801DF2E62
|
||||||
S11313D2E5D3E7C0D7D52EE9DF1CF1980088007564
|
S11313D2F570E8F1755002D61279A8E76168DD0D5F
|
||||||
S11313E25002D6040AE816AB1265FE4EFB88008151
|
S11313E279B4E76168DD06799CE778FEE730E803C3
|
||||||
S11313F298004C06DFE7F52EE9C0D7F52EE9D7C7EA
|
S11313F2BFD4E7E5D3E785654C06DFD8C0D7D52E41
|
||||||
S11314024070E801DF31F570E8F1755002D61279C7
|
S1131402E9DF1BF198008800755002D61279FEE7D5
|
||||||
S1131412A8E76168DD1079B4E76168DD0913041691
|
S11314121265FE26FB88008198004C06DFE8F52E53
|
||||||
S1131422E816799CE7BB85654C06DFDE30E803BF2E
|
S1131422E9EFD9F52EE9D7C74070E801DF31F5704D
|
||||||
S1131432D4E7E5D3E7C0D7D52EE9DF1CF1980088BD
|
S1131432E8F1755002D61279A8E76168DD1079B433
|
||||||
S113144200755002D60416E816AB1265FEECFA8853
|
S1131442E76168DD0913040AE816799CE7BB856540
|
||||||
S1131452008198004C06DFE7F52EE9C0D72008FE8C
|
S11314524C06DFDE30E803BFD4E7E5D3E7C0D7D5D7
|
||||||
S113146226F9FE44FB4070E801DF13E60274E8BF8C
|
S11314622EE9DF1CF198008800755002D6040AE8C0
|
||||||
S113147274E8442D01DC07F570E8F6BF74E88F7157
|
S113147216AB1265FEC4FA88008198004C06DFE7B9
|
||||||
S1131482E87391DF0CAF76E844E803DE04A1BF768B
|
S1131482F52EE9C0D7F52EE9D7C74070E801DF3160
|
||||||
S1131492E8634C02DF12AF76E8F743DD0B04FFFF8B
|
S1131492F570E8F1755002D61279A8E76168DD109B
|
||||||
S11314A2BF76E861F8F571E840D6E701DF47F5D683
|
S11314A279B4E76168DD09130416E816799CE7BB91
|
||||||
S11314B2E78F90E74C01DF08AF9CE7BFA8E7EF2571
|
S11314B285654C06DFDE30E803BFD4E7E5D3E7C039
|
||||||
S11314C24C02DF08AF9CE7BFB4E7EF198F91E74CFA
|
S11314C2D7D52EE9DF1CF198008800755002D604A6
|
||||||
S11314D201DF08AF9EE7BFAAE7EF0A4C02DF06AFBF
|
S11314D216E816AB1265FE62FA88008198004C0683
|
||||||
S11314E29EE7BFB6E7F7F1FE51FAF7E1FE4CFAF5D3
|
S11314E2DFE7F52EE9C0D72008FE9CF8FEBAFA40E1
|
||||||
S11314F290E7F591E740D7E701DF49F5D7E78F9207
|
S11314F270E801DF13E60274E8BF74E8442D01DCEE
|
||||||
S1131502E74C01DF08AFA0E7BFACE7EF254C02DFF1
|
S113150207F570E8F6BF74E88F71E87391DF0CAFEA
|
||||||
S113151208AFA0E7BFB8E7EF198F93E74C01DF08E4
|
S113151276E844E803DE04A1BF76E8634C02DF12F6
|
||||||
S1131522AFA2E7BFAEE7EF0A4C02DF06AFA2E7BF06
|
S1131522AF76E8F743DD0B04FFFFBF76E861F8F519
|
||||||
S1131532BAE7F75102FE03FAF75103FEFDF9F592F9
|
S113153271E840D6E701DF47F5D6E78F90E74C0123
|
||||||
S1131542E7F593E740D8E701DD60F19802318EB800
|
S1131542DF08AF9CE7BFA8E7EF254C02DF08AF9C9A
|
||||||
S1131552040490E71488027389771896E789D161A5
|
S1131552E7BFB4E7EF198F91E74C01DF08AF9EE7CD
|
||||||
S1131562E8EEA400A8040112B80679A8E7B800615D
|
S1131562BFAAE7EF0A4C02DF06AF9EE7BFB6E7F772
|
||||||
S113157268DD0679B4E714616861F8EE8A007922BD
|
S1131572F1FEC7F9F7E1FEC2F9F590E7F591E7400C
|
||||||
S1131582E916F743DD22A8004761D31C174561D34E
|
S1131582D7E701DF49F5D7E78F92E74C01DF08AFD0
|
||||||
S113159217A80612799CE714040A0012174361D3B0
|
S1131592A0E7BFACE7EF254C02DF08AFA0E7BFB876
|
||||||
S11315A2558802731996E701EF5CF5D8E78F94E743
|
S11315A2E7EF198F93E74C01DF08AFA2E7BFAEE77D
|
||||||
S11315B24C01DF08AFA4E7BFB0E7EF254C02DF0818
|
S11315B2EF0A4C02DF06AFA2E7BFBAE7F75102FE19
|
||||||
S11315C2AFA4E7BFBCE7EF198F95E74C01DF08AF83
|
S11315C279F9F75103FE73F9F592E7F593E740D8F9
|
||||||
S11315D2A6E7BFB2E7EF0A4C02DF06AFA6E7BFBE3B
|
S11315D2E701DD74F1730990E71896E783634C061B
|
||||||
S11315E2E7F75104FE54F9F75105FE4EF9F594E775
|
S11315E2DFF3F19802318EB8008802730990E7D1D3
|
||||||
S11315F2F595E7EE54FF1504F6FF121743DE5488FF
|
S11315F261E8EEA800A8000112B80679A8E7B804C9
|
||||||
S113160202731996E702EF52A8040112B80079A8EE
|
S11316026168DD0679B4E714616861F8EE8E0079E9
|
||||||
S1131612E7146168DD4079B4E76168DD391504ECEB
|
S113161222E916F743DD2EA8044761D32817456152
|
||||||
S1131622FF14799CE74561D30D6791DF0988027342
|
S1131622D323A80612799CE714040A001217436113
|
||||||
S113163257001996E700C2C379B4E7041400147979
|
S1131632C3621504F6FF12174361D8EEB700A80679
|
||||||
S11316429CE745DE15674C02DF108802731996E7A2
|
S113164212F67822E9EEA100F5D8E78F94E74C016F
|
||||||
S113165200EF07A80612F67822E988028198024C64
|
S1131652DF08AFA4E7BFB0E7EF254C02DF08AFA471
|
||||||
S11316620661E8EEE7FE8F96E7FC390C008F97E7F8
|
S1131662E7BFBCE7EF198F95E74C01DF08AFA6E7A8
|
||||||
S1131672FC560C008F98E7FC730C008F99E7FC94DE
|
S1131672BFB2E7EF0A4C02DF06AFA6E7BFBEE7F749
|
||||||
S11316820C008F9AE7FCB10C008F9BE71008ECD298
|
S11316825104FEB6F8F75105FEB0F8F594E7F59566
|
||||||
S11316920C00D1DD1991DD2991300A00DF0FD59AB2
|
S1131692E7EE40FF8802731996E701EF5FA80001A5
|
||||||
S11316A2E761E8503CD59BE761E8041400D7D5967E
|
S11316A212B80079A8E7146168DD9679B4E7616835
|
||||||
S11316B2E7300A0061E8503CD597E7DDF0043200D8
|
S11316B2DDF713049CE7161504ECFF614900DE0D07
|
||||||
S11316C2D7D598E7300A0061E8503CD599E7EFEBAB
|
S11316C28802730996E79161F81996E700C2C37913
|
||||||
S11316D25102FCEF0C00BFCCE7E1FCEF0C00BFCEE3
|
S11316D2B4E704140061490061D30E8802730996C9
|
||||||
S11316E2E7F1FCEF0C00BFD0E7AFCCE7443D00DCF0
|
S11316E2E74C0261F81996E70088028198024C06D9
|
||||||
S11316F228D5D6E7DF23442D01DC09300A00023065
|
S11316F2DE0AEEF0FE8802731996E7028F96E7FC83
|
||||||
S1131702E9BF30E9E60230E9BF30E944C800DC0D44
|
S1131702390C008F97E7FC560C008F98E7FC730C9A
|
||||||
S1131712F6BF30E9E5D6E7EF04F6BF30E9AFCEE72E
|
S1131712008F99E7FC940C008F9AE7FCB10C008FC0
|
||||||
S1131722443D00DC28D5D7E7DF23442D01DC093012
|
S11317229BE71008ECD20C00D1DD1991DD29913030
|
||||||
S11317320A000232E9BF32E9E60232E9BF32E94481
|
S11317320A00DF0FD59AE761E8503CD59BE761E8E0
|
||||||
S1131742C800DC0DF6BF32E9E5D7E7EF04F6BF3295
|
S1131742041400D7D596E7300A0061E8503CD597D7
|
||||||
S1131752E95102FE3CFF12AFD0E74361D327D5D84B
|
S1131752E7DDF0043200D7D598E7300A0061E8509B
|
||||||
S1131762E7DF22442D01DC09300A000234E9BF34E8
|
S11317623CD599E7EFEB5102FCEF0C00BFCCE7E16B
|
||||||
S1131772E9E60234E9BF34E944C800DC07F6BF34C1
|
S1131772FCEF0C00BFCEE7F1FCEF0C00BFD0E7AFEB
|
||||||
S1131782E9E5D8E7D7F6BF34E9D7D72004F1EE97D5
|
S1131782CCE7443D00DC28D5D6E7DF23442D01DC39
|
||||||
S113179200318EB8008802819803FCF10B0072A814
|
S113179209300A000230E9BF30E9E60230E9BF301D
|
||||||
S11317A2000490E816624DDF2C8802731996E80053
|
S11317A2E944C800DC0DF6BF30E9E5D6E7EF04F6FC
|
||||||
S11317B20996E7D1DD6CA80001120478E814A9A106
|
S11317B2BF30E9AFCEE7443D00DC28D5D7E7DF23CD
|
||||||
S11317C2B944F501DC5C30F4017878E888027319D5
|
S11317C2442D01DC09300A000232E9BF32E9E602A3
|
||||||
S11317D2C6E701EF4DA8000496E8148981994C03E9
|
S11317D232E9BF32E944C800DC0DF6BF32E9E5D78D
|
||||||
S11317E2DC288802730996E74C01DF0CA800010487
|
S11317E2E7EF04F6BF32E95102FE3CFF12AFD0E745
|
||||||
S11317F29CE716617900EF0E4C02DF0AA80001048F
|
S11317F24361D327D5D8E7DF22442D01DC09300A1F
|
||||||
S11318029CE716618900621890E8C2C3311CF6781D
|
S1131802000234E9BF34E9E60234E9BF34E944C8EA
|
||||||
S113181278E888027330E80319C6E700BFD4E7E525
|
S113181200DC07F6BF34E9E5D8E7D7F6BF34E9D7E9
|
||||||
S1131822D3E788034C06DD059802EE64FFAFD4E7E4
|
S1131822D72004F1EE9700318EB800880281980324
|
||||||
S1131832F743DF031004D7B1BFD4E7EFF7C1200A9F
|
S1131832FCF10B0072A8000490E816624DDF2C88BC
|
||||||
S113184213C30400F0121561D8A104F0FF44000090
|
S113184202731996E8000996E7D1DD6CA80001122B
|
||||||
S11318521361F844001061C8EEFA008F9CE870D15D
|
S11318520478E814A9A1B944F501DC5C30F40178F8
|
||||||
S1131862DF29C80A20C80B00AEF8040A00FC94025F
|
S113186278E888027319C6E701EF4DA8000496E8E8
|
||||||
S113187200C80808A8000CF0B802A812B806AEF80E
|
S1131872148981994C03DC288802730996E74C0188
|
||||||
S1131882A1A1FCAF020073E59CE8E090DF49634C40
|
S1131882DF0CA80001049CE716617900EF0E4C02FC
|
||||||
S1131892FFDF07FC10030073EFF44C1BDF18C808CA
|
S1131892DF0AA80001049CE716618900621890E837
|
||||||
S11318A203A8000CF031AEB802AEF8A1A1FCAF025D
|
S11318A2C2C3311CF67878E888027330E80319C69B
|
||||||
S11318B20073CF9CE802D1DF1EC80804A8000CF014
|
S11318B2E700BFD4E7E5D3E788034C06DD059802C9
|
||||||
S11318C2B802A812B806A80CB804AEF8A1A1FCAFDD
|
S11318C2EE64FFAFD4E7F743DF031004D7B1BFD40C
|
||||||
S11318D2020073CF9CE8038F9CE84C02DF2F634C19
|
S11318D2E7EFF7C1200A13C30400F0121561D8A17F
|
||||||
S11318E2FFDF07FC10030073EFF4D1DF6BC80804B9
|
S11318E204F0FF4400001361F844001061C8EEFAEA
|
||||||
S11318F2A8000CF0B802A812B806A80CB804AEF8F6
|
S11318F2008F9CE870D1DF29C80A20C80B00AEF81B
|
||||||
S1131902A1A1FCAF020073CF9CE80351034C03DF97
|
S1131902040A00FC940200C80808A8000CF0B802FB
|
||||||
S11319122B634CFFDF07FC10030073EFF4D1DF38B5
|
S1131912A812B806AEF8A1A1FCAF020073E59CE8D8
|
||||||
S1131922C80806A8000CF0B802A812B806AEF8A1BE
|
S1131922E090DF49634CFFDF07FC10030073EFF420
|
||||||
S1131932A1FCAF020073CF9CE80451044C04DF18ED
|
S11319324C1BDF18C80803A8000CF031AEB802AE85
|
||||||
S113194283DF07FC10030073EFF6FC160300F59C1B
|
S1131942F8A1A1FCAF020073CF9CE802D1DF1EC84C
|
||||||
S1131952E85111EF04F59CE8E1100ED7C1200C13F5
|
S11319520804A8000CF0B802A812B806A80CB8042F
|
||||||
S11319620400F0B8001561D8A104F0FFF743A80001
|
S1131962AEF8A1A1FCAF020073CF9CE8038F9CE800
|
||||||
S113197261F844001061C8EE9B00C80A20C80B003D
|
S11319724C02DF2F634CFFDF07FC10030073EFF40C
|
||||||
S1131982AEF8040A00FC940200C80808A800B802D1
|
S1131982D1DF6BC80804A8000CF0B802A812B8068C
|
||||||
S1131992A812B806AEF8A1A1FCAF02004CFFDF0604
|
S1131992A80CB804AEF8A1A1FCAF020073CF9CE876
|
||||||
S11319A2FC100300EFF64C1BDF1BC80803A8003130
|
S11319A20351034C03DF2B634CFFDF07FC100300DE
|
||||||
S11319B2AEB802AEF8A1A1FCAF02004CFFDF06FCF8
|
S11319B273EFF4D1DF38C80806A8000CF0B802A807
|
||||||
S11319C2100300EFF6D1DD0BE19800FC160300884A
|
S11319C212B806AEF8A1A1FCAF020073CF9CE804E2
|
||||||
S11319D200EF43C80804A800B802A812B806A80C6D
|
S11319D251044C04DF1883DF07FC10030073EFF695
|
||||||
S11319E2B804AEF8A1A1FCAF02004CFFDF06FC1064
|
S11319E2FC160300F59CE85111EF04F59CE8E110A4
|
||||||
S11319F20300EFF6D1DFD1C80806A800B802A81286
|
S11319F20ED7C1200C130400F0B8001561D8A1045D
|
||||||
S1131A02B806AEF8A1A1FCAF0200980081DFBCFCCD
|
S1131A02F0FFF743A80061F844001061C8EE9B00A0
|
||||||
S1131A12100300EFF5E1100ED7C12006C3C48F9066
|
S1131A12C80A20C80B00AEF8040A00FC940200C8ED
|
||||||
S1131A2200718CA80C12DC2D369000F67182B80479
|
S1131A220808A800B802A812B806AEF8A1A1FCAF33
|
||||||
S1131A32B802A804440000A80261F8440F00DE15AD
|
S1131A3202004CFFDF06FC100300EFF64C1BDF1B19
|
||||||
S1131A4200A804B800A80204010016A80061D8A1E5
|
S1131A42C80803A80031AEB802AEF8A1A1FCAF02E7
|
||||||
S1131A52B80417EFDBF6B800F143DE0FA8061689C7
|
S1131A52004CFFDF06FC100300EFF6D1DD0BE1982A
|
||||||
S1111A629BA5A717B806A800A1EFEB1008D7A4
|
S1131A6200FC1603008800EF43C80804A800B8026B
|
||||||
|
S1131A72A812B806A80CB804AEF8A1A1FCAF0200E3
|
||||||
|
S1131A824CFFDF06FC100300EFF6D1DFD1C80806D5
|
||||||
|
S1131A92A800B802A812B806AEF8A1A1FCAF0200D1
|
||||||
|
S1131AA2980081DFBCFC100300EFF5E1100ED7C1F2
|
||||||
|
S1131AB22006C3C48F9000718CA80C12DC2D3690C2
|
||||||
|
S1131AC200F67182B804B802A804440000A80261B6
|
||||||
|
S1131AD2F8440F00DE1500A804B800A802040100AF
|
||||||
|
S1131AE216A80061D8A1B80417EFDBF6B800F143D9
|
||||||
|
S1131AF2DE0FA80616899BA5A717B806A800A1EFB2
|
||||||
|
S1071B02EB1008D701
|
||||||
S10B2000006450320064503208
|
S10B2000006450320064503208
|
||||||
S214017E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C
|
S214017E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C
|
||||||
S214017E10FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C
|
S214017E10FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C
|
@ -141,7 +141,7 @@ void setMotorState(uint8_t motorid,uint8_t act)
|
|||||||
uint16_t MotorTarget[6] = {0};
|
uint16_t MotorTarget[6] = {0};
|
||||||
void setMotorTarget(uint8_t motorid,uint16_t target)
|
void setMotorTarget(uint8_t motorid,uint16_t target)
|
||||||
{
|
{
|
||||||
if (MotorHardStop1[motorid]!=0 && MotorHardStop2[motorid]!=0 && MotorErr[motorid] != 0)
|
if (MotorHardStop1[motorid]!=0 && MotorHardStop2[motorid]!=0)
|
||||||
{
|
{
|
||||||
MotorTarget[motorid] = target;
|
MotorTarget[motorid] = target;
|
||||||
}
|
}
|
||||||
@ -212,8 +212,11 @@ void AutoCalCtrl(void)
|
|||||||
MotorArr2state = 1;
|
MotorArr2state = 1;
|
||||||
MotorArr3state = 1;
|
MotorArr3state = 1;
|
||||||
setMotorState(MOTOR1,ACT_XQ);
|
setMotorState(MOTOR1,ACT_XQ);
|
||||||
setMotorState(MOTOR3,ACT_XQ);
|
//setMotorState(MOTOR3,ACT_XQ);
|
||||||
setMotorState(MOTOR5,ACT_XQ);
|
//setMotorState(MOTOR5,ACT_XQ);
|
||||||
|
wait1=0;
|
||||||
|
wait2=0;
|
||||||
|
wait3=0;
|
||||||
autocalcounter[0] = 0;
|
autocalcounter[0] = 0;
|
||||||
autocalcounter[1] = 0;
|
autocalcounter[1] = 0;
|
||||||
autocalcounter[2] = 0;
|
autocalcounter[2] = 0;
|
||||||
@ -284,7 +287,7 @@ void AutoCalCtrl(void)
|
|||||||
}
|
}
|
||||||
if (autocalcounter[0] > 3000 || MotorErr[MOTOR1] != 0)
|
if (autocalcounter[0] > 3000 || MotorErr[MOTOR1] != 0)
|
||||||
{
|
{
|
||||||
MotorArr1state = 4;
|
MotorArr1state++;
|
||||||
wait1 = 0;
|
wait1 = 0;
|
||||||
setMotorState(MOTOR1,ACT_NOACT);
|
setMotorState(MOTOR1,ACT_NOACT);
|
||||||
}
|
}
|
||||||
@ -342,7 +345,23 @@ void AutoCalCtrl(void)
|
|||||||
//2
|
//2
|
||||||
switch (MotorArr2state)
|
switch (MotorArr2state)
|
||||||
{
|
{
|
||||||
case 1://motor3 xq
|
case 1:
|
||||||
|
if (MotorArr1state == 0)
|
||||||
|
{
|
||||||
|
wait2++;
|
||||||
|
if (wait2 > 50)
|
||||||
|
{
|
||||||
|
wait2 = 0;
|
||||||
|
MotorArr2state++;
|
||||||
|
setMotorState(MOTOR3,ACT_XQ);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
wait2 = 0;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 2://motor3 xq
|
||||||
autocalcounter[1]++;
|
autocalcounter[1]++;
|
||||||
if (MotorHardStop1[MOTOR3] != 0)
|
if (MotorHardStop1[MOTOR3] != 0)
|
||||||
{
|
{
|
||||||
@ -352,12 +371,12 @@ void AutoCalCtrl(void)
|
|||||||
}
|
}
|
||||||
if (autocalcounter[1] > 3000 || MotorErr[MOTOR3] != 0)
|
if (autocalcounter[1] > 3000 || MotorErr[MOTOR3] != 0)
|
||||||
{
|
{
|
||||||
MotorArr2state = 4;
|
MotorArr2state = 5;
|
||||||
wait2 = 0;
|
wait2 = 0;
|
||||||
setMotorState(MOTOR3,ACT_NOACT);
|
setMotorState(MOTOR3,ACT_NOACT);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 2://wait
|
case 3://wait
|
||||||
wait2++;
|
wait2++;
|
||||||
if (wait2 > 50)
|
if (wait2 > 50)
|
||||||
{
|
{
|
||||||
@ -366,7 +385,7 @@ void AutoCalCtrl(void)
|
|||||||
autocalcounter[1] = 0;
|
autocalcounter[1] = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3://motor3 xh
|
case 4://motor3 xh
|
||||||
autocalcounter[1]++;
|
autocalcounter[1]++;
|
||||||
if (MotorHardStop2[MOTOR3] != 0)
|
if (MotorHardStop2[MOTOR3] != 0)
|
||||||
{
|
{
|
||||||
@ -376,12 +395,12 @@ void AutoCalCtrl(void)
|
|||||||
}
|
}
|
||||||
if (autocalcounter[1] > 3000 || MotorErr[MOTOR3] != 0)
|
if (autocalcounter[1] > 3000 || MotorErr[MOTOR3] != 0)
|
||||||
{
|
{
|
||||||
MotorArr2state = 4;
|
MotorArr2state++;
|
||||||
wait2 = 0;
|
wait2 = 0;
|
||||||
setMotorState(MOTOR3,ACT_NOACT);
|
setMotorState(MOTOR3,ACT_NOACT);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 4://wait
|
case 5://wait
|
||||||
wait2++;
|
wait2++;
|
||||||
if (wait2 > 50)
|
if (wait2 > 50)
|
||||||
{
|
{
|
||||||
@ -390,7 +409,7 @@ void AutoCalCtrl(void)
|
|||||||
autocalcounter[1] = 0;
|
autocalcounter[1] = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 5://motor4 xq
|
case 6://motor4 xq
|
||||||
autocalcounter[1]++;
|
autocalcounter[1]++;
|
||||||
if (MotorHardStop1[MOTOR4] != 0)
|
if (MotorHardStop1[MOTOR4] != 0)
|
||||||
{
|
{
|
||||||
@ -404,7 +423,7 @@ void AutoCalCtrl(void)
|
|||||||
setMotorState(MOTOR4,ACT_NOACT);
|
setMotorState(MOTOR4,ACT_NOACT);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 6://wait
|
case 7://wait
|
||||||
wait2++;
|
wait2++;
|
||||||
if (wait2 > 50)
|
if (wait2 > 50)
|
||||||
{
|
{
|
||||||
@ -413,7 +432,7 @@ void AutoCalCtrl(void)
|
|||||||
autocalcounter[1] = 0;
|
autocalcounter[1] = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 8:
|
||||||
autocalcounter[1]++;
|
autocalcounter[1]++;
|
||||||
if (MotorHardStop2[MOTOR4] != 0)
|
if (MotorHardStop2[MOTOR4] != 0)
|
||||||
{
|
{
|
||||||
@ -432,7 +451,23 @@ void AutoCalCtrl(void)
|
|||||||
}
|
}
|
||||||
switch (MotorArr3state)
|
switch (MotorArr3state)
|
||||||
{
|
{
|
||||||
case 1://motor5 xq
|
case 1:
|
||||||
|
if (MotorArr2state == 0)
|
||||||
|
{
|
||||||
|
wait3++;
|
||||||
|
if (wait3 > 50)
|
||||||
|
{
|
||||||
|
wait3 = 0;
|
||||||
|
MotorArr3state++;
|
||||||
|
setMotorState(MOTOR5,ACT_XQ);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
wait3 = 0;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 2://motor5 xq
|
||||||
autocalcounter[2]++;
|
autocalcounter[2]++;
|
||||||
if (MotorHardStop1[MOTOR5] != 0)
|
if (MotorHardStop1[MOTOR5] != 0)
|
||||||
{
|
{
|
||||||
@ -442,12 +477,12 @@ void AutoCalCtrl(void)
|
|||||||
}
|
}
|
||||||
if (autocalcounter[2] > 3000 || MotorErr[MOTOR5] != 0)
|
if (autocalcounter[2] > 3000 || MotorErr[MOTOR5] != 0)
|
||||||
{
|
{
|
||||||
MotorArr3state = 4;
|
MotorArr3state = 5;
|
||||||
wait3 = 0;
|
wait3 = 0;
|
||||||
setMotorState(MOTOR5,ACT_NOACT);
|
setMotorState(MOTOR5,ACT_NOACT);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 2://wait
|
case 3://wait
|
||||||
wait3++;
|
wait3++;
|
||||||
if (wait3 > 50)
|
if (wait3 > 50)
|
||||||
{
|
{
|
||||||
@ -456,7 +491,7 @@ void AutoCalCtrl(void)
|
|||||||
autocalcounter[2] = 0;
|
autocalcounter[2] = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3://motor5 xh
|
case 4://motor5 xh
|
||||||
autocalcounter[2]++;
|
autocalcounter[2]++;
|
||||||
if (MotorHardStop2[MOTOR5] != 0)
|
if (MotorHardStop2[MOTOR5] != 0)
|
||||||
{
|
{
|
||||||
@ -466,12 +501,12 @@ void AutoCalCtrl(void)
|
|||||||
}
|
}
|
||||||
if (autocalcounter[2] > 3000 || MotorErr[MOTOR5] != 0)
|
if (autocalcounter[2] > 3000 || MotorErr[MOTOR5] != 0)
|
||||||
{
|
{
|
||||||
MotorArr3state = 4;
|
MotorArr3state = 5;
|
||||||
wait3 = 0;
|
wait3 = 0;
|
||||||
setMotorState(MOTOR5,ACT_NOACT);
|
setMotorState(MOTOR5,ACT_NOACT);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 4://wait
|
case 5://wait
|
||||||
wait3++;
|
wait3++;
|
||||||
if (wait3 > 50)
|
if (wait3 > 50)
|
||||||
{
|
{
|
||||||
@ -480,7 +515,7 @@ void AutoCalCtrl(void)
|
|||||||
autocalcounter[2] = 0;
|
autocalcounter[2] = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 5://motor6 xq
|
case 6://motor6 xq
|
||||||
autocalcounter[2]++;
|
autocalcounter[2]++;
|
||||||
if (MotorHardStop1[MOTOR6] != 0)
|
if (MotorHardStop1[MOTOR6] != 0)
|
||||||
{
|
{
|
||||||
@ -494,7 +529,7 @@ void AutoCalCtrl(void)
|
|||||||
setMotorState(MOTOR6,ACT_NOACT);
|
setMotorState(MOTOR6,ACT_NOACT);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 6://wait
|
case 7://wait
|
||||||
wait3++;
|
wait3++;
|
||||||
if (wait3 > 50)
|
if (wait3 > 50)
|
||||||
{
|
{
|
||||||
@ -503,7 +538,7 @@ void AutoCalCtrl(void)
|
|||||||
autocalcounter[2] = 0;
|
autocalcounter[2] = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 8:
|
||||||
autocalcounter[2]++;
|
autocalcounter[2]++;
|
||||||
if (MotorHardStop2[MOTOR6] != 0)
|
if (MotorHardStop2[MOTOR6] != 0)
|
||||||
{
|
{
|
||||||
@ -759,26 +794,27 @@ void MotorCtrl(void)//10ms
|
|||||||
MotorState[MOTOR5] = ACT_NOACT;
|
MotorState[MOTOR5] = ACT_NOACT;
|
||||||
MotorState[MOTOR6] = ACT_NOACT;
|
MotorState[MOTOR6] = ACT_NOACT;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < 6; i++)
|
for (i = 0; i < 6; i++)
|
||||||
{
|
{
|
||||||
MotorStateReal[i] = MotorState[i];
|
MotorStateReal[i] = MotorState[i];
|
||||||
if (MotorState[i] == ACT_NOACT && MotorHardStop1[i] != 0 && MotorHardStop2[i] != 0 )
|
|
||||||
{
|
|
||||||
if (MotorErr[i] != 0)
|
|
||||||
{
|
|
||||||
MotorTarget[i] = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 6; i++)
|
||||||
|
{
|
||||||
|
|
||||||
|
if (MotorState[i] == ACT_NOACT && MotorHardStop1[i] != 0 && MotorHardStop2[i] != 0 )
|
||||||
|
{
|
||||||
if (MotorTarget[i]!=0 && MotorHardStop1[i] > MotorTarget[i] && MotorTarget[i] > MotorHardStop2[i])
|
if (MotorTarget[i]!=0 && MotorHardStop1[i] > MotorTarget[i] && MotorTarget[i] > MotorHardStop2[i])
|
||||||
{
|
{
|
||||||
if (MotorTarget[i] > MotorHallLoc[i]+10)
|
if (MotorTarget[i] > MotorHallLoc[i]+10)
|
||||||
{
|
{
|
||||||
MotorStateReal[i] = ACT_XQ;
|
MotorStateReal[i] = ACT_XQ;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
else if (MotorTarget[i] < MotorHallLoc[i]-10)
|
else if (MotorTarget[i] < MotorHallLoc[i]-10)
|
||||||
{
|
{
|
||||||
MotorStateReal[i] = ACT_XH;
|
MotorStateReal[i] = ACT_XH;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -797,9 +833,7 @@ void MotorCtrl(void)//10ms
|
|||||||
{
|
{
|
||||||
MotorStateReal[i] = ACT_NOACT;
|
MotorStateReal[i] = ACT_NOACT;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
MotorTarget[i] = 0;
|
MotorTarget[i] = 0;
|
||||||
@ -975,7 +1009,6 @@ void HallDetecte(void)
|
|||||||
{
|
{
|
||||||
HallErrorCount[i] = 500;
|
HallErrorCount[i] = 500;
|
||||||
MotorErr[i] = 1;
|
MotorErr[i] = 1;
|
||||||
MotorTarget[i] = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -67,13 +67,12 @@ void Apply_task(void)
|
|||||||
if (Timer_5ms_flag == 1)
|
if (Timer_5ms_flag == 1)
|
||||||
{
|
{
|
||||||
Timer_5ms_flag = 0;
|
Timer_5ms_flag = 0;
|
||||||
|
KeyPro();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Timer_10ms_flag == 1)
|
if (Timer_10ms_flag == 1)
|
||||||
{
|
{
|
||||||
Timer_10ms_flag = 0;
|
Timer_10ms_flag = 0;
|
||||||
KeyPro();
|
|
||||||
MotorCtrl();
|
MotorCtrl();
|
||||||
LIN_Task();
|
LIN_Task();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user