Update

修复bug： - 添加计数器修复上位机因为通过信号槽更新太快导致崩溃 - 修正从机代码，同时需要注意避免从机地址冲突导致数据紊乱更新内容： - 上位机等待队列实现降重 - 上位机实现日志队列可屏蔽期望： - 上位机反馈更多主机信息，如连接情况，上一次通信时间等
supine0703 · Mar 18, 2024 · 8062f3b · 8062f3b
1 parent 416d8bf
commit 8062f3b
Show file tree

Hide file tree

Showing 19 changed files with 523 additions and 493 deletions.
diff --git a/proj/hex/host_b.hex b/proj/hex/host_b.hex
@@ -28,9 +28,9 @@
 :0805BC008D508B518A528953C6
 :1005C400120630300052AB51AA52A95374111201D1
 :1005D40072AB51AA52A953900001E5501201847DD7
-:1005E40002120755AD07AB51AA52A953E4F55812AC
+:1005E40002120755AD07AB51AA52A953755801120F
 :1005F4000795AB51AA52A95312077C92024019AB3A
-:1006040051AA52A953E4F5587D04120795AB51AA97
+:1006040051AA52A9537558017D04120795AB51AAFA
 :1006140052A95312077C920220020EAB51AA52A98E
 :0B06240053900001E550120184A20277
 :01062F0022A8

diff --git a/proj/hex/slave.hex b/proj/hex/slave.hex
@@ -1,56 +1,52 @@
-:03000000020356A2
-:0C035600787FE4F6D8FD75815802039D05
-:03059C00010B034D
-:1003E2007F381205877F0C1205877F061205877FEB
-:1003F200011205877F86120587E4FFC3940A400431
-:100402007E3780027E30EE2FFF1205AE7F03EFC3F0
-:10041200940A40047E3780027E30EE2FFF1205AE32
-:050422007F3A0205AE67
-:0A0592007F89120587AF990205AEBC
-:1004A5008F50E550D394097F89500D120587E5508B
-:1004B5002430FF1205AED3221205877F4E1205AEFA
-:0204C500C32250
-:05001E007F330205A67E
-:10054F007598F0E4F587758920AF218F8B8F8DD249
-:06055F008ED2AFD2AC22E7
-:060536008B508A5189522E
-:10053C007557047D2812047DAD07AB50AA51A95202
-:03054C0002045254
-:1004E8001203E212054F7508FF750905750A927522
-:0A04F8000CFF750D00750E1E80FE4E
-:03002300020226B0
-:0D022600C0E0C0F0C083C082C0D075D01809
-:10023300C2AC2098030202B9309A2BC29885994622
-:10024300E54624FD600A240D6018047069209D664C
-:10025300C29D7546017547037B007A0079467D028E
-:100263008043D29D80507B007A0079461205365038
-:1002730045E54624FD602324F2703BAF471204A5F5
-:100283005004AF4780027FFF8F48754604754703CC
-:100293007B007A0079467D03800B7546007B007AEC
-:1002A3000079467D011204C7AD1F7B007A007946B1
-:0802B300755400120003D2ACE7
-:0B02BB00D0D0D082D083D0F0D0E03251
-:100502007F017580FFC2A2C2A0D2A1D2A2AE80EEAC
-:0905120030E7040FEF70EEC2A205
-:01051B0022BD
-:0B058700EF6007C201F551120565226C
-:0705AE00D2018F5102056527
-:10056500120502C2A1A20192A0855180D2A200C2A9
-:02057500A222C0
-:0805A6008F993099FDC29922E2
-:10000300ED60171202C6FF1205A6AF54EF6002DFC0
+:030000000202B643
+:0C02B600787FE4F6D8FD7581440202FD5B
+:01001E0022BF
+:01001F0022BE
+:09054B00EF60048000C322D322FA
+:1004FD007598F0E4F587758920AF218F8B8F8DD29C
+:06050D008ED2AFD2AC2239
+:0B05350012001E1204FD12001F80FBCC
+:0300230002039144
+:10039100C0E0C0F0C083C082C0D075D000C000C032
+:1003A10001C002C003C004C005C006C007C2AC3012
+:1003B100980B309A051203DB8003120342D2ACD0B2
+:1003C10007D006D005D004D003D002D001D000D090
+:0A03D100D0D082D083D0F0D0E0320B
+:0604E4008B128A1389143B
+:1004EA007519047D28120467AD07AB12AA13A91463
+:0304FA0002043CBD
+:1003DB00859908C298E508600A240A6026047025EE
+:1003EB00209D22C29D750801E4F509FB7A0079086E
+:1003FB007D0212048FAD077B007A00790875160118
+:05040B00020003D29D78
+:0104100022C9
+:100342007B007A0079081204E45043E50824FD603A
+:100352002224F27039AF0912054B50047F04800247
+:100362007F058F0885090AE4F509FB7A0079087D83
+:1003720003800AE4F508FB7A0079087D0112048FF4
+:0E038200AD077B007A007908E4F5161200033F
+:01039000224A
+:1004B0007F017580FFC2A2C2A0D2A1D2A2AE80EEFF
+:0904C00030E7040FEF70EEC2A258
+:0104C9002210
+:0B054000EF6007C200F51B120513223C
+:07055C00D2008F1B02051302
+:100513001204B0C2A1A20092A0851B80D2A200C285
+:02052300A22212
+:080554008F993099FDC2992234
+:10000300ED6017120226FF120554AF16EF6002DFF0
 :0A001300FE740129F9E43AFADDE970
 :01001D0022C0
