tmp

modules/logic.c

@@ -70,7 +70,20 @@ void logic_single(void)
 // сброс каналов через 0.5 секунды
 void logic_cnt_task(void)
 {
-    
+    for (int i = 0; i < CH_NUM; i++)
+    {
+        if (channel_cnt[i].active == true)
+        {
+            channel_cnt[i].cnt++;
+            
+            if (channel_cnt[i].cnt >= 50)
+            {
+                channel_cnt[i].active = false;
+                channel_cnt[i].cnt = 0;
+                HAL_GPIO_WritePin(channels[i].port, channels[i].pin, GPIO_PIN_RESET);
+            }  
+        }
+    }
 }
 
 //

modules/logic.h

@@ -28,6 +28,9 @@ void channel_init(void);
 //
 void logic_single(void);
 
+//
+void logic_cnt_task(void);
+
 //
 void logic_main(void);
 

output/drone.hex

@@ -1,15 +1,15 @@
 :020000040800F2
-:1000000068080020C14B0008DD4B0008E14B0008E8
+:1000000090080020514C00086D4C0008714C00080D
 :1000100000000000000000000000000000000000E0
-:10002000000000000000000000000000E54B000898
-:100030000000000000000000E74B00083547000802
+:10002000000000000000000000000000754C000807
+:100030000000000000000000774C00083547000871
 :100040007F11000800000000971100084B12000803
 :100050009F120008AF17000833180008371800086F
 :100060000000000047420008532D0008BB3600087E
 :100070000F37000883380008D3380008000000005C
 :10008000A537000800000000000000000B47000832
-:1000900000000000FB320008053300082749000873
-:1000A000000000004B490008000000000B2E000873
+:1000900000000000FB32000805330008374A000862
+:1000A000000000005B4A0008000000000B2E000862
 :1000B000FDB5B2B03A98049102A93B2288540020C1
 :1000C0000D9026A8401C31900DE00498329A90477C
 :1000D0000490002801D100F037FF0D98401C0D90CE
@@ -47,7 +47,7 @@
 :1002D000001D349908600594002C00D0BAE002A8F3
 :1002E0003B21405C002800D1ADE00024E4430648F7
 :1002F0007844143000F018FF201A01D000F024FEDA
-:1003000000F0F9FDF446000028470000CBCCCC0CEF
+:1003000000F0F9FD84470000B8470000CBCCCC0CCE
 :10031000641E01D000F00EFE3295079D17AC002D33
 :100320000FD0329E227802A9300000F0C7FE0028CC
 :1003300002D4641C6D1EF5D13296002801D000F065
@@ -83,7 +83,7 @@
 :10051000F2FC0F99079A891A0A9A891A081A002870
 :1005200001DC00F0E8FC00F031FC02A83B21415C5A
 :10053000002909D00024E4434B487844FF302B3095
-:10054000D8E600BF084500003A21405C62286AD026
+:10054000D8E600BF984500003A21405C62286AD096
 :10055000682819D06A2845D06C2806D071284FD059
 :10056000742831D07A2821D06FE03498006801686F
 :10057000001D349A106000297AD10024E4433B48DE
@@ -101,7 +101,7 @@
 :100630001060002905D10024E4430C4878442C3094
 :1006400058E60D98087000F056FC34980068016870
 :10065000001D349A106000290AD10024E4430348A5
-:100660007844083046E600BF98430000AC430000E1
+:100660007844083046E600BF284400003C440000BF
 :100670000D98086000F03FFC34980268D21D0720F6
 :1006800082433498026003CA349B1A6002AA03C2F0
 :100690002022C80F04D007982D2117AA11540DE06D
@@ -132,8 +132,8 @@
 :10082000FBFC4CD869004A0D11001C31002A19D07C
 :10083000002917DDB24A914206DB1005290080220B
 :1008400012061140014311E07F4A2A400805104377
