Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 03:20:00 +03:00
Code Issues Wiki Activity

oops, my retarded arm fix disabled all arming :)

Browse source 
git-svn-id: https://afrodevices.googlecode.com/svn/trunk/baseflight@160 7c89a4a9-59b9-e629-4cfe-3a2d53b20e61
This commit is contained in:
timecop 2012-06-01 03:15:22 +00:00
parent 49653ec65e
commit 12d6c41407
3 changed files with 2356 additions and 2356 deletions
Download patch file Download diff file Expand all files Collapse all files

4600
obj/baseflight.hex
View file

File diff suppressed because it is too large Load diff

108
obj/baseflight_fy90q.hex
View file

@ -190,8 +190,8 @@
:100BC00000000000340100202C20493243204572EF
:100BD000726F72733A2000004166726F33322043A5
:100BE0004C492076657273696F6E20322E30204A30
:100BF000756E2020312032303132202F2030323AB1
:100C000032303A3232000000140200200D0A456EE4
:100BF000756E2020312032303132202F2031323AB0
:100C000031323A3437000000140200200D0A456EDC
:100C1000746572696E6720434C49204D6F64652C82
:100C200020747970652027657869742720746F2097
:100C300072657475726E2C206F72202768656C70F7
@ -827,9 +827,9 @@
:10339000407958B12D48007840B101201B49087090
:1033A0003448B0F900003449088005E01748007837
:1033B00010B100201549087000202849087035E137
:1033C0001F48B0F904000A49B1F86A10884207DBC7
:1033D0001B48B0F900000649B1F86A1088425BDA70
:1033E0000A480078012849E0B2010020F2010020DB
:1033C0001F48B0F904000A49B1F86A10884257DB77
:1033D000074890F86E0001285ED11948B0F9000046
:1033E0000349B1F86A1049E0B2010020F20100205F
:1033F0003C0300207901002028010020F601002074
:10340000F801002000100140F40100203C010020E0
:103410002C01002074010020CC00002020A1070016
@ -838,71 +838,71 @@
:1034400042010020A00100203E0100205801002080
:1034500040010020940100209A01002081010020F9
:103460006A0100206C010020F001002029010020E9
:103470009604002010020020B00100200CD1FC486E
:1034800090F86E00012807D1FA480078142896D1E8
:103490000020F9490870C9E0F848B0F90400F4497F
:1034A000B1F86C10884207DCF448B0F90000F0492C
:1034B000B1F86C10884223DDF048B0F90200EC4905
:1034C000B1F86C1088421BDAEB480078C0B9EC48C0
:1034D0000088A8B9EB480078012811D1E44890F899
:1034E0006E0001280CD1E3480078142807D1012090
:1034F000E1490870E448B0F90000E449088095E02B
:103500000020DC49087091E0DC48B0F90600D84999
:10351000B1F86C10884220DDD748007800281CD113
:10352000D648B0F90400D249B1F86A10884215DAD9
:10353000D248B0F90200CE49B1F86A1088420DDADB
:103470009604002010020020B001002088420BDAE0
:10348000FB480078012807D1FA480078142896D123
:103490000020F7490870C9E0F748B0F90400F7497F
:1034A000B1F86C1088420CDCF348B0F90000F34925
:1034B000B1F86C10884223DDF04890F86E000128C6
:1034C0001ED1ED48B0F90200EC49B1F86C10884209
:1034D00016DAE748007898B9E948008880B9E948E1
:1034E000007801280CD1E3480078142807D1012086
:1034F000DF490870E448B0F90000E449088095E02D
:103500000020DC49087091E0DB48B0F90600DB4997
:10351000B1F86C10884220DDD548007800281CD115
:10352000D548B0F90400D549B1F86A10884215DAD7
:10353000D148B0F90200D149B1F86A1088420DDAD9
:10354000CC480078142803D14FF4C870D0490880C3
:10355000C8480078401CC749087067E0C748B0F900
:103560000400C349B1F86C10884214DDC348B0F9B7
:103570000200BF49B1F86A1088420CDABD480078F1
:10355000C8480078401CC749087067E0C648B0F901
:103560000400C649B1F86C10884214DDC248B0F9B5
:103570000200C249B1F86A1088420CDABD480078EE
:10358000142802D10120C3490870BA480078401CB1
:10359000B84908704AE0B948B0F90200B449B1F836
:1035A0006C10884209DDB248008F801C01B2B0481F
:1035B00001870120FDF772FC38E0B048B0F9020045
:1035C000AB49B1F86A10884209DAA948008F801E19
:1035D00001B2A74801870120FDF760FC26E0A7485B
:1035E000B0F90000A249B1F86C10884209DDA0488A
:1035F000C08E801C00B29E49C8860120FDF74EFC9B
:1036000014E09E48B0F900009949B1F86A10884268
:1036100009DA9748C08E801E00B29549C8860120FD
:10359000B84908704AE0B848B0F90200B749B1F834
:1035A0006C10884209DDB548008F801C01B2B34819
:1035B00001870120FDF772FC38E0AF48B0F9020046
:1035C000AE49B1F86A10884209DAAC48008F801E13
:1035D00001B2AA4801870120FDF760FC26E0A64859
:1035E000B0F90000A549B1F86C10884209DDA34884
:1035F000C08E801C00B2A149C8860120FDF74EFC98
:1036000014E09D48B0F900009C49B1F86A10884266
:1036100009DA9A48C08E801E00B29849C8860120F7
:10362000FDF73CFC02E00020924908700420FDF701
:103630009DFD18B398480088A0B18F4800780128F4
:1036400010D18E48B0F906008949B1F86A10884255
:103630009DFD18B398480088A0B18D4800780128F6
:1036400010D18D48B0F906008C49B1F86A10884253
:1036500008DD9248407928B932209149088000203D
:103660008D4908808D48007A48B18B48008828B978
:103670000120894908803220894908800DE0894865
:10368000008850B17C48007838B900208249088011
:10369000844908800120844908800025B7E07748E4
:1036A000B0F9080040F21451884208DD7348B0F9BF
:10368000008850B17A48007838B900208249088013
:10369000844908800120844908800025B7E07648E5
:1036A000B0F9080040F21451884208DD7248B0F9C0
:1036B000080040F2A461884201DA012000E0002005
:1036C0006E49B1F9081040F21452914201DA012119
:1036D00000E0002141EA40006849B1F9081040F2D9
:1036C0006D49B1F9081040F21452914201DA01211A
:1036D00000E0002141EA40006749B1F9081040F2DA
:1036E000A462914201DD012100E0002140EA810055
:1036F0006249B1F90A1040F21452914201DA0121F3
:1037000000E0002140EAC1005C49B1F90A1040F232
:103710001452914208DD5949B1F90A1040F2A462ED
:10372000914201DA012100E0002140EA01105349F1
:1036F0006149B1F90A1040F21452914201DA0121F4
:1037000000E0002140EAC1005B49B1F90A1040F233
:103710001452914208DD5849B1F90A1040F2A462EE
:10372000914201DA012100E0002140EA01105249F2
:10373000B1F90A1040F2A462914201DD012100E0DA
:10374000002140EA41104D49B1F90C1040F21452E9
:10375000914201DA012100E0002140EA811047494D
:10376000B1F90C1040F21452914208DD4349B1F90D
:10374000002140EA41104C49B1F90C1040F21452EA
:10375000914201DA012100E0002140EA811046494E
:10376000B1F90C1040F21452914208DD4249B1F90E
:103770000C1040F2A462914201DA012100E0002124
:1037800040EAC1103D49B1F90C1040F2A4629142E7
:1037900001DD012100E0002140EA01203749B1F9B3
:1037800040EAC1103C49B1F90C1040F2A4629142E8
:1037900001DD012100E0002140EA01203649B1F9B4
:1037A0000E1040F21452914201DA012100E0002192
:1037B00040EA41203149B1F90E1040F214529142D1
:1037C00008DD2E49B1F90E1040F2A462914201DAEF
:1037D000012100E0002140EA81202849B1F90E10C2
:1037B00040EA41203049B1F90E1040F214529142D2
:1037C00008DD2D49B1F90E1040F2A462914201DAF0
:1037D000012100E0002140EA81202749B1F90E10C3
:1037E00040F2A462914201DD012100E0002140EAA3
:1037F000C1201F49443131F815100840002801DD6F
:1037F000C1202249443131F815100840002801DD6C
:10380000012000E0002025494855681CC5B20B2D59
:10381000FFF645AF2148007848B9154890F86F0089
:10381000FFF645AF2148007848B9184890F86F0086
:1038200000EB80002149B1F9001088420EDA012036
:10383000FDF784FC50B11E48007850B900201D49A6
:103840000880488001201A49087002E000201849C9
:1038500008701248407910B90120174908701448BF
:10386000007801282CD1C003144908602CE0000026
:103870003C030020810100203C0100204201002087
:103870003C01002081010020420100203C03002087
:10388000F8010020F401002010020020B001002007
:10389000F6010020FA010020F0010020960400202B
:1038A000680100206A0100206C0100203E01002018
@ -990,8 +990,8 @@
:103DC00000B23E4921F814003B4830F914000028A5
:103DD00003DD394830F9140003E0374830F91400A6
:103DE0004042B0F5207F03DD0020344921F8140063
:103DF000324830F914007D2190FBF1F02C4910314C
:103E0000095D4843801100B20C902B4931F9141020
:103DF000324830F914007D2190FBF1F12C4810304D
:103E0000005D4143881100B20C902B4931F9141028
:103E10002C4A125D51430A2291FBF2F0C11700EBCC
:103E20005171A7EBE1010FB2234830F81400264985
:103E300031F81410401A0FFA80F91F4830F81400B6