-:10051C00309802800CEF60101F7E7CEE60F73098F4
-:09052C0004C298D3221E80F3C31F
-:0105350022A3
-:10057700AF0512051C5007E5991202DFD322C322EB
-:06047D008B538A548955DF
-:10048300E4FC120577501874012555F555E43554ED
-:10049300F5540CAB53FAA955AD5712057740E8AFA5
-:0104A3000454
-:0104A4002235
-:06059F000121FD01220014
+:1004CA00309802800CEF60101F7E7CEE60F7309847
+:0904DA0004C298D3221E80F3C372
+:0104E30022F6
+:10052500AF051204CA5007E59912023FD322C32230
+:060467008B158A168917AF
+:10046D00E4FC120525501874012517F517E435160F
+:10047D00F5160CAB15FAA917AD1912052540E8AF05
+:01048D00046A
+:01048E00224B
+:060563000121FD01220050
 :1000260000102030405060708191A1B1C1D1E1F142
 :1000360012023222524272629383B3A3D3C3F3E312
 :100046002434041464744454A5B58595E5F5C5D5E2
@@ -83,34 +79,34 @@
 :1001F6007D5C3F1EF9D8BB9A75543716F1D0B39281
 :100206002E0F6C4DAA8BE8C926076445A283E0C170
 :100216001F3E5D7C9BBAD9F81736557493B2D1F060