-:1008500005000DE0FC410000FC41000000420000EA
-:10086000F8410000290080221206114000240D00EA
+:1008500005000DE08C4200008C4200009042000038
+:1008600088420000290080221206114000240D0059
 :100870002000290000F0EAFC1490FF1F002F09DD82
 :1008800000F01EFD02000B002000290000F085FD95
 :1008900004000D00F01D0721149A002A0ADD491EEC
@@ -175,7 +175,7 @@
 :100AD000684600786946487000F06AFE406A00780F
 :100AE000694608700E9F20B2002803DC139C054E57
 :100AF0007E4410366846807866280DD16D1C25E04E
-:100B0000FF0700005C3F000097750000A086010011
+:100B0000FF070000EC3F000097750000A086010081
 :100B10000000F03F84D7974168468078672847D126
 :100B200028B20321C943884248DBB84246DA6D1C2B
 :100B300002A8008F1299C0B2084203D120B2B84275
@@ -275,7 +275,7 @@
 :10111000C043F9E7C9B202788A4203D0401C002AD2
 :10112000F9D1002070472E0080B5002801D100BF02
 :1011300007A006490B68002B03D022220021984704
-:1011400001E000F070FB222002BD00005C040020E2
+:1011400001E000F070FB222002BD000084040020BA
 :10115000636F6E73747261696E742068616E646C23
 :1011600065723A20626164206D6573736167650022
 :10117000431C0178401C0942FBD1C01A7047FEE7AE
@@ -721,9 +721,9 @@
 :102CF00000E00F48F2BD0C480068704780B5FFF750
 :102D0000FAFF0F49094A1268120A5207520F895CEA
 :102D1000C84002BD2C100240002002408913000070
-:102D2000FFF8FFFFB04B00085400002004100240E1
-:102D300000127A00904B0008A04B000800093D00EB
-:102D4000F44B000801480068704700BF50040020A1
+:102D2000FFF8FFFF404C0008540000200410024050
+:102D300000127A00204C0008304C000800093D00C9
+:102D4000844C000801480068704700BF78040020E8
 :102D50007047FEE700B50200D205D20D364B1A804F
 :102D6000364A1268D2695206FAD500BD38B586B027
 :102D70008020800232490A6802430A6009680840DC
@@ -739,7 +739,7 @@
 :102E100080FD01BD10B504000C490878064A1080F9
 :102E200006480268D2695206FAD50122FFF7ECF88B
 :102E300000F03EFA10BD000028380140DC00002000
-:102E400014100240181002400038014066040020AF
+:102E40001410024018100240003801408E04002087
 :102E500010B50400FA2080000E490978FEF72DFB1A
 :102E600001000D480068FEF728FB00F0CBF90028B0
 :102E700001D001200CE0042C09D200222100002006
@@ -818,7 +818,7 @@
 :10330000A5F801BD80B5074800F0A0F801BD000098
 :1033100018100240CC02002000440140E7030000E6
 :103320007FBB00001403002000480140CF070000CD
-:1033300060040020448B6CE7FB6927400080474015
+:1033300088040020448B6CE7FB69274000804740ED
 :10334000BF1200002844014010B50400002C01D138
 :10335000012026E03D20205C002805D100203C21F2
 :103360006054200000F0A8F902203D216054211D86
@@ -899,9 +899,9 @@
 :103810009020C005FFF74EFC0F48007810280DD10E
 :103820000E480178002909D1012101700C4801706E
 :1038300004E00020054908600549086031BD00002A
-:1038400040420F008402002044040020480400206D
-:103850004C040020410600006404002063040020A2
-:10386000620400207047704770477047704710B57A
+:1038400040420F00840200206C040020700400201D
+:1038500074040020410600008C0400208B0400202A
+:103860008A0400207047704770477047704710B552
 :103870000400080011000200200000F003F82000FE
 :1038800010BDFEE71206130A1A43130C1A4300BFB9
 :10389000094205D0830705D00270401C491EF9D1AA