4
src/mw.c
View file

@ -326,10 +326,10 @@ void loop(void)
} else if (armed)
armed = 0;
rcDelayCommand = 0;
} else if ((rcData[YAW] < cfg.mincheck || rcData[ROLL] < cfg.mincheck) && armed == 1 && cfg.retarded_arm == 1) {
} else if ((rcData[YAW] < cfg.mincheck || (cfg.retarded_arm == 1 && rcData[ROLL] < cfg.mincheck)) && armed == 1 ) {
if (rcDelayCommand == 20)
armed = 0; // rcDelayCommand = 20 => 20x20ms = 0.4s = time to wait for a specific RC command to be acknowledged
} else if ((rcData[YAW] > cfg.maxcheck || rcData[ROLL] > cfg.maxcheck) && rcData[PITCH] < cfg.maxcheck && armed == 0 && calibratingG == 0 && calibratedACC == 1 && cfg.retarded_arm == 1) {
} else if ((rcData[YAW] > cfg.maxcheck || (rcData[ROLL] > cfg.maxcheck && cfg.retarded_arm == 1)) && rcData[PITCH] < cfg.maxcheck && armed == 0 && calibratingG == 0 && calibratedACC == 1) {
if (rcDelayCommand == 20) {
armed = 1;
headFreeModeHold = heading;