-:10042700E4F557F558ED601E1202C66557FF9000B8
-:1004370026936558F557EF90012693F558740129CF
-:0A044700F9E43AFADDE2AE57AF58CF
-:010451002288
-:1004C7008B508A518952AC05120427AB50AA51A907
-:1004D700528C82758300EE8FF0120329EC2402FF01
-:0104E70022F2
-:100452008D568B538A54895515561556AD5612042E
-:1004620027AB53AA54A9558556827583001202F10F
-:0B047200B50706EEB5F002D322C3224E
-:100362000204E8E493A3F8E493A34003F68001F2C5
-:1003720008DFF48029E493A3F85407240CC8C3339C
-:10038200C4540F4420C8834004F456800146F6DF6B
-:10039200E4800B010204081020408090059CE47E5A
-:1003A200019360BCA3FF543F30E509541FFEE49360
-:1003B200A360010ECF54C025E060A840B8E493A327
-:1003C200FAE493A3F8E493A3C8C582C8CAC583CA52
-:1003D200F0A3C8C582C8CAC583CADFE9DEE780BE0A
-:0105A5000055
-:1002C600BB010689828A83E0225002E722BBFE0236
-:0902D600E32289828A83E4932269
-:1002DF00BB010689828A83F0225002F722BBFE01FE
-:0202EF00F322F8
-:1002F100BB0110E58229F582E5833AF583E0F5F04B
-:10030100A3E0225009E92582F886F008E622BBFE27
-:100311000AE92582F8E2F5F008E222E5832AF5836D
-:08032100E993F5F0A3E9932232
-:10032900F8BB0111E58229F582E5833AF583E8F006
-:10033900E5F0A3F0225009E92582C8F608A6F022C3
-:0D034900BBFE09E92582C8F2E5F008F222AA
+:10041100E4F519F51AED601E1202266519FF900028
+:100421002693651AF519EF90012693F51A7401299F
+:0A043100F9E43AFADDE2AE19AF1A61
+:01043B00229E
+:10048F008B128A138914AC05120411AB12AA13A98B
+:10049F00148C82758300EE8FF0120289EC2402FF18
+:0104AF00222A
+:10043C008D188B158A16891715181518AD181204F6
+:10044C0011AB15AA16A917851882758300120251D3
+:0B045C00B50706EEB5F002D322C32264
+:1002C200020535E493A3F8E493A34003F68001F218
+:1002D20008DFF48029E493A3F85407240CC8C3333D
+:1002E200C4540F4420C8834004F456800146F6DF0C
+:1002F200E4800B0102040810204080900563E47E34
+:10030200019360BCA3FF543F30E509541FFEE49300
+:10031200A360010ECF54C025E060A840B8E493A3C7
+:10032200FAE493A3F8E493A3C8C582C8CAC583CAF2
+:10033200F0A3C8C582C8CAC583CADFE9DEE780BEAA
+:010569000091
+:10022600BB010689828A83E0225002E722BBFE02D6
+:09023600E32289828A83E4932209
+:10023F00BB010689828A83F0225002F722BBFE019E
+:02024F00F32298
+:10025100BB0110E58229F582E5833AF583E0F5F0EB
+:10026100A3E0225009E92582F886F008E622BBFEC8
+:100271000AE92582F8E2F5F008E222E5832AF5830E
+:08028100E993F5F0A3E99322D3
+:10028900F8BB0111E58229F582E5833AF583E8F0A7
+:10029900E5F0A3F0225009E92582C8F608A6F02264
+:0D02A900BBFE09E92582C8F2E5F008F2224B
 :00000001FF