@@ -1064,9 +1064,9 @@
 :104260000CCAFDF7E2F900F07EF901000F48FFF7F4
 :1042700088FF0A49086061880D48FFF7AFFF0649CB
 :10428000088031BD18100240A00300200024014026
-:10429000141002405C030020600400203C04002055
-:1042A00040040020F564FED137694A3FDC0100205C
-:1042B000E0030020300400200800024070477047EF
+:10429000141002405C030020880400206404002005
+:1042A00068040020F564FED137694A3FDC01002034
+:1042B000E0030020580400200800024070477047C7
 :1042C000FEB5040000252F00019500953420205CE8
 :1042D000012801D102205EE0012630003421605423
 :1042E000032021688968014001290AD121680968F1
@@ -1133,12 +1133,12 @@
 :1046B00003E00120E072E0688047E07AA07270BDFC
 :1046C00010B50400A1882068FEF7E7FC10BD80B596
 :1046D00000F00EF8054800F019F801BD1410024072
-:1046E00010040020CF46000843460008D04B0008C5
+:1046E00038040020CF46000843460008604C00080C
 :1046F00080B540219020C005FEF7CFFC002801D0F6
 :10470000012000E00020C0B202BDFEE70EB4C0B53B
 :10471000020003A801900020009001AB0121044891
 :1047200078440C30FBF7C4FC029906B0084700BF80
-:104730002B04000080B500F089F800F075F83F48C0
+:10473000BB04000080B500F089F800F075F83F4830
 :104740000178491C017001780A2901D1002101700A
 :1047500000200A2824DA3A490C2242438A18127AA5
 :10476000002A1BD00C2242438A189288521E0C2326
@@ -1154,77 +1154,86 @@
 :1048000011DA0F480C2169434118497A002908D070
 :1048100021000C226A43821851720C2169434058CE
 :1048200080476D1CEBE731BD00B5074801680029E2
