rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

made sonar support compiled in (lol) 

changed PPM pulse idle detect to 2.7ms per JimDrew instructions
updated keil project w /sonar source files.

git-svn-id: https://afrodevices.googlecode.com/svn/trunk/baseflight@168 7c89a4a9-59b9-e629-4cfe-3a2d53b20e61
This commit is contained in:
timecop 2012-06-26 01:36:58 +00:00
parent ce1ec92a67
commit 2fd5645dce
5 changed files with 2709 additions and 2669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
baseflight.uvproj
View File

@ -604,6 +604,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\src\drv_mma845x.c</FilePath> <FilePath>.\src\drv_mma845x.c</FilePath>
</File> </File>
<File>
<FileName>drv_hcsr04.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\drv_hcsr04.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -1369,6 +1374,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\src\drv_mma845x.c</FilePath> <FilePath>.\src\drv_mma845x.c</FilePath>
</File> </File>
<File>
<FileName>drv_hcsr04.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\drv_hcsr04.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -2314,6 +2324,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\src\drv_mma845x.c</FilePath> <FilePath>.\src\drv_mma845x.c</FilePath>
</File> </File>
<File>
<FileName>drv_hcsr04.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\drv_hcsr04.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>

4904
obj/baseflight.hex
View File

File diff suppressed because it is too large Load Diff

455
obj/baseflight_fy90q.hex
View File