diff --git a/proj/hex/slave1.hex b/proj/hex/slave1.hex
@@ -1,58 +1,58 @@
-:0300000002037583
-:0C037500787FE4F6D8FD75814B0203BCD4
-:0305BB00014801F3
-:100401007F381205A67F0C1205A67F061205A67F6E
-:10041100011205A67F861205A6E4FFC3940A4004D3
-:100421007E3780027E30EE2FFF1205CD7F01EFC3B4
-:10043100940A40047E3780027E30EE2FFF1205CDF4
-:050441007F3A0205CD29
-:0A05B1007F891205A67F590205CDCF
-:1004C4008F13E513D394097F89500D1205A6E51304
-:1004D4002430FF1205CDD3221205A67F4E1205CD7E
-:0204E400C32231
-:05001E007F310205C561
-:10056E007598F0E4F587758920AF218F8B8F8DD22A
-:06057E008ED2AFD2AC22C8
-:060555008B138A148915C6
-:10055B00751A047D2812049CAD07AB13AA14A915B8
-:03056B0002047116
-:1005070012040112056E7545FF7546057547B175ED
-:0A05170049FF754A00754B1E80FE77
-:03002300020226B0
-:10022600C0E0C0F0C083C082C0D075D000C000C09E
-:0D02360001C002C003C004C005C006C0071F
-:10024300C2AC2098030202C8309A2AC29885990941
-:10025300E50914600A240B6018047069209D66C2C6
-:100263009D750901750A017B007A0079097D028079
-:1002730043D29D80507B007A007909120555504581
-:10028300E50924FD602324F2703BAF0A1204C45035
-:1002930004AF0A80027FFF8F0B750904750A017B87
-:1002A300007A0079097D03800B7509007B007A00D1
-:1002B30079097D011204E6AD077B007A007909759F
-:0702C3001700120003D2AC8A
-:1002CA00D007D006D005D004D003D002D001D00088
-:0B02DA00D0D0D082D083D0F0D0E03232
-:100521007F017580FFC2A2C2A0D2A1D2A2AE80EE8D
-:0905310030E7040FEF70EEC2A2E6
-:01053A00229E
-:0B05A600EF6007C201F514120584226B
-:0705CD00D2018F1402058426
-:10058400120521C2A1A20192A0851480D2A200C2A8
-:02059400A222A1
-:0805C5008F993099FDC29922C3
-:10000300ED60171202E5FF1205C5AF17EF6002DFBF
+:030000000202B643
+:0C02B600787FE4F6D8FD7581440202FD5B
+:1003DC007F381205AA7F0C1205AA7F061205AA7F88
+:1003EC00011205AA7F861205AAE4FFC3940A4004F1
+:1003FC007E3780027E30EE2FFF1205BD7F01EFC3EA
+:10040C00940A40047E3780027E30EE2FFF1205BD29
+:05041C007F3A0205BD5E
+:01001E0022BF
+:1004D7008F13E513D394097F89500D1205AAE513ED
+:1004E7002430FF1205BDD3221205AA7F4E1205BD87
+:0204F700C3221E
+:100567007598F0E4F587758920AF218F8B8F8DD231
+:060577008ED2AFD2AC22CF
+:0B059F001203DC12056712001E80FB37
+:0300230002039243
+:10039200C0E0C0F0C083C082C0D075D000C000C031
+:1003A20001C002C003C004C005C006C007C2AC3011
+:1003B200980B309A051204218003120342D2ACD06A
+:1003C20007D006D005D004D003D002D001D000D08F
+:0A03D200D0D082D083D0F0D0E0320A
+:06054E008B138A148915CD
+:10055400751A047D281204AFAD07AB13AA14A915AC
+:030564000204840A
+:10042100859909C298E50914600A240B60270470B4
+:1004310026209D23C29D750901750A017B007A0062
+:1004410079097D021204F9AD077B007A00790975FB
+:070451001701020003D29D18
+:010458002281
+:100342007B007A00790912054E5044E50924FD60CC
+:100352002324F2703AAF0A1204D75004AF0A800283
+:100362007FFF8F0B750904750A017B007A007909FA
+:100372007D03800AE4F509FB7A0079097D01120404
+:0F038200F9AD077B007A007909E4F51712000343
+:010391002249
+:10051A007F017580FFC2A2C2A0D2A1D2A2AE80EE94
+:09052A0030E7040FEF70EEC2A2ED
+:0105330022A5
+:0B05AA00EF6007C201F51412057D226E
+:0705BD00D2018F1402057D3D
+:10057D0012051AC2A1A20192A0851480D2A200C2B6
+:02058D00A222A8
+:0805B5008F993099FDC29922D3
+:10000300ED6017120226FF1205B5AF17EF6002DF8E
 :0A001300FE740129F9E43AFADDE970
 :01001D0022C0
-:10053B00309802800CEF60101F7E7CEE60F73098D5
-:09054B0004C298D3221E80F3C300
-:010554002284
-:10059600AF0512053B5007E5991202FED322C3228E
-:06049C008B168A17891877
-:1004A200E4FC120596501874012518F518E4351766
-:1004B200F5170CAB16FAA918AD1A12059640E8AF5B
-:0104C2000435
-:0104C3002216
-:0605BE000121FD012200F5
+:10053400309802800CEF60101F7E7CEE60F73098DC
+:0905440004C298D3221E80F3C307
+:01054D00228B
+:10058F00AF051205345007E59912023FD322C3225B
+:0604AF008B168A17891864
+:1004B500E4FC12058F501874012518F518E435175A
+:1004C500F5170CAB16FAA918AD1A12058F40E8AF4F
+:0104D5000422
+:0104D6002203
+:0605C4000121FD012200EF
 :1000260000102030405060708191A1B1C1D1E1F142
 :1000360012023222524272629383B3A3D3C3F3E312
 :100046002434041464744454A5B58595E5F5C5D5E2