-:1048300002D00168491E016000BD0000650400202F
-:10484000640100205804002054040020034801683B
-:10485000034A127889180160704700BF5004002095
-:10486000D800002010B500F05FF800F027F800F045
-:104870006DF8FEF74DFFFFF7F7FBFEF7D5FCFFF7EE
-:10488000A3FEFEF773FA0A48FFF740FFFA20800004
-:1048900000F09CF807490A20FFF783FF06490A2029
-:1048A000FFF77FFFFFF724FF0400FFF7A5FFFCE7FA
-:1048B000804B0008314200084546000838B590B0EA
-:1048C0003022002104A8FEF7D2FF10220021684602
-:1048D000FEF7CDFF122004900120079009901020D0
-:1048E00008900A9002240C9400250D95A0208003C6
-:1048F0000E900F9504A8FDF7D3FE002801D000F01C
-:104900000FF8072000900194029503950121684655
-:10491000FEF726F9002801D000F002F811B030BDF2
-:1049200000B572B6FEE7FEE780B5064801681022C2
-:104930000A4302600020FEF78BFA00F005F8002021
-:1049400002BD0000002002407047FEE738B586B087
-:104950001422002101A8FEF78AFF80208002194955
-:104960000A6802430A600A6810400090009880209C
-:10497000C0020A6802430A60096808400090009873
-:104980000120029002200390002504950A2D17DAD9
-:104990000D4C0820684320188088019001A9082048
-:1049A00068432058FEF77CFA00220820684320184C
-:1049B0008188082068432058FEF77CFB6D1CE5E7E2
-:1049C00007B030BD141002400000002070B5040094
-:1049D000FEF7B8F9050026000020C043864202D049
-:1049E000044800783618FEF7ADF9401BB042FAD300
-:1049F00070BD00BFD8000020686A6C747A4C00005B
-:104A00007072696E74665F733A20256E20646973F4
-:104A1000616C6C6F776564007072696E74663A20C1
-:104A200062616420256E20617267756D656E740029
-:104A30007072696E74665F733A20626164202573D8
-:104A400020617267756D656E7400000000000000E3
-:104A50006E616E004E414E00696E6600494E460022
-:104A6000300070B40123002413E00168001D1942D6
-:104A700002D04D466D1E49190C60091D121F042AF3
-:104A8000FAD20D00960701D50C80AD1C1A4000D05B
-:104A90002C700268001D002AE7D170BC704730B549
-:104AA00001684118446862088A188368E40704D5DD
-:104AB0004C461B1901E0641C06D191420BD00C78C6
-:104AC00064B2491C0D78491C1D705B1C002CF2D48B
-:104AD000641EF7D5F1E70C3030BD000010B5074972
-:104AE00079441831064C7C44163404E0081D0A68E9
-:104AF000891888470100A142F8D110BD08000000C4
-:104B0000240000005FFFFFFF8C030000DC0000209A
-:104B1000000000008BFFFFFFE60000004A010000DC
-:104B20000000002000F00DF8002801D0FFF7D6FFAC
-:104B300000BF00BF002000BF00BFFFF793FE00F0E2
-:104B400002F80120704780B500F002F801BD0000B6
-:104B500007463846FCF770FEFBE738B505000C0049
-:104B6000200000F005F8A04200D00025280032BD4A
-:104B700080B50249FEF7EEF802BD00BF90000020AC
-:104B8000465720737461727465642E2E2E0D0A00D0
-:104B900002030405060708090A0B0C0D0E0F10107E
-:104BA0000102030405060708090A0B0C0D0E0F107D
-:104BB00000000000000000000102030406070809CD
-:104BC0000148804701480047FD4B0008E94B0008B9
-:104BD000427574746F6E0D0A0000000000B5FEE7A8
-:104BE00000B5FEE77047704700BF00BF00BF00BFC1
-:104BF000FFF798FF00000000010203047047FD006A
-:104C000002480002FB0002480004FB0002480008C2
-:104C1000FB0002480010FB0002480080FD00030476
-:104C2000004880FC000304004840FC0003040048E6
-:104C300020FC000304004810FC000304004808FDA9
-:104C4000000004FC001E127A00DA4A0008DA4A006A
-:104C500008DA4A0008DA4A0008DA4A0008DA4A00A4
-:104C600008DA4A0008F8FF0B26110008DA4A0008A3
-:104C7000DA4A0008FAFF15000002040101340200BC
-:104C800020840200203402002034020020FC0003B3
-:104C900034020020FC0007D4000020C0000020E007
-:034CA00000000110
-:0400000508004BE9BB
+:1048300002D00168491E016000BD00008D04002007
+:1048400064010020800400207C04002003480168EB
+:10485000034A127889180160704700BF780400206D
+:10486000D800002070B586B01422002101A8FEF700
+:10487000FEFF802080023A490A6802430A600A6803
+:104880001040009000988020C0020A6802430A602D
+:1048900009680840009000980120029002200390CF
+:1048A0000026049635000A2D17DA2E4C082068439E
+:1048B00020188088019001A9082068432058FEF73D
+:1048C000EFFA0022082068432018818808206843F6
+:1048D0002058FEF7EFFB6D1CE5E730000A280BDAE5
+:1048E0002149320004234343CA5432000423434382
+:1048F000C9184A80401CF1E706B070BD38B50025E4
+:104900002C000A2C2ADA184804216143415C012951
+:1049100022D10421614341184988491C0422624381
+:10492000821851800421614341184988322913DBE0
+:104930002900042262438154290004226243801822
+:1049400041800848002208216143411889880823D2
+:104950006343C058FEF7AEFB641CD2E731BD0000D4
+:1049600014100240000000201004002080B500F068
+:1049700063F800F02BF8FFF775FFFEF7C9FEFFF7AD
+:1049800073FBFEF751FCFFF71FFEFEF7EFF90B4834
+:10499000FFF7BCFEFA20800000F060F808490A200A
+:1049A000FFF7FFFE07490A20FFF7FBFE06490A2032
+:1049B000FFF7F7FEFFF720FFFCE70000104C0008B0
+:1049C0003142000845460008FD48000838B590B05F
+:1049D0003022002104A8FEF74AFF10220021684679
+:1049E000FEF745FF12200490012007900990102047
+:1049F00008900A9002240C9400250D95A0208003B5
+:104A00000E900F9504A8FDF74BFE002801D000F092
+:104A10000FF8072000900194029503950121684644
+:104A2000FEF79EF8002801D000F002F811B030BD6A
+:104A300000B572B6FEE7FEE780B5064801681022B1
+:104A40000A4302600020FEF703FA00F005F8002098
+:104A500002BD0000002002407047FEE770B5040070
+:104A6000FEF770F9050026000020C043864202D000
+:104A7000044800783618FEF765F9401BB042FAD3B7
+:104A800070BD00BFD8000020686A6C747A4C0000CA
+:104A90007072696E74665F733A20256E2064697364
+:104AA000616C6C6F776564007072696E74663A2031
+:104AB00062616420256E20617267756D656E740099
+:104AC0007072696E74665F733A2062616420257348
+:104AD00020617267756D656E740000000000000053
+:104AE0006E616E004E414E00696E6600494E460092
+:104AF000300070B40123002413E00168001D194246
+:104B000002D04D466D1E49190C60091D121F042A62
+:104B1000FAD20D00960701D50C80AD1C1A4000D0CA
+:104B20002C700268001D002AE7D170BC704730B5B8
+:104B300001684118446862088A188368E40704D54C
+:104B40004C461B1901E0641C06D191420BD00C7835
+:104B500064B2491C0D78491C1D705B1C002CF2D4FA
+:104B6000641EF7D5F1E70C3030BD000010B50749E1
+:104B700079441831064C7C44163404E0081D0A6858
+:104B8000891888470100A142F8D110BD0800000033
+:104B9000240000005FFFFFFFB4030000DC000020E2
+:104BA000000000008BFFFFFFE60000004A0100004C
+:104BB0000000002000F00DF8002801D0FFF7D6FF1C
+:104BC00000BF00BF002000BF00BFFFF7CFFE00F016
+:104BD00002F80120704780B500F002F801BD000026
+:104BE00007463846FCF728FEFBE738B505000C0001
+:104BF000200000F005F8A04200D00025280032BDBA
+:104C000080B50249FEF7A6F802BD00BF9000002063
+:104C1000465720737461727465642E2E2E0D0A003F
+:104C200002030405060708090A0B0C0D0E0F1010ED
+:104C30000102030405060708090A0B0C0D0E0F10EC
+:104C4000000000000000000001020304060708093C
+:104C500001488047014800478D4C0008794C000806
+:104C6000427574746F6E0D0A0000000000B5FEE717
+:104C700000B5FEE77047704700BF00BF00BF00BF30
+:104C8000FFF798FF00000000010203047047FD00D9
+:104C900002480002FB0002480004FB000248000832
+:104CA000FB0002480010FB0002480080FD000304E6
+:104CB000004880FC000304004840FC000304004856
+:104CC00020FC000304004810FC000304004808FD19
+:104CD000000004FC001E127A006A4B00086A4B00B8
+:104CE000086A4B00086A4B00086A4B00086A4B00D0
+:104CF000086A4B0008F8FF0B261100086A4B0008F1
+:104D00006A4B0008FAFF150000020401013402009A
+:104D100020840200203402002034020020FC000322
+:104D200034020020FC0007D4000020C0000020E076
+:034D30000000017F
+:0400000508004C792A
 :00000001FF

user/main.c

@@ -48,8 +48,10 @@ int main()
     timer_AddFunction(10, adc_task);
     timer_AddFunction(10, button_run);
     
-    bool foo;
-    foo = but_is_string();
+    timer_AddFunction(10, logic_cnt_task);
+    
+    //bool foo;
+    //foo = but_is_string();
     
     while(1) 
     {