@ -1,5 +1,5 @@
:020000040800F2 :020000040800F2
:100000001019002085800008D5800008D7800008DE :100000001819002085800008D5800008D7800008D6
:10001000D9800008DB800008DD80000800000000B7 :10001000D9800008DB800008DD80000800000000B7
:10002000000000000000000000000000DF80000869 :10002000000000000000000000000000DF80000869
:10003000E180000800000000E38000089B660008E3 :10003000E180000800000000E38000089B660008E3
@ -14,7 +14,7 @@
:1000C000C3600008B1640008A9640008E780000864 :1000C000C3600008B1640008A9640008E780000864
:1000D000E7800008E78000085F6B0008E780000801 :1000D000E7800008E78000085F6B0008E780000801
:1000E000E7800008E7800008E7800008DFF80CD010 :1000E000E7800008E7800008E7800008DFF80CD010
:1000F00008F034FD004800477B1700081019002065 :1000F00008F034FD004800477B170008181900205D
:10010000F0B504460E461546B4FBF5F038B1B4FB25 :10010000F0B504460E461546B4FBF5F038B1B4FB25
:10011000F5F72A4631463846FFF7F2FF0646B4FBAC :10011000F5F72A4631463846FFF7F2FF0646B4FBAC
:10012000F5F005FB1040FBA1085C3070701CF0BDC1 :10012000F5F005FB1040FBA1085C3070701CF0BDC1
@ -89,7 +89,7 @@
:10057000536176696E672E2E2E0000000D0A5265BB :10057000536176696E672E2E2E0000000D0A5265BB
:10058000626F6F74696E672E2E2E00000D0A4C6527 :10058000626F6F74696E672E2E2E00000D0A4C6527
:100590006176696E6720434C49206D6F64652E2E2D :100590006176696E6720434C49206D6F64652E2E2D
:1005A0002E0D0A0094030020000000201A020020F3 :1005A0002E0D0A0098030020000000201E020020EB
:1005B000456E61626C656420666561747572657311 :1005B000456E61626C656420666561747572657311
:1005C0003A2000004C0000206C69737400000000A9 :1005C0003A2000004C0000206C69737400000000A9
:1005D000417661696C61626C6520666561747572F3 :1005D000417661696C61626C6520666561747572F3
@ -102,7 +102,7 @@
:1006400020626520616E79206F72646572206F662A :1006400020626520616E79206F72646572206F662A
:100650002041455452313233340D0A0043757272D1 :100650002041455452313233340D0A0043757272D1
:10066000656E742061737369676E6D656E743A2090 :10066000656E742061737369676E6D656E743A2090
:10067000000000001904002043757272656E74203A :10067000000000001D04002043757272656E742036
:100680006D697865723A2000040000204176616946 :100680006D697865723A2000040000204176616946
:100690006C61626C65206D69786572733A20000048 :100690006C61626C65206D69786572733A20000048
:1006A000496E76616C6964206D6978657220747931 :1006A000496E76616C6964206D6978657220747931
@ -181,28 +181,28 @@
:100B3000207661726961626C65206E616D650D0A77 :100B3000207661726961626C65206E616D650D0A77
:100B40000000000053797374656D20557074696DF1 :100B40000000000053797374656D20557074696DF1
:100B5000653A2000207365636F6E64732C20566FB6 :100B5000653A2000207365636F6E64732C20566FB6
:100B60006C746167653A2000B2010020202A2030B1 :100B60006C746167653A2000B6010020202A2030AD
:100B70002E315620280000007001002053206261B1 :100B70002E315620280000007401002053206261AD
:100B80007474657279290D0A00000000446574656B :100B80007474657279290D0A00000000446574656B
:100B9000637465642073656E736F72733A2000002E :100B9000637465642073656E736F72733A2000002E
:100BA0007C00002041434348573A20009400002035 :100BA0008000002041434348573A2000980000202D
:100BB000040200204379636C652054696D653A2016 :100BB000080200204379636C652054696D653A2012
:100BC00000000000340100202C20493243204572EF :100BC00000000000380100202C20493243204572EB
:100BD000726F72733A2000004166726F33322043A5 :100BD000726F72733A2000004166726F33322043A5
:100BE0004C492076657273696F6E20322E30204A30 :100BE0004C492076657273696F6E20322E30204A30
:100BF000756E2031342032303132202F2031353A99 :100BF000756E2032362032303132202F2031303A9B
:100C000033393A33340000001A0200200D0A456ED1 :100C000033353A30340000001E0200200D0A456ED4
:100C1000746572696E6720434C49204D6F64652C82 :100C1000746572696E6720434C49204D6F64652C82
:100C200020747970652027657869742720746F2097 :100C200020747970652027657869742720746F2097
:100C300072657475726E2C206F72202768656C70F7 :100C300072657475726E2C206F72202768656C70F7
:100C4000270D0A0000000020E89A00089403002005 :100C4000270D0A0000000020E89A00089803002001
:100C50000D1B5B4B000000001B5B324A1B5B313BF2 :100C50000D1B5B4B000000001B5B324A1B5B313BF2
:100C600031480000770100084552523A20556E6B1A :100C600031480000770100084552523A20556E6B1A
:100C70006E6F776E20636F6D6D616E642C20747281 :100C70006E6F776E20636F6D6D616E642C20747281
:100C800079202768656C70270000000008200800A4 :100C800079202768656C70270000000008200800A4
:100C9000094801780078401C074A107007484454FE :100C9000094801780078401C074A107007484454FE
:100CA000204605F0FCFE00BF05F0C9FE00287FF4D9 :100CA000204605F0FCFE00BF05F0C9FE00287FF4D9
:100CB0002DAE00BFA3E6000000000020940300203A :100CB0002DAE00BFA3E60000000000209803002036
:100CC00070B5064634460CE02178FE4807F08AFAF3 :100CC00070B5064634460CE02178FE4807F08AFAF3
:100CD00005462DB1A01BC1B2FA482A1AFA48815420 :100CD00005462DB1A01BC1B2FA482A1AFA48815420
:100CE000641C20780028EFD170BD70B5B422F7499C :100CE000641C20780028EFD170BD70B5B422F7499C
@ -267,8 +267,8 @@
:1010900040F27E40A1F87C0040F23A70A1F87E0058 :1010900040F27E40A1F87C0040F23A70A1F87E0058
:1010A0004FF47A70A1F880004FF4C870A1F8820064 :1010A0004FF47A70A1F880004FF4C870A1F8820064
:1010B0003220A1F88400012081F8860040F2DC5043 :1010B0003220A1F88400012081F8860040F2DC5043
:1010C00014E0000074A000081904002000FC0008CF :1010C00014E0000074A000081D04002000FC0008CB
:1010D000FC04002008050020AC00002003141400CC :1010D000000500200C050020B000002003141400BF
:1010E000414554523132333400000000A1F88800E9 :1010E000414554523132333400000000A1F88800E9
:1010F000A1F88A00A1F88C004FF47F70A1F88E004F :1010F000A1F88A00A1F88C004FF47F70A1F88E004F
:101100004FF4FA60A1F890000A2081F8920081F86B :101100004FF4FA60A1F890000A2081F8920081F86B
@ -284,7 +284,7 @@
:1011A0000D49096881430C4A116070470A4800687C :1011A0000D49096881430C4A116070470A4800687C
:1011B0007047014609484068084201D00120704745 :1011B0007047014609484068084201D00120704745
:1011C0000020FCE7054949688143044A51607047A3 :1011C0000020FCE7054949688143044A51607047A3
:1011D0000248406870470000A8000020B4030020C7 :1011D0000248406870470000AC000020B8030020BF
:1011E00070B5FE48008807F090FA0546FC4907F004 :1011E00070B5FE48008807F090FA0546FC4907F004
:1011F00088F8044607F0ACFA00B2FA49088070BDDE :1011F00088F8044607F0ACFA00B2FA49088070BDDE
:101200002DE9F047804689464946404608F04EF9A8 :101200002DE9F047804689464946404608F04EF9A8
@ -348,13 +348,13 @@
:1015A00002F0E6FD00245BE0144830F8140002A9C4 :1015A00002F0E6FD00245BE0144830F8140002A9C4
:1015B00031F81410084400B22DF814003DF914005D :1015B00031F81410084400B22DF814003DF914005D
:1015C0001C4931F914100844401C032190FBF1F030 :1015C0001C4931F914100844401C032190FBF1F030
:1015D00000B2194921F8140030E000000202002096 :1015D00000B2194921F8140030E000000602002092
:1015E0007593D83EB00000203B597E90A9E781401A :1015E0007593D83EB40000203B597E90A9E7814016
:1015F000E40000209B36CF478A48323EE8000020B6 :1015F000E80000209B36CF478A48323EEC000020AE
:10160000B4030020EE00002080040020F40000203D :10160000B8030020F200002084040020F80000202D
:101610006804002074040020CC000020FA000020A0 :101610006C04002078040020D0000020FE00002090
:10162000000048435E06A33BC8000020D400002011 :10162000000048435E06A33BCC000020D800002009
:101630003A010020CE000020BC0000203DF914003B :101630003E010020D2000020C00000203DF914002F
:1016400000EBD07149102E4A22F814100120FFF748 :1016400000EBD07149102E4A22F814100120FFF748
:1016500098FD18B900202B4921F81400601CC4B271 :1016500098FD18B900202B4921F81400601CC4B271
:10166000032CA1DB8020FFF7A4FD78B32648007887 :10166000032CA1DB8020FFF7A4FD78B32648007887
@ -367,8 +367,8 @@
:1016D0004078012812D10E48B0F904100E48B0F934 :1016D0004078012812D10E48B0F904100E48B0F934
:1016E000000001EB4000401C032190FBF1F000B230 :1016E000000001EB4000401C032190FBF1F000B230
:1016F0000749888008468088074908801FBD000088 :1016F0000749888008468088074908801FBD000088
:10170000CE000020EE000020DA000020B40300200C :10170000D2000020F2000020DE000020B8030020FC
:10171000BC000020DE000020D800002070B55F482B :10171000C0000020E2000020DC00002070B55F481F
:10172000007808B1022000E00020054605F055FDD4 :10172000007808B1022000E00020054605F055FDD4
:10173000401BC6B24FF40040594908602C4607E0F0 :10173000401BC6B24FF40040594908602C4607E0F0
:101740005848B0F87E10204605F038FD601CC4B241 :101740005848B0F87E10204605F038FD601CC4B241
@ -392,9 +392,9 @@
:10186000124908600DE00120FFF7A3FC48B14FF4D6 :10186000124908600DE00120FFF7A3FC48B14FF4D6
:101870000070FFF79EFC20B10A49D1F8A40004F0E3 :101870000070FFF79EFC20B10A49D1F8A40004F0E3
:1018800076F804F010FF0C4908604FF47A700B49A9 :1018800076F804F010FF0C4908604FF47A700B49A9
:10189000088001E001F0CAFCFCE700001101002013 :10189000088001E001F0CAFCFCE70000150100200F
:1018A00014080140B40300203D3100085401002019 :1018A00014080140B80300203D3100085801002011
:1018B000001001404D5B000830010020FE010020B7 :1018B000001001404D5B00083401002002020020AE
:1018C00010B5FB48407804280BD0F948407801282F :1018C00010B5FB48407804280BD0F948407801282F
:1018D00007D0F7484078052803D0F5484078082815 :1018D00007D0F7484078052803D0F5484078082815
:1018E00002D10120F34908702020FFF762FC18B9EB :1018E00002D10120F34908702020FFF762FC18B9EB
@ -458,8 +458,8 @@
:101C80000B49B1F89010884203DD0948B0F8900084 :101C80000B49B1F89010884203DD0948B0F8900084
:101C90000AE00748B0F88C00054991F98610094A16 :101C90000AE00748B0F88C00054991F98610094A16
:101CA000B2F9042001FB020000B20449088197E761 :101CA000B2F9042001FB020000B20449088197E761
:101CB000B4030020110100201001002012010020B7 :101CB000B8030020150100201401002016010020A7
:101CC0008C040020C6010020B4010020FE48C0881A :101CC00090040020CA010020B8010020FE48C0880E
:101CD0000146FE4840880144FD4890F98600FB4AD1 :101CD0000146FE4840880144FD4890F98600FB4AD1
:101CE000928850434042084400B2FA490880F648BE :101CE000928850434042084400B2FA490880F648BE
:101CF000C088F6490988494208440146F44890F9E9 :101CF000C088F6490988494208440146F44890F9E9
@ -523,8 +523,8 @@
:1020900086000E4A928850434042084400B21946D6 :1020900086000E4A928850434042084400B21946D6
:1020A0004881B9E2094AB2F90020514201EBD172EC :1020A0004881B9E2094AB2F90020514201EBD172EC
:1020B000054BDB8803EB6203044AB2F9020000EB34 :1020B000054BDB8803EB6203044AB2F9020000EB34
:1020C000D07203EB620307E0B4010020C6010020D8 :1020C000D07203EB620307E0B8010020CA010020D0
:1020D000B40300208C040020FE4A92F98620FE4EB4 :1020D000B803002090040020FE4A92F98620FE4EAC
:1020E000B68802FB063212B2FC4B1A80FA4AB2F9E9 :1020E000B68802FB063212B2FC4B1A80FA4AB2F9E9
:1020F0000020514201EBD172F94BDB8803EB620205 :1020F0000020514201EBD172F94BDB8803EB620205
:10210000F54BB3F90230584200EBD07302EB630396 :10210000F54BB3F90230584200EBD07302EB630396
@ -588,8 +588,8 @@
:1024A00000EBD07201EB62020A4991F986100A4BE7 :1024A00000EBD07201EB62020A4991F986100A4BE7
:1024B0009B8801FB032109B2084A11800649B1F942 :1024B0009B8801FB032109B2084A11800649B1F942
:1024C0000010484200EBD071054AD28802EB61014E :1024C0000010484200EBD071054AD28802EB61014E
:1024D000014A07E0B4030020C60100208C0400205C :1024D000014A07E0B8030020CA0100209004002050
:1024E000B4010020528852420A44FC4991F98610F6 :1024E000B8010020528852420A44FC4991F98610F2
:1024F000FB4B9B8801FB032109B2FA4A5180FA4940 :1024F000FB4B9B8801FB032109B2FA4A5180FA4940
:10250000C988F74A128852420A44F549B1F90200D3 :10250000C988F74A128852420A44F549B1F90200D3
:1025100000EBD07102EB6102F04991F98610F04BAB :1025100000EBD07102EB6102F04991F98610F04BAB
@ -652,9 +652,9 @@
:1028A0000844B0F5FA6F02DD4FF4FA6006E0104814 :1028A0000844B0F5FA6F02DD4FF4FA6006E0104814
:1028B000B0F900000949B1F88810084400B20C4989 :1028B000B0F900000949B1F88810084400B20C4989
:1028C00008800846B0F902000449B1F88A100844AB :1028C00008800846B0F902000449B1F88A100844AB
:1028D000B0F57F7F12DA4FF47F7023E0B40300205D :1028D000B0F57F7F12DA4FF47F7023E0B803002059
:1028E000C60100208C040020B4010020C800002094 :1028E000CA01002090040020B8010020CC00002084
:1028F000120100203901002042010020B648B0F941 :1028F000160100203D01002046010020B648B0F935
:102900000200B649B1F88A100844B0F5FA6F02DD4A :102900000200B649B1F88A100844B0F5FA6F02DD4A
:102910004FF4FA6006E0B048B0F90200AF49B1F8F0 :102910004FF4FA6006E0B048B0F90200AF49B1F8F0
:102920008A10084400B2AC49488000BF00BF202094 :102920008A10084400B2AC49488000BF00BF202094
@ -700,10 +700,10 @@
:102BA000154921F8140006E00C48B0F8800000B286 :102BA000154921F8140006E00C48B0F8800000B286
:102BB000114921F814001248007830B90748B0F8DC :102BB000114921F814001248007830B90748B0F8DC
:102BC000800000B20C4921F81400601CC4B20B480C :102BC000800000B20C4921F81400601CC4B20B480C
:102BD00000788442A4DBF8BD12010020B403002079 :102BD00000788442A4DBF8BD16010020B803002071
:102BE000420100201E050020C80000202201002014 :102BE0004601002022050020CC0000202601002004
:102BF00023010020240100208C040020100100206B :102BF000270100202801002090040020140100205B
:102C00003C0100202DE9F04104460D4616464FF0E8 :102C0000400100202DE9F04104460D4616464FF0E4
:102C1000000815E000270AE0F948C06880F48050F9 :102C1000000815E000270AE0F948C06880F48050F9
:102C2000F749C860284603F063FD781CC7B2A74285 :102C2000F749C860284603F063FD781CC7B2A74285
:102C3000F2DB3C2003F05CFD08F1010000F0FF082E :102C3000F2DB3C2003F05CFD08F1010000F0FF082E
@ -767,11 +767,11 @@
:102FD000010000F0FF09B9F1080FF2DBC3464FEA28 :102FD000010000F0FF09B9F1080FF2DBC3464FEA28
:102FE000E87108EB5171C81000F0EEFE1549087049 :102FE000E87108EB5171C81000F0EEFE1549087049
:102FF0001548807A18B10720144908703EE027E090 :102FF0001548807A18B10720144908703EE027E090
:103000000010014042010020B4030020FC04002015 :103000000010014046010020B80300200005002008
:10301000B4010020BC010020C201002008050020EE :10301000B8010020C0010020C60100200C050020DE
:103020003801002016020020B0010020182D445461 :103020003C0100201A020020B4010020182D445455
:10303000FB21094000806640780100207A010020D1 :10303000FB210940008066407C0100207E010020C9
:103040009C040020B20100201E0500207901002010 :10304000A0040020B6010020220500207D01002000
:10305000FE480078FE490988884206DCFD4890F861 :10305000FE480078FE490988884206DCFD4890F861
:103060006400FA490978884205DD0020FA490870B1 :103060006400FA490978884205DD0020FA490870B1
:10307000FA49087002E00420F7490870F648007821 :10307000FA49087002E00420F7490870F648007821
@ -835,16 +835,16 @@
:103410001748007810B1002015490870002028498D :103410001748007810B1002015490870002028498D
:10342000087035E11F48B0F904000A49B1F872107C :10342000087035E11F48B0F904000A49B1F872107C
:10343000884257DB074890F8760001285ED119488A :10343000884257DB074890F8760001285ED119488A
:10344000B0F900000349B1F8721049E0B201002060 :10344000B0F900000349B1F8721049E0B60100205C
:10345000F8010020B4030020790100202801002099 :10345000FC010020B80300207D0100202C01002089
:10346000FC010020FE01002000100140FA010020B4 :10346000000200200202002000100140FE010020A6
:103470003C0100202C01002074010020CC00002021 :10347000400100203001002078010020D000002011
:1034800020A107007C010020E5010020F049020096 :1034800020A1070080010020E9010020F04902008E
:103490000C0801408001002054010020AC040020F1 :103490000C0801408401002058010020B0040020E5
:1034A000EC04002042010020A00100203E01002089 :1034A000F004002046010020A40100204201002079
:1034B0005801002040010020940100209A010020C2 :1034B0005C01002044010020980100209E010020B2
:1034C000810100206A0100206C010020F60100202B :1034C000850100206E01002070010020FA0100201B
:1034D000290100201E05002016020020B001002056 :1034D0002D010020220500201A020020B401002046
:1034E00088420BDAFB480078012807D1FA480078B7 :1034E00088420BDAFB480078012807D1FA480078B7
:1034F000142896D10020F7490870C9E0F748B0F9C0 :1034F000142896D10020F7490870C9E0F748B0F9C0
:103500000400F749B1F8741088420CDCF348B0F9B4 :103500000400F749B1F8741088420CDCF348B0F9B4
@ -908,11 +908,11 @@
:1038A00000201D490880488001201A49087002E064 :1038A00000201D490880488001201A49087002E064
:1038B0000020184908701248407910B901201749B2 :1038B0000020184908701248407910B901201749B2
:1038C00008701448007801282CD1C00314490860FE :1038C00008701448007801282CD1C00314490860FE
:1038D0002CE000003C01002081010020420100207A :1038D0002CE000004001002085010020460100206E
:1038E000B4030020FE010020FA010020160200208F :1038E000B803002002020020FE0100201A0200207E
:1038F000B0010020FC01002000020020F6010020A1 :1038F000B40100200002002004020020FA01002090
:103900001E050020680100206A0100206C010020D3 :10390000220500206C0100206E01002070010020C3
:103910003E010020590100209A010020580100209A :10391000420100205D0100209E0100205C0100208A
:10392000140801404FF40040FE4908601020FDF7E4 :10392000140801404FF40040FE4908601020FDF7E4
:1039300028FC50B3FC48807968B1FC48007868B92D :1039300028FC50B3FC48807968B1FC48007868B92D
:103940000120FA490870FA49081F02F050F80320D4 :103940000120FA490870FA49081F02F050F80320D4
@ -977,15 +977,15 @@
:103CF00014902D48005D00FB0AF040110FFA80FB84 :103CF00014902D48005D00FB0AF040110FFA80FB84
:103D000008983844A0EB0B0000B2284921F81400B1 :103D000008983844A0EB0B0000B2284921F81400B1
:103D1000601CC4B2032CFFF6E8AEFDF777FEFDF79A :103D1000601CC4B2032CFFF6E8AEFDF777FEFDF79A
:103D200022FE45E0100801401E050020360100205B :103D200022FE45E010080140220500203A01002053
:103D3000D80100206601002037010020CC010020BE :103D3000DC0100206A0100203B010020D0010020AE
:103D4000DC01002039010020A60100202C01002008 :103D4000E00100203D010020AA01002030010020F8
:103D500030010020340100205C0100201602002008 :103D50003401002038010020600100201A020020F8
:103D600035FA8E3CF2010020000020415E01002067 :103D600035FA8E3CF601002000002041620100205F
:103D700059010020B40100200CFEFFFFC800002004 :103D70005D010020B80100200CFEFFFFCC000020F8
:103D8000F00300209A010020F0D8FFFFBC000020C3 :103D8000F40300209E010020F0D8FFFFC0000020B7
:103D90009401002080C1FFFFBC01002082010020AF :103D90009801002080C1FFFFC001002086010020A3
:103DA000880100208E010020C2010020C6010020F1 :103DA0008C01002092010020C6010020CA010020E1
:103DB000FDF705FE09B0BDE8F08F000010B5F2492F :103DB000FDF705FE09B0BDE8F08F000010B5F2492F
:103DC000F24802F013FF10BD2DE9F0470446F04918 :103DC000F24802F013FF10BD2DE9F0470446F04918
:103DD00091F8620004F099FC8046204604F095FCBE :103DD00091F8620004F099FC8046204604F095FCBE
@ -1047,13 +1047,13 @@
:10415000140000B2214921F81400084630F8140078 :10415000140000B2214921F81400084630F8140078
:10416000204921F81400601CC4B2032CC3DB10BD2D :10416000204921F81400601CC4B2032CC3DB10BD2D
:1041700010B50548416819488847034881681748C1 :1041700010B50548416819488847034881681748C1
:104180008847FFF778FF10BD5C0500205005002030 :104180008847FFF778FF10BD600500205405002028
:10419000B40300203333534000F07F45700100200A :10419000B80300203333534000F07F457401002002
:1041A000F8010020FC0100202C050020EE0000207A :1041A000FC0100200002002030050020F200002069
:1041B0000202002068010020060200200C020020FC :1041B000060200206C0100200A02002010020020EC
:1041C000380500206E0100206A010020290100202E :1041C0003C050020720100206E0100202D0100201E
:1041D0006C010020FE01002044050020E8000020C2 :1041D000700100200202002048050020EC000020B1
:1041E000C20000201002002010B50446FE490C70E9 :1041E000C60000201402002010B50446FE490C70E1
:1041F0000846007802F053FCFC480078FA49097838 :1041F0000846007802F053FCFC480078FA49097838
:104200004840FA490870200AF749087008460078C3 :104200004840FA490870200AF749087008460078C3
:1042100002F045FCF5480078F34909784840F34935 :1042100002F045FCF5480078F34909784840F34935
@ -1117,11 +1117,11 @@
:1045B000008800B2FFF752FE02F045F806B230461E :1045B000008800B2FFF752FE02F045F806B230461E
:1045C000FFF74CFE0120FCF7DCFD07460220FCF75C :1045C000FFF74CFE0120FCF7DCFD07460220FCF75C
:1045D000D8FD47EA40070420FCF7D3FD47EA8007EF :1045D000D8FD47EA40070420FCF7D3FD47EA8007EF
:1045E000102026E0CEE115E11B0200201F02002072 :1045E000102026E0CEE115E11F020020230200206A
:1045F0001C02002021020020680500201A02002071 :1045F00020020020250200206C0500201E02002061
:10460000200200201D0200201E0200204201002086 :104600002402002021020020220200204601002076
:10461000E4010020E5010020CC010020EE01002093 :10461000E8010020E9010020D0010020F201002083
:10462000F00100205D010020BC03002034010020C7 :10462000F401002061010020C003002038010020B7
:1046300077E1FCF7A6FD47EAC0070820FCF7A1FDDB :1046300077E1FCF7A6FD47EAC0070820FCF7A1FDDB
:1046400047EA00163046FFF709FEEB490978EB4AC6 :1046400047EA00163046FFF709FEEB490978EB4AC6
:10465000127841EA4201EA4A127841EA8201E94AC3 :10465000127841EA4201EA4A127841EA8201E94AC3
@ -1182,15 +1182,15 @@
:1049C0002E480078401C2D49087000BF00BF2B48BE :1049C0002E480078401C2D49087000BF00BF2B48BE
:1049D000007848B9232D02D1FBF78AFF04E0522D5D :1049D000007848B9232D02D1FBF78AFF04E0522D5D
:1049E00002D1012001F033FF02F029F800287FF402 :1049E00002D1012001F033FF02F029F800287FF402
:1049F000CAAC00BFC4E40000590100205B010020E4 :1049F000CAAC00BFC4E400005D0100205F010020DC
:104A00005A0100203C01002036010020370100201F :104A00005E010020400100203A0100203B0100200F
:104A100038010020F4000020BC000020FA00002033 :104A10003C010020F8000020C0000020FE00002023
:104A2000120100208C04002042010020E40100203B :104A2000160100209004002046010020E80100202B
:104A3000E5010020CC010020EE010020F001002063 :104A3000E9010020D0010020F2010020F401002053
:104A4000E6010020EA0100205D010020C8000020EE :104A4000EA010020EE01002061010020CC000020DE
:104A50001602002008010020B2010020B40300204B :104A50001A0200200C010020B6010020B80300203B
:104A6000FC010020FE01002000020020A80100201F :104A6000000200200202002004020020AC0100200D
:104A7000AA010020AC010020AE010020200200208D :104A7000AE010020B0010020B2010020240200207D
:104A800044F25061884201DDA0EB4100F6498842C2 :104A800044F25061884201DDA0EB4100F6498842C2
:104A900002DA48F6A0410844704710B5F3480068B0 :104A900002DA48F6A0410844704710B5F3480068B0
:104AA000F3490968441A2046FFF7EAFF0446002C40 :104AA000F3490968441A2046FFF7EAFF0446002C40
@ -1253,12 +1253,12 @@
:104E300030F914001E4921F8140004EB8401194ACA :104E300030F914001E4921F8140004EB8401194ACA
:104E400002EB8100FFF740FE074604EB8401194A9C :104E400002EB8100FFF740FE074604EB8401194A9C
:104E500002EB81003946FFF73AFE601CC4B2022C17 :104E500002EB81003946FFF73AFE601CC4B2022C17
:104E6000FFF67AAFBDE8FC87B0B9FFFF6002002013 :104E6000FFF67AAFBDE8FC87B0B9FFFF640200200F
:104E700064020020B4030020182D4454FB21194083 :104E700068020020B8030020182D4454FB2119407B
:104E80000000F03FD30237396C0200206802002096 :104E80000000F03FD3023739700200206C0200208E
:104E900048F4FFFF98020020240200204C0200206A :104E900048F4FFFF9C02002028020020500200205E
:104EA00018FCFFFF38060020D8050020440200202F :104EA00018FCFFFF3C060020DC0500204802002023
:104EB000F20100201006002070B504460D468DB1A9 :104EB000F60100201406002070B504460D468DB1A1
:104EC000FE480068B4EB500F01D2204602E0FB48D8 :104EC000FE480068B4EB500F01D2204602E0FB48D8
:104ED0000068400804B2002C01DD204600E00020FC :104ED0000068400804B2002C01DD204600E00020FC
:104EE000044613E0F5480068844201D2204601E000 :104EE000044613E0F5480068844201D2204601E000
@ -1322,13 +1322,13 @@
:10528000002CE2D100BF30BDF0B501460A460B4606 :10528000002CE2D100BF30BDF0B501460A460B4606
:105290000024002542F210760FE08B4208D01078EF :105290000024002542F210760FE08B4208D01078EF
:1052A000303800FB065085B20A2096FBF0F086B23B :1052A000303800FB065085B20A2096FBF0F086B23B
:1052B00010782E2800D11346521C31E06C020020D9 :1052B00010782E2800D11346521C31E070020020D5
:1052C000B403002070020020440200200000C84205 :1052C000B803002074020020480200200000C842F9
:1052D00050020020E8050020B8050020240200202C :1052D00054020020EC050020BC050020280200201C
:1052E0004C02002010060020C805002030F8FFFF07 :1052E0005002002014060020CC05002030F8FFFFFB
:1052F00048F4FFFFF2010020380600204802002099 :1052F00048F4FFFFF60100203C0600204C0200208D
:105300002C7D8E3FA00CB34500A00C463C02002033 :105300002C7D8E3FA00CB34500A00C46400200202F
:10531000CC010020340200203002002050E0EF30A9 :10531000D0010020380200203402002050E0EF309D
:1053200010780028B9D18A4200D1F0BD07E004EB23 :1053200010780028B9D18A4200D1F0BD07E004EB23
:105330008400440011F8010B30382044C4B2981E98 :105330008400440011F8010B30382044C4B2981E98
:105340008842F4D813F8010C303813F802CCACF1D1 :105340008842F4D813F8010C303813F802CCACF1D1
@ -1397,14 +1397,14 @@
:10573000ECFF0646284902F01AFE2849086000F0EE :10573000ECFF0646284902F01AFE2849086000F0EE
:10574000C8FF244908604FF07E512448006803F0E8 :10574000C8FF244908604FF07E512448006803F0E8
:105750007DF845D22148006844E000002D31010069 :105750007DF845D22148006844E000002D31010069
:105760003D0200203E0200203F020020A80500204C :10576000410200204202002043020020AC0500203C
:1057700041020020CC010020E4010020E5010020CE :1057700045020020D0010020E8010020E9010020BE
:10578000EE0100208CD90700A0860100F001002066 :10578000F20100208CD90700A0860100F40100205E
:1057900040020020640100205D0100203C01002047 :105790004402002068010020610100204001002037
:1057A0005C010020D4010020160200209C02002091 :1057A00060010020D80100201A020020A002002081
:1057B000280200207C020020809698008C020020A5 :1057B0002C02002080020020809698009002002099
:1057C0009402002060060020740200208402002061 :1057C0009802002064060020780200208802002051
:1057D000660100202C02002000007A4444020020D0 :1057D0006A0100203002002000007A4448020020C4
:1057E0004FF07E509749086002A803A9964B1A1FF4 :1057E0004FF07E509749086002A803A9964B1A1FF4
:1057F000CDE900109549081FFFF745FC6421039887 :1057F000CDE900109549081FFFF745FC6421039887
:10580000B0FBF1F0924908806421029890FBF1F01E :10580000B0FBF1F0924908806421029890FBF1F01E
@ -1443,14 +1443,14 @@
:105A100000100E49081FFFF736FB114800681549B2 :105A100000100E49081FFFF736FB114800681549B2
:105A200008600A4B1A1F1049081FFFF70FFB0C48AC :105A200008600A4B1A1F1049081FFFF70FFB0C48AC
:105A30000068204908600E48B0F8AC0000B21E496A :105A30000068204908600E48B0F8AC0000B21E496A
:105A400008807CBD44020020D8010020D001002045 :105A400008807CBD48020020DC010020D401002039
:105A5000E6010020EA010020370100203601002085 :105A5000EA010020EE0100203B0100203A01002075
:105A6000600200206C0200205C0200206601002021 :105A60006402002070020020600200206A01002011
:105A7000B403002098020020180200209C0200209D :105A7000B80300209C0200201C020020A00200208D
:105A80000000C842B80500200000FA440000204190 :105A80000000C842BC0500200000FA44000020418C
:105A9000C805002000007A44D8050020955500086C :105A9000CC05002000007A44DC0500209555000864
:105AA0005E010020F2010020E80500201006002021 :105AA00062010020F6010020EC0500201406002011
:105AB00038060020640200207002002070B5044601 :105AB0003C060020680200207402002070B50446F5
:105AC00001204649087000F0EEFD05464448006894 :105AC00001204649087000F0EEFD05464448006894
:105AD000281A44490860424805600846006841F2B7 :105AD000281A44490860424805600846006841F2B7
:105AE0008831884202D900203F4908703F493E4A28 :105AE0008831884202D900203F4908703F493E4A28
@ -1468,10 +1468,10 @@
:105BA000154BB3F8700018E0134B93F86F305BB1EE :105BA000154BB3F8700018E0134B93F86F305BB1EE
:105BB000114B65339B5C144C54F823304FF47774CD :105BB000114B65339B5C144C54F823304FF47774CD
:105BC00004EB530398B208E00B4B65339B5C0E4C1F :105BC00004EB530398B208E00B4B65339B5C0E4C1F
:105BD00054F8233003F5777398B270BDA10200200A :105BD00054F8233003F5777398B270BDA502002006
:105BE000A4020020A8020020AC020020A40600208D :105BE000A8020020AC020020B0020020A80600207D
:105BF000A00200203E010020B4030020AD020020DE :105BF000A402002042010020B8030020B1020020CE
:105C0000AE020020BD5A00088806002010B50446E8 :105C0000B2020020BD5A00088C06002010B50446E0
:105C10009448807A18B101209349087002E000206E :105C10009448807A18B101209349087002E000206E
:105C2000914908704FF48060FBF7C3FAB0B38F4816 :105C2000914908704FF48060FBF7C3FAB0B38F4816
:105C300090F8770000EB80008D49B1F900108842A0 :105C300090F8770000EB80008D49B1F900108842A0
@ -1509,11 +1509,11 @@
:105E30000078002804DD1D480088401C1B490880AC :105E30000078002804DD1D480088401C1B490880AC
:105E40001A4800881549097888420ADB002017495A :105E40001A4800881549097888420ADB002017495A
:105E500008801249087004E00020144908801149A4 :105E500008801249087004E00020144908801149A4
:105E6000087010BD1E050020C2020020B4030020EF :105E6000087010BD22050020C6020020B8030020E3
:105E70003E0100203C010020C50200203601002028 :105E70004201002040010020C90200203A01002018
:105E800037010020E4010020C4020020B6020020F7 :105E80003B010020E8010020C8020020BA020020E7
:105E9000B0020020C1020020B2020020290100202F :105E9000B4020020C5020020B60200202D0100201F
:105EA000B8020020C0020020BC020020B402002082 :105EA000BC020020C4020020C0020020B802002072
:105EB00038B54FF44060ADF8000003208DF80200C3 :105EB00038B54FF44060ADF8000003208DF80200C3
:105EC00014208DF803006946FA4801F0CDFF4FF425 :105EC00014208DF803006946FA4801F0CDFF4FF425
:105ED0004061F84802F021F800241CE002E00A20AA :105ED0004061F84802F021F800241CE002E00A20AA
@ -1578,10 +1578,10 @@
:1062800000200978491C49B20E4B1970144909685D :1062800000200978491C49B20E4B1970144909685D
:106290008854012291020848006801F032FA70E047 :106290008854012291020848006801F032FA70E047
:1062A0000E480078F0B101210348006801F015FAAA :1062A0000E480078F0B101210348006801F015FAAA
:1062B0001DE06EE0000C0140D0020020801A0600B4 :1062B0001DE06EE0000C0140D4020020801A0600B0
:1062C000D4020020CD020020D9020020CB02002001 :1062C000D8020020D1020020DD020020CF020020F1
:1062D000D6020020D7020020D5020020CC020020E8 :1062D000DA020020DB020020D9020020D0020020D8
:1062E000E00200200121D948006801F0ECF9D7480C :1062E000E40200200121D948006801F0ECF9D74808
:1062F000006801F010FAD64991F900200978491C8C :1062F000006801F010FAD64991F900200978491C8C
:1063000049B2D34B1970D34909688854CF48006803 :1063000049B2D34B1970D34909688854CF48006803
:1063100001F001FACE4991F900200978491C49B2EF :1063100001F001FACE4991F900200978491C49B2EF
@ -1635,10 +1635,10 @@
:1066100078F800BF1748007820B1A8F101005FEAC0 :1066100078F800BF1748007820B1A8F101005FEAC0
:106620000008F7D1B8F1000F0BD114480088401CC6 :106620000008F7D1B8F1000F0BD114480088401CC6
:106630001249088005480068FFF79BFC0020BDE870 :106630001249088005480068FFF79BFC0020BDE870
:10664000F0810120FBE70D4800887047D002002050 :10664000F0810120FBE70D4800887047D40200204C
:10665000CD020020E0020020CB020020D802002062 :10665000D1020020E4020020CF020020DC02002052
:10666000CC020020D7020020DC020020D60200204D :10666000D0020020DB020020E0020020DA0200203D
:10667000D9020020D4020020D5020020C802002048 :10667000DD020020D8020020D9020020CC02002038
:1066800000B585B0684601F057F875490098B0FB31 :1066800000B585B0684601F057F875490098B0FB31
:10669000F1F07449086005B000BD73480068401C03 :10669000F1F07449086005B000BD73480068401C03
:1066A00071490860704700BF6F4801684FF0E020F3 :1066A00071490860704700BF6F4801684FF0E020F3
@ -1669,9 +1669,9 @@
:1068300080F480501249C86040F2DB1204FB02F180 :1068300080F480501249C86040F2DB1204FB02F180
:10684000881EFFF755FF1920FFF752FFE6E710B14A :10684000881EFFF755FF1920FFF752FFE6E710B14A
:106850001049114A116011490C4A0C3A11607047F5 :106850001049114A116011490C4A0C3A11607047F5
:1068600040420F00E4020020E8020020401901002D :1068600040420F00E8020020EC0200204019010025
:1068700080A000080700400000080140000C014013 :1068700080A000080700400000080140000C014013
:1068800000100140000230006803002018ED00E015 :1068800000100140000230006C03002018ED00E011
:1068900000E400E0EFBEADDEF04F00200400FA059A :1068900000E400E0EFBEADDEF04F00200400FA059A
:1068A00010B5B848B84909680844B8490865B848F7 :1068A00010B5B848B84909680844B8490865B848F7
:1068B0000068B549096888420BD9B5480068B249F3 :1068B0000068B549096888420BD9B5480068B249F3
@ -1719,9 +1719,9 @@
:106B5000144801F039F91448056007B030BD10B58C :106B5000144801F039F91448056007B030BD10B58C
:106B600040F225510F4801F05DF9012809D10E4886 :106B600040F225510F4801F05DF9012809D10E4886
:106B7000006830B10B4801F051F904460A49096830 :106B7000006830B10B4801F051F904460A49096830
:106B8000884710BDB4070020F0020020000002403A :106B8000884710BDB8070020F40200200000024032
:106B9000F40200200008014000380140B406002043 :106B9000F80200200008014000380140B80600203B
:106BA000EC02002000440040F802002070476D49CC :106BA000F002002000440040FC02002070476D49C4
:106BB0000988490009B201806A494988490009B237 :106BB0000988490009B201806A494988490009B237
:106BC000418068498988490009B2818070477047CF :106BC000418068498988490009B2818070477047CF
:106BD00070476449C98809B201806249098909B2CC :106BD00070476449C98809B201806249098909B2CC
@ -1749,8 +1749,8 @@
:106D300000F059FB012113484C3800F028FB0121D9 :106D300000F059FB012113484C3800F028FB0121D9
:106D400010484C3800F019FB02210E484C38FFF770 :106D400010484C3800F019FB02210E484C38FFF770
:106D50005EFF01210B484C3800F03BFB11B000BD39 :106D50005EFF01210B484C3800F03BFB11B000BD39
:106D600000207047B4080020CF6B0008D36B0008E8 :106D600000207047B8080020CF6B0008D36B0008E4
:106D7000D16B0008AF6B0008AD6B00080202002069 :106D7000D16B0008AF6B0008AD6B00080602002065
:106D8000080002404C2401402DE9FC410646002742 :106D8000080002404C2401402DE9FC410646002742
:106D900000256BE0FB4800EBC50103C9CDE900010C :106D900000256BE0FB4800EBC50103C9CDE900010C
:106DA000F94800EBC5040098B0425DD1BDF806106B :106DA000F94800EBC5040098B0425DD1BDF806106B
@ -1815,13 +1815,13 @@
:10715000194800F0B5FD0821174800F0B8FD0821D6 :10715000194800F0B5FD0821174800F0B8FD0821D6
:10716000154800F0BAFD0121134800F086FD012109 :10716000154800F0BAFD0121134800F086FD012109
:10717000114800F08CFD08210F4800F09BFD002015 :10717000114800F08CFD08210F4800F09BFD002015
:1071800009B030BDFC020020C60800205E030020CC :1071800009B030BD00030020CA08002062030020BF
:10719000060900203E010020600300206203002059 :107190000A09002042010020640300206603002049
:1071A000640300205C030020000801405D03002010 :1071A0006803002060030020000801406103002004
:1071B000000C014040420F0000080040084A1278CD :1071B000000C014040420F0000080040084A1278CD
:1071C000904203DA074A52F82020118070470146A6 :1071C000904203DA074A52F82020118070470146A6
:1071D000054800EBC100C08870470148007870473F :1071D000054800EBC100C08870470148007870473F
:1071E0005D0300203C030020C6080020324810B593 :1071E0006103002040030020CA080020324810B587
:1071F000016841F0010101604168304A114041607D :1071F000016841F0010101604168304A114041607D
:1072000001682F4A11400160016821F4802101606A :1072000001682F4A11400160016821F4802101606A
:10721000416821F4FE0141604FF41F01816000F0DC :10721000416821F4FE0141604FF41F01816000F0DC
@ -1921,7 +1921,7 @@
:1077F00000E08143D1617047074A0029116901D037 :1077F00000E08143D1617047074A0029116901D037
:10780000014300E08143116170470348416A41F040 :10780000014300E08143116170470348416A41F040
:1078100080714162704700000010024000127A003F :1078100080714162704700000010024000127A003F
:107820008003002000093D0030B50288F84BF94C78 :107820008403002000093D0030B50288F84BF94C74
:1078300098420DD0A0420BD0B0F1804F08D0F64D49 :1078300098420DD0A0420BD0B0F1804F08D0F64D49
:10784000A84205D0F54DA84202D0F54DA84203D17B :10784000A84205D0F54DA84202D0F54DA84203D17B
:1078500022F070054A882A43F24DA84206D0F24D24 :1078500022F070054A882A43F24DA84206D0F24D24
@ -2254,7 +2254,7 @@
:108CC00008BF052070474100080218BF04200A0EA3 :108CC00008BF052070474100080218BF04200A0EA3
:108CD00018BF40F001004FF07F4232EA010108BFA7 :108CD00018BF40F001004FF07F4232EA010108BFA7
:108CE00040F00200012808BF052070470048704787 :108CE00040F00200012808BF052070470048704787
:108CF000900300202DE9F74F144696B00021C4E9F7 :108CF000940300202DE9F74F144696B00021C4E9F3
:108D000002111799099121F00047C9498F4206DCE9 :108D000002111799099121F00047C9498F4206DCE9
:108D10001799C4E9000119B00020BDE8F08FC549DA :108D10001799C4E9000119B00020BDE8F08FC549DA
:108D2000C54EB94241DD0999DFF81083DFF810A381 :108D2000C54EB94241DD0999DFF81083DFF810A381
@ -2377,7 +2377,7 @@
:10947000220E0000DB0FC92F22AAFD290000C92FF0 :10947000220E0000DB0FC92F22AAFD290000C92FF0
:1094800002E008C8121F08C1002AFAD170477047CD :1094800002E008C8121F08C1002AFAD170477047CD
:10949000002001E001C1121F002AFBD1704700002B :10949000002001E001C1121F002AFBD1704700002B
:1094A0000149086070470000900300202DE9F04753 :1094A0000149086070470000940300202DE9F0474F
:1094B0004FF0684202EB400305460C46B3F1654F9E :1094B0004FF0684202EB400305460C46B3F1654F9E
:1094C0003CBF02EB4102B2F1654F3FD34FF07F4208 :1094C0003CBF02EB4102B2F1654F3FD34FF07F4208
:1094D000B2EB400F28BFB2EB410F03D2BDE8F0471B :1094D000B2EB400F28BFB2EB410F03D2BDE8F0471B
@ -2485,87 +2485,87 @@
:109B300090A4000887A60008BD0100087EA60008C2 :109B300090A4000887A60008BD0100087EA60008C2
:109B4000C7A60008DD06000877A600086BA6000877 :109B4000C7A60008DD06000877A600086BA6000877
:109B5000EB070008A8A500085AA70008E5080008B8 :109B5000EB070008A8A500085AA70008E5080008B8
:109B6000C3A3000800000000210400200000000042 :109B6000C3A300080000000025040020000000003E
:109B700020000000C0A30008000000002204002014 :109B700020000000C0A30008000000002604002010
:109B800000000000640000005DA300080200000067 :109B800000000000640000005DA300080200000067
:109B900024040020B0040000A406000028A400084B :109B900028040020B0040000A406000028A4000847
:109BA000020000003004002000000000D007000088 :109BA000020000003404002000000000D007000084
:109BB00034A400080200000032040020000000006D :109BB00034A4000802000000360400200000000069
:109BC000D0070000CCA300080200000034040020ED :109BC000D0070000CCA300080200000038040020E9
:109BD00000000000D0070000EAA400080200000016 :109BD00000000000D0070000EAA400080200000016
:109BE0002604002000000000D0070000F3A40008B5 :109BE0002A04002000000000D0070000F3A40008B1
:109BF000020000002804002000000000D007000040 :109BF000020000002C04002000000000D00700003C
:109C00003DA50008000000002A040020000000001C :109C00003DA50008000000002E0400200000000018
:109C10000100000039A70008000000002B0400200C :109C10000100000039A70008000000002F04002008
:109C200000000000C800000048A700080000000075 :109C200000000000C800000048A700080000000075
:109C30002C04002000000000C800000016A400084A :109C30003004002000000000C800000016A4000846
:109C4000020000002E040020E8030000D0070000FE :109C40000200000032040020E8030000D0070000FA
:109C500064A4000802000000360400203200000066 :109C500064A40008020000003A0400203200000062
:109C6000F201000055A400080200000038040020A2 :109C6000F201000055A40008020000003C0400209E
:109C700032000000F201000073A40008040000009C :109C700032000000F201000073A40008040000009C
:109C800064040020B004000000C2010083A40008A6 :109C800068040020B004000000C2010083A40008A2
:109C90000400000058040020B004000000C20100CD :109C9000040000005C040020B004000000C20100C9
:109CA00038A6000800000000230400200000000087 :109CA00038A6000800000000270400200000000083
:109CB00001000000FDA300080000000016040020C1 :109CB00001000000FDA30008000000001A040020BD
:109CC0000A000000C8000000EAA30008000000002D :109CC0000A000000C8000000EAA30008000000002D
:109CD000170400200A00000032000000D7A300088B :109CD0001B0400200A00000032000000D7A3000887
:109CE00000000000180400200A00000032000000FC :109CE000000000001C0400200A00000032000000F8
:109CF000C0A50008010000003A040020FFFFFFFF9C :109CF000C0A50008010000003E040020FFFFFFFF98
:109D000001000000A3A30008020000003C040020A2 :109D000001000000A3A3000802000000400400209E
:109D100000000000D0070000B1A30008020000000E :109D100000000000D0070000B1A30008020000000E
:109D20003E04002000000000D007000007A4000847 :109D20004204002000000000D007000007A4000843
:109D3000020000004004002000000000D0070000E6 :109D3000020000004404002000000000D0070000E2
:109D40009CA5000802000000420400200000000062 :109D40009CA500080200000046040020000000005E
:109D5000D00700002DA700080200000044040020E6 :109D5000D00700002DA700080200000048040020E2
:109D600000000000D007000047A600080000000027 :109D600000000000D007000047A600080000000027
:109D70004804002000000000FF0000004AA5000881 :109D70004C04002000000000FF0000004AA500087D
:109D800001000000460400209CFFFFFF640000006B :109D8000010000004A0400209CFFFFFF6400000067
:109D90005CA5000801000000470400209CFFFFFFB5 :109D90005CA50008010000004B0400209CFFFFFFB1
:109DA000640000007BA50008020000004A040020B7 :109DA000640000007BA50008020000004E040020B3
:109DB00064000000B80B00000CA7000802000000BF :109DB00064000000B80B00000CA7000802000000BF
:109DC0004C04002064000000B80B000082A30008CF :109DC0005004002064000000B80B000082A30008CB
:109DD000020000004E04002064000000B80B0000E8 :109DD000020000005204002064000000B80B0000E4
:109DE0008CA5000802000000500400206400000060 :109DE0008CA500080200000054040020640000005C
:109DF000B80B00001DA7000802000000520400205C :109DF000B80B00001DA70008020000005604002058
:109E000064000000B80B000093A3000802000000EB :109E000064000000B80B000093A3000802000000EB
:109E10005404002064000000B80B000040A40008B7 :109E10005804002064000000B80B000040A40008B3
:109E200000000000F4030020000000000300000018 :109E200000000000F8030020000000000300000014
:109E300018A6000800000000F50300200000000044 :109E300018A6000800000000F90300200000000040
:109E4000FA00000095A4000802000000F6030020BC :109E4000FA00000095A4000802000000FA030020B8
:109E5000000000000001000027A60008020000002A :109E5000000000000001000027A60008020000002A
:109E6000F803002064000000E8030000B0A500082B :109E6000FC03002064000000E8030000B0A5000827
:109E700003000000EE030020B0B9FFFF50460000D1 :109E700003000000F2030020B0B9FFFF50460000CD
:109E8000D9A5000800000000C00300200000000069 :109E8000D9A5000800000000C40300200000000065
:109E9000C8000000D6A4000800000000CA0300208B :109E9000C8000000D6A4000800000000CE03002087
:109EA00000000000C80000006EA3000800000000D1 :109EA00000000000C80000006EA3000800000000D1
:109EB000D403002000000000C8000000CEA5000868 :109EB000D803002000000000C8000000CEA5000864
:109EC00000000000C103002000000000C8000000E6 :109EC00000000000C503002000000000C8000000E2
:109ED000CBA4000800000000CB030020000000001D :109ED000CBA4000800000000CF0300200000000019
:109EE000C800000063A3000800000000D5030020A4 :109EE000C800000063A3000800000000D9030020A0
:109EF00000000000C8000000E3A50008000000000A :109EF00000000000C8000000E3A50008000000000A
:109F0000C203002000000000C8000000E0A4000818 :109F0000C603002000000000C8000000E0A4000814
:109F100000000000CC03002000000000C80000008A :109F100000000000D003002000000000C800000086
:109F200078A3000800000000D60300200000000015 :109F200078A3000800000000DA0300200000000011
:109F3000C80000005DA60008020000005C040020CC :109F3000C80000005DA600080200000060040020C8
:109F400000000000D00700009EA4000800000000F0 :109F400000000000D00700009EA4000800000000F0
:109F50005F04002000000000010000006DA5000863 :109F50006304002000000000010000006DA500085F
:109F600002000000600400200A000000D00700008A :109F600002000000640400200A000000D007000086
:109F7000FEA6000802000000620400200A000000A3 :109F7000FEA6000802000000660400200A0000009F
:109F8000D0070000C3A4000800000000BD030020AB :109F8000D0070000C3A4000800000000C1030020A7
:109F900000000000C8000000BBA400080000000092 :109F900000000000C8000000BBA400080000000092
:109FA000C703002000000000C8000000B3A40008A0 :109FA000CB03002000000000C8000000B3A400089C
:109FB00000000000D103002000000000C8000000E5 :109FB00000000000D503002000000000C8000000E1
:109FC00036A5000800000000BC03002000000000CF :109FC00036A5000800000000C003002000000000CB
:109FD000C80000002FA5000800000000C6030020F4 :109FD000C80000002FA5000800000000CA030020F0
:109FE00000000000C800000028A5000800000000D4 :109FE00000000000C800000028A5000800000000D4
:109FF000D003002000000000C8000000F0A6000808 :109FF000D403002000000000C8000000F0A6000804
:10A0000000000000BE03002000000000C8000000A7 :10A0000000000000C203002000000000C8000000A3
:10A01000EAA6000800000000C803002000000000BD :10A01000EAA6000800000000CC03002000000000B9
:10A02000C8000000E4A6000800000000D2030020E1 :10A02000C8000000E4A6000800000000D6030020DD
:10A0300000000000C800000020A50008000000008B :10A0300000000000C800000020A50008000000008B
:10A04000C303002000000000C800000018A500089D :10A04000C703002000000000C800000018A5000899
:10A0500000000000CD03002000000000C800000048 :10A0500000000000D103002000000000C800000044
:10A0600010A5000800000000D70300200000000039 :10A0600010A5000800000000DB0300200000000035
:10A07000C800000041455254313233340000000022 :10A07000C800000041455254313233340000000022
:10A080000010014000101000000801400080100086 :10A080000010014000101000000801400080100086
:10A090004C5555555555A53F7751C1166CC156BF06 :10A090004C5555555555A53F7751C1166CC156BF06
@ -2677,21 +2677,22 @@
:10A730005F7961775F6D6178006661696C736166EE :10A730005F7961775F6D6178006661696C736166EE
:10A74000655F64656C6179006661696C73616665FB :10A74000655F64656C6179006661696C73616665FB
:10A750005F6F66665F64656C617900007CA70008C6 :10A750005F6F66665F64656C617900007CA70008C6
:10A760000000002094030000428C000860A800084C :10A760000000002098030000428C000864A8000844
:10A77000940300207C150000909400084113D6A299 :10A770009803002080150000909400084113D6A291
:10A78000140812A31B084D041AD30C1ADA041A7702 :10A78000140812A31B084D041AD30C1ADA041A7702
:10A79000041A72041AC7041A67041A471C1A7A08A2 :10A79000041A72041AC7041A67041A471C1A7A08A2
:10A7A0001A23081A53041A8E0C1AF2041A9B041A5C :10A7A0001A23081A53041A8E0C1AF2041A9B041A5C
:10A7B00060045119181A37041AE1101A04081A18FB :10A7B00060045119181A37041AE1101A04081A18FB
:10A7C000041A3C041AA7101AAF041ABE041A331054 :10A7C000041A3C041AA7101AAF041ABE041A331054
:10A7D0005A85301A81081A0D101A97081A2D08295F :10A7D0001A85081A2D08411A810C1A0D0C5A971463
:10A7E0001C41135AA71B086A141A58045BF6A65C8E :10A7E000292041135AA71B086A141A58045BF6A6BD
:10A7F00031021F130243011204CBDC0502012009C0 :10A7F0006031021F130243011204CBDC0502012069
:10A800002230899A029203899D01F222403A02087D :10A80000092230899A029203899D01F222403A027C
:10A8100012043A040812083A0808120C22105A04CA :10A810000812043A040812083A0808120C22105AC6
:10A82000201908392019083920190829201334085B :10A82000042019083920190839201908292013345F
:10A830001B4038041A3C0419191B4034181A3804F8 :10A83000081B4038041A3C0419191B4034181A38F4
:10A840001A3C041931193CB13BA24A6141380C0150 :10A84000041A3C041931193CB13BA24A6141380C4D
:10A85000020304060708090204066D291069144161 :10A8500001020304060708090204066D29106914A1
:04A8600041000000B3
:04000005080000ED02 :04000005080000ED02
:00000001FF :00000001FF

2
src/board.h
View File

@ -93,7 +93,7 @@ typedef struct sensor_t
#define MAG #define MAG
#define BARO #define BARO
#define LEDRING #define LEDRING
// #define SONAR #define SONAR
#endif #endif

2
src/drv_pwm.c
View File

@ -85,7 +85,7 @@ static void ppmIRQHandler(TIM_TypeDef *tim)
diff = ((0xFFFF - last) + now); diff = ((0xFFFF - last) + now);
} }
if (diff > 4000) { if (diff > 2700) { // Per http://www.rcgroups.com/forums/showpost.php?p=21996147&postcount=3960 "So, if you use 2.5ms or higher as being the reset for the PPM stream start, you will be fine. I use 2.7ms just to be safe."
chan = 0; chan = 0;
} else { } else {
if (diff > 750 && diff < 2250 && chan < 8) { // 750 to 2250 ms is our 'valid' channel range if (diff > 750 && diff < 2250 && chan < 8) { // 750 to 2250 ms is our 'valid' channel range