@@ -85,34 +85,34 @@
 :1001F6007D5C3F1EF9D8BB9A75543716F1D0B39281
 :100206002E0F6C4DAA8BE8C926076445A283E0C170
 :100216001F3E5D7C9BBAD9F81736557493B2D1F060
-:10044600E4F51AF51BED601E1202E5651AFF900031
-:100456002693651BF51AEF90012693F51B74012967
-:0A046600F9E43AFADDE2AE1AAF1B2A
-:010470002269
-:1004E6008B138A148915AC05120446AB13AA14A9FA
-:1004F600158C82758300EE8FF0120348EC2402FF00
-:0105060022D2
-:100471008D198B168A17891815191519AD191204BA
-:1004810046AB16AA17A918851982758300120310A5
-:0B049100B50706EEB5F002D322C3222F
-:10038100020507E493A3F8E493A34003F68001F286
-:1003910008DFF48029E493A3F85407240CC8C3337D
-:1003A100C4540F4420C8834004F456800146F6DF4C
-:1003B100E4800B01020408102040809005BBE47E1C
-:1003C100019360BCA3FF543F30E509541FFEE49341
-:1003D100A360010ECF54C025E060A840B8E493A308
-:1003E100FAE493A3F8E493A3C8C582C8CAC583CA33
-:1003F100F0A3C8C582C8CAC583CADFE9DEE780BEEB
-:0105C4000036
-:1002E500BB010689828A83E0225002E722BBFE0217
-:0902F500E32289828A83E493224A
-:1002FE00BB010689828A83F0225002F722BBFE01DF
-:02030E00F322D8
-:10031000BB0110E58229F582E5833AF583E0F5F02B
-:10032000A3E0225009E92582F886F008E622BBFE08
-:100330000AE92582F8E2F5F008E222E5832AF5834E
-:08034000E993F5F0A3E9932213
-:10034800F8BB0111E58229F582E5833AF583E8F0E7
-:10035800E5F0A3F0225009E92582C8F608A6F022A4
-:0D036800BBFE09E92582C8F2E5F008F2228B
+:10045900E4F51AF51BED601E120226651AFF9000DD
+:100469002693651BF51AEF90012693F51B74012954
+:0A047900F9E43AFADDE2AE1AAF1B17
+:010483002256
+:1004F9008B138A148915AC05120459AB13AA14A9D4
+:10050900158C82758300EE8FF0120289EC2402FFAC
+:0105190022BF
+:100484008D198B168A17891815191519AD191204A7
+:1004940059AB16AA17A9188519827583001202513F
+:0B04A400B50706EEB5F002D322C3221C
+:1002C20002059FE493A3F8E493A34003F68001F2AE
+:1002D20008DFF48029E493A3F85407240CC8C3333D
+:1002E200C4540F4420C8834004F456800146F6DF0C
+:1002F200E4800B01020408102040809005C4E47ED3
+:10030200019360BCA3FF543F30E509541FFEE49300
+:10031200A360010ECF54C025E060A840B8E493A3C7
+:10032200FAE493A3F8E493A3C8C582C8CAC583CAF2
+:10033200F0A3C8C582C8CAC583CADFE9DEE780BEAA
+:0105CA000030
+:10022600BB010689828A83E0225002E722BBFE02D6
+:09023600E32289828A83E4932209
+:10023F00BB010689828A83F0225002F722BBFE019E
+:02024F00F32298
+:10025100BB0110E58229F582E5833AF583E0F5F0EB
+:10026100A3E0225009E92582F886F008E622BBFEC8
+:100271000AE92582F8E2F5F008E222E5832AF5830E
+:08028100E993F5F0A3E99322D3
+:10028900F8BB0111E58229F582E5833AF583E8F0A7
+:10029900E5F0A3F0225009E92582C8F608A6F02264
+:0D02A900BBFE09E92582C8F2E5F008F2224B
 :00000001FF