From 5a05de5da7afed70c470db1f83c2c27a023376a7 Mon Sep 17 00:00:00 2001 From: dongie Date: Wed, 23 Apr 2014 09:53:05 +0900 Subject: [PATCH] fixing some typos and inconsistencies in cli/set variable naming. --- obj/baseflight.hex | 450 ++++++++++++++++++++++----------------------- src/cli.c | 8 +- src/config.c | 4 +- src/main.c | 2 +- src/mw.c | 4 +- src/mw.h | 4 +- 6 files changed, 236 insertions(+), 236 deletions(-) diff --git a/obj/baseflight.hex b/obj/baseflight.hex index 588942ae69..c7f79d9908 100644 --- a/obj/baseflight.hex +++ b/obj/baseflight.hex @@ -304,8 +304,8 @@ :1012E00025642C20636F6E6669672073697A653A9E :1012F0002025640D0A0000004166726F33322043DE :101300004C492076657273696F6E20322E3220410F -:1013100070722032312032303134202F2031393A6E -:1013200034373A3530000000000000200D0A456EC9 +:1013100070722032332032303134202F2030393A6D +:1013200035313A3435000000000000200D0A456ECA :10133000746572696E6720434C49204D6F64652C5B :1013400020747970652027657869742720746F2070 :1013500072657475726E2C206F72202768656C70D0 @@ -3276,20 +3276,20 @@ :10CCA000FEE000085AE1000804E10008C6E00008C0 :10CCB0003FE0000800000000D1E000083BE0000871 :10CCC000CCE0000858E00008FEE0000827E100087A -:10CCD00054E0000800000000A3E8000824E0000879 -:10CCE0000BE0000863E8000813E00008F7E2000822 -:10CCF000000000007EE8000811E800083303000887 -:10CD000079E80008D1E600088D03000840E7000834 -:10CD1000B0E70008AD0600087DE6000898E50008C9 -:10CD20005F0700086EE70008A3E80008D5080008C0 -:10CD300020E30008F1E40008F70800086EE40008AA -:10CD4000BDE40008C109000878E60008A3E800086F -:10CD5000D909000874E6000895E60008050A0008ED -:10CD6000DFE60008DCE70008D10C00082DE700082A -:10CD70009DE30008570D0008A8E20008FCDF00084A -:10CD8000E70D0008D2E30008A0E70008AF0800089C -:10CD90006AE70008EFE70008210E000863E70008D3 -:10CDA00057E70008690F0008D5E50008A3E8000868 +:10CCD00054E0000800000000A5E8000824E0000877 +:10CCE0000BE0000865E8000813E00008F7E2000820 +:10CCF0000000000080E8000813E800083303000883 +:10CD00007BE80008D3E600088D03000842E700082E +:10CD1000B2E70008AD0600087FE600089AE50008C3 +:10CD20005F07000870E70008A5E80008D5080008BC +:10CD300020E30008F3E40008F708000870E40008A6 +:10CD4000BFE40008C10900087AE60008A5E8000869 +:10CD5000D909000876E6000897E60008050A0008E9 +:10CD6000E1E60008DEE70008D10C00082FE7000824 +:10CD70009FE30008570D0008A8E20008FCDF000848 +:10CD8000E70D0008D4E30008A2E70008AF08000898 +:10CD90006CE70008F1E70008210E000865E70008CD +:10CDA00059E70008690F0008D7E50008A5E8000862 :10CDB00013100008EEE2000802000000A0040020AA :10CDC00000000000282300003BE2000800000000F3 :10CDD000A204002000000000010000006EE1000835 @@ -3297,137 +3297,137 @@ :10CDF000D6E20008020000006405002000000000E8 :10CE0000D0070000E2E200080200000066050020F2 :10CE100000000000D007000030E20008020000001F -:10CE20006805002000000000D00700009CE4000816 +:10CE20006805002000000000D00700009EE4000814 :10CE300002000000A805002000000000D00700004C -:10CE4000A5E4000802000000AA0500200000000080 -:10CE5000D007000054E80008020000006A05002026 -:10CE600000000000D00700005EE40008020000009F +:10CE4000A7E4000802000000AA050020000000007E +:10CE5000D007000056E80008020000006A05002024 +:10CE600000000000D007000060E40008020000009D :10CE70006C05002000000000D007000074E10008ED :10CE8000020000006E05002000000000D007000036 :10CE9000B0E2000802000000700500200000000061 -:10CEA000D00700004FE300080200000072050020D8 -:10CEB00032000000007D000040E300080200000096 -:10CEC0007405002032000000F20100008BE500082C +:10CEA000D007000058E300080200000072050020CF +:10CEB00032000000007D000049E30008020000008D +:10CEC0007405002032000000F20100008DE500082A :10CED00000000000AC050020000000000100000080 :10CEE0009DE1000800000000AD05002000000000EA -:10CEF00064000000E5E6000801000000AE05002027 -:10CF0000FFFFFFFF01000000C0E600080000000076 -:10CF100029080020300000007E00000078E30008AF +:10CEF00064000000E7E6000801000000AE05002025 +:10CF0000FFFFFFFF01000000C2E600080000000074 +:10CF100029080020300000007E00000082E30008A5 :10CF200004000000B4050020B004000000C20100AD -:10CF300074E3000804000000B8050020B0040000FD +:10CF30007EE3000804000000B8050020B0040000F3 :10CF4000004B0000A9E1000800000000BC05002023 :10CF50000000000001000000BFE100080000000028 :10CF6000BD0500200000000001000000FCE20008F8 :10CF700000000000B00500200000000004000000D8 -:10CF800088E3000801000000B10500200000000057 +:10CF800092E3000801000000B1050020000000004D :10CF90000400000005E3000800000000A4050020D4 -:10CFA000000000000300000082E60008000000000E -:10CFB000BE0500200000000001000000CDE70008D1 +:10CFA000000000000300000084E60008000000000C +:10CFB000BE0500200000000001000000CFE70008CF :10CFC00000000000BF05002000000000020000007B -:10CFD0004DE4000800000000C00500200000000033 +:10CFD0004FE4000800000000C00500200000000031 :10CFE0000100000084E20008000000009805002015 :10CFF0000A000000C80000005CE200080000000019 :10D00000990500200A0000003200000049E20008F3 :10D01000000000009A0500200A0000003200000015 -:10D0200005E50008000000009B050020000000004E -:10D030000900000038E60008000000007605002026 +:10D0200007E50008000000009B050020000000004C +:10D03000090000003AE60008000000007605002024 :10D04000000000000800000064E10008000000008B -:10D05000770500200000000008000000FDE3000844 +:10D05000770500200000000008000000FFE3000842 :10D06000000000007805002000000000080000001B -:10D070005EE50008030000007A0500204CFFFFFF7A -:10D08000680100001CE40008030000007C0500208B -:10D090004CFFFFFF6801000038E8000803000000B3 -:10D0A0007E0500204CFFFFFF6801000003E600083A +:10D0700060E50008030000007A0500204CFFFFFF78 +:10D08000680100001EE40008030000007C05002089 +:10D090004CFFFFFF680100003AE8000803000000B1 +:10D0A0007E0500204CFFFFFF6801000005E6000838 :10D0B0000100000080050020FFFFFFFF01000000CD :10D0C00013E30008000000008105002000000000BC -:10D0D00005000000EDE50008020000008A050020C0 +:10D0D00005000000EFE50008020000008A050020BE :10D0E0006400000084030000DDE10008000000008F -:10D0F000880500200000000080000000F4E3000824 +:10D0F000880500200000000080000000F6E3000822 :10D100000200000082050020000000000001000075 -:10D110000AE7000802000000840500206400000007 -:10D12000E80300001BE7000802000000860500205D -:10D1300064000000E8030000B1E600080000000001 +:10D110000CE7000802000000840500206400000005 +:10D12000E80300001DE7000802000000860500205B +:10D1300064000000E8030000B3E6000800000000FF :10D140002C080020000000000100000027E2000879 :10D1500000000000980800200000000020000000EF :10D1600024E20008000000009908002000000000F0 -:10D1700064000000D7E40008000000009A080020C6 +:10D1700064000000D9E40008000000009A080020C4 :10D1800001000000FA0000006FE20008000000004B -:10D190009B0800200000000001000000B8E3000828 +:10D190009B0800200000000001000000BAE3000826 :10D1A000000000009E080020000000009600000023 :10D1B0008EE20008020000009C0800200100000030 -:10D1C0008403000028E30008000000004B08002052 -:10D1D00000000000FA00000027E600080000000040 +:10D1C0008403000031E30008000000004B08002049 +:10D1D00000000000FA00000029E60008000000003E :10D1E0004C0800200000000064000000D5E10008A9 :10D1F000000000004D080020000000006400000056 -:10D200002FE60008000000004E080020000000008B -:10D210006400000030E30008000000004F08002018 -:10D22000000000006400000095E30008000000001A -:10D230005008002000000000640000006CE30008BB +:10D2000031E60008000000004E0800200000000089 +:10D210006400000039E30008000000004F0800200F +:10D22000000000006400000067E300080000000048 +:10D2300050080020000000006400000028E30008FF :10D240000000000051080020000000006400000001 -:10D2500091E700080200000052080020E8030000E7 -:10D26000D007000082E8000800000000E00800206D -:10D2700000000000C800000091E800080000000065 +:10D2500093E700080200000052080020E8030000E5 +:10D26000D007000084E8000800000000E00800206B +:10D2700000000000C800000093E800080000000063 :10D28000E108002000000000C8000000C4E200081F :10D2900002000000E2080020E8030000D0070000C0 :10D2A000EDE1000802000000E40800206400000036 -:10D2B000D007000017E5000801000000AF050020BE -:10D2C000000000000400000019E600080100000052 -:10D2D000E6080020FFFFFFFF0100000043E6000812 +:10D2B000D007000019E5000801000000AF050020BC +:10D2C00000000000040000001BE600080100000050 +:10D2D000E6080020FFFFFFFF0100000045E6000810 :10D2E00001000000E708002000000000010000002D -:10D2F00033E7000800000000E808002000000000FC -:10D30000FF000000FBE60008000000005A080020B3 +:10D2F00035E7000800000000E808002000000000FA +:10D30000FF000000FDE60008000000005A080020B1 :10D3100000000000FA00000007E200080000000022 :10D320005C080020000000006400000016E2000815 :10D33000000000005B080020000000006400000006 -:10D34000AEE40008000000006C08002000000000AF -:10D350000100000036E40008030000005808002027 -:10D36000D4FEFFFF2C01000076E50008030000005A -:10D3700056080020D4FEFFFF2C010000D7E3000870 +:10D34000B0E40008000000006C08002000000000AD +:10D350000100000038E40008030000005808002025 +:10D36000D4FEFFFF2C01000078E500080300000058 +:10D3700056080020D4FEFFFF2C010000D9E300086E :10D38000000000005D0800200000000030000000E8 -:10D39000E5E3000805000000600800200000000030 -:10D3A000010000002EE500080500000064080020D0 -:10D3B000000000000100000079E7000805000000FF -:10D3C000680800200000000001000000DDE5000802 +:10D39000E7E300080500000060080020000000002E +:10D3A0000100000030E500080500000064080020CE +:10D3B00000000000010000007BE7000805000000FD +:10D3C000680800200000000001000000DFE5000800 :10D3D0000300000054080020B0B9FFFF50460000D1 -:10D3E00060E6000800000000310800200000000096 -:10D3F000C800000088E40008000000003B0800208E +:10D3E00062E6000800000000310800200000000094 +:10D3F000C80000008AE40008000000003B0800208C :10D4000000000000C800000089E1000800000000E2 -:10D410004508002000000000C800000055E6000894 +:10D410004508002000000000C800000057E6000892 :10D42000000000003208002000000000C8000000DA -:10D430007DE40008000000003C080020000000001F +:10D430007FE40008000000003C080020000000001D :10D44000C80000007EE1000800000000460800203F -:10D4500000000000C80000006AE6000800000000AC -:10D460003308002000000000C800000092E400081B +:10D4500000000000C80000006CE6000800000000AA +:10D460003308002000000000C800000094E4000819 :10D47000000000003D08002000000000C80000007F :10D4800093E10008000000004708002000000000B1 -:10D49000C800000049E7000802000000EA08002078 -:10D4A00000000000D007000007E4000800000000B2 -:10D4B000EE0800200000000001000000C7E50008A1 +:10D49000C80000004BE7000802000000EA08002076 +:10D4A00000000000D007000009E4000800000000B0 +:10D4B000EE0800200000000001000000C9E500089F :10D4C00002000000F00800200A000000D007000061 -:10D4D0006BE8000802000000F20800200A000000CB -:10D4E000D00700005EE3000800000000ED08002007 -:10D4F000000000006400000045E400080000000097 -:10D500002E08002000000000C80000002EE40008E3 +:10D4D0006DE8000802000000F20800200A000000C9 +:10D4E000D007000070E3000800000000ED080020F5 +:10D4F000000000006400000047E400080000000095 +:10D500002E08002000000000C800000030E40008E1 :10D51000000000003808002000000000C8000000E3 -:10D5200026E400080000000042080020000000007F -:10D53000C800000084E50008000000002D0800205D -:10D5400000000000C80000006FE5000800000000B7 -:10D550003708002000000000C800000068E500084F +:10D5200028E400080000000042080020000000007D +:10D53000C800000086E50008000000002D0800205B +:10D5400000000000C800000071E5000800000000B5 +:10D550003708002000000000C80000006AE500084D :10D56000000000004108002000000000C80000008A -:10D570004EE80008000000002F0800200000000016 -:10D58000C800000048E8000800000000390800203A -:10D5900000000000C800000042E800080000000091 -:10D5A0004308002000000000C80000008BE70008CE +:10D5700050E80008000000002F0800200000000014 +:10D58000C80000004AE80008000000003908002038 +:10D5900000000000C800000044E80008000000008F +:10D5A0004308002000000000C80000008DE70008CC :10D5B000000000003008002000000000C80000004B -:10D5C00085E70008000000003A0800200000000085 -:10D5D000C800000073E700080000000044080020B5 -:10D5E00000000000C800000056E500080000000030 -:10D5F0003408002000000000C80000004EE50008CC +:10D5C00087E70008000000003A0800200000000083 +:10D5D000C800000075E700080000000044080020B3 +:10D5E00000000000C800000058E50008000000002E +:10D5F0003408002000000000C800000050E50008CA :10D60000000000003E08002000000000C8000000EC -:10D6100046E5000800000000480800200000000067 -:10D62000C800000040E500080000000036080020A7 -:10D6300000000000C80000003AE5000800000000FB -:10D640004008002000000000C800000028E5000895 +:10D6100048E5000800000000480800200000000065 +:10D62000C800000042E500080000000036080020A5 +:10D6300000000000C80000003CE5000800000000F9 +:10D640004008002000000000C80000002AE5000893 :10D65000000000004A08002000000000C800000090 :10D660004145525431323334000000000000803F05 :10D6700000000000A8AAAA3F000000000000803FB0 @@ -3515,12 +3515,12 @@ :10DB900000000000524F4C4C3B50495443483B5905 :10DBA00041573B414C543B506F733B506F73523B5A :10DBB0004E6176523B4C4556454C3B4D41473B569A -:10DBC000454C3B000000000000C20100F5E90008E0 -:10DBD00018EA00080100000000E10000D3E9000895 -:10DBE000BFE90008020000000096000089E9000873 -:10DBF000ABE9000803000000004B000067E90008E3 -:10DC000053E900080400000080250000A3E8000894 -:10DC1000A3E80008B56206010300F00500FF19B58E +:10DBC000454C3B000000000000C20100F7E90008DE +:10DBD0001AEA00080100000000E10000D5E9000891 +:10DBE000C1E9000802000000009600008BE900086F +:10DBF000ADE9000803000000004B000069E90008DF +:10DC000055E900080400000080250000A5E8000890 +:10DC1000A5E80008B56206010300F00500FF19B58C :10DC20006206010300F00300FD15B5620601030062 :10DC3000F00100FB11B56206010300F00000FA0FCD :10DC4000B56206010300F00200FC13B56206010391 @@ -3633,132 +3633,132 @@ :10E2F0006F7074696D65004E6F6E65006770735F57 :10E30000747970650073657269616C72785F747995 :10E310007065006163635F68617264776172650054 -:10E32000666561747572650072635F726174650021 -:10E33000726F6C6C5F70697463685F7261746500A2 -:10E34000736572766F5F70776D5F72617465006D73 -:10E350006F746F725F70776D5F72617465006E616C -:10E36000765F736C65775F7261746500747061725B -:10E3700061746500736F667473657269616C5F6266 -:10E3800061756472617465006770735F6261756462 -:10E390007261746500796177726174650067657494 -:10E3A0002F736574206D6F746F72206F7574707544 -:10E3B000742076616C7565007468726F74746C6536 -:10E3C0005F636F7272656374696F6E5F76616C759F -:10E3D000650073617665006261726F5F7461625F90 -:10E3E00073697A65006261726F5F6E6F6973655FF2 -:10E3F0006C7066006779726F5F6C706600616C6943 -:10E40000676E5F6D6167006E61765F636F6E7472D9 -:10E410006F6C735F68656164696E6700616C6967E2 -:10E420006E5F626F6172645F706974636800695FD8 -:10E430007069746368006163635F7472696D5F70B3 -:10E440006974636800705F70697463680074656CF8 -:10E45000656D657472795F7377697463680064656C -:10E46000616462616E6433645F68696768006770E5 -:10E4700073706173737468726F7567680067707327 -:10E480005F706F73725F69006770735F706F735F47 -:10E4900069006770735F6E61765F69006D696E63B6 -:10E4A0006865636B006D6178636865636B006163C9 -:10E4B000635F756E61726D656463616C007061733A -:10E4C000737468726F7567682067707320746F204B -:10E4D00073657269616C00616C745F686F6C645F16 -:10E4E0007468726F74746C655F6E65757472616C5C -:10E4F000006C697374206F72202D76616C206F72CE -:10E500002076616C00706F7765725F6164635F6332 -:10E5100068616E6E656C00727373695F6175785FB8 -:10E520006368616E6E656C00645F76656C00626145 -:10E53000726F5F63665F76656C00695F76656C001D -:10E54000705F76656C00645F6C6576656C00695F12 -:10E550006C6576656C00705F6C6576656C00616CEF -:10E5600069676E5F626F6172645F726F6C6C006985 -:10E570005F726F6C6C006163635F7472696D5F7270 -:10E580006F6C6C00705F726F6C6C0072657461729E -:10E590006465645F61726D007072696E7420636F90 -:10E5A0006E666967757261626C6520736574746903 -:10E5B0006E677320696E2061207061737461626C94 -:10E5C0006520666F726D006E61765F73706565645D -:10E5D0005F6D696E0076657273696F6E006D61675D -:10E5E0005F6465636C696E6174696F6E006D6178FC -:10E5F0005F616E676C655F696E636C696E6174699B -:10E600006F6E007961775F636F6E74726F6C5F64B9 -:10E610006972656374696F6E007961775F646972AE -:10E62000656374696F6E0072635F6578706F007404 -:10E6300068725F6578706F00616C69676E5F67799B -:10E64000726F007472695F756E61726D65645F737D -:10E650006572766F006770735F706F73725F7000C2 -:10E660006770735F706F735F70006770735F6E6168 -:10E67000765F70006D61700068656C700064756D28 -:10E68000700074656C656D657472795F70726F7619 -:10E6900069646572006D617070696E67206F6620D5 -:10E6A0007263206368616E6E656C206F7264657260 -:10E6B000007069645F636F6E74726F6C6C6572007A -:10E6C0007265626F6F745F636861726163746572B3 -:10E6D0000064657369676E20637573746F6D206D78 -:10E6E0006978657200666978656477696E675F61ED -:10E6F0006C74686F6C645F646972006163635F6C03 -:10E7000070665F666163746F72006779726F5F63D2 -:10E710006D70665F666163746F72006779726F5FB8 -:10E72000636D70666D5F666163746F72006D6F74A8 -:10E730006F720067696D62616C5F666C6167730020 -:10E7400064656661756C7473006770735F77705F82 -:10E750007261646975730073686F7720737973747D -:10E76000656D2073746174757300736574006578EA -:10E77000697400645F616C74006261726F5F6366EC -:10E780005F616C7400695F616C7400705F616C74D0 -:10E79000007470615F627265616B706F696E7400A6 -:10E7A0007361766520616E64207265626F6F7400BC -:10E7B000726573657420746F2064656661756C742E -:10E7C0007320616E64207265626F6F740074656C93 -:10E7D000656D657472795F706F7274006D697865CC -:10E7E00072206E616D65206F72206C697374006EAB -:10E7F000616D653D76616C7565206F7220626C613C -:10E800006E6B206F72202A20666F72206C697374A1 -:10E8100000666561747572655F6E616D6520617516 -:10E8200078666C6167206F7220626C616E6B206627 -:10E830006F72206C69737400616C69676E5F626FE0 -:10E840006172645F79617700695F79617700705FF9 -:10E85000796177006465616462616E6433645F6CE2 -:10E860006F77004D4D4138343578006E61765F73B7 -:10E87000706565645F6D617800636D6978006175CE -:10E8800078006661696C736166655F64656C617967 -:10E89000006661696C736166655F6F66665F64657B -:10E8A0006C61790043414D535441423B0043414C1C -:10E8B00049423B0047505320484F4C443B00484599 -:10E8C0004144465245453B00414E474C453B00477D -:10E8D000505320484F4D453B004D41473B0043417D -:10E8E0004D545249473B004845414441444A3B004E -:10E8F00041524D3B00484F52495A4F4E3B00564102 -:10E9000052494F3B004241524F3B00424545504522 -:10E91000523B00474F5645524E4F523B004C4C49DC -:10E92000474854533B0050415353544852553B00C1 -:10E930004C45444C4F573B004F53442053573B00EA -:10E940004C45444D41583B0054454C454D4554526F -:10E95000593B0024504D544B3235312C3139323033 -:10E96000302A32320D0A0024505542582C34312CB2 -:10E97000312C303030332C303030312C3139323092 -:10E98000302C302A32330D0A0024505542582C3492 -:10E99000312C312C303030332C303030312C333876 -:10E9A0003430302C302A32360D0A0024504D544B6E -:10E9B0003235312C33383430302A32370D0A0024C6 -:10E9C000504D544B3235312C35373630302A3243A6 -:10E9D0000D0A0024505542582C34312C312C303043 -:10E9E00030332C303030312C35373630302C302A23 -:10E9F00032440D0A0024505542582C34312C312C0D -:10EA0000303030332C303030312C31313532303001 -:10EA10002C302A31450D0A0024504D544B323531EB -:10EA20002C3131353230302A31460D0A00000000D9 +:10E3200066656174757265007470615F72617465B1 +:10E330000072635F7261746500726F6C6C5F70690C +:10E340007463685F7261746500736572766F5F7085 +:10E35000776D5F72617465006D6F746F725F707757 +:10E360006D5F72617465007961775F7261746500D9 +:10E370006E61765F736C65775F7261746500736F51 +:10E38000667473657269616C5F62617564726174F1 +:10E3900065006770735F62617564726174650067C0 +:10E3A00065742F736574206D6F746F72206F757450 +:10E3B0007075742076616C7565007468726F747422 +:10E3C0006C655F636F7272656374696F6E5F7661AF +:10E3D0006C75650073617665006261726F5F746170 +:10E3E000625F73697A65006261726F5F6E6F6973F5 +:10E3F000655F6C7066006779726F5F6C7066006154 +:10E400006C69676E5F6D6167006E61765F636F6EEA +:10E4100074726F6C735F68656164696E6700616CCC +:10E4200069676E5F626F6172645F706974636800D0 +:10E43000695F7069746368006163635F7472696DBA +:10E440005F706974636800705F70697463680074FA +:10E45000656C656D657472795F7377697463680064 +:10E460006465616462616E6433645F6869676800F3 +:10E47000677073706173737468726F756768006733 +:10E4800070735F706F73725F69006770735F706F36 +:10E49000735F69006770735F6E61765F69006D69B5 +:10E4A0006E636865636B006D6178636865636B00BC +:10E4B0006163635F756E61726D656463616C00704A +:10E4C0006173737468726F75676820677073207406 +:10E4D0006F2073657269616C00616C745F686F6C4A +:10E4E000645F7468726F74746C655F6E6575747266 +:10E4F000616C006C697374206F72202D76616C20E2 +:10E500006F722076616C00706F7765725F61646313 +:10E510005F6368616E6E656C00727373695F6175CD +:10E52000785F6368616E6E656C00645F76656C0031 +:10E530006261726F5F63665F76656C00695F7665C6 +:10E540006C00705F76656C00645F6C6576656C006E +:10E55000695F6C6576656C00705F6C6576656C00F4 +:10E56000616C69676E5F626F6172645F726F6C6C21 +:10E5700000695F726F6C6C006163635F7472696DD8 +:10E580005F726F6C6C00705F726F6C6C00726574A0 +:10E5900061726465645F61726D007072696E74208F +:10E5A000636F6E666967757261626C65207365740E +:10E5B00074696E677320696E206120706173746185 +:10E5C000626C6520666F726D006E61765F73706558 +:10E5D00065645F6D696E0076657273696F6E006D5C +:10E5E00061675F6465636C696E6174696F6E006D0D +:10E5F00061785F616E676C655F696E636C696E619F +:10E6000074696F6E007961775F636F6E74726F6C9F +:10E610005F646972656374696F6E007961775F64C6 +:10E620006972656374696F6E0072635F6578706F9D +:10E63000007468725F6578706F00616C69676E5F07 +:10E640006779726F007472695F756E61726D65646F +:10E650005F736572766F006770735F706F73725F60 +:10E6600070006770735F706F735F70006770735FC7 +:10E670006E61765F70006D61700068656C7000643B +:10E68000756D700074656C656D657472795F70721C +:10E690006F7669646572006D617070696E67206F76 +:10E6A00066207263206368616E6E656C206F7264B1 +:10E6B0006572007069645F636F6E74726F6C6C6515 +:10E6C00072007265626F6F745F6368617261637418 +:10E6D00065720064657369676E20637573746F6D2E +:10E6E000206D6978657200666978656477696E6720 +:10E6F0005F616C74686F6C645F646972006163630E +:10E700005F6C70665F666163746F72006779726FC9 +:10E710005F636D70665F666163746F7200677972C4 +:10E720006F5F636D70666D5F666163746F72006DBD +:10E730006F746F720067696D62616C5F666C6167B0 +:10E74000730064656661756C7473006770735F77DE +:10E75000705F7261646975730073686F7720737995 +:10E760007374656D207374617475730073657400E0 +:10E770006578697400645F616C74006261726F5FD8 +:10E7800063665F616C7400695F616C7400705F61E7 +:10E790006C74007470615F627265616B706F696E3A +:10E7A00074007361766520616E64207265626F6FBC +:10E7B0007400726573657420746F2064656661759A +:10E7C0006C747320616E64207265626F6F74007484 +:10E7D000656C656D657472795F706F7274006D69D8 +:10E7E000786572206E616D65206F72206C6973743C +:10E7F000006E616D653D76616C7565206F7220629B +:10E800006C616E6B206F72202A20666F72206C69BB +:10E81000737400666561747572655F6E616D652005 +:10E82000617578666C6167206F7220626C616E6BD7 +:10E8300020666F72206C69737400616C69676E5F2B +:10E84000626F6172645F79617700695F79617700F7 +:10E85000705F796177006465616462616E643364DE +:10E860005F6C6F77004D4D4138343578006E6176BE +:10E870005F73706565645F6D617800636D697800D2 +:10E88000617578006661696C736166655F64656C6B +:10E890006179006661696C736166655F6F66665F6A +:10E8A00064656C61790043414D535441423B0043E0 +:10E8B000414C49423B0047505320484F4C443B0099 +:10E8C00048454144465245453B00414E474C453B37 +:10E8D0000047505320484F4D453B004D41473B00BA +:10E8E00043414D545249473B004845414441444A05 +:10E8F0003B0041524D3B00484F52495A4F4E3B005E +:10E90000564152494F3B004241524F3B0042454520 +:10E910005045523B00474F5645524E4F523B004CDC +:10E920004C49474854533B00504153535448525567 +:10E930003B004C45444C4F573B004F5344205357EA +:10E940003B004C45444D41583B0054454C454D45DA +:10E950005452593B0024504D544B3235312C3139EF +:10E960003230302A32320D0A0024505542582C34AD +:10E97000312C312C303030332C303030312C313997 +:10E980003230302C302A32330D0A00245055425890 +:10E990002C34312C312C303030332C303030312C81 +:10E9A00033383430302C302A32360D0A0024504DA2 +:10E9B000544B3235312C33383430302A32370D0A4B +:10E9C0000024504D544B3235312C35373630302AF7 +:10E9D00032430D0A0024505542582C34312C312C2E +:10E9E000303030332C303030312C35373630302C1D +:10E9F000302A32440D0A0024505542582C34312C10 +:10EA0000312C303030332C303030312C3131353204 +:10EA100030302C302A31450D0A0024504D544B32F1 +:10EA200035312C3131353230302A31460D0A000073 :10EA300050EA000800000020640400002EBB00081B :10EA40004CEB0008640400201426000050BD0008B0 :10EA5000019A0320803FCBDC0502C1022F0113B3D2 -:10EA600035025C08021A03092EAB01114BF0E8BC19 -:10EA700029491AC80C290832021AF50C2908297CE0 -:10EA80001305E92A080832041AFE18290832051A63 -:10EA9000D90C290832061ABE0C290832071AE70CCD -:10EAA000290829591AA40C290832091ADE0C290848 -:10EAB000320A1ACF0C2908320B1AB40C2908320C6E -:10EAC0001A266C29082A0D1C190C2908320E1A4026 -:10EAD0000C2908320F1A300C290832101A1D0C2983 -:10EAE0000832111AAD48290832121A1318390831A0 -:10EAF0001A380C290832141A480C290872150225F4 +:10EA600035025C08021A03092EAB01114BF2E8BC17 +:10EA700029491ACA0C290832021AF70C2908297CDC +:10EA80001307E92A08084204190C290832051ADB81 +:10EA900024290832061AC00C29082A0723190C2930 +:10EAA0000829591AA60C290832091AE00C2908323B +:10EAB0000A1AD10C2908320B1AB60C2908320C1A82 +:10EAC000286029082A0D04190C2908320E1A420C54 +:10EAD0002908320F1A320C290832101A1F0C290883 +:10EAE00032111AAF48290832121A151829083213A0 +:10EAF0001A3A0C290832141A4A0C290872150225F0 :10EB0000FF0378803F0222010210047A03B46904F3 :10EB100001167A035D4AD93309102112010A1C0239 :10EB20009DC208342C01401A40921A4019290C89C0 diff --git a/src/cli.c b/src/cli.c index 643aa72501..8fc979454b 100644 --- a/src/cli.c +++ b/src/cli.c @@ -113,7 +113,7 @@ typedef struct { const clivalue_t valueTable[] = { { "looptime", VAR_UINT16, &mcfg.looptime, 0, 9000 }, - { "emf_avoidance", VAR_UINT8, &mcfg.emfAvoidance, 0, 1 }, + { "emf_avoidance", VAR_UINT8, &mcfg.emf_avoidance, 0, 1 }, { "midrc", VAR_UINT16, &mcfg.midrc, 1200, 1700 }, { "minthrottle", VAR_UINT16, &mcfg.minthrottle, 0, 2000 }, { "maxthrottle", VAR_UINT16, &mcfg.maxthrottle, 0, 2000 }, @@ -169,9 +169,9 @@ const clivalue_t valueTable[] = { { "thr_mid", VAR_UINT8, &cfg.thrMid8, 0, 100 }, { "thr_expo", VAR_UINT8, &cfg.thrExpo8, 0, 100 }, { "roll_pitch_rate", VAR_UINT8, &cfg.rollPitchRate, 0, 100 }, - { "yawrate", VAR_UINT8, &cfg.yawRate, 0, 100 }, - { "tparate", VAR_UINT8, &cfg.dynThrPID, 0, 100}, - { "tpa_breakpoint", VAR_UINT16, &cfg.tpaBreakPoint, 1000, 2000}, + { "yaw_rate", VAR_UINT8, &cfg.yawRate, 0, 100 }, + { "tpa_rate", VAR_UINT8, &cfg.dynThrPID, 0, 100}, + { "tpa_breakpoint", VAR_UINT16, &cfg.tpa_breakpoint, 1000, 2000}, { "failsafe_delay", VAR_UINT8, &cfg.failsafe_delay, 0, 200 }, { "failsafe_off_delay", VAR_UINT8, &cfg.failsafe_off_delay, 0, 200 }, { "failsafe_throttle", VAR_UINT16, &cfg.failsafe_throttle, 1000, 2000 }, diff --git a/src/config.c b/src/config.c index 13bf2e888f..29a21d7901 100755 --- a/src/config.c +++ b/src/config.c @@ -228,7 +228,7 @@ static void resetConf(void) mcfg.softserial_1_inverted = 0; mcfg.softserial_2_inverted = 0; mcfg.looptime = 3500; - mcfg.emfAvoidance = 0; + mcfg.emf_avoidance = 0; mcfg.rssi_aux_channel = 0; cfg.pidController = 0; @@ -265,7 +265,7 @@ static void resetConf(void) cfg.rollPitchRate = 0; cfg.yawRate = 0; cfg.dynThrPID = 0; - cfg.tpaBreakPoint = 1500; + cfg.tpa_breakpoint = 1500; cfg.thrMid8 = 50; cfg.thrExpo8 = 0; // for (i = 0; i < CHECKBOXITEMS; i++) diff --git a/src/main.c b/src/main.c index 7a193460fa..8726d492c4 100755 --- a/src/main.c +++ b/src/main.c @@ -38,7 +38,7 @@ int main(void) #endif checkFirstTime(false); readEEPROM(); - systemInit(mcfg.emfAvoidance); + systemInit(mcfg.emf_avoidance); #ifdef USE_LAME_PRINTF init_printf(NULL, _putc); #endif diff --git a/src/mw.c b/src/mw.c index 96303ad753..c76664c22d 100755 --- a/src/mw.c +++ b/src/mw.c @@ -99,11 +99,11 @@ void annexCode(void) int i; // PITCH & ROLL only dynamic PID adjustemnt, depending on throttle value - if (rcData[THROTTLE] < cfg.tpaBreakPoint) { + if (rcData[THROTTLE] < cfg.tpa_breakpoint) { prop2 = 100; } else { if (rcData[THROTTLE] < 2000) { - prop2 = 100 - (uint16_t)cfg.dynThrPID * (rcData[THROTTLE] - cfg.tpaBreakPoint) / (2000 - cfg.tpaBreakPoint); + prop2 = 100 - (uint16_t)cfg.dynThrPID * (rcData[THROTTLE] - cfg.tpa_breakpoint) / (2000 - cfg.tpa_breakpoint); } else { prop2 = 100 - cfg.dynThrPID; } diff --git a/src/mw.h b/src/mw.h index 950aca751f..91a10e1088 100755 --- a/src/mw.h +++ b/src/mw.h @@ -165,7 +165,7 @@ typedef struct config_t { uint8_t yawRate; uint8_t dynThrPID; - uint16_t tpaBreakPoint; // Breakpoint where TPA is activated + uint16_t tpa_breakpoint; // Breakpoint where TPA is activated int16_t mag_declination; // Get your magnetic decliniation from here : http://magnetic-declination.com/ int16_t angleTrim[2]; // accelerometer trim @@ -224,7 +224,7 @@ typedef struct master_t { uint8_t mixerConfiguration; uint32_t enabledFeatures; uint16_t looptime; // imu loop time in us - uint8_t emfAvoidance; // change pll settings to avoid noise in the uhf band + uint8_t emf_avoidance; // change pll settings to avoid noise in the uhf band motorMixer_t customMixer[MAX_MOTORS]; // custom mixtable // motor/esc/servo related stuff