RadioShuttle Lib for the STM32 L4 Heltec Board

Dependents:   Turtle_RadioShuttle

Revision:
11:91bc7ef20f21
Parent:
10:f98abaa76518
--- a/RadioShuttle.s	Tue Feb 26 17:37:13 2019 +0100
+++ b/RadioShuttle.s	Mon Mar 04 09:41:41 2019 +0100
@@ -1383,10 +1383,9 @@
         PUSH     {r4-r11,lr}
         SUB      sp,sp,#0x5c
         MOV      r9,r1
-        LDRD     r6,r8,[sp,#0x84]
+        LDRD     r8,r6,[sp,#0x88]
+        LDRD     r11,r7,[sp,#0x80]
         LDR      r1,[r0,#0xf4]
-        LDR      r11,[sp,#0x80]
-        LDR      r7,[sp,#0x8c]
         MOV      r5,r3
         MOV      r10,r2
         ADD      r4,sp,#0x24
@@ -1397,221 +1396,223 @@
         ADDNE    sp,sp,#0x5c
         POPNE    {r4-r11,pc}
         CMP      r8,#0
-        BEQ      |L12.66|
+        BEQ      |L12.64|
         LDRB     r1,[r0,#0xf0]
         CMP      r1,#0
         ITT      EQ
         ADDEQ    sp,sp,#0x5c
         POPEQ    {r4-r11,pc}
-        B        |L12.80|
-|L12.66|
+        B        |L12.78|
+|L12.64|
         LDRB     r1,[r0,#0xf1]
         CMP      r1,#0
         ITT      EQ
         ADDEQ    sp,sp,#0x5c
         POPEQ    {r4-r11,pc}
-|L12.80|
+|L12.78|
         LDRH     r3,[r5,#0]
         UBFX     r1,r3,#4,#3
         CMP      r1,#1
         IT       NE
         CMPNE    r1,#2
-        BEQ      |L12.138|
+        BEQ      |L12.140|
+        LDRD     r2,r3,[r6,#8]
         MOV      r1,r10
-        ADR      r0,|L12.584|
+        ADR      r0,|L12.576|
         BL       _Z7dprintfPKcz
         CMP      r8,#0
-        BEQ      |L12.122|
-        CMP      r6,#0
+        BEQ      |L12.124|
+        CMP      r7,#0
         ITT      LE
         ADDLE    sp,sp,#0x5c
         POPLE    {r4-r11,pc}
-        B.W      |L12.566|
-|L12.122|
-        LDRD     r1,r2,[r7,#0]
+        B.W      |L12.560|
+|L12.124|
+        LDRD     r1,r2,[r6,#0]
         MOV      r0,r10
         BL       _Z4dumpPKcPvi
         ADD      sp,sp,#0x5c
         POP      {r4-r11,pc}
-|L12.138|
-        LDR      r2,[r0,#0xec]
-        CBZ      r2,|L12.174|
+|L12.140|
+        LDR      r0,[r0,#0xec]
+        CBZ      r0,|L12.176|
         CMP      r1,#1
         ITEET    EQ
-        LDREQ    r0,[r5,#0xc]
-        LDRNE    r0,[r5,#8]
-        LSRNE    r0,r0,#11
-        LDREQ    r1,[r5,#8]
-        ITT      NE
-        LDRNE    r1,[r5,#4]
+        LDREQ    r1,[r5,#0xc]
+        LDRNE    r1,[r5,#8]
         LSRNE    r1,r1,#11
-        CMP      r2,r1
+        LDREQ    r2,[r5,#8]
+        ITT      NE
+        LDRNE    r2,[r5,#4]
+        LSRNE    r2,r2,#11
+        CMP      r0,r2
         ITEE     EQ
-        CMPEQ    r2,r0
+        CMPEQ    r0,r1
         ADDNE    sp,sp,#0x5c
         POPNE    {r4-r11,pc}
-|L12.174|
+|L12.176|
         TST      r3,#0x80
-        BNE      |L12.198|
-        ADR      r0,|L12.628|
+        BNE      |L12.200|
+        ADR      r0,|L12.636|
         ADD      r4,r4,#4
         LDR      r0,[r0,#0]
         STR      r0,[sp,#0x24]
         LDRB     r0,[r5,#0]
         TST      r0,#0x80
-        BEQ      |L12.206|
-|L12.198|
-        ADR      r0,|L12.636|
+        BEQ      |L12.208|
+|L12.200|
+        ADR      r0,|L12.644|
         LDR      r0,[r0,#0]
         STR      r0,[r4],#4
-|L12.206|
+|L12.208|
         LDRH     r0,[r5,#0]
         TST      r0,#0x100
-        BEQ      |L12.224|
-        MOV      r0,r4
-        ADR      r1,|L12.644|
-        BL       __ARM_common_memcpy4_5
-        ADDS     r4,r4,#5
-|L12.224|
-        LDRH     r0,[r5,#0]
-        TST      r0,#0x200
-        BEQ      |L12.242|
+        BEQ      |L12.226|
         MOV      r0,r4
         ADR      r1,|L12.652|
         BL       __ARM_common_memcpy4_5
         ADDS     r4,r4,#5
-|L12.242|
+|L12.226|
+        LDRH     r0,[r5,#0]
+        TST      r0,#0x200
+        BEQ      |L12.244|
+        MOV      r0,r4
+        ADR      r1,|L12.660|
+        BL       __ARM_common_memcpy4_5
+        ADDS     r4,r4,#5
+|L12.244|
         LDRH     r0,[r5,#0]
         TST      r0,#0x400
-        BEQ      |L12.264|
-        ADR      r0,|L12.660|
+        BEQ      |L12.266|
+        ADR      r0,|L12.668|
         LDR      r1,[r0,#0]
         STR      r1,[r4],#4
         LDRH     r0,[r0,#4]
         STRH     r0,[r4],#2
-|L12.264|
+|L12.266|
         LDRH     r0,[r5,#0]
         TST      r0,#0x800
-        BEQ      |L12.282|
+        BEQ      |L12.284|
         MOV      r0,r4
-        ADR      r1,|L12.668|
+        ADR      r1,|L12.676|
         BL       __ARM_common_memcpy4_5
         ADDS     r4,r4,#5
-|L12.282|
+|L12.284|
         LDRH     r0,[r5,#0]
         TST      r0,#0x1000
-        BEQ      |L12.298|
-        ADR      r0,|L12.676|
+        BEQ      |L12.300|
+        ADR      r0,|L12.684|
         LDR      r0,[r0,#0]
         STR      r0,[r4],#4
-|L12.298|
+|L12.300|
         LDRH     r0,[r5,#0]
         TST      r0,#0x2000
-        BEQ      |L12.316|
-        MOV      r0,r4
-        ADR      r1,|L12.684|
-        BL       __ARM_common_memcpy4_5
-        ADDS     r4,r4,#5
-|L12.316|
-        LDRH     r0,[r5,#0]
-        TST      r0,#0x4000
-        BEQ      |L12.334|
+        BEQ      |L12.318|
         MOV      r0,r4
         ADR      r1,|L12.692|
         BL       __ARM_common_memcpy4_5
         ADDS     r4,r4,#5
-|L12.334|
+|L12.318|
         LDRH     r0,[r5,#0]
-        LSRS     r0,r0,#15
-        BEQ      |L12.350|
+        TST      r0,#0x4000
+        BEQ      |L12.336|
         MOV      r0,r4
         ADR      r1,|L12.700|
         BL       __ARM_common_memcpy4_5
         ADDS     r4,r4,#5
-|L12.350|
+|L12.336|
+        LDRH     r0,[r5,#0]
+        LSRS     r0,r0,#15
+        BEQ      |L12.352|
+        MOV      r0,r4
+        ADR      r1,|L12.708|
+        BL       __ARM_common_memcpy4_5
+        ADDS     r4,r4,#5
+|L12.352|
         ADD      r0,sp,#0x24
         CMP      r4,r0
         ITT      HI
         MOVHI    r0,#0
         STRBHI   r0,[r4,#-1]
-        LDRH     r12,[r5,#0]
-        UBFX     r3,r12,#4,#3
-        CMP      r3,#1
+        LDRH     r3,[r5,#0]
+        UBFX     r12,r3,#4,#3
+        CMP      r12,#1
         ITEET    EQ
-        LDRHEQ   r2,[r5,#4]
+        LDRHEQ   r1,[r5,#4]
         LDRHNE   r0,[r5,#4]
-        UBFXNE   r2,r0,#0,#11
+        UBFXNE   r1,r0,#0,#11
         LDRHEQ   r0,[r5,#6]
         ITTET    NE
         LDRHNE   r0,[r5,#8]
         UBFXNE   r0,r0,#0,#11
-        LDREQ    r1,[r5,#0xc]
-        LDRNE    r1,[r5,#8]
+        LDREQ    r2,[r5,#0xc]
+        LDRNE    r2,[r5,#8]
         ITETT    NE
-        LSRNE    r1,r1,#11
+        LSRNE    r2,r2,#11
         LDREQ    r4,[r5,#8]
         LDRNE    r4,[r5,#4]
         LSRNE    r4,r4,#11
         CMP      r8,#0
         BEQ      |L12.476|
-        LDR      r7,[r9,#0x30]
-        STRD     r1,r4,[sp,#0x10]
-        STRD     r7,r6,[sp,#0x18]
-        LSRS     r1,r12,#15
+        ADD      r8,sp,#0x10
+        LDR      r6,[r9,#0x30]
+        STM      r8,{r2,r4,r6,r7}
+        LSRS     r2,r3,#15
         BEQ      |L12.438|
-        LDRH     r1,[r5,#2]
-        UBFX     r1,r1,#7,#4
-        LSLS     r0,r0,r1
+        LDRH     r2,[r5,#2]
+        UBFX     r2,r2,#7,#4
+        LSLS     r0,r0,r2
 |L12.438|
-        LDRH     r1,[r5,#2]
-        STRD     r2,r0,[sp,#8]
-        LSR      r12,r1,#11
-        UBFX     r1,r1,#0,#11
-        STRD     r1,r12,[sp,#0]
-        CMP      r3,#1
-        ITE      EQ
-        ADREQ    r2,|L12.708|
-        ADRNE    r2,|L12.716|
+        LDRH     r2,[r5,#2]
+        STRD     r1,r0,[sp,#8]
+        LSRS     r3,r2,#11
+        UBFX     r2,r2,#0,#11
+        CMP      r12,#1
+        STRD     r2,r3,[sp,#0]
+        ITE      EQ
+        ADREQ    r2,|L12.716|
+        ADRNE    r2,|L12.724|
         ADD      r3,sp,#0x24
         MOV      r1,r10
-        LDR      r0,|L12.724|
+        LDR      r0,|L12.732|
         BL       _Z7dprintfPKcz
-        B        |L12.556|
+        B        |L12.550|
 |L12.476|
-        LDR      r8,[r7,#0xc]
-        LDR      r7,[r7,#8]
-        LSR      r12,r12,#15
-        STRD     r4,r7,[sp,#0x14]
-        STRD     r8,r6,[sp,#0x1c]
-        CMP      r12,#0
-        BEQ      |L12.512|
-        LDRH     r12,[r5,#2]
-        UBFX     r12,r12,#7,#4
-        LSL      r0,r0,r12
-|L12.512|
-        LDRH     r12,[r5,#2]
-        STRD     r0,r1,[sp,#0xc]
-        LSR      r4,r12,#11
-        STRD     r4,r2,[sp,#4]
+        LDR      r8,[r6,#0xc]
+        LDR      r6,[r6,#8]
+        LSRS     r3,r3,#15
+        STRD     r4,r6,[sp,#0x14]
+        STRD     r8,r7,[sp,#0x1c]
+        CMP      r3,#0
+        BEQ      |L12.506|
+        LDRH     r3,[r5,#2]
+        UBFX     r3,r3,#7,#4
+        LSL      r0,r0,r3
+|L12.506|
+        LDRH     r3,[r5,#2]
+        STRD     r1,r0,[sp,#8]
+        LSR      r4,r3,#11
+        STR      r4,[sp,#4]
+        STR      r2,[sp,#0x10]
         ITE      NE
         MOVNE    r0,#0
-        UBFXEQ   r0,r12,#0,#11
+        UBFXEQ   r0,r3,#0,#11
         STR      r0,[sp,#0]
-        CMP      r3,#1
-        ITE      EQ
-        ADREQ    r2,|L12.708|
-        ADRNE    r2,|L12.716|
+        CMP      r12,#1
+        ITE      EQ
+        ADREQ    r2,|L12.716|
+        ADRNE    r2,|L12.724|
         ADD      r3,sp,#0x24
         MOV      r1,r10
-        LDR      r0,|L12.728|
+        LDR      r0,|L12.736|
         BL       _Z7dprintfPKcz
-|L12.556|
-        CMP      r6,#0
+|L12.550|
+        CMP      r7,#0
         ITT      LE
         ADDLE    sp,sp,#0x5c
         POPLE    {r4-r11,pc}
-|L12.566|
-        MOV      r2,r6
+|L12.560|
+        MOV      r2,r7
         MOV      r1,r11
         MOV      r0,r10
         BL       _Z4dumpPKcPvi
@@ -1619,63 +1620,63 @@
         POP      {r4-r11,pc}
         ENDP
 
-        DCW      0x0000
-|L12.584|
-        DCB      "PacketTrace %s: invalid RadioHeader magic",0
-        DCB      0
-        DCB      0
-|L12.628|
-        DCB      "Req|",0
-        DCB      0
+|L12.576|
+        DCB      "PacketTrace %s: invalid RadioHeader magic (dBm:%d Snr:%"
+        DCB      "d)",0
         DCB      0
         DCB      0
 |L12.636|
-        DCB      "Rsp|",0
+        DCB      "Req|",0
         DCB      0
         DCB      0
         DCB      0
 |L12.644|
-        DCB      "rAck|",0
+        DCB      "Rsp|",0
+        DCB      0
         DCB      0
         DCB      0
 |L12.652|
-        DCB      "LowP|",0
+        DCB      "rAck|",0
         DCB      0
         DCB      0
 |L12.660|
-        DCB      "HighP|",0
+        DCB      "LowP|",0
+        DCB      0
         DCB      0
 |L12.668|
-        DCB      "More|",0
-        DCB      0
+        DCB      "HighP|",0
         DCB      0
 |L12.676|
-        DCB      "Con|",0
-        DCB      0
+        DCB      "More|",0
         DCB      0
         DCB      0
 |L12.684|
-        DCB      "Encr|",0
+        DCB      "Con|",0
+        DCB      0
         DCB      0
         DCB      0
 |L12.692|
-        DCB      "Auth|",0
+        DCB      "Encr|",0
         DCB      0
         DCB      0
 |L12.700|
-        DCB      "Opts|",0
+        DCB      "Auth|",0
         DCB      0
         DCB      0
 |L12.708|
-        DCB      "Fully",0
+        DCB      "Opts|",0
         DCB      0
         DCB      0
 |L12.716|
-        DCB      "Packed",0
+        DCB      "Fully",0
+        DCB      0
         DCB      0
 |L12.724|
+        DCB      "Packed",0
+        DCB      0
+|L12.732|
         DCD      ||.conststring||
-|L12.728|
+|L12.736|
         DCD      ||.conststring||+0x48
 
         AREA ||i._ZN12RadioShuttle11SendMessageEPNS_10RadioEntryEPviiijiiihh||, CODE, READONLY, ALIGN=2
@@ -1684,172 +1685,172 @@
         PUSH     {r4-r11,lr}
         SUB      sp,sp,#0x44
         MOV      r8,r1
+        MOV      r4,r0
         MOVS     r1,#0
-        STR      r1,[sp,#0x10]
-        MOV      r9,r2
-        LDRH     r12,[sp,#0x10]
-        LDR      r2,[sp,#0x74]
-        MOV      r4,r0
-        BFI      r12,r2,#7,#9
-        LDRD     r6,r0,[sp,#0x78]
-        STRH     r12,[sp,#0x10]
-        LDR      r5,[sp,#0x68]
-        LDRH     r2,[sp,#0x12]
+        LDRD     r5,r0,[sp,#0x78]
+        LDR      r6,[sp,#0x68]
         MOV      r7,r3
-        BFI      r2,r5,#11,#5
+        MOV      r9,r2
+        STR      r1,[sp,#0x18]
+        STR      r1,[sp,#0x24]
+        LDRH     r2,[sp,#0x18]
+        LDR      r3,[sp,#0x74]
+        LDR      r12,[sp,#0x84]
+        BFI      r2,r3,#7,#9
+        STRH     r2,[sp,#0x18]
+        LDRH     r3,[sp,#0x1a]
         LDR      r10,[sp,#0x70]
-        LDR      r3,[sp,#0x84]
-        STR      r1,[sp,#0x14]
-        STR      r1,[sp,#0x18]
+        BFI      r3,r6,#11,#5
         STR      r1,[sp,#0x1c]
-        STRH     r2,[sp,#0x12]
-        MOV      r5,r0
-        TST      r12,#0x80
-        BEQ      |L13.84|
-        CBNZ     r7,|L13.84|
+        STR      r1,[sp,#0x20]
+        STRH     r3,[sp,#0x1a]
+        MOV      r6,r0
+        TST      r2,#0x80
+        BEQ      |L13.86|
+        CBNZ     r7,|L13.86|
         MOV      r11,#0x7ff
         CMP      r11,r0,ASR #4
         IT       HI
-        ASRHI    r5,r0,#4
-|L13.84|
+        ASRHI    r6,r0,#4
+|L13.86|
         LDR      r11,[sp,#0x6c]
         CMP      r11,#0x800
         IT       CC
-        CMPCC    r5,#0x800
-        BCS      |L13.208|
-        LDR      r5,[r4,#4]
-        CMP      r5,#0x200000
+        CMPCC    r6,#0x800
+        BCS      |L13.192|
+        LDR      r6,[r4,#4]
+        CMP      r6,#0x200000
         IT       CC
         CMPCC    r10,#0x200000
-        BCS      |L13.208|
-        BIC      r12,r12,#0xf
-        ADD      r12,r12,#0xb
-        BIC      r12,r12,#0x70
-        ADD      r12,r12,#0x20
-        STRH     r12,[sp,#0x10]
-        LDR      r12,[sp,#0x14]
+        BCS      |L13.192|
+        BIC      r2,r2,#0xf
+        ADDS     r2,r2,#0xb
+        BIC      r2,r2,#0x70
+        ADDS     r2,r2,#0x20
+        STRH     r2,[sp,#0x18]
+        LDR      r2,[sp,#0x1c]
         CMP      r0,#0x800
-        BFI      r12,r11,#0,#11
-        STR      r12,[sp,#0x14]
-        BCC      |L13.166|
-|L13.152|
+        BFI      r2,r11,#0,#11
+        STR      r2,[sp,#0x1c]
+        BCC      |L13.162|
+        NOP      
+|L13.148|
         ADD      r0,r0,r0,LSR #31
         ASRS     r0,r0,#1
         ADDS     r1,r1,#1
         CMP      r0,#0x800
-        BCS      |L13.152|
-|L13.166|
-        LDR      r12,[sp,#0x18]
-        BFI      r12,r0,#0,#11
-        STR      r12,[sp,#0x18]
-        LDR      r12,[sp,#0x14]
-        BFI      r12,r10,#11,#21
-        STR      r12,[sp,#0x14]
-        LDR      r5,[r4,#4]
-        LDR      r12,[sp,#0x18]
-        BFI      r12,r5,#11,#21
-        MOVS     r5,#0xc
-        STR      r12,[sp,#0x18]
-        B        |L13.272|
-|L13.208|
-        BIC      r12,r12,#0xf
-        ADD      r12,r12,#0xb
-        BIC      r12,r12,#0x70
-        ADD      r12,r12,#0x10
-        STRH     r12,[sp,#0x10]
-        STRH     r11,[sp,#0x14]
+        BCS      |L13.148|
+|L13.162|
+        LDR      r2,[sp,#0x20]
+        BFI      r2,r0,#0,#11
+        STR      r2,[sp,#0x20]
+        LDR      r2,[sp,#0x1c]
+        BFI      r2,r10,#11,#21
+        STR      r2,[sp,#0x1c]
+        LDR      r6,[r4,#4]
+        LDR      r2,[sp,#0x20]
+        BFI      r2,r6,#11,#21
+        MOVS     r6,#0xc
+        STR      r2,[sp,#0x20]
+        B        |L13.248|
+|L13.192|
+        BIC      r2,r2,#0xf
+        ADDS     r2,r2,#0xb
+        BIC      r2,r2,#0x70
+        ADDS     r2,r2,#0x10
+        STRH     r2,[sp,#0x18]
+        STRH     r11,[sp,#0x1c]
         CMP      r0,#0x10000
-        BCC      |L13.254|
+        BCC      |L13.234|
         NOP      
-|L13.240|
+|L13.220|
         ADD      r0,r0,r0,LSR #31
         ASRS     r0,r0,#1
         ADDS     r1,r1,#1
         CMP      r0,#0x10000
-        BCS      |L13.240|
-|L13.254|
-        STRH     r0,[sp,#0x16]
-        STR      r10,[sp,#0x18]
-        LDR      r12,[r4,#4]
-        MOVS     r5,#0x10
-        STR      r12,[sp,#0x1c]
-|L13.272|
+        BCS      |L13.220|
+|L13.234|
+        STRH     r0,[sp,#0x1e]
+        STR      r10,[sp,#0x20]
+        LDR      r2,[r4,#4]
+        MOVS     r6,#0x10
+        STR      r2,[sp,#0x24]
+|L13.248|
         CMP      r1,#0xf
-        BLS      |L13.304|
+        BLS      |L13.280|
         LDRB     r0,[r4,#0xf0]
         CMP      r0,#0
         ITTEE    EQ
         LDRBEQ   r0,[r4,#0xf1]
         CMPEQ    r0,#0
-        ADRNE    r0,|L13.1124|
+        ADRNE    r0,|L13.1096|
         BLNE     _Z7dprintfPKcz
         MOVS     r0,#0
         ADD      sp,sp,#0x44
         POP      {r4-r11,pc}
-|L13.304|
-        MOV      r12,#0
-        CBNZ     r7,|L13.424|
+|L13.280|
+        MOVS     r2,#0
+        CBNZ     r7,|L13.388|
         LDRB     r11,[r4,#0x1c]
         CMP      r11,#4
-        BCC      |L13.334|
-        LDRH     lr,[sp,#0x10]
+        BCC      |L13.306|
+        LDRH     lr,[sp,#0x18]
         TST      lr,#0x80
         IT       NE
-        MOVNE    r12,#1
-|L13.334|
+        MOVNE    r2,#1
+|L13.306|
         CMP      r11,#3
         ITT      LS
-        LDRHLS   r11,[sp,#0x10]
+        LDRHLS   r11,[sp,#0x18]
         TSTLS    r11,#0x80
-        BEQ      |L13.356|
-        CMP      r12,#0
-        BEQ      |L13.436|
-|L13.356|
-        LDR      r12,[sp,#0x80]
-        ORRS     r12,r12,r3
-        BNE      |L13.370|
-        CMP      r1,#0
-        BLE      |L13.436|
-|L13.370|
-        LDRH     r12,[sp,#0x10]
+        BEQ      |L13.324|
+        CBZ      r2,|L13.388|
+|L13.324|
+        LDR      r2,[sp,#0x80]
+        ORRS     r2,r2,r12
+        BNE      |L13.336|
+        CMP      r1,#0
+        BLE      |L13.400|
+|L13.336|
+        LDRH     r2,[sp,#0x18]
         MOV      r11,#0x100
-        ORR      r11,r11,r12,LSR #7
-        BFI      r12,r11,#7,#9
-        STRH     r12,[sp,#0x10]
-        LDR      r12,[sp,#0x80]
-        CMP      r5,#0xc
-        BFI      r2,r12,#0,#4
-        BFI      r2,r3,#4,#3
-        BFI      r2,r1,#7,#4
-        STRH     r2,[sp,#0x12]
-        BEQ      |L13.426|
-        CMP      r5,#0x10
-        IT       EQ
-        STRHEQ   r0,[sp,#0x16]
-        B        |L13.446|
-|L13.424|
-        B        |L13.436|
-|L13.426|
-        LDR      r1,[sp,#0x18]
+        ORR      r11,r11,r2,LSR #7
+        BFI      r2,r11,#7,#9
+        STRH     r2,[sp,#0x18]
+        LDR      r2,[sp,#0x80]
+        CMP      r6,#0xc
+        BFI      r3,r2,#0,#4
+        BFI      r3,r12,#4,#3
+        BFI      r3,r1,#7,#4
+        STRH     r3,[sp,#0x1a]
+        BEQ      |L13.390|
+        CMP      r6,#0x10
+        IT       EQ
+        STRHEQ   r0,[sp,#0x1e]
+        B        |L13.410|
+|L13.388|
+        B        |L13.400|
+|L13.390|
+        LDR      r1,[sp,#0x20]
         BFI      r1,r0,#0,#11
-        STR      r1,[sp,#0x18]
-        B        |L13.446|
-|L13.436|
-        ADDS     r0,r7,r5
-        BFI      r2,r0,#0,#11
-        STRH     r2,[sp,#0x12]
-|L13.446|
-        SUB      r0,r6,#0x2700
+        STR      r1,[sp,#0x20]
+        B        |L13.410|
+|L13.400|
+        ADDS     r0,r7,r6
+        BFI      r3,r0,#0,#11
+        STRH     r3,[sp,#0x1a]
+|L13.410|
+        SUB      r0,r5,#0x2700
         SUBS     r0,r0,#0xf
-        BNE      |L13.552|
+        BNE      |L13.522|
         LDR      r0,[r8,#0x28]
         LDR      r1,[r4,#0xb4]
-        LDR      r6,[r0,#8]
+        LDR      r3,[r0,#8]
         LDR      r0,[r1,#4]
         MOV      r2,r1
-        CBZ      r0,|L13.490|
+        CBZ      r0,|L13.454|
         NOP      
-|L13.472|
+|L13.436|
         LDR      r12,[r0,#0x10]
         CMP      r12,r10
         ITTE     CS
@@ -1857,67 +1858,72 @@
         LDRCS    r0,[r0,#8]
         LDRCC    r0,[r0,#0xc]
         CMP      r0,#0
-        BNE      |L13.472|
-|L13.490|
+        BNE      |L13.436|
+|L13.454|
         CMP      r2,r1
-        BEQ      |L13.502|
+        BEQ      |L13.466|
         LDR      r0,[r2,#0x10]
         CMP      r10,r0
         IT       CS
         MOVCS    r1,r2
-|L13.502|
+|L13.466|
         LDR      r0,[r4,#0xb4]
         CMP      r1,r0
-        ITT      NE
-        LDRNE    r0,[r1,#0x14]
-        CMPNE    r0,#0
-        BEQ      |L13.552|
+        BEQ      |L13.520|
+        LDR      r0,[r1,#0x14]
+        MOV      r5,r3
+        CBZ      r0,|L13.522|
         CMN      r0,#0x50
-        BLT      |L13.552|
+        BLT      |L13.516|
         CMN      r0,#0x46
         IT       LT
-        MOVLT    r6,#0xe
-        BLT      |L13.552|
+        MOVLT    r5,#0xe
+        BLT      |L13.516|
         CMN      r0,#0x3c
         IT       LT
-        MOVLT    r6,#0xa
-        BLT      |L13.552|
+        MOVLT    r5,#0xa
+        BLT      |L13.516|
         CMN      r0,#0x32
         ITE      LT
-        MOVLT    r6,#6
-        MOVGE    r6,#2
-|L13.552|
+        MOVLT    r5,#6
+        MOVGE    r5,#2
+|L13.516|
+        CMP      r5,r3
+        BLE      |L13.522|
+|L13.520|
+        MOV      r5,r3
+|L13.522|
         LDR      r0,[r8,#0x30]
-        CMP      r0,r6
-        BEQ      |L13.576|
+        CMP      r0,r5
+        BEQ      |L13.546|
         LDR      r0,[r8,#0]
         LDR      r1,[r0,#0]
         LDR      r2,[r1,#0x7c]
-        SXTB     r1,r6
+        SXTB     r1,r5
         BLX      r2
-        STR      r6,[r8,#0x30]
-|L13.576|
+        STR      r5,[r8,#0x30]
+|L13.546|
         MOVS     r0,#0
         MOV      r11,r0
-        STR      r0,[sp,#0x20]
+        STR      r0,[sp,#0x10]
         LDR      r0,[r4,#0xfc]
         CMP      r0,#0
         ITTT     NE
         CMPNE    r9,#0
         LDRNE    r0,[sp,#0x74]
         TSTNE    r0,#0x40
-        BEQ      |L13.856|
+        BEQ      |L13.824|
         ADD      r2,sp,#0x6c
         ADD      r1,r4,#0x3c
-        ADD      r0,sp,#0x40
+        ADD      r0,sp,#0x34
         BL       _ZNSt3mapIiN12RadioShuttle8AppEntryESt4lessIiESaISt4pairIKiS1_EEE4findERS5_
         LDR      r0,[r4,#0x4c]
-        LDR      r1,[sp,#0x40]
+        LDR      r1,[sp,#0x34]
         CMP      r1,r0
         ITT      NE
         LDRNE    r0,[r1,#0x20]
         CMPNE    r0,#0
-        BEQ      |L13.856|
+        BEQ      |L13.824|
         LDR      r0,[sp,#0x6c]
         STR      r0,[sp,#0x3c]
         ADD      r2,sp,#0x38
@@ -1928,7 +1934,7 @@
         LDR      r0,[r4,#0x68]
         LDR      r1,[sp,#0xc]
         CMP      r1,r0
-        BEQ      |L13.856|
+        BEQ      |L13.824|
         LDRB     r0,[r1,#0x20]
         CMP      r0,#0
         ITT      EQ
@@ -1940,29 +1946,28 @@
         BLX      r1
         BFI      r11,r0,#0,#3
         MOVS     r0,#0
-        SUBS     r3,r7,#1
+        SUBS     r1,r7,#1
         MOV      r12,#0xd
         CMP      r7,#0
-        BLE      |L13.738|
-        SUB      r1,r9,#1
-        TST      r3,#1
-        IT       EQ
-        LDRBEQ   r0,[r1,#1]!
-        MOVS     r2,#0
-        ADDS     r3,r3,#1
-        ASRS     r3,r3,#1
-        BEQ      |L13.736|
-        NOP      
-|L13.720|
-        LDRB     lr,[r1,#1]
-        SUBS     r3,r3,#1
+        BLE      |L13.706|
+        SUB      r2,r9,#1
+        TST      r1,#1
+        IT       EQ
+        LDRBEQ   r0,[r2,#1]!
+        MOVS     r3,#0
+        ADDS     r1,r1,#1
+        ASRS     r1,r1,#1
+        BEQ      |L13.704|
+|L13.688|
+        LDRB     lr,[r2,#1]
+        SUBS     r1,r1,#1
         ADD      r0,r0,lr
-        LDRB     lr,[r1,#2]!
-        ADD      r2,r2,lr
-        BNE      |L13.720|
-|L13.736|
-        ADD      r0,r0,r2
-|L13.738|
+        LDRB     lr,[r2,#2]!
+        ADD      r3,r3,lr
+        BNE      |L13.688|
+|L13.704|
+        ADD      r0,r0,r3
+|L13.706|
         MOVS     r1,#1
         LSL      r1,r1,r12
         SUBS     r1,r1,#1
@@ -1970,18 +1975,18 @@
         ASR      r0,r0,r12
         ADD      r0,r0,r1
         BFI      r11,r0,#3,#13
-        LDRH     r1,[sp,#0x12]
-        LSR      r0,r11,#16
-        BFI      r0,r1,#0,#11
-        LSRS     r1,r1,#11
-        BFI      r0,r1,#11,#5
-        BFI      r11,r0,#16,#16
+        LDRH     r0,[sp,#0x1a]
+        LSR      r1,r11,#16
+        BFI      r1,r0,#0,#11
+        LSRS     r0,r0,#11
+        BFI      r1,r0,#11,#5
         LDR      r0,[sp,#0xc]
-        STR      r11,[sp,#0x28]
-        ADD      r11,r7,#8
+        BFI      r11,r1,#16,#16
+        STR      r11,[sp,#8]
         LDR      r0,[r0,#0x24]
-        STR      r0,[sp,#0x24]
+        STR      r0,[sp,#0x28]
         LDR      r0,[r4,#0xfc]
+        ADD      r11,r7,#8
         LDR      r1,[r0,#0]
         LDR      r1,[r1,#0x14]
         BLX      r1
@@ -1993,31 +1998,30 @@
         ADDNE    r11,r11,r0
         MOV      r0,r11
         BL       _Znaj
-        STR      r0,[sp,#8]
+        STR      r0,[sp,#0x14]
         MOV      r0,r11
         BL       _Znaj
-        STR      r0,[sp,#0x20]
-        LDR      r0,[sp,#8]
-        CMP      r0,#0
-        BEQ      |L13.1024|
-        LDR      r0,[sp,#0x20]
-        CMP      r0,#0
+        STR      r0,[sp,#0x10]
+        LDR      r0,[sp,#0x14]
+        CMP      r0,#0
+        BEQ      |L13.996|
+        LDR      r0,[sp,#0x10]
+        CBZ      r0,|L13.940|
+        LDR      r1,[sp,#0x14]
         LDR      r0,[sp,#8]
-        BEQ      |L13.1020|
-        LDR      r1,[sp,#0x28]
-        STR      r1,[r0,#0]
-        B        |L13.858|
-|L13.856|
-        B        |L13.958|
-|L13.858|
-        LDR      r1,[sp,#0x24]
-        STR      r1,[r0,#4]
-        LDR      r0,[sp,#8]
+        STR      r0,[r1,#0]
+        LDR      r0,[sp,#0x28]
+        B        |L13.826|
+|L13.824|
+        B        |L13.924|
+|L13.826|
+        STR      r0,[r1,#4]
+        LDR      r0,[sp,#0x14]
         MOV      r2,r7
         MOV      r1,r9
         ADDS     r0,r0,#8
         BL       __aeabi_memcpy
-        LDR      r1,[sp,#0x40]
+        LDR      r1,[sp,#0x34]
         LDR      r0,[r4,#0xfc]
         MOVS     r3,#0
         LDRB     r2,[r1,#0x24]
@@ -2028,90 +2032,94 @@
         MOVS     r3,#0
         BLX      r12
         STR      r11,[sp,#0]
-        STR      r0,[sp,#0x28]
+        STR      r0,[sp,#0x2c]
         LDR      r0,[r4,#0xfc]
-        LDR      r3,[sp,#0x20]
-        LDR      r2,[sp,#8]
+        LDRD     r3,r2,[sp,#0x10]
         LDR      r1,[r0,#0]
         LDR      r12,[r1,#0x20]
-        LDR      r1,[sp,#0x28]
+        LDR      r1,[sp,#0x2c]
         BLX      r12
         LDR      r0,[r4,#0xfc]
         LDR      r1,[r0,#0]
         LDR      r2,[r1,#0x1c]
-        LDR      r1,[sp,#0x28]
+        LDR      r1,[sp,#0x2c]
         BLX      r2
-        LDR      r0,[sp,#8]
+        LDR      r0,[sp,#0x14]
         BL       _ZdaPv
         LDRB     r0,[r4,#0xf0]
-        CBZ      r0,|L13.958|
+        CBZ      r0,|L13.924|
         MOV      r2,r11
-        ADR      r0,|L13.1148|
-        LDR      r1,[sp,#0x20]
+        ADR      r0,|L13.1120|
+        LDR      r1,[sp,#0x10]
         BL       _Z4dumpPKcPvi
-|L13.958|
+|L13.924|
         LDR      r0,[r4,#0xf8]
-        CBZ      r0,|L13.980|
-        STR      r6,[sp,#0]
-        LDR      r1,[r0,#0]
-        ADDS     r3,r7,r5
+        CBZ      r0,|L13.950|
+        STR      r5,[sp,#0]
+        ADDS     r3,r7,r6
+        LDR      r1,[r0,#0]
         MOV      r2,r10
+        B        |L13.942|
+|L13.940|
+        B        |L13.990|
+|L13.942|
         LDR      r12,[r1,#8]
         LDR      r1,[sp,#0x6c]
         BLX      r12
-|L13.980|
+|L13.950|
         CMP      r9,#0
-        BEQ      |L13.1042|
-        LDR      r0,[sp,#0x20]
-        STR      r5,[sp,#0]
+        BEQ      |L13.1014|
+        LDR      r0,[sp,#0x10]
+        STR      r6,[sp,#0]
         CMP      r0,#0
         LDR      r0,[r8,#0]
-        ADD      r3,sp,#0x10
+        ADD      r3,sp,#0x18
         LDR      r1,[r0,#0]
         LDR      r12,[r1,#0x30]
         ITTEE    EQ
         SXTHEQ   r2,r7
         MOVEQ    r1,r9
         SXTHNE   r2,r11
-        LDRNE    r1,[sp,#0x20]
+        LDRNE    r1,[sp,#0x10]
         BLX      r12
-        B        |L13.1064|
-|L13.1020|
+        B        |L13.1036|
+|L13.990|
+        LDR      r0,[sp,#0x14]
         BL       _ZdaPv
-|L13.1024|
+|L13.996|
         LDR      r0,[r8,#0x80]
         ADDS     r0,r0,#1
         STR      r0,[r8,#0x80]
         ADD      sp,sp,#0x44
         MOVS     r0,#0
         POP      {r4-r11,pc}
-|L13.1042|
+|L13.1014|
         MOVS     r0,#0
         STR      r0,[sp,#0]
         LDR      r0,[r8,#0]
         MOVS     r3,#0
-        MOV      r2,r5
+        MOV      r2,r6
         LDR      r1,[r0,#0]
         LDR      r12,[r1,#0x30]
-        ADD      r1,sp,#0x10
+        ADD      r1,sp,#0x18
         BLX      r12
-|L13.1064|
+|L13.1036|
         MOVS     r0,#0
         STRB     r0,[r8,#0xa4]
-        ADDS     r1,r7,r5
+        ADDS     r1,r7,r6
         STRH     r1,[r8,#0x2e]
         MOVS     r1,#1
         CMP      r9,#0
         IT       EQ
         MOVEQ    r7,#0
-        ADD      r3,sp,#0x10
+        ADD      r3,sp,#0x18
         STRD     r1,r0,[sp,#8]
         STRD     r9,r7,[sp,#0]
-        ADR      r2,|L13.1164|
+        ADR      r2,|L13.1136|
         MOV      r1,r8
         MOV      r0,r4
         BL       _ZN12RadioShuttle11PacketTraceEPNS_10RadioEntryEPKcPNS_11RadioHeaderEPvibPNS_16ReceivedMsgEntryE
-        LDR      r0,[sp,#0x20]
+        LDR      r0,[sp,#0x10]
         CMP      r0,#0
         IT       NE
         BLNE     _ZdaPv
@@ -2120,14 +2128,14 @@
         POP      {r4-r11,pc}
         ENDP
 
-|L13.1124|
+|L13.1096|
         DCB      "Window scale too large",0
         DCB      0
-|L13.1148|
+|L13.1120|
         DCB      "EncryptedData",0
         DCB      0
         DCB      0
-|L13.1164|
+|L13.1136|
         DCB      "TxSend",0
         DCB      0
 
@@ -2815,56 +2823,59 @@
 
 _ZN12RadioShuttle16CalculateTXPowerEPNS_10RadioEntryEj PROC
         PUSH     {r4,r5}
-        MOV      r4,r0
-        LDR      r0,[r1,#0x28]
-        LDR      r3,[r4,#0xb4]
-        LDR      r0,[r0,#8]
-        LDR      r1,[r3,#4]
-        MOV      r12,r3
+        LDR      r1,[r1,#0x28]
+        LDR      r12,[r0,#0xb4]
+        LDR      r4,[r1,#8]
+        LDR      r1,[r12,#4]
+        MOV      r3,r12
         CBZ      r1,|L25.34|
 |L25.18|
         LDR      r5,[r1,#0x10]
         CMP      r5,r2
         ITTE     CS
-        MOVCS    r12,r1
+        MOVCS    r3,r1
         LDRCS    r1,[r1,#8]
         LDRCC    r1,[r1,#0xc]
         CMP      r1,#0
         BNE      |L25.18|
 |L25.34|
-        MOV      r1,r12
-        CMP      r12,r3
-        BEQ      |L25.48|
-        LDR      r12,[r1,#0x10]
-        CMP      r2,r12
-        BCS      |L25.50|
-|L25.48|
-        MOV      r1,r3
-|L25.50|
-        CMP      r1,r3
-        ITTEE    NE
-        LDRNE    r1,[r1,#0x14]
-        CMPNE    r1,#0
+        CMP      r3,r12
+        BEQ      |L25.44|
+        LDR      r1,[r3,#0x10]
+        CMP      r2,r1
+        BCS      |L25.46|
+|L25.44|
+        MOV      r3,r12
+|L25.46|
+        CMP      r3,r12
+        BEQ      |L25.106|
+        LDR      r1,[r3,#0x14]
+        MOV      r0,r4
+        CMP      r1,#0
+        ITT      EQ
         POPEQ    {r4,r5}
         BXEQ     lr
         CMN      r1,#0x50
-        ITT      LT
-        POPLT    {r4,r5}
-        BXLT     lr
+        BLT      |L25.98|
         CMN      r1,#0x46
-        ITTT     LT
+        IT       LT
         MOVLT    r0,#0xe
-        POPLT    {r4,r5}
-        BXLT     lr
+        BLT      |L25.98|
         CMN      r1,#0x3c
-        ITTT     LT
+        IT       LT
         MOVLT    r0,#0xa
-        POPLT    {r4,r5}
-        BXLT     lr
+        BLT      |L25.98|
         CMN      r1,#0x32
         ITE      LT
         MOVLT    r0,#6
         MOVGE    r0,#2
+|L25.98|
+        CMP      r0,r4
+        ITT      LE
+        POPLE    {r4,r5}
+        BXLE     lr
+|L25.106|
+        MOV      r0,r4
         POP      {r4,r5}
         BX       lr
         ENDP
@@ -3538,20 +3549,20 @@
         CBZ      r0,|L35.36|
         MOV      r2,r3
         MOV      r1,r4
-        ADR      r0,|L35.628|
+        ADR      r0,|L35.644|
         BL       _Z7dprintfPKcz
 |L35.36|
         CMP      r10,#0
         BEQ      |L35.56|
         MOV      r11,#0
         TST      r9,#1
-        BEQ      |L35.308|
-        B.W      |L35.620|
+        BEQ      |L35.300|
+        B.W      |L35.634|
 |L35.56|
         MOV      r1,#0x74
-        ADD      r0,sp,#8
+        ADD      r0,sp,#0x30
         BL       __aeabi_memclr4
-        ADD      r1,sp,#8
+        ADD      r1,sp,#0x30
         ADD      r0,r6,#0x74
         BL       _ZNSt4listIN12RadioShuttle12SendMsgEntryESaIS1_EE9push_backERKS1_
         LDR      r0,[r6,#0x84]
@@ -3561,35 +3572,37 @@
         MOV      r0,r4
         BL       __aeabi_memclr4
         LDR      r0,[r5,#0]
+        STR      r0,[r4,#0]
+        MOV      r0,#0x270f
         TST      r9,#0x20
-        STR      r0,[r4,#0]
+        STR      r0,[r4,#0x14]
         ITT      NE
         LDRNE    r0,[r6,#0xfc]
         CMPNE    r0,#0
-        BEQ      |L35.296|
+        BEQ      |L35.302|
         STR      r7,[sp,#0xb8]
         LDR      r0,[r5,#0]
         STR      r0,[sp,#0xbc]
         ADD      r2,sp,#0xb8
         ADD      r1,r6,#0x58
-        MOV      r0,sp
+        ADD      r0,sp,#0x2c
         BL       _ZNSt3mapISt4pairIjiEN12RadioShuttle12ConnectEntryESt4lessIS1_ESaIS0_IKS1_S3_EEE4findERS6_
         LDR      r0,[r6,#0x68]
-        LDR      r1,[sp,#0]
+        LDR      r1,[sp,#0x2c]
         CMP      r1,r0
-        BNE      |L35.204|
+        BNE      |L35.210|
         LDR      r3,[r5,#0]
         STR      r7,[sp,#0xb0]
         LDR      r12,[r5,#0]
         STR      r12,[sp,#0xb4]
         MOVS     r0,#0
-        STRD     r7,r12,[sp,#0x7c]
+        STRD     r7,r12,[sp,#0]
         MOV      r1,r0
         BFI      r1,r0,#0,#8
-        STRD     r1,r0,[sp,#0x8c]
-        STR      r0,[sp,#0x94]
-        STRD     r7,r3,[sp,#0x84]
-        ADD      r2,sp,#0x7c
+        STRD     r1,r0,[sp,#0x10]
+        STRD     r7,r3,[sp,#8]
+        STR      r0,[sp,#0x18]
+        MOV      r2,sp
         ADD      r1,r6,#0x58
         ADD      r0,sp,#0xc8
         BL       _ZNSt3mapISt4pairIjiEN12RadioShuttle12ConnectEntryESt4lessIS1_ESaIS0_IKS1_S3_EEE6insertERKS7_
@@ -3601,21 +3614,21 @@
         ADD      r0,sp,#0xa4
         BL       _ZNSt3mapISt4pairIjiEN12RadioShuttle12ConnectEntryESt4lessIS1_ESaIS0_IKS1_S3_EEE4findERS6_
         LDR      r0,[sp,#0xa4]
-        STR      r0,[sp,#0]
-|L35.204|
+        STR      r0,[sp,#0x2c]
+|L35.210|
         MOVS     r0,#0
         BL       time
         LDR      r1,[r8,#0x10]
         LDR      r1,[r1,#0xac]
-        ADD      r1,r1,r0
-        LDR      r0,[sp,#0]
-        STR      r1,[r0,#0x24]
+        ADD      r0,r0,r1
+        LDR      r1,[sp,#0x2c]
+        STR      r0,[r1,#0x24]
         MOVS     r0,#0
         BL       time
         LDR      r1,[r8,#0x10]
         LDR      r1,[r1,#0xb0]
         ADDS     r2,r0,r1
-        LDR      r1,[sp,#0]
+        LDR      r1,[sp,#0x2c]
         ADD      r0,r1,#0x10
         STR      r2,[r1,#0x28]
         ADDS     r1,r1,#0x24
@@ -3625,7 +3638,7 @@
         MOVS     r1,#0x21
         ADDS     r0,r0,#8
         STR      r1,[r4,#0xc]
-|L35.262|
+|L35.268|
         STR      r7,[r4,#0x10]
         STR      r0,[r4,#0x28]
         LDR      r0,[sp,#0x100]
@@ -3638,49 +3651,50 @@
         STRB     r0,[r4,#0x2c]
         MOVS     r0,#2
         STR      r0,[r4,#0x1c]
-        B        |L35.620|
-        B        |L35.308|
-|L35.296|
+        B        |L35.634|
+|L35.300|
+        B        |L35.314|
+|L35.302|
         MOVS     r0,#0
         MOVS     r1,#1
         STR      r0,[r4,#4]
         STRD     r0,r1,[r4,#8]
-        B        |L35.262|
-|L35.308|
+        B        |L35.268|
+|L35.314|
         TST      r9,#0x20
         ITT      NE
         LDRNE    r0,[r6,#0xfc]
         CMPNE    r0,#0
-        BEQ      |L35.544|
-        STR      r7,[sp,#0x28]
+        BEQ      |L35.552|
+        STR      r7,[sp,#0x20]
         LDR      r0,[r5,#0]
-        STR      r0,[sp,#0x2c]
-        ADD      r2,sp,#0x28
+        STR      r0,[sp,#0x24]
+        ADD      r2,sp,#0x20
         ADD      r1,r6,#0x58
         ADD      r0,sp,#8
         BL       _ZNSt3mapISt4pairIjiEN12RadioShuttle12ConnectEntryESt4lessIS1_ESaIS0_IKS1_S3_EEE4findERS6_
         LDR      r0,[r6,#0x68]
         LDR      r1,[sp,#8]
         CMP      r1,r0
-        BEQ      |L35.364|
+        BEQ      |L35.370|
         LDR      r0,[r6,#0xfc]
         LDR      r1,[r0,#0]
         LDR      r1,[r1,#0xc]
         BLX      r1
         MOV      r11,r0
         CMP      r4,r11
-        BEQ      |L35.372|
-|L35.364|
+        BEQ      |L35.378|
+|L35.370|
         ADD      sp,sp,#0xd4
         MOVS     r0,#0
         POP      {r4-r11,pc}
-|L35.372|
+|L35.378|
         MOV      r0,r4
         BL       _Znaj
-        STR      r0,[sp,#0xc]
-        CBZ      r0,|L35.472|
+        STR      r0,[sp,#0x10]
+        CBZ      r0,|L35.478|
         LDR      r0,[r6,#0xfc]
-        LDR      r3,[sp,#0xc]
+        LDR      r3,[sp,#0x10]
         LDRB     r2,[r5,#0x10]
         STRD     r2,r3,[sp,#0]
         LDR      r2,[r0,#0]
@@ -3692,29 +3706,29 @@
         BLX      r12
         MOV      r2,r11
         MOV      r0,r10
-        LDR      r1,[sp,#0xc]
+        LDR      r1,[sp,#0x10]
         BL       memcmp
         CMP      r0,#0
         LDRB     r0,[r6,#0xf1]
-        BEQ      |L35.494|
-        CMP      r0,#0
-        ITT      NE
-        ADRNE    r0,|L35.672|
+        BEQ      |L35.500|
+        CMP      r0,#0
+        ITT      NE
+        ADRNE    r0,|L35.688|
         BLNE     _Z7dprintfPKcz
         MOV      r11,#0xa0
-|L35.442|
-        LDR      r0,[sp,#0xc]
+|L35.448|
+        LDR      r0,[sp,#0x10]
         BL       _ZdaPv
         TST      r11,#0x80
-        BEQ      |L35.518|
+        BEQ      |L35.524|
         STRD     r10,r4,[sp,#0]
         LDRD     r0,r12,[r5,#0]
         MOVS     r3,#7
         MOV      r1,r7
         LDR      r2,[sp,#0x100]
         BLX      r12
-        B        |L35.560|
-|L35.472|
+        B        |L35.568|
+|L35.478|
         LDR      r0,[r8,#0x10]
         LDR      r1,[r0,#0x80]
         ADDS     r1,r1,#1
@@ -3722,37 +3736,38 @@
         ADD      sp,sp,#0xd4
         MOVS     r0,#0
         POP      {r4-r11,pc}
-|L35.494|
-        CMP      r0,#0
-        ITT      NE
-        ADRNE    r0,|L35.692|
+|L35.500|
+        CMP      r0,#0
+        ITT      NE
+        ADRNE    r0,|L35.708|
         BLNE     _Z7dprintfPKcz
         MOV      r11,#0x20
         LDR      r1,[sp,#8]
         MOVS     r0,#1
         STRB     r0,[r1,#0x20]
-        B        |L35.442|
-|L35.518|
+        B        |L35.448|
+|L35.524|
         LDR      r0,[sp,#8]
         LDRB     r0,[r0,#0x20]
-        CBZ      r0,|L35.560|
+        CBZ      r0,|L35.568|
         STRD     r10,r4,[sp,#0]
         LDRD     r0,r12,[r5,#0]
         MOVS     r3,#8
         MOV      r1,r7
         LDR      r2,[sp,#0x100]
         BLX      r12
-        B        |L35.560|
-|L35.544|
+        B        |L35.568|
+        B        |L35.552|
+|L35.552|
         STRD     r10,r4,[sp,#0]
         LDRD     r0,r12,[r5,#0]
         MOVS     r3,#3
         MOV      r1,r7
         LDR      r2,[sp,#0x100]
         BLX      r12
-|L35.560|
+|L35.568|
         TST      r9,#2
-        BEQ      |L35.620|
+        BEQ      |L35.634|
         MOVS     r1,#0x74
         MOV      r0,sp
         BL       __aeabi_memclr4
@@ -3760,8 +3775,9 @@
         STR      r0,[sp,#0]
         MOVS     r0,#0
         ORR      r1,r11,#1
-        STR      r7,[sp,#0x10]
         STRD     r0,r1,[sp,#8]
+        MOV      r1,#0x270f
+        STRD     r7,r1,[sp,#0x10]
         STR      r0,[sp,#4]
         LDR      r1,[sp,#0x100]
         STR      r1,[sp,#0x18]
@@ -3773,20 +3789,21 @@
         MOV      r1,sp
         ADD      r0,r6,#0x74
         BL       _ZNSt4listIN12RadioShuttle12SendMsgEntryESaIS1_EE9push_backERKS1_
-|L35.620|
+|L35.634|
         ADD      sp,sp,#0xd4
         MOVS     r0,#1
         POP      {r4-r11,pc}
         ENDP
 
-|L35.628|
+        DCW      0x0000
+|L35.644|
         DCB      "ProcessRequestMessage: len=%d msgFlags=0x%x",0
-|L35.672|
+|L35.688|
         DCB      "Password: Failed",0
         DCB      0
         DCB      0
         DCB      0
-|L35.692|
+|L35.708|
         DCB      "Password: Ok",0
         DCB      0
         DCB      0
@@ -4606,126 +4623,130 @@
         ENDP
 
 
-        AREA ||i._ZN12RadioShuttle7StartupENS_9RadioTypeE||, CODE, READONLY, ALIGN=2
-
-_ZN12RadioShuttle7StartupENS_9RadioTypeE PROC
-        PUSH     {r4-r6,lr}
-        MOV      r5,r0
+        AREA ||i._ZN12RadioShuttle7StartupENS_9RadioTypeEj||, CODE, READONLY, ALIGN=2
+
+_ZN12RadioShuttle7StartupENS_9RadioTypeEj PROC
+        PUSH     {r4-r7,lr}
+        MOV      r4,r0
         LDR      r0,[r0,#0x38]
-        SUB      sp,sp,#0x10
+        SUB      sp,sp,#0x14
+        MOV      r7,r2
         MOV      r6,r1
         CMP      r0,#0
         ITTT     EQ
         MOVEQ    r0,#8
-        ADDEQ    sp,sp,#0x10
-        POPEQ    {r4-r6,pc}
-        STRB     r6,[r5,#0x1c]
-        LDR      r0,[r5,#0x34]
-        LDR      r4,[r0,#0]
-        CMP      r4,r0
+        ADDEQ    sp,sp,#0x14
+        POPEQ    {r4-r7,pc}
+        STRB     r6,[r4,#0x1c]
+        LDR      r0,[r4,#0x34]
+        LDR      r5,[r0,#0]
+        CMP      r5,r0
         BEQ      |L43.60|
-        NOP      
 |L43.32|
-        ADD      r1,r4,#8
-        MOV      r0,r5
+        ADD      r1,r5,#8
+        MOV      r0,r4
         BL       _ZN12RadioShuttle10_initRadioEPNS_10RadioEntryE
-        ADR      r0,|L43.216|
-        LDR      r1,[r4,#0xa4]
+        ADR      r0,|L43.224|
+        LDR      r1,[r5,#0xa4]
         BL       _Z7dprintfPKcz
-        LDR      r4,[r4,#0]
-        LDR      r0,[r5,#0x34]
-        CMP      r4,r0
+        LDR      r5,[r5,#0]
+        LDR      r0,[r4,#0x34]
+        CMP      r5,r0
         BNE      |L43.32|
 |L43.60|
         MOV      r2,#0x55555555
         MOVS     r1,#0x10
         MOV      r0,sp
         BL       _Z5CPUIDPhij
-        MOV      r4,r0
+        MOV      r5,r0
         MOVS     r2,#1
         MOV      r1,sp
-        ADD      r0,r5,#0xc
+        ADD      r0,r4,#0xc
         BL       memcmp
         CMP      r0,#0
-        BNE      |L43.210|
-        ASRS     r1,r4,#31
-        ADD      r1,r4,r1,LSR #30
-        LDR      r0,|L43.236|
+        BNE      |L43.218|
+        ASRS     r1,r5,#31
+        ADD      r1,r5,r1,LSR #30
+        LDR      r0,|L43.244|
         ASRS     r1,r1,#2
         MOV      r2,sp
         CMP      r1,#0
-        BLE      |L43.144|
-        SUBS     r2,r2,#4
+        BLE      |L43.146|
+        SUBS     r3,r2,#4
         TST      r1,#1
         BEQ      |L43.120|
-        LDR      r3,[r2,#4]!
-        ADD      r0,r0,r3
+        LDR      r2,[r3,#4]!
+        ADD      r0,r0,r2
 |L43.120|
-        MOV      r12,#0
-        ASRS     r3,r1,#1
-        BEQ      |L43.142|
+        MOVS     r5,#0
+        ASRS     r12,r1,#1
+        BEQ      |L43.144|
 |L43.128|
-        LDR      r1,[r2,#4]
-        SUBS     r3,r3,#1
+        LDR      r1,[r3,#4]
+        SUBS     r12,r12,#1
         ADD      r0,r0,r1
-        LDR      r1,[r2,#8]!
-        ADD      r12,r12,r1
+        LDR      r1,[r3,#8]!
+        ADD      r5,r5,r1
         BNE      |L43.128|
-|L43.142|
-        ADD      r0,r0,r12
 |L43.144|
-        LDR      r1,[r5,#8]
-        LDR      r2,[r5,#0x100]
+        ADD      r0,r0,r5
+|L43.146|
+        LDR      r1,[r4,#8]
+        LDR      r2,[r4,#0x100]
         ADD      r0,r0,r1
         CMP      r2,r0
-        IT       EQ
-        STREQ    r1,[r5,#4]
-        LDR      r0,[r5,#0xf8]
-        CBZ      r0,|L43.210|
-        LDR      r1,[r5,#4]
+        BNE      |L43.166|
+        STR      r1,[r4,#4]
+        CMP      r7,#0
+        IT       NE
+        STRNE    r7,[r4,#4]
+|L43.166|
+        LDR      r0,[r4,#0xf8]
+        CBZ      r0,|L43.218|
+        LDR      r1,[r4,#4]
         STR      r1,[r0,#0xc]
-        LDR      r0,[r5,#0xf8]
+        LDR      r1,[r4,#0xf8]
         CMP      r6,#6
-        BCS      |L43.206|
+        BCS      |L43.214|
         TBB      [pc,r6]
         DCB      0x0d,0x03,0x05,0x07
         DCB      0x09,0x0b
-        LDR      r1,|L43.240|
-        B        |L43.208|
-        LDR      r1,|L43.244|
-        B        |L43.208|
-        LDR      r1,|L43.248|
-        B        |L43.208|
-        LDR      r1,|L43.252|
-        B        |L43.208|
-        LDR      r1,|L43.256|
-        B        |L43.208|
-|L43.206|
-        LDR      r1,|L43.260|
-|L43.208|
-        STR      r1,[r0,#0x10]
-|L43.210|
-        ADD      sp,sp,#0x10
-        MOVS     r0,#0
-        POP      {r4-r6,pc}
-        ENDP
-
+        LDR      r0,|L43.248|
+        B        |L43.216|
+        LDR      r0,|L43.252|
+        B        |L43.216|
+        LDR      r0,|L43.256|
+        B        |L43.216|
+        LDR      r0,|L43.260|
+        B        |L43.216|
+        LDR      r0,|L43.264|
+        B        |L43.216|
+|L43.214|
+        LDR      r0,|L43.268|
 |L43.216|
+        STR      r0,[r1,#0x10]
+|L43.218|
+        ADD      sp,sp,#0x14
+        MOVS     r0,#0
+        POP      {r4-r7,pc}
+        ENDP
+
+|L43.224|
         DCB      "RandomRetry: %d ms",0
         DCB      0
-|L43.236|
+|L43.244|
         DCD      0x83548797
-|L43.240|
+|L43.248|
         DCD      ||i._ZN12RadioShuttle12GetRadioNameENS_9RadioTypeE||+0x28
-|L43.244|
+|L43.252|
         DCD      ||i._ZN12RadioShuttle12GetRadioNameENS_9RadioTypeE||+0x38
-|L43.248|
+|L43.256|
         DCD      ||i._ZN12RadioShuttle12GetRadioNameENS_9RadioTypeE||+0x48
-|L43.252|
+|L43.260|
         DCD      ||i._ZN12RadioShuttle12GetRadioNameENS_9RadioTypeE||+0x54
-|L43.256|
+|L43.264|
         DCD      ||i._ZN12RadioShuttle12GetRadioNameENS_9RadioTypeE||+0x64
-|L43.260|
+|L43.268|
         DCD      ||i._ZN12RadioShuttle12GetRadioNameENS_9RadioTypeE||+0x74
 
         AREA ||i._ZN12RadioShuttle8AddRadioEP5Radio9ModemTypePKNS_12RadioProfileE||, CODE, READONLY, ALIGN=2
@@ -6023,11 +6044,11 @@
         RELOC 42, ||i._ZN12RadioShuttle10_initRadioEPNS_10RadioEntryE||
         DCD      0x00000001
 
-        AREA ||area_number.72||, LINKORDER=||i._ZN12RadioShuttle7StartupENS_9RadioTypeE||, DATA, READONLY, SECTYPE={SHT_ARM_EXIDX}, ALIGN=2
+        AREA ||area_number.72||, LINKORDER=||i._ZN12RadioShuttle7StartupENS_9RadioTypeEj||, DATA, READONLY, SECTYPE={SHT_ARM_EXIDX}, ALIGN=2
 
         EXPORTAS ||area_number.72||, ||.ARM.exidx||
         DCD      0x00000000
-        RELOC 42, ||i._ZN12RadioShuttle7StartupENS_9RadioTypeE||
+        RELOC 42, ||i._ZN12RadioShuttle7StartupENS_9RadioTypeEj||
         DCD      0x00000001
 
         AREA ||area_number.73||, LINKORDER=||i._ZN12RadioShuttle12GetRadioTypeEv||, DATA, READONLY, SECTYPE={SHT_ARM_EXIDX}, ALIGN=2
@@ -10119,7 +10140,7 @@
         EXPORT _ZN12RadioShuttle7ConnectEij [CODE]
         EXPORT _ZN12RadioShuttle7KillMsgEii [CODE]
         EXPORT _ZN12RadioShuttle7SendMsgEiPviijiPi [CODE]
-        EXPORT _ZN12RadioShuttle7StartupENS_9RadioTypeE [CODE]
+        EXPORT _ZN12RadioShuttle7StartupENS_9RadioTypeEj [CODE]
         EXPORT _ZN12RadioShuttle8AddRadioEP5Radio9ModemTypePKNS_12RadioProfileE [CODE]
         EXPORT _ZN12RadioShuttle8StrErrorE11RSErrorCode [CODE]
         EXPORT _ZN12RadioShuttle9RS_RxDoneEP5RadioPvPhtsa [CODE]
@@ -10432,7 +10453,7 @@
 _ZN12RadioShuttle11TimeoutFuncEv:
 .LFB2618:
 	.file 3 "./RadioShuttle-STM32L4/RadioShuttle.cpp"
-	.loc 3 1972 1
+	.loc 3 1983 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -10442,57 +10463,57 @@
 	.cfi_offset 5, -12
 	.cfi_offset 6, -8
 	.cfi_offset 14, -4
-	.loc 3 1972 1
+	.loc 3 1983 1
 	mov	r4, r0
-	.loc 3 1973 17
+	.loc 3 1984 17
 	movs	r0, #8
 	bl	_Z12InterruptMSG15InterruptDevice
-	.loc 3 1974 18
+	.loc 3 1985 18
 	ldr	r3, [r4, #168]
 .LBB3893:
-	.loc 3 1975 5
+	.loc 3 1986 5
 	ldrb	r2, [r4, #180]	@ zero_extendqisi2
 .LBE3893:
-	.loc 3 1974 18
+	.loc 3 1985 18
 	adds	r3, r3, #1
 	str	r3, [r4, #168]
 .LBB3895:
-	.loc 3 1975 5
+	.loc 3 1986 5
 	cbnz	r2, .L13
-	.loc 3 1975 33 discriminator 1
+	.loc 3 1986 33 discriminator 1
 	ldrb	r2, [r4, #181]	@ zero_extendqisi2
 	cbz	r2, .L14
 .L13:
 .LBB3894:
-	.loc 3 1980 17
+	.loc 3 1991 17
 	ldr	r5, .L18
-	.loc 3 1978 28
+	.loc 3 1989 28
 	ldr	r6, [r4, #36]
-	.loc 3 1980 17
+	.loc 3 1991 17
 	ldr	r2, .L18+4
 	movs	r1, #33
 	mov	r0, r5
 	bl	snprintf
-	.loc 3 1981 28
+	.loc 3 1992 28
 	str	r5, [r6, #184]
 .L14:
 .LBE3894:
 .LBE3895:
-	.loc 3 1983 16
+	.loc 3 1994 16
 	movs	r3, #0
 	str	r3, [r4, #164]
-	.loc 3 1984 19
+	.loc 3 1995 19
 	str	r3, [r4, #168]
-	.loc 3 1985 18
+	.loc 3 1996 18
 	ldr	r0, [r4, #156]
-	.loc 3 1986 1
+	.loc 3 1997 1
 	pop	{r4, r5, r6, lr}
 	.cfi_restore 14
 	.cfi_restore 6
 	.cfi_restore 5
 	.cfi_restore 4
 	.cfi_def_cfa_offset 0
-	.loc 3 1985 18
+	.loc 3 1996 18
 	b	_ZN4mbed6Ticker6detachEv
 .L19:
 	.align	2
@@ -11274,7 +11295,7 @@
 	.type	_ZN12RadioShuttle10_initRadioEPNS_10RadioEntryE, %function
 _ZN12RadioShuttle10_initRadioEPNS_10RadioEntryE:
 .LFB2584:
-	.loc 3 312 1
+	.loc 3 318 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -11288,34 +11309,34 @@
 	.cfi_offset 9, -12
 	.cfi_offset 10, -8
 	.cfi_offset 14, -4
-	.loc 3 318 31
+	.loc 3 324 31
 	ldr	r3, [r1, #40]
-	.loc 3 312 1
+	.loc 3 318 1
 	mov	r6, r0
-	.loc 3 318 9
+	.loc 3 324 9
 	ldr	r0, [r1]
-	.loc 3 318 50
+	.loc 3 324 50
 	ldr	r2, [r3, #16]
-	.loc 3 312 1
+	.loc 3 318 1
 	mov	r4, r1
-	.loc 3 318 50
+	.loc 3 324 50
 	ldr	r1, [r3]
-	.loc 3 318 80
-	ldr	r3, [r0]
-	.loc 3 312 1
+	.loc 3 324 80
+	ldr	r3, [r0]
+	.loc 3 318 1
 	sub	sp, sp, #48
 	.cfi_def_cfa_offset 80
-	.loc 3 318 26
+	.loc 3 324 26
 	ldr	r3, [r3, #20]
 	add	r1, r1, r2
 	blx	r3
-	.loc 3 319 9
+	.loc 3 325 9
 	ldr	r3, [r6, #188]
-	.loc 3 319 5
+	.loc 3 325 5
 	cbz	r3, .L48
-	.loc 3 320 41
+	.loc 3 326 41
 	ldr	r2, [r4, #40]
-	.loc 3 320 74
+	.loc 3 326 74
 	ldr	r1, [r2, #12]
 .LBB4167:
 .LBB4168:
@@ -11327,18 +11348,18 @@
 .L48:
 .LBE4168:
 .LBE4167:
-	.loc 3 322 5
+	.loc 3 328 5
 	ldrb	r7, [r4, #44]	@ zero_extendqisi2
 	cmp	r7, #1
 	bne	.L49
-	.loc 3 323 47
+	.loc 3 329 47
 	ldr	r3, [r4, #40]
 	ldr	r0, [r4]
-	.loc 3 323 31
+	.loc 3 329 31
 	ldrsb	r2, [r3, #8]
-	.loc 3 327 44
+	.loc 3 333 44
 	ldr	ip, [r0]
-	.loc 3 323 31
+	.loc 3 329 31
 	movs	r5, #0
 	mov	r1, #2000
 	mov	r9, #4
@@ -11355,15 +11376,15 @@
 	mov	r3, r5
 	mov	r1, r7
 	blx	r10
-	.loc 3 330 31
+	.loc 3 336 31
 	ldrb	r1, [r4, #44]	@ zero_extendqisi2
-	.loc 3 330 13
+	.loc 3 336 13
 	ldr	r0, [r4]
-	.loc 3 330 47
+	.loc 3 336 47
 	ldr	r2, [r4, #40]
-	.loc 3 334 43
+	.loc 3 340 43
 	ldr	ip, [r0]
-	.loc 3 330 31
+	.loc 3 336 31
 	str	r9, [sp, #32]
 	clz	r3, r1
 	lsrs	r3, r3, #5
@@ -11379,22 +11400,22 @@
 	blx	r5
 .L49:
 .LBB4169:
-	.loc 3 336 5
+	.loc 3 342 5
 	ldrb	r5, [r4, #44]	@ zero_extendqisi2
 	cbnz	r5, .L50
 	ldr	r0, [r4]
 .LBB4170:
-	.loc 3 343 56
+	.loc 3 349 56
 	ldr	r3, [r4, #40]
-	.loc 3 343 31
+	.loc 3 349 31
 	movs	r7, #1
 	mov	r1, #2000
 	mov	r9, #5
 	mov	r8, #19200
 	ldrsb	r2, [r3, #8]
-	.loc 3 346 52
-	ldr	r3, [r0]
-	.loc 3 343 31
+	.loc 3 352 52
+	ldr	r3, [r0]
+	.loc 3 349 31
 	strd	r5, r1, [sp, #32]
 	strd	r5, r5, [sp, #24]
 	strd	r5, r7, [sp, #16]
@@ -11404,15 +11425,15 @@
 	ldr	r10, [r3, #36]
 	movw	r3, #25000
 	blx	r10
-	.loc 3 348 31
+	.loc 3 354 31
 	ldr	r1, .L62
-	.loc 3 348 13
+	.loc 3 354 13
 	ldr	r0, [r4]
-	.loc 3 348 56
+	.loc 3 354 56
 	ldr	r2, [r4, #40]
-	.loc 3 351 50
-	ldr	r3, [r0]
-	.loc 3 348 31
+	.loc 3 357 50
+	ldr	r3, [r0]
+	.loc 3 354 31
 	str	r9, [sp, #8]
 	strd	r5, r1, [sp]
 	strd	r5, r7, [sp, #36]
@@ -11427,32 +11448,32 @@
 .L50:
 .LBE4170:
 .LBE4169:
-	.loc 3 353 39
+	.loc 3 359 39
 	ldrb	r3, [r6, #28]	@ zero_extendqisi2
 	ldr	r0, [r4]
-	.loc 3 353 5
+	.loc 3 359 5
 	subs	r3, r3, #1
 	cmp	r3, #1
 	ldr	r2, [r0]
 	bhi	.L51
-	.loc 3 354 25
+	.loc 3 360 25
 	ldr	r3, [r2, #52]
 	blx	r3
 .L52:
-	.loc 3 358 34
+	.loc 3 364 34
 	movs	r0, #0
 	bl	time
-	.loc 3 359 28
+	.loc 3 365 28
 	ldr	r5, [r4]
-	.loc 3 359 44
+	.loc 3 365 44
 	ldrb	r7, [r4, #44]	@ zero_extendqisi2
-	.loc 3 359 88
+	.loc 3 365 88
 	ldr	r3, [r5]
-	.loc 3 358 28
+	.loc 3 364 28
 	strd	r0, [r4, #152]
-	.loc 3 359 88
+	.loc 3 365 88
 	ldr	r8, [r3, #44]
-	.loc 3 359 44
+	.loc 3 365 44
 	ldr	r3, [r3, #80]
 	mov	r1, r7
 	mov	r0, r5
@@ -11462,30 +11483,30 @@
 	mov	r0, r5
 	blx	r8
 .LBB4171:
-	.loc 3 360 5
+	.loc 3 366 5
 	ldrb	r1, [r4, #44]	@ zero_extendqisi2
 .LBE4171:
-	.loc 3 359 22
+	.loc 3 365 22
 	str	r0, [r4, #160]
 .LBB4173:
-	.loc 3 360 5
+	.loc 3 366 5
 	cmp	r1, #1
 	bne	.L53
 .LBB4172:
-	.loc 3 364 47
+	.loc 3 370 47
 	ldr	r5, [r4, #40]
-	.loc 3 364 13
+	.loc 3 370 13
 	ldr	r7, [r4]
-	.loc 3 364 31
+	.loc 3 370 31
 	ldrsb	r2, [r5, #8]
-	.loc 3 368 50
+	.loc 3 374 50
 	ldr	ip, [r7]
-	.loc 3 362 63
+	.loc 3 368 63
 	movs	r3, #10
 	sdiv	r3, r0, r3
-	.loc 3 362 13
+	.loc 3 368 13
 	add	r3, r3, r0
-	.loc 3 364 31
+	.loc 3 370 31
 	str	r3, [sp, #36]
 	movs	r0, #4
 	movs	r3, #0
@@ -11504,60 +11525,60 @@
 .L53:
 .LBE4172:
 .LBE4173:
-	.loc 3 370 24
+	.loc 3 376 24
 	ldr	r2, [r4, #160]
-	.loc 3 370 51
+	.loc 3 376 51
 	ldr	r1, [r4, #180]
 	udiv	r3, r1, r2
 	mls	r3, r2, r3, r1
-	.loc 3 370 37
+	.loc 3 376 37
 	add	r3, r3, r2
-	.loc 3 371 18
+	.loc 3 377 18
 	add	r3, r3, #4000
 	str	r3, [r4, #164]
-	.loc 3 372 36
+	.loc 3 378 36
 	ldr	r3, [r4, #40]
-	.loc 3 373 32
+	.loc 3 379 32
 	ldr	r0, [r4]
-	.loc 3 372 21
+	.loc 3 378 21
 	ldr	r3, [r3, #8]
 	str	r3, [r4, #48]
-	.loc 3 373 62
-	ldr	r3, [r0]
-	.loc 3 373 48
+	.loc 3 379 62
+	ldr	r3, [r0]
+	.loc 3 379 48
 	ldrb	r1, [r4, #44]	@ zero_extendqisi2
 	ldr	r3, [r3, #44]
 	movs	r2, #12
 	blx	r3
-	.loc 3 373 26
+	.loc 3 379 26
 	str	r0, [r4, #52]
-	.loc 3 374 5
+	.loc 3 380 5
 	ldrb	r3, [r6, #180]	@ zero_extendqisi2
-	.loc 3 373 48
+	.loc 3 379 48
 	mov	r5, r0
-	.loc 3 374 5
+	.loc 3 380 5
 	cbnz	r3, .L54
-	.loc 3 374 33 discriminator 1
+	.loc 3 380 33 discriminator 1
 	ldrb	r3, [r6, #181]	@ zero_extendqisi2
 	cbz	r3, .L55
 .L54:
-	.loc 3 376 48
+	.loc 3 382 48
 	ldr	r0, [r4]
-	.loc 3 376 64
+	.loc 3 382 64
 	ldrb	r1, [r4, #44]	@ zero_extendqisi2
-	.loc 3 376 78
-	ldr	r3, [r0]
-	.loc 3 376 64
+	.loc 3 382 78
+	ldr	r3, [r0]
+	.loc 3 382 64
 	movs	r2, #49
 	ldr	r3, [r3, #44]
 	blx	r3
-	.loc 3 375 16
+	.loc 3 381 16
 	mov	r1, r5
 	mov	r2, r0
 	ldr	r0, .L62+4
 	bl	_Z7dprintfPKcz
 .L55:
-	.loc 3 379 1
+	.loc 3 385 1
 	movs	r0, #0
 	add	sp, sp, #48
 	.cfi_remember_state
@@ -11566,7 +11587,7 @@
 	pop	{r4, r5, r6, r7, r8, r9, r10, pc}
 .L51:
 	.cfi_restore_state
-	.loc 3 356 22
+	.loc 3 362 22
 	ldr	r3, [r2, #64]
 	ldr	r1, .L62+8
 	blx	r3
@@ -11580,47 +11601,52 @@
 	.cfi_endproc
 .LFE2584:
 	.size	_ZN12RadioShuttle10_initRadioEPNS_10RadioEntryE, .-_ZN12RadioShuttle10_initRadioEPNS_10RadioEntryE
-	.section	.text._ZN12RadioShuttle7StartupENS_9RadioTypeE,"ax",%progbits
-	.align	1
-	.global	_ZN12RadioShuttle7StartupENS_9RadioTypeE
-	.syntax unified
-	.thumb
-	.thumb_func
-	.fpu fpv4-sp-d16
-	.type	_ZN12RadioShuttle7StartupENS_9RadioTypeE, %function
-_ZN12RadioShuttle7StartupENS_9RadioTypeE:
+	.section	.text._ZN12RadioShuttle7StartupENS_9RadioTypeEm,"ax",%progbits
+	.align	1
+	.global	_ZN12RadioShuttle7StartupENS_9RadioTypeEm
+	.syntax unified
+	.thumb
+	.thumb_func
+	.fpu fpv4-sp-d16
+	.type	_ZN12RadioShuttle7StartupENS_9RadioTypeEm, %function
+_ZN12RadioShuttle7StartupENS_9RadioTypeEm:
 .LFB2582:
 	.loc 3 253 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 16
 	@ frame_needed = 0, uses_anonymous_args = 0
-	push	{r0, r1, r2, r3, r4, r5, r6, r7, r8, lr}
-	.cfi_def_cfa_offset 40
-	.cfi_offset 4, -24
-	.cfi_offset 5, -20
-	.cfi_offset 6, -16
-	.cfi_offset 7, -12
-	.cfi_offset 8, -8
+	push	{r4, r5, r6, r7, r8, r9, lr}
+	.cfi_def_cfa_offset 28
+	.cfi_offset 4, -28
+	.cfi_offset 5, -24
+	.cfi_offset 6, -20
+	.cfi_offset 7, -16
+	.cfi_offset 8, -12
+	.cfi_offset 9, -8
 	.cfi_offset 14, -4
 	.loc 3 254 5
 	ldr	r3, [r0, #44]
 	.loc 3 253 1
+	sub	sp, sp, #20
+	.cfi_def_cfa_offset 48
+	.loc 3 253 1
 	mov	r4, r0
 	mov	r6, r1
+	mov	r7, r2
 	.loc 3 254 5
 	cmp	r3, #0
-	beq	.L75
+	beq	.L78
 	.loc 3 260 28
-	mov	r7, r0
+	mov	r8, r0
 	.loc 3 257 16
 	strb	r1, [r4, #28]
 	.loc 3 260 28
-	ldr	r5, [r7, #36]!
+	ldr	r5, [r8, #36]!
 	.loc 3 262 16
-	ldr	r8, .L82+12
+	ldr	r9, .L85+12
 .L67:
 	.loc 3 260 34 discriminator 3
-	cmp	r5, r7
+	cmp	r5, r8
 	beq	.L66
 	.loc 3 261 19 discriminator 2
 	add	r1, r5, #8
@@ -11628,7 +11654,7 @@
 	bl	_ZN12RadioShuttle10_initRadioEPNS_10RadioEntryE
 	.loc 3 262 16 discriminator 2
 	ldr	r1, [r5, #172]
-	mov	r0, r8
+	mov	r0, r9
 	bl	_Z7dprintfPKcz
 .LBB4174:
 .LBB4175:
@@ -11653,16 +11679,16 @@
 	bl	memcmp
 	.loc 3 268 5
 	cbz	r0, .L68
-.L81:
-	.loc 3 286 12
+.L84:
+	.loc 3 292 12
 	movs	r0, #0
 .L65:
-	.loc 3 287 1
-	add	sp, sp, #16
+	.loc 3 293 1
+	add	sp, sp, #20
 	.cfi_remember_state
-	.cfi_def_cfa_offset 24
+	.cfi_def_cfa_offset 28
 	@ sp needed
-	pop	{r4, r5, r6, r7, r8, pc}
+	pop	{r4, r5, r6, r7, r8, r9, pc}
 .L68:
 	.cfi_restore_state
 .LBB4176:
@@ -11672,7 +11698,7 @@
 	addlt	r3, r3, #3
 .LBE4176:
 	.loc 3 272 14
-	ldr	r2, .L82
+	ldr	r1, .L85
 .LBB4177:
 	.loc 3 275 29
 	asrs	r3, r3, #2
@@ -11681,11 +11707,11 @@
 	cmp	r3, r0
 	ble	.L70
 	.loc 3 276 14 discriminator 2
-	ldr	r1, [sp, r0, lsl #2]
+	ldr	r2, [sp, r0, lsl #2]
 	.loc 3 275 5 discriminator 2
 	adds	r0, r0, #1
 	.loc 3 276 14 discriminator 2
-	add	r2, r2, r1
+	add	r1, r1, r2
 	.loc 3 275 5 discriminator 2
 	b	.L71
 .L70:
@@ -11693,19 +11719,23 @@
 	.loc 3 278 13
 	ldr	r3, [r4, #8]
 	.loc 3 279 5
-	ldr	r1, [r4, #196]
+	ldr	r2, [r4, #196]
 	.loc 3 278 10
-	add	r2, r2, r3
+	add	r1, r1, r3
 	.loc 3 279 5
-	cmp	r1, r2
+	cmp	r2, r1
+	bne	.L73
 	.loc 3 280 19
+	cmp	r7, #0
 	it	eq
-	streq	r3, [r4, #4]
-	.loc 3 282 9
+	moveq	r7, r3
+	str	r7, [r4, #4]
+.L73:
+	.loc 3 288 9
 	ldr	r3, [r4, #188]
-	.loc 3 282 5
+	.loc 3 288 5
 	cmp	r3, #0
-	beq	.L81
+	beq	.L84
 	subs	r6, r6, #1
 	uxtb	r6, r6
 .LBB4178:
@@ -11715,35 +11745,35 @@
 	str	r2, [r3, #12]
 	cmp	r6, #4
 	it	ls
-	ldrls	r3, .L82+4
+	ldrls	r3, .L85+4
 .LBE4179:
 .LBE4178:
-	.loc 3 284 9
+	.loc 3 290 9
 	ldr	r2, [r4, #188]
 	ite	ls
 	ldrls	r3, [r3, r6, lsl #2]
-	ldrhi	r3, .L82+8
+	ldrhi	r3, .L85+8
 .LBB4180:
 .LBB4181:
 	.loc 10 37 59
 	str	r3, [r2, #16]
-	b	.L81
-.L75:
+	b	.L84
+.L78:
 .LBE4181:
 .LBE4180:
 	.loc 3 255 16
 	movs	r0, #8
 	b	.L65
-.L83:
-	.align	2
-.L82:
+.L86:
+	.align	2
+.L85:
 	.word	-2091612265
 	.word	.LANCHOR2
 	.word	.LC4
 	.word	.LC5
 	.cfi_endproc
 .LFE2582:
-	.size	_ZN12RadioShuttle7StartupENS_9RadioTypeE, .-_ZN12RadioShuttle7StartupENS_9RadioTypeE
+	.size	_ZN12RadioShuttle7StartupENS_9RadioTypeEm, .-_ZN12RadioShuttle7StartupENS_9RadioTypeEm
 	.section	.text._ZN12RadioShuttle12GetRadioTypeEv,"ax",%progbits
 	.align	1
 	.global	_ZN12RadioShuttle12GetRadioTypeEv
@@ -11754,12 +11784,12 @@
 	.type	_ZN12RadioShuttle12GetRadioTypeEv, %function
 _ZN12RadioShuttle12GetRadioTypeEv:
 .LFB2585:
-	.loc 3 384 1
+	.loc 3 390 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
 	@ link register save eliminated.
-	.loc 3 386 1
+	.loc 3 392 1
 	ldrb	r0, [r0, #28]	@ zero_extendqisi2
 	bx	lr
 	.cfi_endproc
@@ -11775,7 +11805,7 @@
 	.type	_ZN12RadioShuttle14MaxMessageSizeEPii, %function
 _ZN12RadioShuttle14MaxMessageSizeEPii:
 .LFB2593:
-	.loc 3 610 1
+	.loc 3 616 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -11785,52 +11815,52 @@
 	.cfi_offset 4, -12
 	.cfi_offset 5, -8
 	.cfi_offset 14, -4
-	.loc 3 611 5
+	.loc 3 617 5
 	ldr	r3, [r0, #44]
-	.loc 3 610 1
+	.loc 3 616 1
 	mov	r5, r0
 	mov	r4, r1
-	.loc 3 611 5
-	cbz	r3, .L88
-	.loc 3 616 5
+	.loc 3 617 5
+	cbz	r3, .L91
+	.loc 3 622 5
 	lsls	r3, r2, #25
-	bpl	.L90
-	.loc 3 617 13
+	bpl	.L93
+	.loc 3 623 13
 	ldr	r0, [r0, #192]
-	.loc 3 617 9
-	cbz	r0, .L90
-	.loc 3 618 60
-	ldr	r3, [r0]
-	.loc 3 618 59
+	.loc 3 623 9
+	cbz	r0, .L93
+	.loc 3 624 60
+	ldr	r3, [r0]
+	.loc 3 624 59
 	ldr	r3, [r3, #20]
 	blx	r3
-	.loc 3 618 19
+	.loc 3 624 19
 	adds	r0, r0, #16
-.L87:
-	.loc 3 620 2
-	cbz	r4, .L91
-	.loc 3 621 29
+.L90:
+	.loc 3 626 2
+	cbz	r4, .L94
+	.loc 3 627 29
 	ldr	r3, [r5, #32]
 	subs	r3, r3, r0
-	.loc 3 621 15
+	.loc 3 627 15
 	str	r3, [r4]
-	.loc 3 623 9
+	.loc 3 629 9
 	movs	r0, #0
-.L86:
-	.loc 3 624 1
+.L89:
+	.loc 3 630 1
 	pop	{r3, r4, r5, pc}
-.L90:
-	.loc 3 615 9
+.L93:
+	.loc 3 621 9
 	movs	r0, #16
-	b	.L87
-.L88:
-	.loc 3 612 16
+	b	.L90
+.L91:
+	.loc 3 618 16
 	movs	r0, #8
-	b	.L86
-.L91:
-	.loc 3 623 9
-	mov	r0, r4
-	b	.L86
+	b	.L89
+.L94:
+	.loc 3 629 9
+	mov	r0, r4
+	b	.L89
 	.cfi_endproc
 .LFE2593:
 	.size	_ZN12RadioShuttle14MaxMessageSizeEPii, .-_ZN12RadioShuttle14MaxMessageSizeEPii
@@ -11844,56 +11874,56 @@
 	.type	_ZN12RadioShuttle13GetStatisticsEPPNS_10RadioStatsEP5Radio, %function
 _ZN12RadioShuttle13GetStatisticsEPPNS_10RadioStatsEP5Radio:
 .LFB2594:
-	.loc 3 629 1
-	.cfi_startproc
-	@ args = 0, pretend = 0, frame = 0
-	@ frame_needed = 0, uses_anonymous_args = 0
-	.loc 3 630 5
+	.loc 3 635 1
+	.cfi_startproc
+	@ args = 0, pretend = 0, frame = 0
+	@ frame_needed = 0, uses_anonymous_args = 0
+	.loc 3 636 5
 	ldr	r3, [r0, #44]
-	.loc 3 629 1
+	.loc 3 635 1
 	push	{r4, lr}
 	.cfi_def_cfa_offset 8
 	.cfi_offset 4, -8
 	.cfi_offset 14, -4
-	.loc 3 630 5
-	cbz	r3, .L96
-	.loc 3 635 28
+	.loc 3 636 5
+	cbz	r3, .L99
+	.loc 3 641 28
 	ldr	r3, [r0, #36]!
-.L95:
-	.loc 3 635 34 discriminator 1
+.L98:
+	.loc 3 641 34 discriminator 1
 	cmp	r3, r0
-	beq	.L97
-	.loc 3 636 32
+	beq	.L100
+	.loc 3 642 32
 	ldr	r4, [r3, #8]
 	cmp	r4, r2
-	beq	.L94
-	.loc 3 636 32 is_stmt 0 discriminator 2
-	cbz	r2, .L94
+	beq	.L97
+	.loc 3 642 32 is_stmt 0 discriminator 2
+	cbz	r2, .L97
 .LBB4182:
 .LBB4183:
 	.loc 4 227 21 is_stmt 1
 	ldr	r3, [r3]
-	b	.L95
-.L94:
+	b	.L98
+.L97:
 .LBE4183:
 .LBE4182:
-	.loc 3 637 22
+	.loc 3 643 22
 	adds	r3, r3, #88
-	.loc 3 637 20
+	.loc 3 643 20
 	str	r3, [r1]
-	.loc 3 638 20
+	.loc 3 644 20
 	movs	r0, #0
-.L93:
-	.loc 3 643 1
+.L96:
+	.loc 3 649 1
 	pop	{r4, pc}
-.L96:
-	.loc 3 631 16
+.L99:
+	.loc 3 637 16
 	movs	r0, #8
-	b	.L93
-.L97:
-	.loc 3 642 12
+	b	.L96
+.L100:
+	.loc 3 648 12
 	movs	r0, #10
-	b	.L93
+	b	.L96
 	.cfi_endproc
 .LFE2594:
 	.size	_ZN12RadioShuttle13GetStatisticsEPPNS_10RadioStatsEP5Radio, .-_ZN12RadioShuttle13GetStatisticsEPPNS_10RadioStatsEP5Radio
@@ -11907,23 +11937,23 @@
 	.type	_ZN12RadioShuttle4IdleEv, %function
 _ZN12RadioShuttle4IdleEv:
 .LFB2595:
-	.loc 3 648 1
+	.loc 3 654 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
 	@ link register save eliminated.
-	.loc 3 649 28
+	.loc 3 655 28
 	ldr	r3, [r0, #116]
-	cbnz	r3, .L103
-	.loc 3 649 28 is_stmt 0 discriminator 1
+	cbnz	r3, .L106
+	.loc 3 655 28 is_stmt 0 discriminator 1
 	ldr	r0, [r0, #104]
 	clz	r0, r0
 	lsrs	r0, r0, #5
 	bx	lr
-.L103:
-	.loc 3 651 12 is_stmt 1
+.L106:
+	.loc 3 657 12 is_stmt 1
 	movs	r0, #0
-	.loc 3 652 1
+	.loc 3 658 1
 	bx	lr
 	.cfi_endproc
 .LFE2595:
@@ -11938,7 +11968,7 @@
 	.type	_ZN12RadioShuttle17UpdateNodeStartupENS_9RadioTypeE, %function
 _ZN12RadioShuttle17UpdateNodeStartupENS_9RadioTypeE:
 .LFB2583:
-	.loc 3 292 1
+	.loc 3 298 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -11950,57 +11980,57 @@
 	.cfi_offset 6, -12
 	.cfi_offset 7, -8
 	.cfi_offset 14, -4
-	.loc 3 293 5
+	.loc 3 299 5
 	ldrb	r3, [r0, #28]	@ zero_extendqisi2
 	and	r3, r3, #253
 	cmp	r3, #1
-	.loc 3 292 1
+	.loc 3 298 1
 	mov	r4, r0
 	mov	r7, r1
-	.loc 3 293 5
-	bne	.L109
-	.loc 3 297 28
+	.loc 3 299 5
+	bne	.L112
+	.loc 3 303 28
 	mov	r6, r0
 	ldr	r5, [r6, #36]!
-.L108:
-	.loc 3 297 34 discriminator 1
+.L111:
+	.loc 3 303 34 discriminator 1
 	cmp	r5, r6
-	beq	.L106
-	.loc 3 298 23
+	beq	.L109
+	.loc 3 304 23
 	mov	r0, r4
 	bl	_ZN12RadioShuttle4IdleEv
-	.loc 3 298 26
-	cbz	r0, .L107
-	.loc 3 298 26 is_stmt 0 discriminator 1
+	.loc 3 304 26
+	cbz	r0, .L110
+	.loc 3 304 26 is_stmt 0 discriminator 1
 	cmp	r7, #1
-	bne	.L107
-	.loc 3 299 17 is_stmt 1
+	bne	.L110
+	.loc 3 305 17 is_stmt 1
 	ldr	r0, [r5, #8]
-	.loc 3 299 30
-	ldr	r3, [r0]
-	.loc 3 299 29
+	.loc 3 305 30
+	ldr	r3, [r0]
+	.loc 3 305 29
 	ldr	r3, [r3, #52]
 	blx	r3
-.L107:
+.L110:
 .LBB4184:
 .LBB4185:
 	.loc 4 227 21 discriminator 2
 	ldr	r5, [r5]
-	b	.L108
-.L106:
+	b	.L111
+.L109:
 .LBE4185:
 .LBE4184:
-	.loc 3 304 16
+	.loc 3 310 16
 	strb	r7, [r4, #28]
-	.loc 3 306 12
+	.loc 3 312 12
 	movs	r0, #0
-.L105:
-	.loc 3 307 1
+.L108:
+	.loc 3 313 1
 	pop	{r3, r4, r5, r6, r7, pc}
-.L109:
-	.loc 3 294 16
+.L112:
+	.loc 3 300 16
 	movs	r0, #14
-	b	.L105
+	b	.L108
 	.cfi_endproc
 .LFE2583:
 	.size	_ZN12RadioShuttle17UpdateNodeStartupENS_9RadioTypeE, .-_ZN12RadioShuttle17UpdateNodeStartupENS_9RadioTypeE
@@ -12014,22 +12044,22 @@
 	.type	_ZN12RadioShuttle8StrErrorE11RSErrorCode, %function
 _ZN12RadioShuttle8StrErrorE11RSErrorCode:
 .LFB2596:
-	.loc 3 657 1
+	.loc 3 663 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
 	@ link register save eliminated.
 	cmp	r1, #15
 	itte	ls
-	ldrls	r3, .L116
+	ldrls	r3, .L119
 	ldrls	r0, [r3, r1, lsl #2]
-	.loc 3 657 1
-	ldrhi	r0, .L116+4
-	.loc 3 693 1
+	.loc 3 663 1
+	ldrhi	r0, .L119+4
+	.loc 3 699 1
 	bx	lr
-.L117:
-	.align	2
-.L116:
+.L120:
+	.align	2
+.L119:
 	.word	.LANCHOR3
 	.word	.LC6
 	.cfi_endproc
@@ -12045,7 +12075,7 @@
 	.type	_ZN12RadioShuttle12GetRadioNameENS_9RadioTypeE, %function
 _ZN12RadioShuttle12GetRadioNameENS_9RadioTypeE:
 .LFB2597:
-	.loc 3 697 1
+	.loc 3 703 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -12054,15 +12084,15 @@
 	uxtb	r1, r1
 	cmp	r1, #4
 	itte	ls
-	ldrls	r3, .L121
+	ldrls	r3, .L124
 	ldrls	r0, [r3, r1, lsl #2]
-	.loc 3 697 1
-	ldrhi	r0, .L121+4
-	.loc 3 712 1
+	.loc 3 703 1
+	ldrhi	r0, .L124+4
+	.loc 3 718 1
 	bx	lr
-.L122:
-	.align	2
-.L121:
+.L125:
+	.align	2
+.L124:
 	.word	.LANCHOR2
 	.word	.LC4
 	.cfi_endproc
@@ -12078,22 +12108,22 @@
 	.type	_ZN12RadioShuttle17SaveTimeOnAirSlotEmiiihhi, %function
 _ZN12RadioShuttle17SaveTimeOnAirSlotEmiiihhi:
 .LFB2603:
-	.loc 3 1321 1
+	.loc 3 1329 1
 	.cfi_startproc
 	@ args = 16, pretend = 0, frame = 24
 	@ frame_needed = 0, uses_anonymous_args = 0
 	push	{r0, r1, r2, r3, r4, r5, r6, lr}
 	.cfi_def_cfa_offset 32
 	.cfi_offset 14, -4
-	.loc 3 1323 38
+	.loc 3 1331 38
 	ldr	r0, [r0, #160]
 	bl	_ZN4mbed5Timer7read_msEv
-	.loc 3 1326 11
+	.loc 3 1334 11
 	movs	r2, #20
 	movs	r1, #0
 	add	r0, sp, #4
 	bl	memset
-	.loc 3 1336 1
+	.loc 3 1344 1
 	add	sp, sp, #28
 	.cfi_def_cfa_offset 4
 	@ sp needed
@@ -12111,22 +12141,22 @@
 	.type	_ZN12RadioShuttle17EnablePacketTraceEmbbP5Radio, %function
 _ZN12RadioShuttle17EnablePacketTraceEmbbP5Radio:
 .LFB2609:
-	.loc 3 1713 1
+	.loc 3 1724 1
 	.cfi_startproc
 	@ args = 4, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
 	@ link register save eliminated.
-	.loc 3 1716 29
+	.loc 3 1727 29
 	strb	r3, [r0, #181]
-	.loc 3 1717 29
+	.loc 3 1728 29
 	ldr	r3, [sp]
-	.loc 3 1714 33
+	.loc 3 1725 33
 	str	r1, [r0, #176]
-	.loc 3 1715 29
+	.loc 3 1726 29
 	strb	r2, [r0, #180]
-	.loc 3 1717 29
+	.loc 3 1728 29
 	str	r3, [r0, #184]
-	.loc 3 1718 1
+	.loc 3 1729 1
 	bx	lr
 	.cfi_endproc
 .LFE2609:
@@ -12141,7 +12171,7 @@
 	.type	_ZN12RadioShuttle11PacketTraceEPNS_10RadioEntryEPKcPNS_11RadioHeaderEPvibPNS_16ReceivedMsgEntryE, %function
 _ZN12RadioShuttle11PacketTraceEPNS_10RadioEntryEPKcPNS_11RadioHeaderEPvibPNS_16ReceivedMsgEntryE:
 .LFB2610:
-	.loc 3 1723 1
+	.loc 3 1734 1
 	.cfi_startproc
 	@ args = 16, pretend = 0, frame = 56
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -12159,332 +12189,333 @@
 	mov	r4, r3
 	sub	sp, sp, #100
 	.cfi_def_cfa_offset 136
-	.loc 3 1727 27
+	.loc 3 1738 27
 	ldr	r3, [r0, #184]
-	.loc 3 1723 1
-	ldr	r5, [sp, #140]
-	ldrb	r8, [sp, #144]	@ zero_extendqisi2
-	ldr	r9, [sp, #148]
+	.loc 3 1734 1
+	ldr	r6, [sp, #140]
+	ldrb	r9, [sp, #144]	@ zero_extendqisi2
+	ldr	r5, [sp, #148]
 	mov	r10, r1
-	mov	r6, r2
-	.loc 3 1727 5
-	cbz	r3, .L126
-	.loc 3 1727 33 discriminator 1
+	mov	r7, r2
+	.loc 3 1738 5
+	cbz	r3, .L129
+	.loc 3 1738 33 discriminator 1
 	ldr	r2, [r1]
 	cmp	r3, r2
-	bne	.L125
-.L126:
-	.loc 3 1729 5
-	cmp	r8, #0
-	beq	.L128
-	.loc 3 1729 14 discriminator 1
+	bne	.L128
+.L129:
+	.loc 3 1740 5
+	cmp	r9, #0
+	beq	.L131
+	.loc 3 1740 14 discriminator 1
 	ldrb	r3, [r0, #180]	@ zero_extendqisi2
-.L205:
-	.loc 3 1731 15 discriminator 1
-	cbz	r3, .L125
-	.loc 3 1734 23
+.L208:
+	.loc 3 1742 15 discriminator 1
+	cbz	r3, .L128
+	.loc 3 1745 23
 	ldrb	r3, [r4]	@ zero_extendqisi2
 	and	r3, r3, #112
-	.loc 3 1734 5
+	.loc 3 1745 5
 	cmp	r3, #16
-	beq	.L130
-	.loc 3 1734 9 discriminator 1
+	beq	.L133
+	.loc 3 1745 9 discriminator 1
 	cmp	r3, #32
-	beq	.L130
-	.loc 3 1735 16
-	mov	r1, r6
-	ldr	r0, .L209
+	beq	.L133
+	.loc 3 1746 16
+	ldrd	r2, r3, [r5, #8]
+	mov	r1, r7
+	ldr	r0, .L212
 	bl	_Z7dprintfPKcz
-	.loc 3 1736 9
-	cmp	r8, #0
-	beq	.L131
-.L206:
-	.loc 3 1737 10
-	cmp	r5, #0
-	ble	.L125
-	.loc 3 1738 18
+	.loc 3 1747 9
+	cmp	r9, #0
+	beq	.L134
+.L209:
+	.loc 3 1748 10
+	cmp	r6, #0
+	ble	.L128
+	.loc 3 1749 18
 	ldr	r1, [sp, #136]
 	movs	r3, #0
-	mov	r2, r5
-.L207:
-	.loc 3 1741 14
-	mov	r0, r6
+	mov	r2, r6
+.L210:
+	.loc 3 1752 14
+	mov	r0, r7
 	bl	_Z4dumpPKcPKvib
-.L125:
-	.loc 3 1815 1
+.L128:
+	.loc 3 1826 1
 	add	sp, sp, #100
 	.cfi_remember_state
 	.cfi_def_cfa_offset 36
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, r10, fp, pc}
-.L128:
+.L131:
 	.cfi_restore_state
-	.loc 3 1731 15 discriminator 1
+	.loc 3 1742 15 discriminator 1
 	ldrb	r3, [r0, #181]	@ zero_extendqisi2
-	b	.L205
-.L131:
-	.loc 3 1741 14
-	mov	r3, r8
-	ldrd	r1, r2, [r9]
-	b	.L207
-.L130:
+	b	.L208
+.L134:
+	.loc 3 1752 14
+	mov	r3, r9
+	ldrd	r1, r2, [r5]
+	b	.L210
+.L133:
 .LBB4186:
-	.loc 3 1746 27
+	.loc 3 1757 27
 	ldr	r1, [r0, #176]
-	.loc 3 1746 5
-	cbz	r1, .L133
+	.loc 3 1757 5
+	cbz	r1, .L136
 .LBB4187:
-	.loc 3 1747 55
+	.loc 3 1758 55
 	cmp	r3, #16
-	.loc 3 1748 110
+	.loc 3 1759 110
 	ittet	ne
 	ldrne	r2, [r4, #4]
-	.loc 3 1747 105
+	.loc 3 1758 105
 	ldrne	r3, [r4, #8]
-	.loc 3 1748 55
+	.loc 3 1759 55
 	ldrdeq	r2, r3, [r4, #8]
-	.loc 3 1748 110
+	.loc 3 1759 110
 	ubfxne	r2, r2, #11, #21
-	.loc 3 1747 105
+	.loc 3 1758 105
 	it	ne
 	ubfxne	r3, r3, #11, #21
-	.loc 3 1749 9
+	.loc 3 1760 9
 	cmp	r1, r2
-	bne	.L125
-	.loc 3 1749 48 discriminator 1
+	bne	.L128
+	.loc 3 1760 48 discriminator 1
 	cmp	r1, r3
-	bne	.L125
-.L133:
+	bne	.L128
+.L136:
 .LBE4187:
 .LBE4186:
-	.loc 3 1754 15
+	.loc 3 1765 15
 	ldrh	r3, [r4]
-	.loc 3 1754 5
+	.loc 3 1765 5
 	tst	r3, #128
-	add	r7, sp, #44
-	bne	.L155
-	.loc 3 1755 9
+	add	r8, sp, #44
+	bne	.L158
+	.loc 3 1766 9
 	movs	r2, #4
-	ldr	r1, .L209+4
-	mov	r0, r7
+	ldr	r1, .L212+4
+	mov	r0, r8
 	bl	memcpy
-	.loc 3 1756 13
+	.loc 3 1767 13
 	ldrh	r3, [r4]
-	.loc 3 1756 5
+	.loc 3 1767 5
 	lsls	r0, r3, #24
-	.loc 3 1755 9
+	.loc 3 1766 9
 	add	fp, sp, #48
-	.loc 3 1756 5
-	bpl	.L137
-.L136:
-	.loc 3 1757 9
+	.loc 3 1767 5
+	bpl	.L140
+.L139:
+	.loc 3 1768 9
 	mov	r0, fp
 	movs	r2, #4
-	ldr	r1, .L209+8
+	ldr	r1, .L212+8
 	bl	memcpy
 	add	fp, fp, #4
-.L137:
-	.loc 3 1758 13
+.L140:
+	.loc 3 1769 13
 	ldrh	r3, [r4]
-	.loc 3 1758 5
+	.loc 3 1769 5
 	lsls	r1, r3, #23
-	bpl	.L138
-	.loc 3 1759 9
+	bpl	.L141
+	.loc 3 1770 9
 	mov	r0, fp
 	movs	r2, #5
-	ldr	r1, .L209+12
-	bl	memcpy
-	add	fp, fp, #5
-.L138:
-	.loc 3 1760 13
-	ldrh	r3, [r4]
-	.loc 3 1760 5
-	lsls	r2, r3, #22
-	bpl	.L139
-	.loc 3 1761 9
-	mov	r0, fp
-	movs	r2, #5
-	ldr	r1, .L209+16
-	bl	memcpy
-	add	fp, fp, #5
-.L139:
-	.loc 3 1762 13
-	ldrh	r3, [r4]
-	.loc 3 1762 5
-	lsls	r3, r3, #21
-	bpl	.L140
-	.loc 3 1763 9
-	mov	r0, fp
-	movs	r2, #6
-	ldr	r1, .L209+20
-	bl	memcpy
-	add	fp, fp, #6
-.L140:
-	.loc 3 1764 13
-	ldrh	r3, [r4]
-	.loc 3 1764 5
-	lsls	r0, r3, #20
-	bpl	.L141
-	.loc 3 1765 9
-	mov	r0, fp
-	movs	r2, #5
-	ldr	r1, .L209+24
+	ldr	r1, .L212+12
 	bl	memcpy
 	add	fp, fp, #5
 .L141:
-	.loc 3 1766 13
+	.loc 3 1771 13
 	ldrh	r3, [r4]
-	.loc 3 1766 5
-	lsls	r1, r3, #19
+	.loc 3 1771 5
+	lsls	r2, r3, #22
 	bpl	.L142
-	.loc 3 1767 9
-	mov	r0, fp
-	movs	r2, #4
-	ldr	r1, .L209+28
-	bl	memcpy
-	add	fp, fp, #4
-.L142:
-	.loc 3 1768 13
-	ldrh	r3, [r4]
-	.loc 3 1768 5
-	lsls	r2, r3, #18
-	bpl	.L143
-	.loc 3 1769 9
+	.loc 3 1772 9
 	mov	r0, fp
 	movs	r2, #5
-	ldr	r1, .L209+32
+	ldr	r1, .L212+16
 	bl	memcpy
 	add	fp, fp, #5
-.L143:
-	.loc 3 1770 13
+.L142:
+	.loc 3 1773 13
 	ldrh	r3, [r4]
-	.loc 3 1770 5
-	lsls	r3, r3, #17
+	.loc 3 1773 5
+	lsls	r3, r3, #21
+	bpl	.L143
+	.loc 3 1774 9
+	mov	r0, fp
+	movs	r2, #6
+	ldr	r1, .L212+20
+	bl	memcpy
+	add	fp, fp, #6
+.L143:
+	.loc 3 1775 13
+	ldrh	r3, [r4]
+	.loc 3 1775 5
+	lsls	r0, r3, #20
 	bpl	.L144
-	.loc 3 1771 9
+	.loc 3 1776 9
 	mov	r0, fp
 	movs	r2, #5
-	ldr	r1, .L209+36
+	ldr	r1, .L212+24
 	bl	memcpy
 	add	fp, fp, #5
 .L144:
-	.loc 3 1772 13
+	.loc 3 1777 13
 	ldrh	r3, [r4]
-	.loc 3 1772 5
-	lsrs	r3, r3, #15
-	beq	.L145
-	.loc 3 1773 9
+	.loc 3 1777 5
+	lsls	r1, r3, #19
+	bpl	.L145
+	.loc 3 1778 9
+	mov	r0, fp
+	movs	r2, #4
+	ldr	r1, .L212+28
+	bl	memcpy
+	add	fp, fp, #4
+.L145:
+	.loc 3 1779 13
+	ldrh	r3, [r4]
+	.loc 3 1779 5
+	lsls	r2, r3, #18
+	bpl	.L146
+	.loc 3 1780 9
 	mov	r0, fp
 	movs	r2, #5
-	ldr	r1, .L209+40
+	ldr	r1, .L212+32
+	bl	memcpy
+	add	fp, fp, #5
+.L146:
+	.loc 3 1781 13
+	ldrh	r3, [r4]
+	.loc 3 1781 5
+	lsls	r3, r3, #17
+	bpl	.L147
+	.loc 3 1782 9
+	mov	r0, fp
+	movs	r2, #5
+	ldr	r1, .L212+36
 	bl	memcpy
 	add	fp, fp, #5
-.L145:
-	.loc 3 1774 5
-	cmp	fp, r7
-	.loc 3 1775 11
+.L147:
+	.loc 3 1783 13
+	ldrh	r3, [r4]
+	.loc 3 1783 5
+	lsrs	r3, r3, #15
+	beq	.L148
+	.loc 3 1784 9
+	mov	r0, fp
+	movs	r2, #5
+	ldr	r1, .L212+40
+	bl	memcpy
+	add	fp, fp, #5
+.L148:
+	.loc 3 1785 5
+	cmp	fp, r8
+	.loc 3 1786 11
 	itt	hi
 	movhi	r3, #0
 	strbhi	r3, [fp, #-1]
-	.loc 3 1779 29
+	.loc 3 1790 29
 	ldrb	r3, [r4]	@ zero_extendqisi2
 	ldrh	r1, [r4]
 	ldrb	ip, [r4, #3]	@ zero_extendqisi2
-	.loc 3 1779 49
+	.loc 3 1790 49
 	ldrh	lr, [r4, #4]
 	and	r3, r3, #112
 	cmp	r3, #16
-	bne	.L147
-	.loc 3 1782 55 discriminator 1
+	bne	.L150
+	.loc 3 1793 55 discriminator 1
 	ldrd	r0, fp, [r4, #8]
-	.loc 3 1780 54 discriminator 1
+	.loc 3 1791 54 discriminator 1
 	ldrh	r3, [r4, #6]
-	.loc 3 1785 16 discriminator 1
-	ldr	r2, .L209+44
-.L208:
-	.loc 3 1784 5 discriminator 2
-	cmp	r8, #0
-	beq	.L149
-	.loc 3 1789 28 discriminator 4
+	.loc 3 1796 16 discriminator 1
+	ldr	r2, .L212+44
+.L211:
+	.loc 3 1795 5 discriminator 2
+	cmp	r9, #0
+	beq	.L152
+	.loc 3 1800 28 discriminator 4
 	ldrh	r4, [r4, #2]
-	.loc 3 1785 16 discriminator 4
-	str	r5, [sp, #28]
+	.loc 3 1796 16 discriminator 4
+	str	r6, [sp, #28]
 	lsrs	r1, r1, #15
-	ubfx	r8, r4, #0, #11
+	ubfx	r5, r4, #0, #11
 	ldr	r1, [r10, #48]
-	str	r8, [sp]
-	.loc 3 1792 78 discriminator 4
+	str	r5, [sp]
+	.loc 3 1803 78 discriminator 4
 	itt	ne
 	ubfxne	r4, r4, #7, #4
-	.loc 3 1785 16 discriminator 4
+	.loc 3 1796 16 discriminator 4
 	lslne	r3, r3, r4
 	lsr	ip, ip, #3
 	strd	r0, r1, [sp, #20]
 	strd	r3, fp, [sp, #12]
 	strd	ip, lr, [sp, #4]
-	mov	r3, r7
-	mov	r1, r6
-	ldr	r0, .L209+48
+	mov	r3, r8
+	mov	r1, r7
+	ldr	r0, .L212+48
 	bl	_Z7dprintfPKcz
-	b	.L206
-.L155:
-	.loc 3 1725 11
-	mov	fp, r7
-	b	.L136
-.L147:
-	.loc 3 1781 100 discriminator 2
+	b	.L209
+.L158:
+	.loc 3 1736 11
+	mov	fp, r8
+	b	.L139
+.L150:
+	.loc 3 1792 100 discriminator 2
 	ldr	r2, [r4, #8]
-	.loc 3 1780 108 discriminator 2
+	.loc 3 1791 108 discriminator 2
 	ldrh	r3, [r4, #8]
-	.loc 3 1782 110 discriminator 2
+	.loc 3 1793 110 discriminator 2
 	ldr	r0, [r4, #4]
-	.loc 3 1781 100 discriminator 2
+	.loc 3 1792 100 discriminator 2
 	ubfx	fp, r2, #11, #21
-	.loc 3 1779 49 discriminator 2
+	.loc 3 1790 49 discriminator 2
 	ubfx	lr, lr, #0, #11
-	.loc 3 1780 54 discriminator 2
+	.loc 3 1791 54 discriminator 2
 	ubfx	r3, r3, #0, #11
-	.loc 3 1782 110 discriminator 2
+	.loc 3 1793 110 discriminator 2
 	ubfx	r0, r0, #11, #21
-	.loc 3 1785 16 discriminator 2
-	ldr	r2, .L209+52
-	b	.L208
-.L149:
-	.loc 3 1802 21 discriminator 4
+	.loc 3 1796 16 discriminator 2
+	ldr	r2, .L212+52
+	b	.L211
+.L152:
+	.loc 3 1813 21 discriminator 4
 	ubfx	r1, r1, #7, #9
-	.loc 3 1798 16 discriminator 4
+	.loc 3 1809 16 discriminator 4
 	ands	r1, r1, #256
-	.loc 3 1802 66 discriminator 4
+	.loc 3 1813 66 discriminator 4
 	itet	eq
-	ldrheq	r8, [r4, #2]
-	.loc 3 1798 16 discriminator 4
-	movne	r8, #0
-	ubfxeq	r8, r8, #0, #11
+	ldrheq	r9, [r4, #2]
+	.loc 3 1809 16 discriminator 4
+	movne	r9, #0
+	ubfxeq	r9, r9, #0, #11
 	lsr	ip, ip, #3
-	cbz	r1, .L153
-	.loc 3 1805 78 discriminator 9
+	cbz	r1, .L156
+	.loc 3 1816 78 discriminator 9
 	ldrh	r1, [r4, #2]
 	ubfx	r1, r1, #7, #4
-	.loc 3 1798 16 discriminator 9
+	.loc 3 1809 16 discriminator 9
 	lsls	r3, r3, r1
-.L153:
-	.loc 3 1798 16 is_stmt 0 discriminator 12
-	str	r5, [sp, #32]
-	ldr	r1, [r9, #12]
+.L156:
+	.loc 3 1809 16 is_stmt 0 discriminator 12
+	str	r6, [sp, #32]
+	ldr	r1, [r5, #12]
 	str	r1, [sp, #28]
-	ldr	r1, [r9, #8]
-	str	r8, [sp]
+	ldr	r1, [r5, #8]
+	str	r9, [sp]
 	strd	r0, r1, [sp, #20]
 	strd	r3, fp, [sp, #12]
 	strd	ip, lr, [sp, #4]
-	mov	r3, r7
-	mov	r1, r6
-	ldr	r0, .L209+56
+	mov	r3, r8
+	mov	r1, r7
+	ldr	r0, .L212+56
 	bl	_Z7dprintfPKcz
-	b	.L206
-.L210:
-	.align	2
-.L209:
+	b	.L209
+.L213:
+	.align	2
+.L212:
 	.word	.LC9
 	.word	.LC10
 	.word	.LC11
@@ -12513,7 +12544,7 @@
 	.type	_ZN12RadioShuttle12CadDetectionEPNS_10RadioEntryE, %function
 _ZN12RadioShuttle12CadDetectionEPNS_10RadioEntryE:
 .LFB2611:
-	.loc 3 1821 1 is_stmt 1
+	.loc 3 1832 1 is_stmt 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 32
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -12522,58 +12553,58 @@
 	.cfi_offset 4, -12
 	.cfi_offset 5, -8
 	.cfi_offset 14, -4
-	.loc 3 1822 22
+	.loc 3 1833 22
 	movs	r3, #255
-	.loc 3 1821 1
+	.loc 3 1832 1
 	sub	sp, sp, #36
 	.cfi_def_cfa_offset 48
-	.loc 3 1821 1
+	.loc 3 1832 1
 	mov	r4, r1
-	.loc 3 1822 22
+	.loc 3 1833 22
 	strb	r3, [r1, #45]
-	.loc 3 1821 1
+	.loc 3 1832 1
 	mov	r5, r0
-	.loc 3 1824 11
+	.loc 3 1835 11
 	mov	r0, sp
 	bl	_ZN4mbed5TimerC1Ev
-	.loc 3 1825 12
+	.loc 3 1836 12
 	mov	r0, sp
 	bl	_ZN4mbed5Timer5startEv
-	.loc 3 1827 9
+	.loc 3 1838 9
 	ldr	r0, [r4]
-	.loc 3 1827 25
-	ldr	r3, [r0]
-	.loc 3 1827 24
+	.loc 3 1838 25
+	ldr	r3, [r0]
+	.loc 3 1838 24
 	ldr	r3, [r3, #60]
 	blx	r3
-	.loc 3 1828 5
+	.loc 3 1839 5
 	ldrb	r3, [r5, #181]	@ zero_extendqisi2
-	cbz	r3, .L214
-	.loc 3 1829 16
-	ldr	r0, .L220
+	cbz	r3, .L217
+	.loc 3 1840 16
+	ldr	r0, .L223
 	bl	_Z7dprintfPKcz
-.L214:
-	.loc 3 1831 20
+.L217:
+	.loc 3 1842 20
 	mov	r0, sp
 	bl	_ZN4mbed5Timer7read_msEv
-	.loc 3 1831 23
+	.loc 3 1842 23
 	cmp	r0, #49
-	bgt	.L213
-	.loc 3 1833 17
+	bgt	.L216
+	.loc 3 1844 17
 	ldrb	r3, [r4, #45]	@ zero_extendqisi2
-	.loc 3 1833 9
+	.loc 3 1844 9
 	cmp	r3, #255
-	beq	.L214
-.L213:
-	.loc 3 1837 13
+	beq	.L217
+.L216:
+	.loc 3 1848 13
 	ldrb	r4, [r4, #45]	@ zero_extendqisi2
-	.loc 3 1824 11
+	.loc 3 1835 11
 	mov	r0, sp
-	.loc 3 1837 13
+	.loc 3 1848 13
 	sxtb	r4, r4
-	.loc 3 1824 11
+	.loc 3 1835 11
 	bl	_ZN4mbed5TimerD1Ev
-	.loc 3 1841 1
+	.loc 3 1852 1
 	subs	r3, r4, #1
 	rsbs	r0, r3, #0
 	adcs	r0, r0, r3
@@ -12581,9 +12612,9 @@
 	.cfi_def_cfa_offset 12
 	@ sp needed
 	pop	{r4, r5, pc}
-.L221:
-	.align	2
-.L220:
+.L224:
+	.align	2
+.L223:
 	.word	.LC22
 	.cfi_endproc
 .LFE2611:
@@ -12598,7 +12629,7 @@
 	.type	_ZN12RadioShuttle9RS_TxDoneEP5RadioPv, %function
 _ZN12RadioShuttle9RS_TxDoneEP5RadioPv:
 .LFB2612:
-	.loc 3 1846 1
+	.loc 3 1857 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -12608,54 +12639,54 @@
 	.cfi_offset 4, -12
 	.cfi_offset 5, -8
 	.cfi_offset 14, -4
-	.loc 3 1849 22
+	.loc 3 1860 22
 	ldr	r3, [r2, #84]
 	adds	r3, r3, #1
-	.loc 3 1846 1
+	.loc 3 1857 1
 	mov	r4, r2
-	.loc 3 1849 22
+	.loc 3 1860 22
 	str	r3, [r2, #84]
-	.loc 3 1846 1
+	.loc 3 1857 1
 	mov	r5, r0
-	.loc 3 1850 28
+	.loc 3 1861 28
 	ldrh	r0, [r2, #46]
-	.loc 3 1850 21
+	.loc 3 1861 21
 	ldrd	r3, r2, [r2, #104]
-	.loc 3 1850 28
+	.loc 3 1861 28
 	movs	r1, #0
-	.loc 3 1850 21
+	.loc 3 1861 21
 	adds	r3, r3, r0
 	adc	r2, r1, r2
 	strd	r3, r2, [r4, #104]
-	.loc 3 1851 34
+	.loc 3 1862 34
 	ldr	r0, [r5, #160]
 	bl	_ZN4mbed5Timer7read_msEv
-	.loc 3 1851 17
+	.loc 3 1862 17
 	str	r0, [r4, #168]
-	.loc 3 1853 6
+	.loc 3 1864 6
 	ldr	r0, [r4]
-	.loc 3 1853 15
-	ldr	r1, .L227
-	.loc 3 1852 21
+	.loc 3 1864 15
+	ldr	r1, .L230
+	.loc 3 1863 21
 	movs	r3, #1
 	strb	r3, [r4, #172]
-	.loc 3 1853 32
-	ldr	r3, [r0]
-	.loc 3 1853 15
+	.loc 3 1864 32
+	ldr	r3, [r0]
+	.loc 3 1864 15
 	ldr	r3, [r3, #64]
 	blx	r3
-	.loc 3 1855 5
+	.loc 3 1866 5
 	ldrb	r3, [r5, #180]	@ zero_extendqisi2
-	cbz	r3, .L222
-	.loc 3 1857 28
-	ldr	r3, .L227+4
+	cbz	r3, .L225
+	.loc 3 1868 28
+	ldr	r3, .L230+4
 	str	r3, [r4, #176]
-.L222:
-	.loc 3 1859 1
+.L225:
+	.loc 3 1870 1
 	pop	{r3, r4, r5, pc}
-.L228:
-	.align	2
-.L227:
+.L231:
+	.align	2
+.L230:
 	.word	3600000
 	.word	.LC23
 	.cfi_endproc
@@ -12713,7 +12744,7 @@
 	.type	_ZN12RadioShuttle9RS_RxDoneEP5RadioPvPhtsa, %function
 _ZN12RadioShuttle9RS_RxDoneEP5RadioPvPhtsa:
 .LFB2613:
-	.loc 3 1864 1
+	.loc 3 1875 1
 	.cfi_startproc
 	@ args = 12, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -12725,70 +12756,70 @@
 	.cfi_offset 7, -12
 	.cfi_offset 11, -8
 	.cfi_offset 14, -4
-	.loc 3 1864 1
+	.loc 3 1875 1
 	mov	r1, r3
 	mov	r4, r2
-	.loc 3 1867 24
+	.loc 3 1878 24
 	ldrd	r2, [r2, #96]
-	.loc 3 1864 1
+	.loc 3 1875 1
 	ldrh	r6, [sp, #24]
 	ldrsh	r5, [sp, #28]
 	ldrsb	r0, [sp, #32]
-	.loc 3 1867 24
+	.loc 3 1878 24
 	adds	fp, r2, r6
-	.loc 3 1868 25
+	.loc 3 1879 25
 	ldr	r2, [r4, #80]
-	.loc 3 1867 24
+	.loc 3 1878 24
 	adc	ip, r3, #0
-	.loc 3 1876 19
+	.loc 3 1887 19
 	ldrb	r3, [r1]	@ zero_extendqisi2
-	.loc 3 1868 25
+	.loc 3 1879 25
 	adds	r2, r2, #1
 	str	r2, [r4, #80]
-	.loc 3 1876 5
+	.loc 3 1887 5
 	and	r2, r3, #15
 	cmp	r2, #11
-	.loc 3 1867 24
+	.loc 3 1878 24
 	strd	fp, [r4, #96]
-	.loc 3 1870 21
+	.loc 3 1881 21
 	strd	r5, r0, [r4, #136]
-	.loc 3 1872 22
+	.loc 3 1883 22
 	strd	r1, r6, [r4, #56]
-	.loc 3 1874 19
+	.loc 3 1885 19
 	strd	r5, r0, [r4, #64]
-	.loc 3 1876 5
-	bne	.L231
-	.loc 3 1876 47 discriminator 1
+	.loc 3 1887 5
+	bne	.L234
+	.loc 3 1887 47 discriminator 1
 	and	r3, r3, #112
-	.loc 3 1876 30 discriminator 1
+	.loc 3 1887 30 discriminator 1
 	cmp	r3, #16
-	beq	.L232
-	.loc 3 1876 33 discriminator 2
+	beq	.L235
+	.loc 3 1887 33 discriminator 2
 	cmp	r3, #32
-	beq	.L232
-.L231:
-	.loc 3 1885 13
+	beq	.L235
+.L234:
+	.loc 3 1896 13
 	ldr	r0, [r4]
-	.loc 3 1885 26
-	ldr	r3, [r0]
-	.loc 3 1885 25
+	.loc 3 1896 26
+	ldr	r3, [r0]
+	.loc 3 1896 25
 	ldr	r3, [r3, #52]
 	blx	r3
-.L232:
-	.loc 3 1893 9
+.L235:
+	.loc 3 1904 9
 	ldr	r0, [r4]
-	.loc 3 1893 24
-	ldr	r3, [r0]
-	.loc 3 1893 23
+	.loc 3 1904 24
+	ldr	r3, [r0]
+	.loc 3 1904 23
 	ldr	r3, [r3, #56]
 	blx	r3
-	.loc 3 1894 9
+	.loc 3 1905 9
 	ldr	r0, [r4]
-	.loc 3 1894 18
-	ldr	r1, .L239
-	.loc 3 1894 35
-	ldr	r3, [r0]
-	.loc 3 1895 1
+	.loc 3 1905 18
+	ldr	r1, .L242
+	.loc 3 1905 35
+	ldr	r3, [r0]
+	.loc 3 1906 1
 	pop	{r4, r5, r6, r7, fp, lr}
 	.cfi_restore 14
 	.cfi_restore 11
@@ -12797,12 +12828,12 @@
 	.cfi_restore 5
 	.cfi_restore 4
 	.cfi_def_cfa_offset 0
-	.loc 3 1894 18
+	.loc 3 1905 18
 	ldr	r3, [r3, #64]
 	bx	r3	@ indirect register sibling call
-.L240:
-	.align	2
-.L239:
+.L243:
+	.align	2
+.L242:
 	.word	3600000
 	.cfi_endproc
 .LFE2613:
@@ -12874,23 +12905,23 @@
 	.type	_ZN12RadioShuttle12RS_TxTimeoutEP5RadioPv, %function
 _ZN12RadioShuttle12RS_TxTimeoutEP5RadioPv:
 .LFB2614:
-	.loc 3 1900 1
+	.loc 3 1911 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
 	@ link register save eliminated.
-	.loc 3 1902 5
+	.loc 3 1913 5
 	ldrb	r3, [r0, #180]	@ zero_extendqisi2
-	cbz	r3, .L243
-	.loc 3 1904 28
-	ldr	r3, .L247
+	cbz	r3, .L246
+	.loc 3 1915 28
+	ldr	r3, .L250
 	str	r3, [r2, #176]
-.L243:
-	.loc 3 1910 14
+.L246:
+	.loc 3 1921 14
 	b	_ZN12RadioShuttle9RS_TxDoneEP5RadioPv
-.L248:
-	.align	2
-.L247:
+.L251:
+	.align	2
+.L250:
 	.word	.LC24
 	.cfi_endproc
 .LFE2614:
@@ -12947,7 +12978,7 @@
 	.type	_ZN12RadioShuttle12RS_RxTimeoutEP5RadioPv, %function
 _ZN12RadioShuttle12RS_RxTimeoutEP5RadioPv:
 .LFB2615:
-	.loc 3 1916 1
+	.loc 3 1927 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -12957,35 +12988,35 @@
 	.cfi_offset 4, -12
 	.cfi_offset 5, -8
 	.cfi_offset 14, -4
-	.loc 3 1916 1
+	.loc 3 1927 1
 	mov	r5, r0
-	.loc 3 1919 9
+	.loc 3 1930 9
 	ldr	r0, [r2]
-	.loc 3 1919 18
-	ldr	r1, .L255
-	.loc 3 1919 35
-	ldr	r3, [r0]
-	.loc 3 1919 18
+	.loc 3 1930 18
+	ldr	r1, .L258
+	.loc 3 1930 35
+	ldr	r3, [r0]
+	.loc 3 1930 18
 	ldr	r3, [r3, #64]
-	.loc 3 1916 1
+	.loc 3 1927 1
 	mov	r4, r2
-	.loc 3 1919 18
-	blx	r3
-	.loc 3 1921 5
+	.loc 3 1930 18
+	blx	r3
+	.loc 3 1932 5
 	ldrb	r3, [r5, #181]	@ zero_extendqisi2
-	cbz	r3, .L250
-	.loc 3 1923 13
-	ldr	r5, .L255+4
+	cbz	r3, .L253
+	.loc 3 1934 13
+	ldr	r5, .L258+4
 	mov	r0, r5
 	bl	_Z7dprintfPKcz
-	.loc 3 1924 25
+	.loc 3 1935 25
 	str	r5, [r4, #176]
-.L250:
-	.loc 3 1926 1
+.L253:
+	.loc 3 1937 1
 	pop	{r3, r4, r5, pc}
-.L256:
-	.align	2
-.L255:
+.L259:
+	.align	2
+.L258:
 	.word	3600000
 	.word	.LC25
 	.cfi_endproc
@@ -13043,7 +13074,7 @@
 	.type	_ZN12RadioShuttle10RS_RxErrorEP5RadioPv, %function
 _ZN12RadioShuttle10RS_RxErrorEP5RadioPv:
 .LFB2616:
-	.loc 3 1931 1
+	.loc 3 1942 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -13053,43 +13084,43 @@
 	.cfi_offset 4, -12
 	.cfi_offset 5, -8
 	.cfi_offset 14, -4
-	.loc 3 1934 28
+	.loc 3 1945 28
 	ldr	r3, [r2, #88]
-	.loc 3 1931 1
+	.loc 3 1942 1
 	mov	r5, r0
-	.loc 3 1939 9
+	.loc 3 1950 9
 	ldr	r0, [r2]
-	.loc 3 1934 28
+	.loc 3 1945 28
 	adds	r3, r3, #1
 	str	r3, [r2, #88]
-	.loc 3 1939 22
-	ldr	r3, [r0]
-	.loc 3 1931 1
+	.loc 3 1950 22
+	ldr	r3, [r0]
+	.loc 3 1942 1
 	mov	r4, r2
-	.loc 3 1939 21
+	.loc 3 1950 21
 	ldr	r3, [r3, #52]
 	blx	r3
-	.loc 3 1940 9
+	.loc 3 1951 9
 	ldr	r0, [r4]
-	.loc 3 1940 18
-	ldr	r1, .L263
-	.loc 3 1940 35
-	ldr	r3, [r0]
-	.loc 3 1940 18
+	.loc 3 1951 18
+	ldr	r1, .L266
+	.loc 3 1951 35
+	ldr	r3, [r0]
+	.loc 3 1951 18
 	ldr	r3, [r3, #64]
 	blx	r3
-	.loc 3 1942 5
+	.loc 3 1953 5
 	ldrb	r3, [r5, #181]	@ zero_extendqisi2
-	cbz	r3, .L258
-	.loc 3 1944 28
-	ldr	r3, .L263+4
+	cbz	r3, .L261
+	.loc 3 1955 28
+	ldr	r3, .L266+4
 	str	r3, [r4, #176]
-.L258:
-	.loc 3 1946 1
+.L261:
+	.loc 3 1957 1
 	pop	{r3, r4, r5, pc}
-.L264:
-	.align	2
-.L263:
+.L267:
+	.align	2
+.L266:
 	.word	3600000
 	.word	.LC26
 	.cfi_endproc
@@ -13147,45 +13178,45 @@
 	.type	_ZN12RadioShuttle10RS_CadDoneEP5RadioPvb, %function
 _ZN12RadioShuttle10RS_CadDoneEP5RadioPvb:
 .LFB2617:
-	.loc 3 1951 1
+	.loc 3 1962 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
 	@ link register save eliminated.
-	.loc 3 1954 5
-	cbz	r3, .L267
-	.loc 3 1955 26
+	.loc 3 1965 5
+	cbz	r3, .L270
+	.loc 3 1966 26
 	movs	r1, #1
 	strb	r1, [r2, #45]
-	.loc 3 1956 36
+	.loc 3 1967 36
 	ldr	r1, [r2, #92]
 	adds	r1, r1, #1
 	str	r1, [r2, #92]
-.L268:
-	.loc 3 1960 5
+.L271:
+	.loc 3 1971 5
 	ldrb	r1, [r0, #181]	@ zero_extendqisi2
-	cbz	r1, .L266
-	.loc 3 1962 9
-	cbz	r3, .L270
-	.loc 3 1963 32
-	ldr	r3, .L275
-.L274:
-	.loc 3 1965 32
+	cbz	r1, .L269
+	.loc 3 1973 9
+	cbz	r3, .L273
+	.loc 3 1974 32
+	ldr	r3, .L278
+.L277:
+	.loc 3 1976 32
 	str	r3, [r2, #176]
-.L266:
-	.loc 3 1967 1
+.L269:
+	.loc 3 1978 1
 	bx	lr
-.L267:
-	.loc 3 1958 26
+.L270:
+	.loc 3 1969 26
 	strb	r3, [r2, #45]
-	b	.L268
-.L270:
-	.loc 3 1965 32
-	ldr	r3, .L275+4
-	b	.L274
-.L276:
-	.align	2
-.L275:
+	b	.L271
+.L273:
+	.loc 3 1976 32
+	ldr	r3, .L278+4
+	b	.L277
+.L279:
+	.align	2
+.L278:
 	.word	.LC27
 	.word	.LC28
 	.cfi_endproc
@@ -13249,7 +13280,7 @@
 	.type	_ZN12RadioShuttle10GetDataSumEiPvi, %function
 _ZN12RadioShuttle10GetDataSumEiPvi:
 .LFB2619:
-	.loc 3 1991 1
+	.loc 3 2002 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -13258,28 +13289,28 @@
 	.cfi_offset 4, -8
 	.cfi_offset 14, -4
 	add	r3, r3, r2
-	.loc 3 1993 13
+	.loc 3 2004 13
 	movs	r0, #0
-.L280:
-	.loc 3 1994 14
+.L283:
+	.loc 3 2005 14
 	cmp	r3, r2
-	beq	.L279
-	.loc 3 1995 13
+	beq	.L282
+	.loc 3 2006 13
 	ldrb	r4, [r2], #1	@ zero_extendqisi2
 	add	r0, r0, r4
-	.loc 3 1994 5
-	b	.L280
-.L279:
-	.loc 3 1997 21
+	.loc 3 2005 5
+	b	.L283
+.L282:
+	.loc 3 2008 21
 	movs	r3, #1
 	lsls	r3, r3, r1
-	.loc 3 1997 31
+	.loc 3 2008 31
 	subs	r3, r3, #1
-	.loc 3 1997 16
+	.loc 3 2008 16
 	ands	r3, r3, r0
-	.loc 3 1997 43
+	.loc 3 2008 43
 	asrs	r0, r0, r1
-	.loc 3 1999 1
+	.loc 3 2010 1
 	add	r0, r0, r3
 	pop	{r4, pc}
 	.cfi_endproc
@@ -13312,11 +13343,11 @@
 	mov	r4, r0
 .LBB4189:
 	.loc 1 283 9
-	cbz	r3, .L283
+	cbz	r3, .L286
 	.loc 1 284 19
 	ldr	r3, [r3, #8]
 	blx	r3
-.L283:
+.L286:
 .LBE4189:
 	.loc 1 286 5
 	mov	r0, r4
@@ -13349,7 +13380,7 @@
 .LBB4190:
 	.loc 7 151 5
 	mov	r5, r0
-	ldr	r3, .L288
+	ldr	r3, .L291
 	str	r3, [r5], #40
 .LBE4190:
 	.loc 7 150 13
@@ -13366,9 +13397,9 @@
 	.loc 7 153 5
 	mov	r0, r4
 	pop	{r3, r4, r5, pc}
-.L289:
-	.align	2
-.L288:
+.L292:
+	.align	2
+.L291:
 	.word	_ZTVN4mbed6TickerE+8
 	.cfi_endproc
 .LFE1929:
@@ -13424,7 +13455,7 @@
 	.cfi_offset 14, -4
 .LBB4192:
 	.loc 6 44 5
-	ldr	r3, .L292
+	ldr	r3, .L295
 	str	r3, [r0]
 .LBE4192:
 	.loc 6 43 13
@@ -13436,9 +13467,9 @@
 	.loc 6 45 5
 	mov	r0, r4
 	pop	{r4, pc}
-.L293:
-	.align	2
-.L292:
+.L296:
+	.align	2
+.L295:
 	.word	_ZTVN4mbed14LowPowerTickerE+8
 	.cfi_endproc
 .LFE1936:
@@ -13494,7 +13525,7 @@
 	.cfi_offset 14, -4
 .LBB4194:
 	.loc 2 36 7
-	ldr	r3, .L296
+	ldr	r3, .L299
 	str	r3, [r0]
 .LBE4194:
 	mov	r4, r0
@@ -13503,9 +13534,9 @@
 .LBE4195:
 	mov	r0, r4
 	pop	{r4, pc}
-.L297:
-	.align	2
-.L296:
+.L300:
+	.align	2
+.L299:
 	.word	_ZTVN4mbed15LowPowerTimeoutE+8
 	.cfi_endproc
 .LFE3383:
@@ -13625,7 +13656,7 @@
 	.type	_ZN12RadioShuttle7KillMsgEii, %function
 _ZN12RadioShuttle7KillMsgEii:
 .LFB2591:
-	.loc 3 564 1
+	.loc 3 570 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -13635,55 +13666,55 @@
 	.cfi_offset 4, -12
 	.cfi_offset 5, -8
 	.cfi_offset 14, -4
-	.loc 3 566 27
+	.loc 3 572 27
 	mov	r5, r0
 	ldr	r4, [r5, #96]!
-.L305:
-	.loc 3 566 33 discriminator 1
+.L308:
+	.loc 3 572 33 discriminator 1
 	cmp	r4, r5
-	beq	.L306
-	.loc 3 567 32
+	beq	.L309
+	.loc 3 573 32
 	ldr	r3, [r4, #8]
 	cmp	r3, r1
-	bne	.L302
-	.loc 3 567 32 is_stmt 0 discriminator 1
+	bne	.L305
+	.loc 3 573 32 is_stmt 0 discriminator 1
 	ldr	r3, [r4, #32]
 	cmp	r3, r2
-	bne	.L302
-	.loc 3 568 13 is_stmt 1
+	bne	.L305
+	.loc 3 574 13 is_stmt 1
 	ldrb	r3, [r4, #40]	@ zero_extendqisi2
-	cbnz	r3, .L303
-.L304:
-	.loc 3 570 28
+	cbnz	r3, .L306
+.L307:
+	.loc 3 576 28
 	mov	r1, r4
 	mov	r0, r5
 	bl	_ZNSt7__cxx114listIN12RadioShuttle12SendMsgEntryESaIS2_EE5eraseESt14_List_iteratorIS2_E
-	.loc 3 571 20
+	.loc 3 577 20
 	movs	r0, #0
-.L301:
-	.loc 3 575 1
+.L304:
+	.loc 3 581 1
 	pop	{r3, r4, r5, pc}
-.L302:
+.L305:
 .LBB4225:
 .LBB4226:
 	.loc 4 227 21 discriminator 4
 	ldr	r4, [r4]
-	b	.L305
-.L303:
+	b	.L308
+.L306:
 .LBE4226:
 .LBE4225:
-	.loc 3 569 26
+	.loc 3 575 26
 	ldr	r0, [r4, #12]
-	.loc 3 569 45
+	.loc 3 575 45
 	cmp	r0, #0
-	beq	.L304
-	.loc 3 569 41 discriminator 1
+	beq	.L307
+	.loc 3 575 41 discriminator 1
 	bl	_ZdaPv
+	b	.L307
+.L309:
+	.loc 3 580 12
+	movs	r0, #7
 	b	.L304
-.L306:
-	.loc 3 574 12
-	movs	r0, #7
-	b	.L301
 	.cfi_endproc
 .LFE2591:
 	.size	_ZN12RadioShuttle7KillMsgEii, .-_ZN12RadioShuttle7KillMsgEii
@@ -13795,7 +13826,7 @@
 	.type	_ZN12RadioShuttle20MessageSecurityErrorEPNS_16ReceivedMsgEntryEPNS_8AppEntryEimhh, %function
 _ZN12RadioShuttle20MessageSecurityErrorEPNS_16ReceivedMsgEntryEPNS_8AppEntryEimhh:
 .LFB2602:
-	.loc 3 1296 1
+	.loc 3 1304 1
 	.cfi_startproc
 	@ args = 12, pretend = 0, frame = 120
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -13808,49 +13839,49 @@
 	mov	r4, r2
 	sub	sp, sp, #120
 	.cfi_def_cfa_offset 136
-	.loc 3 1296 1
+	.loc 3 1304 1
 	mov	r5, r0
-	.loc 3 1301 11
+	.loc 3 1309 11
 	movs	r2, #116
 	movs	r1, #0
 	add	r0, sp, #4
-	.loc 3 1296 1
+	.loc 3 1304 1
 	mov	r6, r3
-	.loc 3 1301 11
+	.loc 3 1309 11
 	bl	memset
-	.loc 3 1302 13
+	.loc 3 1310 13
 	ldr	r3, [r4]
 	str	r3, [sp, #4]
-	.loc 3 1305 13
+	.loc 3 1313 13
 	movs	r3, #129
 	str	r3, [sp, #16]
-	.loc 3 1306 17
+	.loc 3 1314 17
 	ldr	r3, [sp, #136]
 	str	r3, [sp, #20]
-	.loc 3 1303 12
+	.loc 3 1311 12
 	movs	r2, #0
-	.loc 3 1312 18
+	.loc 3 1320 18
 	movs	r3, #2
-	.loc 3 1315 21
+	.loc 3 1323 21
 	add	r1, sp, #4
 	add	r0, r5, #96
-	.loc 3 1304 11
+	.loc 3 1312 11
 	strd	r2, r2, [sp, #8]
-	.loc 3 1307 13
+	.loc 3 1315 13
 	str	r6, [sp, #28]
-	.loc 3 1309 11
+	.loc 3 1317 11
 	strd	r4, r2, [sp, #40]
-	.loc 3 1310 18
+	.loc 3 1318 18
 	str	r2, [sp, #52]
-	.loc 3 1311 15
+	.loc 3 1319 15
 	strb	r2, [sp, #48]
-	.loc 3 1312 18
+	.loc 3 1320 18
 	str	r3, [sp, #32]
-	.loc 3 1313 19
+	.loc 3 1321 19
 	strb	r2, [sp, #36]
-	.loc 3 1315 21
+	.loc 3 1323 21
 	bl	_ZNSt7__cxx114listIN12RadioShuttle12SendMsgEntryESaIS2_EE9push_backERKS2_
-	.loc 3 1316 1
+	.loc 3 1324 1
 	add	sp, sp, #120
 	.cfi_def_cfa_offset 16
 	@ sp needed
@@ -13882,10 +13913,10 @@
 	mov	r4, r0
 	.loc 11 70 34
 	ldr	r0, [r0]
-.L314:
+.L317:
 	.loc 11 71 20
 	cmp	r4, r0
-	beq	.L312
+	beq	.L315
 .LBB4275:
 	.loc 11 74 4
 	ldr	r5, [r0]
@@ -13901,8 +13932,8 @@
 .LBE4276:
 	.loc 11 74 4
 	mov	r0, r5
-	b	.L314
-.L312:
+	b	.L317
+.L315:
 .LBE4275:
 	.loc 11 83 5
 	pop	{r3, r4, r5, pc}
@@ -13931,9 +13962,9 @@
 	.cfi_offset 14, -4
 	mov	r6, r0
 	mov	r4, r1
-.L317:
+.L320:
 	.loc 5 1870 18
-	cbz	r4, .L315
+	cbz	r4, .L318
 .LBB4280:
 	.loc 5 1872 4
 	ldr	r1, [r4, #12]
@@ -13958,8 +13989,8 @@
 	mov	r4, r5
 .LBE4280:
 	.loc 5 1870 7
-	b	.L317
-.L315:
+	b	.L320
+.L318:
 	.loc 5 1877 5
 	pop	{r4, r5, r6, pc}
 	.cfi_endproc
@@ -13987,9 +14018,9 @@
 	.cfi_offset 14, -4
 	mov	r6, r0
 	mov	r4, r1
-.L320:
+.L323:
 	.loc 5 1870 18
-	cbz	r4, .L318
+	cbz	r4, .L321
 .LBB4286:
 	.loc 5 1872 4
 	ldr	r1, [r4, #12]
@@ -14014,8 +14045,8 @@
 	mov	r4, r5
 .LBE4286:
 	.loc 5 1870 7
-	b	.L320
-.L318:
+	b	.L323
+.L321:
 	.loc 5 1877 5
 	pop	{r4, r5, r6, pc}
 	.cfi_endproc
@@ -14045,10 +14076,10 @@
 	mov	r4, r0
 	.loc 11 70 34
 	ldr	r0, [r0]
-.L323:
+.L326:
 	.loc 11 71 20
 	cmp	r4, r0
-	beq	.L321
+	beq	.L324
 .LBB4292:
 	.loc 11 74 4
 	ldr	r5, [r0]
@@ -14064,8 +14095,8 @@
 .LBE4293:
 	.loc 11 74 4
 	mov	r0, r5
-	b	.L323
-.L321:
+	b	.L326
+.L324:
 .LBE4292:
 	.loc 11 83 5
 	pop	{r3, r4, r5, pc}
@@ -14096,10 +14127,10 @@
 	mov	r4, r0
 	.loc 11 70 34
 	ldr	r0, [r0]
-.L326:
+.L329:
 	.loc 11 71 20
 	cmp	r4, r0
-	beq	.L324
+	beq	.L327
 .LBB4297:
 	.loc 11 74 4
 	ldr	r5, [r0]
@@ -14115,8 +14146,8 @@
 .LBE4298:
 	.loc 11 74 4
 	mov	r0, r5
-	b	.L326
-.L324:
+	b	.L329
+.L327:
 .LBE4297:
 	.loc 11 83 5
 	pop	{r3, r4, r5, pc}
@@ -14145,9 +14176,9 @@
 	.cfi_offset 14, -4
 	mov	r6, r0
 	mov	r4, r1
-.L329:
+.L332:
 	.loc 5 1870 18
-	cbz	r4, .L327
+	cbz	r4, .L330
 .LBB4302:
 	.loc 5 1872 4
 	ldr	r1, [r4, #12]
@@ -14172,8 +14203,8 @@
 	mov	r4, r5
 .LBE4302:
 	.loc 5 1870 7
-	b	.L329
-.L327:
+	b	.L332
+.L330:
 	.loc 5 1877 5
 	pop	{r4, r5, r6, pc}
 	.cfi_endproc
@@ -14203,10 +14234,10 @@
 	mov	r4, r0
 	.loc 11 70 34
 	ldr	r0, [r0]
-.L332:
+.L335:
 	.loc 11 71 20
 	cmp	r4, r0
-	beq	.L330
+	beq	.L333
 .LBB4308:
 	.loc 11 74 4
 	ldr	r5, [r0]
@@ -14222,8 +14253,8 @@
 .LBE4309:
 	.loc 11 74 4
 	mov	r0, r5
-	b	.L332
-.L330:
+	b	.L335
+.L333:
 .LBE4308:
 	.loc 11 83 5
 	pop	{r3, r4, r5, pc}
@@ -14283,7 +14314,7 @@
 	.type	_ZN12RadioShuttle18UpdateRadioProfileEP5RadioNS_9RadioTypeEPKNS_12RadioProfileE, %function
 _ZN12RadioShuttle18UpdateRadioProfileEP5RadioNS_9RadioTypeEPKNS_12RadioProfileE:
 .LFB2592:
-	.loc 3 580 1
+	.loc 3 586 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 0
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -14293,48 +14324,48 @@
 	.cfi_offset 5, -12
 	.cfi_offset 6, -8
 	.cfi_offset 14, -4
-	.loc 3 580 1
+	.loc 3 586 1
 	mov	r4, r0
-	.loc 3 583 5
-	cbz	r3, .L339
-	.loc 3 583 18 discriminator 1
-	cbz	r1, .L339
-	.loc 3 587 28
+	.loc 3 589 5
+	cbz	r3, .L342
+	.loc 3 589 18 discriminator 1
+	cbz	r1, .L342
+	.loc 3 593 28
 	mov	r5, r0
 	ldr	r0, [r5, #36]!
-.L337:
-	.loc 3 587 34 discriminator 1
+.L340:
+	.loc 3 593 34 discriminator 1
 	cmp	r0, r5
-	beq	.L340
-	.loc 3 588 9
+	beq	.L343
+	.loc 3 594 9
 	ldr	r6, [r0, #8]
 	cmp	r6, r1
-	beq	.L336
+	beq	.L339
 .LBB4315:
 .LBB4316:
 	.loc 4 227 21
 	ldr	r0, [r0]
-	b	.L337
-.L339:
+	b	.L340
+.L342:
 .LBE4316:
 .LBE4315:
-	.loc 3 584 16
+	.loc 3 590 16
 	movs	r0, #14
-.L341:
-	.loc 3 605 1
+.L344:
+	.loc 3 611 1
 	pop	{r4, r5, r6, pc}
-.L340:
-	.loc 3 594 16
+.L343:
+	.loc 3 600 16
 	movs	r0, #9
-	b	.L341
-.L336:
-	.loc 3 597 16
+	b	.L344
+.L339:
+	.loc 3 603 16
 	strb	r2, [r4, #28]
-	.loc 3 600 12
+	.loc 3 606 12
 	add	r1, r0, #8
-	.loc 3 599 14
+	.loc 3 605 14
 	str	r3, [r0, #48]
-	.loc 3 600 12
+	.loc 3 606 12
 	mov	r0, r4
 	bl	_ZN12RadioShuttle10_initRadioEPNS_10RadioEntryE
 .LBB4317:
@@ -14345,9 +14376,9 @@
 	bl	_ZNSt8_Rb_treeImSt4pairIKmN12RadioShuttle19SignalStrengthEntryEESt10_Select1stIS4_ESt4lessImESaIS4_EE5clearEv
 .LBE4318:
 .LBE4317:
-	.loc 3 604 12
+	.loc 3 610 12
 	movs	r0, #0
-	b	.L341
+	b	.L344
 	.cfi_endproc
 .LFE2592:
 	.size	_ZN12RadioShuttle18UpdateRadioProfileEP5RadioNS_9RadioTypeEPKNS_12RadioProfileE, .-_ZN12RadioShuttle18UpdateRadioProfileEP5RadioNS_9RadioTypeEPKNS_12RadioProfileE
@@ -14383,16 +14414,16 @@
 	.loc 3 128 9
 	ldr	r0, [r0, #156]
 	.loc 3 128 5
-	cbz	r0, .L343
+	cbz	r0, .L346
 	.loc 3 129 16 discriminator 1
 	ldr	r3, [r0]
 	ldr	r3, [r3, #4]
 	blx	r3
-.L343:
+.L346:
 	.loc 3 132 6
 	ldr	r5, [r4, #160]
 	.loc 3 132 2
-	cbz	r5, .L344
+	cbz	r5, .L347
 .LBB4435:
 .LBB4436:
 	.loc 8 36 7
@@ -14403,14 +14434,14 @@
 	.loc 3 133 10
 	mov	r0, r5
 	bl	_ZdlPv
-.L344:
+.L347:
 	.loc 3 137 28
 	mov	r6, r4
 	ldr	r5, [r6, #36]!
-.L346:
+.L349:
 	.loc 3 137 34 discriminator 3
 	cmp	r5, r6
-	beq	.L345
+	beq	.L348
 	.loc 3 138 13 discriminator 2
 	ldr	r0, [r5, #8]
 	.loc 3 138 28 discriminator 2
@@ -14422,8 +14453,8 @@
 .LBB4438:
 	.loc 4 227 21 discriminator 2
 	ldr	r5, [r5]
-	b	.L346
-.L345:
+	b	.L349
+.L348:
 .LBE4438:
 .LBE4437:
 .LBB4439:
@@ -14464,7 +14495,7 @@
 .LBB4445:
 	.loc 4 153 16
 	str	r3, [r4, #44]
-.L349:
+.L352:
 .LBE4445:
 .LBE4447:
 .LBE4449:
@@ -14472,23 +14503,23 @@
 .LBE4453:
 	.loc 3 144 33 discriminator 1
 	cmp	r5, r7
-	beq	.L347
+	beq	.L350
 	.loc 3 145 9
 	ldrb	r3, [r5, #40]	@ zero_extendqisi2
-	cbz	r3, .L348
+	cbz	r3, .L351
 	.loc 3 146 22
 	ldr	r0, [r5, #12]
 	.loc 3 146 41
-	cbz	r0, .L348
+	cbz	r0, .L351
 	.loc 3 146 37 discriminator 1
 	bl	_ZdaPv
-.L348:
+.L351:
 .LBB4454:
 .LBB4455:
 	.loc 4 227 21 discriminator 2
 	ldr	r5, [r5]
-	b	.L349
-.L347:
+	b	.L352
+.L350:
 .LBE4455:
 .LBE4454:
 .LBB4456:
@@ -14833,13 +14864,13 @@
 .LBB4575:
 	.loc 5 764 31
 	mov	r0, r2
-.L363:
+.L366:
 .LBE4575:
 .LBE4576:
 .LBB4577:
 .LBB4578:
 	.loc 5 1887 18
-	cbz	r3, .L364
+	cbz	r3, .L367
 	.loc 5 1888 2
 	ldr	r5, [r3, #16]
 	ldr	r4, [r1]
@@ -14851,20 +14882,20 @@
 	ldrlt	r3, [r3, #12]
 	.loc 5 1889 28
 	ldrge	r3, [r3, #8]
-	b	.L363
-.L364:
+	b	.L366
+.L367:
 .LBE4578:
 .LBE4577:
 	.loc 5 2542 28
 	cmp	r2, r0
-	beq	.L367
+	beq	.L370
 	.loc 5 2541 8
 	ldr	r1, [r1]
 	ldr	r3, [r0, #16]
 	cmp	r1, r3
 	it	lt
 	movlt	r0, r2
-.L367:
+.L370:
 	.loc 5 2543 5
 	pop	{r4, r5, pc}
 	.cfi_endproc
@@ -14880,7 +14911,7 @@
 	.type	_ZN12RadioShuttle25AppRequiresAuthenticationEi, %function
 _ZN12RadioShuttle25AppRequiresAuthenticationEi:
 .LFB2588:
-	.loc 3 442 1
+	.loc 3 448 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 8
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -14888,7 +14919,7 @@
 	.cfi_def_cfa_offset 16
 	.cfi_offset 4, -8
 	.cfi_offset 14, -4
-	.loc 3 442 1
+	.loc 3 448 1
 	mov	r4, r0
 	str	r1, [sp, #4]
 .LBB4579:
@@ -14907,28 +14938,28 @@
 .LBE4583:
 .LBE4582:
 .LBE4581:
-	.loc 3 444 5
+	.loc 3 450 5
 	cmp	r0, r4
-	beq	.L371
-	.loc 3 447 5
+	beq	.L374
+	.loc 3 453 5
 	ldr	r3, [r0, #32]
 	cmp	r3, #0
-	.loc 3 448 16
+	.loc 3 454 16
 	ite	eq
 	moveq	r0, #4
 	movne	r0, #5
-.L370:
-	.loc 3 450 1
+.L373:
+	.loc 3 456 1
 	add	sp, sp, #8
 	.cfi_remember_state
 	.cfi_def_cfa_offset 8
 	@ sp needed
 	pop	{r4, pc}
-.L371:
+.L374:
 	.cfi_restore_state
-	.loc 3 445 16
+	.loc 3 451 16
 	movs	r0, #2
-	b	.L370
+	b	.L373
 	.cfi_endproc
 .LFE2588:
 	.size	_ZN12RadioShuttle25AppRequiresAuthenticationEi, .-_ZN12RadioShuttle25AppRequiresAuthenticationEi
@@ -14942,7 +14973,7 @@
 	.type	_ZN12RadioShuttle21DeRegisterApplicationEi, %function
 _ZN12RadioShuttle21DeRegisterApplicationEi:
 .LFB2587:
-	.loc 3 417 1
+	.loc 3 423 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 8
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -14954,7 +14985,7 @@
 	.cfi_offset 7, -12
 	.cfi_offset 8, -8
 	.cfi_offset 14, -4
-	.loc 3 417 1
+	.loc 3 423 1
 	mov	r5, r0
 	str	r1, [sp, #4]
 .LBB4618:
@@ -14973,7 +15004,7 @@
 .LBE4623:
 .LBE4622:
 .LBE4621:
-	.loc 3 419 5
+	.loc 3 425 5
 	cmp	r8, r0
 .LBB4624:
 .LBB4620:
@@ -14981,43 +15012,43 @@
 	mov	r7, r0
 .LBE4620:
 .LBE4624:
-	.loc 3 419 5
-	beq	.L380
-	.loc 3 424 23
+	.loc 3 425 5
+	beq	.L383
+	.loc 3 430 23
 	mov	r6, r5
 	ldr	r4, [r6, #96]!
-.L375:
-	.loc 3 425 14
+.L378:
+	.loc 3 431 14
 	cmp	r6, r4
-	beq	.L376
-	.loc 3 426 9
+	beq	.L379
+	.loc 3 432 9
 	ldr	r2, [r4, #8]
 	ldr	r3, [sp, #4]
 	cmp	r2, r3
-	bne	.L377
-	.loc 3 427 13
+	bne	.L380
+	.loc 3 433 13
 	ldrb	r3, [r4, #40]	@ zero_extendqisi2
-	cbz	r3, .L378
-	.loc 3 428 26
+	cbz	r3, .L381
+	.loc 3 434 26
 	ldr	r0, [r4, #12]
-	.loc 3 428 45
-	cbz	r0, .L378
-	.loc 3 428 41 discriminator 1
+	.loc 3 434 45
+	cbz	r0, .L381
+	.loc 3 434 41 discriminator 1
 	bl	_ZdaPv
-.L378:
-	.loc 3 429 33
+.L381:
+	.loc 3 435 33
 	mov	r1, r4
 	mov	r0, r6
 	bl	_ZNSt7__cxx114listIN12RadioShuttle12SendMsgEntryESaIS2_EE5eraseESt14_List_iteratorIS2_E
 	mov	r4, r0
-	b	.L375
-.L377:
+	b	.L378
+.L380:
 .LBB4625:
 .LBB4626:
 	.loc 4 227 21
 	ldr	r4, [r4]
-	b	.L375
-.L376:
+	b	.L378
+.L379:
 .LBE4626:
 .LBE4625:
 .LBB4627:
@@ -15048,20 +15079,20 @@
 .LBE4629:
 .LBE4628:
 .LBE4627:
-	.loc 3 436 12
+	.loc 3 442 12
 	movs	r0, #0
-.L374:
-	.loc 3 437 1
+.L377:
+	.loc 3 443 1
 	add	sp, sp, #8
 	.cfi_remember_state
 	.cfi_def_cfa_offset 24
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, pc}
-.L380:
+.L383:
 	.cfi_restore_state
-	.loc 3 420 16
+	.loc 3 426 16
 	movs	r0, #2
-	b	.L374
+	b	.L377
 	.cfi_endproc
 .LFE2587:
 	.size	_ZN12RadioShuttle21DeRegisterApplicationEi, .-_ZN12RadioShuttle21DeRegisterApplicationEi
@@ -15115,9 +15146,9 @@
 .LBE4701:
 	.loc 5 2050 12
 	movs	r2, #1
-.L388:
+.L391:
 	.loc 5 2051 18
-	cbz	r3, .L389
+	cbz	r3, .L392
 	.loc 5 2055 17
 	ldr	r1, [r4]
 	ldr	r2, [r3, #16]
@@ -15135,38 +15166,38 @@
 	movge	r2, #0
 	.loc 5 2055 26
 	mov	r3, r1
-	b	.L388
-.L389:
+	b	.L391
+.L392:
 	.loc 5 2058 7
-	cbz	r2, .L398
+	cbz	r2, .L401
 	.loc 5 2060 4
 	ldr	r3, [r7, #12]
 	cmp	r3, r5
-	beq	.L394
+	beq	.L397
 .LBB4702:
 .LBB4703:
 	.loc 5 302 30
 	mov	r0, r5
 	bl	_ZSt18_Rb_tree_decrementPSt18_Rb_tree_node_base
-.L392:
+.L395:
 .LBE4703:
 .LBE4702:
 	.loc 5 2065 7
 	ldr	r2, [r0, #16]
 	ldr	r3, [r4]
 	cmp	r2, r3
-	bge	.L395
-.L394:
+	bge	.L398
+.L397:
 .LBE4704:
 .LBE4706:
 .LBB4707:
 	.loc 5 2109 7
-	cbz	r5, .L399
+	cbz	r5, .L402
 .LBB4708:
 .LBB4709:
 	.loc 5 1765 33
 	cmp	r10, r5
-	beq	.L400
+	beq	.L403
 	.loc 5 1766 10
 	ldr	r2, [r4]
 	ldr	r3, [r5, #16]
@@ -15174,7 +15205,7 @@
 	ite	ge
 	movge	r8, #0
 	movlt	r8, #1
-.L396:
+.L399:
 .LBB4710:
 .LBB4711:
 .LBB4712:
@@ -15246,7 +15277,7 @@
 .LBB4729:
 	.loc 13 249 31
 	movs	r3, #1
-.L401:
+.L404:
 .LBE4729:
 .LBE4730:
 .LBE4732:
@@ -15261,13 +15292,13 @@
 	.loc 5 2118 5
 	mov	r0, r6
 	pop	{r4, r5, r6, r7, r8, r9, r10, pc}
-.L398:
+.L401:
 .LBB4739:
 .LBB4705:
 	.loc 5 2058 7
 	mov	r0, r5
-	b	.L392
-.L400:
+	b	.L395
+.L403:
 .LBE4705:
 .LBE4739:
 .LBB4740:
@@ -15275,12 +15306,12 @@
 .LBB4725:
 	.loc 5 1766 10
 	mov	r8, #1
-	b	.L396
-.L399:
+	b	.L399
+.L402:
 .LBE4725:
 .LBE4733:
 	mov	r0, r5
-.L395:
+.L398:
 .LBE4740:
 .LBB4741:
 .LBB4738:
@@ -15288,7 +15319,7 @@
 	.loc 13 249 31
 	str	r0, [r6]
 	movs	r3, #0
-	b	.L401
+	b	.L404
 .LBE4737:
 .LBE4738:
 .LBE4741:
@@ -15305,7 +15336,7 @@
 	.type	_ZN12RadioShuttle19RegisterApplicationEiPFvimiiPviES0_i, %function
 _ZN12RadioShuttle19RegisterApplicationEiPFvimiiPviES0_i:
 .LFB2586:
-	.loc 3 391 1
+	.loc 3 397 1
 	.cfi_startproc
 	@ args = 4, pretend = 0, frame = 88
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -15319,21 +15350,21 @@
 	.cfi_offset 14, -4
 	sub	sp, sp, #88
 	.cfi_def_cfa_offset 112
-	.loc 3 391 1
+	.loc 3 397 1
 	mov	r4, r0
 	ldr	r5, [sp, #112]
 	str	r1, [sp, #4]
 	mov	r8, r2
 	mov	r6, r3
-	.loc 3 392 5
-	cbnz	r5, .L403
-	.loc 3 392 16 discriminator 1
-	cbz	r3, .L403
-	.loc 3 393 23
+	.loc 3 398 5
+	cbnz	r5, .L406
+	.loc 3 398 16 discriminator 1
+	cbz	r3, .L406
+	.loc 3 399 23
 	mov	r0, r3
 	bl	strlen
 	mov	r5, r0
-.L403:
+.L406:
 .LBB4756:
 .LBB4757:
 	.loc 12 1169 29
@@ -15351,23 +15382,23 @@
 .LBE4760:
 .LBE4759:
 .LBE4758:
-	.loc 3 395 5
+	.loc 3 401 5
 	cmp	r4, r0
-	bne	.L405
-	.loc 3 400 11
+	bne	.L408
+	.loc 3 406 11
 	movs	r2, #20
 	movs	r1, #0
 	add	r0, sp, r2
 	bl	memset
-	.loc 3 401 13
+	.loc 3 407 13
 	ldr	ip, [sp, #4]
-	.loc 3 405 13
+	.loc 3 411 13
 	strb	r5, [sp, #36]
-	.loc 3 403 13
+	.loc 3 409 13
 	movs	r3, #1
-	.loc 3 404 16
+	.loc 3 410 16
 	strd	r3, r6, [sp, #28]
-	.loc 3 402 15
+	.loc 3 408 15
 	strd	ip, r8, [sp, #20]
 .LBB4761:
 .LBB4762:
@@ -15387,7 +15418,7 @@
 .LBE4766:
 .LBE4765:
 .LBE4764:
-	.loc 3 406 20
+	.loc 3 412 20
 	movs	r6, #0
 	strb	r6, [sp, #37]
 .LBB4771:
@@ -15428,20 +15459,20 @@
 	bl	_ZNSt8_Rb_treeIiSt4pairIKiN12RadioShuttle8AppEntryEESt10_Select1stIS4_ESt4lessIiESaIS4_EE16_M_insert_uniqueERKS4_
 .LBE4775:
 .LBE4777:
-	.loc 3 411 12
+	.loc 3 417 12
 	mov	r0, r6
-.L404:
-	.loc 3 412 1
+.L407:
+	.loc 3 418 1
 	add	sp, sp, #88
 	.cfi_remember_state
 	.cfi_def_cfa_offset 24
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, pc}
-.L405:
+.L408:
 	.cfi_restore_state
-	.loc 3 396 16
+	.loc 3 402 16
 	movs	r0, #1
-	b	.L404
+	b	.L407
 	.cfi_endproc
 .LFE2586:
 	.size	_ZN12RadioShuttle19RegisterApplicationEiPFvimiiPviES0_i, .-_ZN12RadioShuttle19RegisterApplicationEiPFvimiiPviES0_i
@@ -15476,13 +15507,13 @@
 .LBB4789:
 	.loc 5 764 31
 	mov	r0, r2
-.L410:
+.L413:
 .LBE4789:
 .LBE4790:
 .LBB4791:
 .LBB4792:
 	.loc 5 1887 18
-	cbz	r3, .L411
+	cbz	r3, .L414
 	.loc 5 1888 2
 	ldr	r5, [r3, #16]
 	ldr	r4, [r1]
@@ -15494,20 +15525,20 @@
 	ldrcc	r3, [r3, #12]
 	.loc 5 1889 28
 	ldrcs	r3, [r3, #8]
-	b	.L410
-.L411:
+	b	.L413
+.L414:
 .LBE4792:
 .LBE4791:
 	.loc 5 2542 28
 	cmp	r2, r0
-	beq	.L414
+	beq	.L417
 	.loc 5 2541 8
 	ldr	r1, [r1]
 	ldr	r3, [r0, #16]
 	cmp	r1, r3
 	it	cc
 	movcc	r0, r2
-.L414:
+.L417:
 	.loc 5 2543 5
 	pop	{r4, r5, pc}
 	.cfi_endproc
@@ -15523,7 +15554,7 @@
 	.type	_ZN12RadioShuttle16CalculateTXPowerEPNS_10RadioEntryEm, %function
 _ZN12RadioShuttle16CalculateTXPowerEPNS_10RadioEntryEm:
 .LFB2605:
-	.loc 3 1492 1
+	.loc 3 1500 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 8
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -15532,11 +15563,11 @@
 	.cfi_offset 4, -12
 	.cfi_offset 5, -8
 	.cfi_offset 14, -4
-	.loc 3 1493 9
+	.loc 3 1501 9
 	ldr	r3, [r1, #40]
-	.loc 3 1492 1
+	.loc 3 1500 1
 	str	r2, [sp, #4]
-	mov	r5, r0
+	mov	r4, r0
 .LBB4793:
 .LBB4794:
 	.loc 12 1169 29
@@ -15544,8 +15575,8 @@
 	adds	r0, r0, #120
 .LBE4794:
 .LBE4793:
-	.loc 3 1493 9
-	ldr	r4, [r3, #8]
+	.loc 3 1501 9
+	ldr	r5, [r3, #8]
 .LBB4796:
 .LBB4795:
 	.loc 12 1169 29
@@ -15556,48 +15587,52 @@
 .LBB4798:
 .LBB4799:
 	.loc 5 985 49
-	adds	r5, r5, #124
+	adds	r4, r4, #124
 .LBE4799:
 .LBE4798:
 .LBE4797:
-	.loc 3 1497 5
-	cmp	r0, r5
-	beq	.L416
-	.loc 3 1501 29
+	.loc 3 1505 5
+	cmp	r0, r4
+	beq	.L419
+	.loc 3 1509 29
 	ldr	r3, [r0, #24]
-	.loc 3 1504 5
-	cbz	r3, .L416
-	.loc 3 1507 5
+	.loc 3 1512 5
+	cbz	r3, .L419
+	.loc 3 1515 5
 	cmn	r3, #80
-	blt	.L416
-	.loc 3 1509 10
+	blt	.L419
+	.loc 3 1517 10
 	cmn	r3, #70
-	blt	.L418
-	.loc 3 1511 10
+	blt	.L422
+	.loc 3 1519 10
 	cmn	r3, #60
-	blt	.L419
-	.loc 3 1516 17
-	adds	r3, r3, #50
+	blt	.L423
+	.loc 3 1524 17
+	cmn	r3, #50
 	ite	lt
-	movlt	r4, #6
-	movge	r4, #2
-.L416:
-	.loc 3 1521 1
-	mov	r0, r4
+	movlt	r3, #6
+	movge	r3, #2
+.L421:
+	cmp	r5, r3
+	it	ge
+	movge	r5, r3
+.L419:
+	.loc 3 1532 1
+	mov	r0, r5
 	add	sp, sp, #12
 	.cfi_remember_state
 	.cfi_def_cfa_offset 12
 	@ sp needed
 	pop	{r4, r5, pc}
-.L418:
+.L422:
 	.cfi_restore_state
-	.loc 3 1510 17
-	movs	r4, #14
-	b	.L416
-.L419:
-	.loc 3 1512 17
-	movs	r4, #10
-	b	.L416
+	.loc 3 1518 17
+	movs	r3, #14
+	b	.L421
+.L423:
+	.loc 3 1520 17
+	movs	r3, #10
+	b	.L421
 	.cfi_endproc
 .LFE2605:
 	.size	_ZN12RadioShuttle16CalculateTXPowerEPNS_10RadioEntryEm, .-_ZN12RadioShuttle16CalculateTXPowerEPNS_10RadioEntryEm
@@ -15611,7 +15646,7 @@
 	.type	_ZN12RadioShuttle20DeleteSignalStrengthEm, %function
 _ZN12RadioShuttle20DeleteSignalStrengthEm:
 .LFB2607:
-	.loc 3 1579 1
+	.loc 3 1590 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 8
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -15619,22 +15654,22 @@
 	.cfi_def_cfa_offset 16
 	.cfi_offset 4, -8
 	.cfi_offset 14, -4
-	.loc 3 1579 1
+	.loc 3 1590 1
 	mov	r4, r0
 	str	r1, [sp, #4]
-	.loc 3 1580 5
-	cbnz	r1, .L425
-.L427:
-	.loc 3 1581 16
+	.loc 3 1591 5
+	cbnz	r1, .L429
+.L431:
+	.loc 3 1592 16
 	movs	r0, #0
-.L426:
-	.loc 3 1591 1
+.L430:
+	.loc 3 1602 1
 	add	sp, sp, #8
 	.cfi_remember_state
 	.cfi_def_cfa_offset 8
 	@ sp needed
 	pop	{r4, pc}
-.L425:
+.L429:
 	.cfi_restore_state
 .LBB4826:
 .LBB4827:
@@ -15652,9 +15687,9 @@
 .LBE4830:
 .LBE4829:
 .LBE4828:
-	.loc 3 1584 5
+	.loc 3 1595 5
 	cmp	r1, r0
-	beq	.L427
+	beq	.L431
 .LBB4831:
 .LBB4832:
 .LBB4833:
@@ -15681,9 +15716,9 @@
 .LBE4833:
 .LBE4832:
 .LBE4831:
-	.loc 3 1590 12
+	.loc 3 1601 12
 	movs	r0, #1
-	b	.L426
+	b	.L430
 	.cfi_endproc
 .LFE2607:
 	.size	_ZN12RadioShuttle20DeleteSignalStrengthEm, .-_ZN12RadioShuttle20DeleteSignalStrengthEm
@@ -15731,37 +15766,37 @@
 .LBB4895:
 	.loc 5 764 31
 	mov	r6, r7
-.L429:
+.L433:
 .LBE4895:
 .LBE4896:
 	.loc 5 1954 18
-	cbz	r4, .L430
+	cbz	r4, .L434
 .LBB4897:
 	.loc 5 1956 4
 	ldr	r3, [r4, #16]
 	ldr	r0, [r1]
 	cmp	r3, r0
-	bcs	.L431
+	bcs	.L435
 	.loc 5 1957 20
 	ldr	r3, [r4, #12]
 	mov	r4, r6
-.L432:
+.L436:
 	mov	r6, r4
 	mov	r4, r3
-	b	.L429
-.L431:
+	b	.L433
+.L435:
 	ldr	r3, [r4, #8]
 .LBB4898:
 	.loc 5 1958 9
-	bhi	.L432
+	bhi	.L436
 .LBB4899:
 	.loc 5 1965 23
 	ldr	r2, [r4, #12]
-.L433:
+.L437:
 .LBB4900:
 .LBB4901:
 	.loc 5 1887 18
-	cbz	r3, .L434
+	cbz	r3, .L438
 	.loc 5 1888 2
 	ldr	r1, [r3, #16]
 	cmp	r0, r1
@@ -15774,14 +15809,14 @@
 	movhi	r3, r4
 	mov	r4, r3
 	mov	r3, r1
-	b	.L433
-.L434:
+	b	.L437
+.L438:
 .LBE4901:
 .LBE4900:
 .LBB4902:
 .LBB4903:
 	.loc 5 1919 18
-	cbz	r2, .L440
+	cbz	r2, .L444
 	.loc 5 1920 2
 	ldr	r3, [r2, #16]
 	cmp	r0, r3
@@ -15792,8 +15827,8 @@
 	ldrcs	r2, [r2, #12]
 	.loc 5 1921 28
 	ldrcc	r2, [r2, #8]
-	b	.L434
-.L430:
+	b	.L438
+.L434:
 .LBE4903:
 .LBE4902:
 .LBE4899:
@@ -15801,7 +15836,7 @@
 .LBE4897:
 	.loc 5 1954 18
 	mov	r4, r6
-.L440:
+.L444:
 .LBE4904:
 .LBE4905:
 .LBB4906:
@@ -15816,13 +15851,13 @@
 .LBB4923:
 	.loc 5 2503 30
 	cmp	r3, r4
-	bne	.L443
+	bne	.L447
 	cmp	r7, r6
-	bne	.L443
+	bne	.L447
 	.loc 5 2504 2
 	mov	r0, r5
 	bl	_ZNSt8_Rb_treeImSt4pairIKmN12RadioShuttle19SignalStrengthEntryEESt10_Select1stIS4_ESt4lessImESaIS4_EE5clearEv
-.L442:
+.L446:
 .LBE4923:
 .LBE4925:
 	.loc 5 2519 32
@@ -15830,12 +15865,12 @@
 	.loc 5 2520 5
 	sub	r0, r8, r0
 	pop	{r3, r4, r5, r6, r7, r8, r9, pc}
-.L443:
+.L447:
 .LBB4926:
 .LBB4924:
 	.loc 5 2506 17
 	cmp	r6, r4
-	beq	.L442
+	beq	.L446
 .LBB4908:
 .LBB4909:
 	.loc 5 374 30
@@ -15882,7 +15917,7 @@
 .LBB4911:
 	.loc 5 374 2
 	mov	r4, r9
-	b	.L443
+	b	.L447
 .LBE4911:
 .LBE4922:
 .LBE4924:
@@ -15940,9 +15975,9 @@
 .LBE4992:
 	.loc 5 2050 12
 	movs	r2, #1
-.L450:
+.L454:
 	.loc 5 2051 18
-	cbz	r3, .L451
+	cbz	r3, .L455
 	.loc 5 2055 17
 	ldr	r1, [r4]
 	ldr	r2, [r3, #16]
@@ -15960,38 +15995,38 @@
 	movcs	r2, #0
 	.loc 5 2055 26
 	mov	r3, r1
-	b	.L450
-.L451:
+	b	.L454
+.L455:
 	.loc 5 2058 7
-	cbz	r2, .L460
+	cbz	r2, .L464
 	.loc 5 2060 4
 	ldr	r3, [r7, #12]
 	cmp	r3, r5
-	beq	.L456
+	beq	.L460
 .LBB4993:
 .LBB4994:
 	.loc 5 302 30
 	mov	r0, r5
 	bl	_ZSt18_Rb_tree_decrementPSt18_Rb_tree_node_base
-.L454:
+.L458:
 .LBE4994:
 .LBE4993:
 	.loc 5 2065 7
 	ldr	r2, [r0, #16]
 	ldr	r3, [r4]
 	cmp	r2, r3
-	bcs	.L457
-.L456:
+	bcs	.L461
+.L460:
 .LBE4995:
 .LBE4997:
 .LBB4998:
 	.loc 5 2109 7
-	cbz	r5, .L461
+	cbz	r5, .L465
 .LBB4999:
 .LBB5000:
 	.loc 5 1765 33
 	cmp	r10, r5
-	beq	.L462
+	beq	.L466
 	.loc 5 1766 10
 	ldr	r2, [r4]
 	ldr	r3, [r5, #16]
@@ -15999,7 +16034,7 @@
 	ite	cs
 	movcs	r8, #0
 	movcc	r8, #1
-.L458:
+.L462:
 .LBB5001:
 .LBB5002:
 .LBB5003:
@@ -16058,7 +16093,7 @@
 .LBB5015:
 	.loc 13 249 31
 	movs	r3, #1
-.L463:
+.L467:
 .LBE5015:
 .LBE5016:
 .LBE5018:
@@ -16073,13 +16108,13 @@
 	.loc 5 2118 5
 	mov	r0, r6
 	pop	{r4, r5, r6, r7, r8, r9, r10, pc}
-.L460:
+.L464:
 .LBB5025:
 .LBB4996:
 	.loc 5 2058 7
 	mov	r0, r5
-	b	.L454
-.L462:
+	b	.L458
+.L466:
 .LBE4996:
 .LBE5025:
 .LBB5026:
@@ -16087,12 +16122,12 @@
 .LBB5011:
 	.loc 5 1766 10
 	mov	r8, #1
-	b	.L458
-.L461:
+	b	.L462
+.L465:
 .LBE5011:
 .LBE5019:
 	mov	r0, r5
-.L457:
+.L461:
 .LBE5026:
 .LBB5027:
 .LBB5024:
@@ -16100,7 +16135,7 @@
 	.loc 13 249 31
 	str	r0, [r6]
 	movs	r3, #0
-	b	.L463
+	b	.L467
 .LBE5023:
 .LBE5024:
 .LBE5027:
@@ -16117,7 +16152,7 @@
 	.type	_ZN12RadioShuttle20UpdateSignalStrengthEmi, %function
 _ZN12RadioShuttle20UpdateSignalStrengthEmi:
 .LFB2606:
-	.loc 3 1526 1
+	.loc 3 1537 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 104
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -16137,7 +16172,7 @@
 	add	r7, r0, #120
 .LBE5058:
 .LBE5057:
-	.loc 3 1526 1
+	.loc 3 1537 1
 	mov	r4, r0
 	str	r1, [sp, #4]
 .LBB5062:
@@ -16147,7 +16182,7 @@
 	add	r1, sp, #4
 .LBE5059:
 .LBE5062:
-	.loc 3 1526 1
+	.loc 3 1537 1
 	mov	r6, r2
 .LBB5063:
 .LBB5060:
@@ -16163,7 +16198,7 @@
 .LBE5066:
 .LBE5065:
 .LBE5064:
-	.loc 3 1530 5
+	.loc 3 1541 5
 	cmp	r0, r8
 .LBB5067:
 .LBB5061:
@@ -16171,50 +16206,50 @@
 	mov	r5, r0
 .LBE5061:
 .LBE5067:
-	.loc 3 1530 5
-	beq	.L465
-	.loc 3 1531 27
+	.loc 3 1541 5
+	beq	.L469
+	.loc 3 1542 27
 	str	r6, [r0, #24]
-	.loc 3 1532 37
+	.loc 3 1543 37
 	movs	r0, #0
 	bl	time
-	.loc 3 1533 26
+	.loc 3 1544 26
 	ldr	r3, [r5, #40]
 	adds	r3, r3, #1
-	.loc 3 1532 31
+	.loc 3 1543 31
 	strd	r0, [r5, #32]
-	.loc 3 1533 26
+	.loc 3 1544 26
 	str	r3, [r5, #40]
-	.loc 3 1534 16
+	.loc 3 1545 16
 	movs	r0, #0
-.L466:
-	.loc 3 1574 1
+.L470:
+	.loc 3 1585 1
 	add	sp, sp, #104
 	.cfi_remember_state
 	.cfi_def_cfa_offset 24
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, pc}
-.L465:
+.L469:
 	.cfi_restore_state
-	.loc 3 1538 12
+	.loc 3 1549 12
 	ldrb	r3, [r4, #28]	@ zero_extendqisi2
 	cmp	r3, #5
 	itt	ls
-	ldrls	r2, .L473
+	ldrls	r2, .L477
 	ldrhls	r3, [r2, r3, lsl #1]
 .LBB5068:
-	.loc 3 1553 5
+	.loc 3 1564 5
 	ldr	r2, [r4, #140]
 .LBE5068:
-	.loc 3 1538 12
+	.loc 3 1549 12
 	it	hi
 	movhi	r3, #1
 .LBB5077:
-	.loc 3 1553 5
+	.loc 3 1564 5
 	cmp	r3, r2
-	bhi	.L468
+	bhi	.L472
 .LBB5069:
-	.loc 3 1554 17
+	.loc 3 1565 17
 	movs	r3, #0
 .LBB5070:
 .LBB5071:
@@ -16222,23 +16257,23 @@
 	ldr	r0, [r4, #132]
 .LBE5071:
 .LBE5070:
-	.loc 3 1554 17
+	.loc 3 1565 17
 	str	r3, [sp, #72]
 .LBE5069:
 .LBE5077:
-	.loc 3 1527 14
+	.loc 3 1538 14
 	mov	r4, #-1
-.L471:
+.L475:
 .LBB5078:
 .LBB5076:
-	.loc 3 1556 40 discriminator 1
+	.loc 3 1567 40 discriminator 1
 	cmp	r8, r0
-	beq	.L469
-	.loc 3 1557 49
+	beq	.L473
+	.loc 3 1568 49
 	ldr	r3, [r0, #32]
-	.loc 3 1557 13
+	.loc 3 1568 13
 	cmp	r3, r4
-	.loc 3 1559 23
+	.loc 3 1570 23
 	ittt	cc
 	ldrcc	r2, [r0, #16]
 	strcc	r2, [sp, #72]
@@ -16247,8 +16282,8 @@
 .LBB5073:
 	.loc 5 287 30
 	bl	_ZSt18_Rb_tree_incrementPSt18_Rb_tree_node_base
-	b	.L471
-.L469:
+	b	.L475
+.L473:
 .LBE5073:
 .LBE5072:
 .LBB5074:
@@ -16257,27 +16292,27 @@
 	add	r1, sp, #72
 	mov	r0, r7
 	bl	_ZNSt8_Rb_treeImSt4pairIKmN12RadioShuttle19SignalStrengthEntryEESt10_Select1stIS4_ESt4lessImESaIS4_EE5eraseERS1_
-.L468:
+.L472:
 .LBE5075:
 .LBE5074:
 .LBE5076:
 .LBE5078:
-	.loc 3 1566 11
+	.loc 3 1577 11
 	movs	r2, #24
 	movs	r1, #0
 	add	r0, sp, #16
 	bl	memset
-	.loc 3 1568 17
+	.loc 3 1579 17
 	ldr	r3, [sp, #4]
-	.loc 3 1567 14
+	.loc 3 1578 14
 	str	r6, [sp, #16]
-	.loc 3 1569 24
+	.loc 3 1580 24
 	movs	r0, #0
-	.loc 3 1568 17
+	.loc 3 1579 17
 	str	r3, [sp, #20]
-	.loc 3 1569 24
+	.loc 3 1580 24
 	bl	time
-	.loc 3 1569 18
+	.loc 3 1580 18
 	strd	r0, [sp, #24]
 .LBB5079:
 .LBB5080:
@@ -16338,12 +16373,12 @@
 	bl	_ZNSt8_Rb_treeImSt4pairIKmN12RadioShuttle19SignalStrengthEntryEESt10_Select1stIS4_ESt4lessImESaIS4_EE16_M_insert_uniqueERKS4_
 .LBE5093:
 .LBE5095:
-	.loc 3 1573 12
+	.loc 3 1584 12
 	movs	r0, #1
-	b	.L466
-.L474:
-	.align	2
-.L473:
+	b	.L470
+.L478:
+	.align	2
+.L477:
 	.word	.LANCHOR4
 	.cfi_endproc
 .LFE2606:
@@ -16369,9 +16404,9 @@
 	ldr	r3, [r1]
 	.loc 13 456 7
 	cmp	r2, r3
-	bcc	.L477
+	bcc	.L481
 	.loc 13 456 7 is_stmt 0 discriminator 2
-	bne	.L478
+	bne	.L482
 	.loc 13 456 36 is_stmt 1 discriminator 3
 	ldr	r0, [r0, #4]
 	ldr	r3, [r1, #4]
@@ -16380,11 +16415,11 @@
 	movge	r0, #0
 	movlt	r0, #1
 	bx	lr
-.L477:
+.L481:
 	.loc 13 456 7
 	movs	r0, #1
 	bx	lr
-.L478:
+.L482:
 	movs	r0, #0
 	.loc 13 456 65
 	bx	lr
@@ -16427,13 +16462,13 @@
 .LBB5117:
 	.loc 5 764 31
 	mov	r5, r6
-.L480:
+.L484:
 .LBE5117:
 .LBE5118:
 .LBB5119:
 .LBB5120:
 	.loc 5 1887 18
-	cbz	r4, .L481
+	cbz	r4, .L485
 .LBB5121:
 .LBB5122:
 	.file 14 "/Volumes/Data/Apps-OSX/gcc-arm-none-eabi-8-2018-q4-major/arm-none-eabi/include/c++/8.2.1/bits/stl_function.h"
@@ -16444,21 +16479,21 @@
 .LBE5122:
 .LBE5121:
 	.loc 5 1888 2
-	cbnz	r0, .L482
+	cbnz	r0, .L486
 	.loc 5 1889 28
 	mov	r5, r4
 	ldr	r4, [r4, #8]
-	b	.L480
-.L482:
+	b	.L484
+.L486:
 	.loc 5 1891 18
 	ldr	r4, [r4, #12]
-	b	.L480
-.L481:
+	b	.L484
+.L485:
 .LBE5120:
 .LBE5119:
 	.loc 5 2542 28
 	cmp	r6, r5
-	beq	.L484
+	beq	.L488
 .LBB5123:
 .LBB5124:
 	.loc 14 386 20
@@ -16470,7 +16505,7 @@
 	cmp	r0, #0
 	it	ne
 	movne	r5, r6
-.L484:
+.L488:
 	.loc 5 2543 5
 	mov	r0, r5
 	pop	{r3, r4, r5, r6, r7, pc}
@@ -16487,7 +16522,7 @@
 	.type	_ZN12RadioShuttle22ProcessResponseMessageEPNS_16ReceivedMsgEntryEPNS_8AppEntryEPNS_12SendMsgEntryEiPvimmhh, %function
 _ZN12RadioShuttle22ProcessResponseMessageEPNS_16ReceivedMsgEntryEPNS_8AppEntryEPNS_12SendMsgEntryEiPvimmhh:
 .LFB2600:
-	.loc 3 1129 1
+	.loc 3 1135 1
 	.cfi_startproc
 	@ args = 28, pretend = 0, frame = 8
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -16503,66 +16538,66 @@
 	mov	r4, r3
 	sub	sp, sp, #20
 	.cfi_def_cfa_offset 48
-	.loc 3 1130 5
+	.loc 3 1136 5
 	ldrb	r3, [r0, #181]	@ zero_extendqisi2
-	.loc 3 1129 1
+	.loc 3 1135 1
 	ldr	r6, [sp, #48]
 	mov	r5, r0
 	mov	r8, r2
 	ldrd	r7, r9, [sp, #56]
-	.loc 3 1130 5
-	cbz	r3, .L487
-	.loc 3 1131 13
-	ldr	r0, .L505
+	.loc 3 1136 5
+	cbz	r3, .L491
+	.loc 3 1137 13
+	ldr	r0, .L509
 	bl	_Z7dprintfPKcz
-.L487:
-	.loc 3 1133 16
+.L491:
+	.loc 3 1139 16
 	ldrb	r3, [r4, #44]	@ zero_extendqisi2
-	.loc 3 1133 5
+	.loc 3 1139 5
 	cmp	r3, #1
-	beq	.L488
-	.loc 3 1133 9 discriminator 1
+	beq	.L492
+	.loc 3 1139 9 discriminator 1
 	cmp	r3, #3
-	beq	.L489
-.L492:
-	.loc 3 1134 16
+	beq	.L493
+.L496:
+	.loc 3 1140 16
 	movs	r0, #0
-.L490:
-	.loc 3 1172 1
+.L494:
+	.loc 3 1178 1
 	add	sp, sp, #20
 	.cfi_remember_state
 	.cfi_def_cfa_offset 28
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, pc}
-.L489:
+.L493:
 	.cfi_restore_state
 .LBB5125:
 .LBB5126:
-	.loc 3 1138 35
+	.loc 3 1144 35
 	and	r6, r6, #160
 .LBE5126:
-	.loc 3 1137 22
+	.loc 3 1143 22
 	movs	r3, #5
 .LBB5141:
-	.loc 3 1138 9
+	.loc 3 1144 9
 	cmp	r6, #32
 .LBE5141:
-	.loc 3 1137 22
+	.loc 3 1143 22
 	strb	r3, [r4, #44]
 .LBB5142:
-	.loc 3 1138 9
-	beq	.L491
-.L504:
+	.loc 3 1144 9
+	beq	.L495
+.L508:
 .LBE5142:
 .LBE5125:
-	.loc 3 1171 12
+	.loc 3 1177 12
 	movs	r0, #1
 .LBB5144:
 .LBB5145:
 .LBB5146:
 .LBB5147:
-	b	.L490
-.L491:
+	b	.L494
+.L495:
 .LBE5147:
 .LBE5146:
 .LBE5145:
@@ -16608,117 +16643,117 @@
 .LBE5140:
 .LBE5139:
 .LBE5138:
-	.loc 3 1140 13
+	.loc 3 1146 13
 	cmp	r0, r5
-	beq	.L492
-	.loc 3 1143 35
+	beq	.L496
+	.loc 3 1149 35
 	ldr	r2, [r4, #108]
 	str	r2, [r0, #36]
-	.loc 3 1142 36
+	.loc 3 1148 36
 	movs	r3, #1
-	.loc 3 1144 35
+	.loc 3 1150 35
 	ldr	r2, [r4, #112]
-	.loc 3 1142 36
+	.loc 3 1148 36
 	strb	r3, [r0, #32]
-	.loc 3 1144 35
+	.loc 3 1150 35
 	str	r2, [r0, #40]
-	b	.L504
-.L488:
+	b	.L508
+.L492:
 .LBE5127:
 .LBE5143:
 .LBE5152:
-	.loc 3 1149 18
+	.loc 3 1155 18
 	movs	r3, #2
 	strb	r3, [r4, #44]
-	.loc 3 1150 5
+	.loc 3 1156 5
 	ldr	r3, [r4, #16]
-	cbnz	r3, .L493
-	.loc 3 1151 24
+	cbnz	r3, .L497
+	.loc 3 1157 24
 	str	r9, [r4, #16]
-.L493:
-	.loc 3 1152 38
+.L497:
+	.loc 3 1158 38
 	ldr	r0, [r5, #160]
 	bl	_ZN4mbed5Timer7read_msEv
-	.loc 3 1153 32
+	.loc 3 1159 32
 	ldr	r3, [sp, #64]
 	add	r0, r0, r3
-	.loc 3 1154 23
+	.loc 3 1160 23
 	movs	r3, #0
 	str	r3, [r4, #56]
-	.loc 3 1155 18
+	.loc 3 1161 18
 	ldrb	r3, [sp, #68]	@ zero_extendqisi2
 	strb	r3, [r4, #72]
-	.loc 3 1156 17
+	.loc 3 1162 17
 	ldrb	r3, [sp, #72]	@ zero_extendqisi2
 	strb	r3, [r4, #73]
 .LBB5153:
-	.loc 3 1157 5
+	.loc 3 1163 5
 	lsls	r3, r6, #26
 .LBE5153:
-	.loc 3 1153 23
+	.loc 3 1159 23
 	str	r0, [r4, #52]
 .LBB5154:
-	.loc 3 1157 5
-	bpl	.L504
-	.loc 3 1157 31 discriminator 1
+	.loc 3 1163 5
+	bpl	.L508
+	.loc 3 1163 31 discriminator 1
 	ldr	r3, [r5, #192]
 	cmp	r3, #0
-	beq	.L504
+	beq	.L508
 .LBB5151:
-	.loc 3 1158 20
+	.loc 3 1164 20
 	ldr	r3, [r4, #12]
 .LBB5149:
-	.loc 3 1159 9
+	.loc 3 1165 9
 	cmp	r7, #8
 .LBE5149:
-	.loc 3 1158 20
+	.loc 3 1164 20
 	orr	r3, r3, #32
 	str	r3, [r4, #12]
 .LBB5150:
-	.loc 3 1159 9
-	bne	.L504
+	.loc 3 1165 9
+	bne	.L508
 .LBB5148:
-	.loc 3 1160 26
+	.loc 3 1166 26
 	ldr	r0, [r5, #192]
-	.loc 3 1160 58
-	ldr	r3, [r0]
-	.loc 3 1160 57
+	.loc 3 1166 58
+	ldr	r3, [r0]
+	.loc 3 1166 57
 	ldr	r3, [r3, #12]
 	blx	r3
-	.loc 3 1161 13
+	.loc 3 1167 13
 	cmp	r0, #32
-	.loc 3 1160 57
+	.loc 3 1166 57
 	mov	r6, r0
-	.loc 3 1161 13
-	bgt	.L504
-	.loc 3 1162 23
+	.loc 3 1167 13
+	bgt	.L508
+	.loc 3 1168 23
 	mov	r2, r7
 	ldr	r1, [sp, #52]
 	add	r0, r4, #108
 	bl	memcpy
-	.loc 3 1163 17
+	.loc 3 1169 17
 	ldr	r0, [r5, #192]
-	.loc 3 1163 44
+	.loc 3 1169 44
 	ldrb	r2, [r8, #16]	@ zero_extendqisi2
-	.loc 3 1163 101
-	ldr	r3, [r0]
-	.loc 3 1163 44
+	.loc 3 1169 101
+	ldr	r3, [r0]
+	.loc 3 1169 44
 	str	r2, [sp]
-	.loc 3 1163 83
+	.loc 3 1169 83
 	add	r5, r4, #76
-	.loc 3 1163 44
+	.loc 3 1169 44
 	str	r5, [sp, #4]
 	ldr	r9, [r3, #16]
 	ldr	r1, [sp, #52]
 	ldr	r3, [r8, #12]
 	mov	r2, r7
 	blx	r9
-	.loc 3 1166 26
+	.loc 3 1172 26
 	strd	r5, r6, [r4, #4]
-	b	.L504
-.L506:
-	.align	2
-.L505:
+	b	.L508
+.L510:
+	.align	2
+.L509:
 	.word	.LC29
 .LBE5148:
 .LBE5150:
@@ -16737,7 +16772,7 @@
 	.type	_ZN12RadioShuttle11SendMessageEPNS_10RadioEntryEPviiimiiihh, %function
 _ZN12RadioShuttle11SendMessageEPNS_10RadioEntryEPviiimiiihh:
 .LFB2604:
-	.loc 3 1341 1
+	.loc 3 1349 1
 	.cfi_startproc
 	@ args = 32, pretend = 0, frame = 32
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -16754,266 +16789,266 @@
 	.cfi_offset 14, -4
 	sub	sp, sp, #52
 	.cfi_def_cfa_offset 88
-	.loc 3 1341 1
+	.loc 3 1349 1
 	mov	r4, r0
 	mov	r7, r1
 	mov	r8, r2
-	.loc 3 1343 11
+	.loc 3 1351 11
 	movs	r1, #0
 	movs	r2, #16
 	add	r0, sp, #32
-	.loc 3 1341 1
+	.loc 3 1349 1
 	ldr	r9, [sp, #100]
 	str	r3, [sp, #16]
 	ldr	r6, [sp, #108]
 	ldrb	r10, [sp, #112]	@ zero_extendqisi2
 	ldrb	fp, [sp, #116]	@ zero_extendqisi2
-	.loc 3 1343 11
+	.loc 3 1351 11
 	bl	memset
-	.loc 3 1347 17
+	.loc 3 1355 17
 	ldrh	r3, [sp, #32]
-	.loc 3 1348 21
+	.loc 3 1356 21
 	ldr	r2, [sp, #88]
-	.loc 3 1347 17
+	.loc 3 1355 17
 	bfi	r3, r9, #7, #9
 	strh	r3, [sp, #32]	@ movhi
-	.loc 3 1348 21
+	.loc 3 1356 21
 	ldrb	r3, [sp, #35]	@ zero_extendqisi2
-	.loc 3 1351 5
+	.loc 3 1359 5
 	ands	r5, r9, #1
-	.loc 3 1348 21
+	.loc 3 1356 21
 	bfi	r3, r2, #3, #5
 	strb	r3, [sp, #35]
-	.loc 3 1351 5
-	beq	.L539
-	.loc 3 1351 37 discriminator 1
+	.loc 3 1359 5
+	beq	.L543
+	.loc 3 1359 37 discriminator 1
 	ldr	r3, [sp, #16]
-	cbnz	r3, .L539
-	.loc 3 1352 24
+	cbnz	r3, .L543
+	.loc 3 1360 24
 	asrs	r3, r6, #4
-	.loc 3 1352 9
+	.loc 3 1360 9
 	movw	r2, #2046
 	cmp	r3, r2
 	it	gt
 	movgt	r3, r6
-.L508:
-	.loc 3 1356 15
+.L512:
+	.loc 3 1364 15
 	ldr	r0, [sp, #92]
 	ldr	r2, [r4, #4]
-	.loc 3 1356 5
+	.loc 3 1364 5
 	cmp	r0, #2048
-	bge	.L509
-	.loc 3 1356 34 discriminator 1
+	bge	.L513
+	.loc 3 1364 34 discriminator 1
 	cmp	r3, #2048
-	bge	.L509
-	.loc 3 1356 76 discriminator 2
-	ldr	r3, .L583
+	bge	.L513
+	.loc 3 1364 76 discriminator 2
+	ldr	r3, .L587
 	cmp	r2, r3
-	bhi	.L509
-	.loc 3 1357 42
+	bhi	.L513
+	.loc 3 1365 42
 	ldr	r1, [sp, #96]
 	cmp	r1, r3
-	bhi	.L509
-	.loc 3 1358 18
+	bhi	.L513
+	.loc 3 1366 18
 	ldrb	r3, [sp, #32]	@ zero_extendqisi2
 	bic	r3, r3, #127
 	orr	r3, r3, #43
 	strb	r3, [sp, #32]
-	.loc 3 1360 29
+	.loc 3 1368 29
 	ldrh	r3, [sp, #36]
 	bfi	r3, r0, #0, #11
 	strh	r3, [sp, #36]	@ movhi
-	.loc 3 1345 9
+	.loc 3 1353 9
 	movs	r3, #0
-.L511:
-	.loc 3 1361 26
+.L515:
+	.loc 3 1369 26
 	cmp	r6, #2048
-	blt	.L510
-	.loc 3 1362 24
+	blt	.L514
+	.loc 3 1370 24
 	asrs	r6, r6, #1
-	.loc 3 1363 21
+	.loc 3 1371 21
 	adds	r3, r3, #1
-	.loc 3 1361 9
-	b	.L511
-.L539:
+	.loc 3 1369 9
+	b	.L515
+.L543:
 	mov	r3, r6
-	b	.L508
-.L510:
-	.loc 3 1365 34
+	b	.L512
+.L514:
+	.loc 3 1373 34
 	ldrh	r0, [sp, #40]
-	.loc 3 1366 35
+	.loc 3 1374 35
 	ldr	r1, [sp, #96]
-	.loc 3 1365 34
+	.loc 3 1373 34
 	bfi	r0, r6, #0, #11
 	strh	r0, [sp, #40]	@ movhi
-	.loc 3 1366 35
+	.loc 3 1374 35
 	ldr	r0, [sp, #36]
 	bfi	r0, r1, #11, #21
 	str	r0, [sp, #36]
-	.loc 3 1367 30
+	.loc 3 1375 30
 	ldr	r0, [sp, #40]
 	bfi	r0, r2, #11, #21
 	str	r0, [sp, #40]
-	.loc 3 1368 14
+	.loc 3 1376 14
 	movs	r2, #12
-.L581:
-	.loc 3 1383 5
+.L585:
+	.loc 3 1391 5
 	cmp	r3, #15
-	.loc 3 1380 14
+	.loc 3 1388 14
 	str	r2, [sp, #20]
-	.loc 3 1383 5
-	ble	.L515
-	.loc 3 1384 9
+	.loc 3 1391 5
+	ble	.L519
+	.loc 3 1392 9
 	ldrb	r3, [r4, #180]	@ zero_extendqisi2
-	cbnz	r3, .L516
-	.loc 3 1384 58 discriminator 1
+	cbnz	r3, .L520
+	.loc 3 1392 58 discriminator 1
 	ldrb	r0, [r4, #181]	@ zero_extendqisi2
-	.loc 3 1384 37 discriminator 1
-	cbz	r0, .L541
-.L516:
-	.loc 3 1385 17
-	ldr	r0, .L583+4
+	.loc 3 1392 37 discriminator 1
+	cbz	r0, .L545
+.L520:
+	.loc 3 1393 17
+	ldr	r0, .L587+4
 	bl	_Z7dprintfPKcz
-.L526:
+.L530:
 .LBB5155:
 .LBB5156:
 .LBB5157:
 .LBB5158:
 .LBB5159:
 .LBB5160:
-	.loc 3 1432 28 discriminator 1
+	.loc 3 1440 28 discriminator 1
 	movs	r0, #0
-.L541:
+.L545:
 .LBE5160:
 .LBE5159:
 .LBE5158:
 .LBE5157:
 .LBE5156:
 .LBE5155:
-	.loc 3 1487 1
+	.loc 3 1495 1
 	add	sp, sp, #52
 	.cfi_remember_state
 	.cfi_def_cfa_offset 36
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, r10, fp, pc}
-.L509:
+.L513:
 	.cfi_restore_state
-	.loc 3 1370 18
+	.loc 3 1378 18
 	ldrb	r3, [sp, #32]	@ zero_extendqisi2
-	.loc 3 1372 28
+	.loc 3 1380 28
 	strh	r0, [sp, #36]	@ movhi
-	.loc 3 1370 18
+	.loc 3 1378 18
 	bic	r3, r3, #127
 	orr	r3, r3, #27
 	strb	r3, [sp, #32]
-	.loc 3 1345 9
+	.loc 3 1353 9
 	movs	r3, #0
-.L514:
-	.loc 3 1373 26
+.L518:
+	.loc 3 1381 26
 	cmp	r6, #65536
-	blt	.L513
-	.loc 3 1374 24
+	blt	.L517
+	.loc 3 1382 24
 	asrs	r6, r6, #1
-	.loc 3 1375 21
+	.loc 3 1383 21
 	adds	r3, r3, #1
-	.loc 3 1373 9
-	b	.L514
-.L513:
-	.loc 3 1378 34
+	.loc 3 1381 9
+	b	.L518
+.L517:
+	.loc 3 1386 34
 	ldr	r1, [sp, #96]
-	.loc 3 1377 33
+	.loc 3 1385 33
 	strh	r6, [sp, #38]	@ movhi
-	.loc 3 1379 29
+	.loc 3 1387 29
 	strd	r1, r2, [sp, #40]
-	.loc 3 1380 14
+	.loc 3 1388 14
 	movs	r2, #16
-	b	.L581
-.L515:
-	.loc 3 1390 5
+	b	.L585
+.L519:
+	.loc 3 1398 5
 	ldr	r2, [sp, #16]
 	cmp	r2, #0
-	bne	.L518
-	.loc 3 1391 9
+	bne	.L522
+	.loc 3 1399 9
 	ldrb	r2, [r4, #28]	@ zero_extendqisi2
 	cmp	r2, #3
-	bls	.L519
-	.loc 3 1391 44 discriminator 1
+	bls	.L523
+	.loc 3 1399 44 discriminator 1
 	cmp	r5, #0
-	beq	.L518
-.L537:
-	.loc 3 1398 23 discriminator 1
+	beq	.L522
+.L541:
+	.loc 3 1406 23 discriminator 1
 	orrs	r2, r10, fp
-	bne	.L520
-	.loc 3 1398 53 discriminator 3
+	bne	.L524
+	.loc 3 1406 53 discriminator 3
 	cmp	r3, #0
-	beq	.L518
-.L520:
-	.loc 3 1399 21
+	beq	.L522
+.L524:
+	.loc 3 1407 21
 	ldrh	r2, [sp, #32]
 	orr	r1, r9, #256
 	bfi	r2, r1, #7, #9
 	strh	r2, [sp, #32]	@ movhi
-	.loc 3 1400 29
+	.loc 3 1408 29
 	ldrb	r2, [sp, #34]	@ zero_extendqisi2
 	bfi	r2, r10, #0, #4
-	.loc 3 1401 28
+	.loc 3 1409 28
 	bfi	r2, fp, #4, #3
 	strb	r2, [sp, #34]
-	.loc 3 1402 30
+	.loc 3 1410 30
 	ldrh	r2, [sp, #34]
 	bfi	r2, r3, #7, #4
-	.loc 3 1404 9
+	.loc 3 1412 9
 	ldr	r3, [sp, #20]
-	.loc 3 1402 30
+	.loc 3 1410 30
 	strh	r2, [sp, #34]	@ movhi
-	.loc 3 1404 9
+	.loc 3 1412 9
 	cmp	r3, #12
-	bne	.L521
-	.loc 3 1405 38
+	bne	.L525
+	.loc 3 1413 38
 	ldrh	r3, [sp, #40]
 	bfi	r3, r6, #0, #11
 	strh	r3, [sp, #40]	@ movhi
-.L522:
-	.loc 3 1413 5
+.L526:
+	.loc 3 1421 5
 	ldr	r2, [sp, #104]
 	movw	r3, #9999
 	cmp	r2, r3
-	bne	.L523
-	.loc 3 1414 32
+	bne	.L527
+	.loc 3 1422 32
 	ldr	r2, [sp, #96]
 	mov	r1, r7
 	mov	r0, r4
 	bl	_ZN12RadioShuttle16CalculateTXPowerEPNS_10RadioEntryEm
 	str	r0, [sp, #104]
-.L523:
-	.loc 3 1415 5
+.L527:
+	.loc 3 1423 5
 	ldr	r3, [r7, #48]
 	ldr	r2, [sp, #104]
 	cmp	r3, r2
-	beq	.L524
-	.loc 3 1416 13
+	beq	.L528
+	.loc 3 1424 13
 	ldr	r0, [r7]
-	.loc 3 1416 40
-	ldr	r3, [r0]
-	.loc 3 1416 32
+	.loc 3 1424 40
+	ldr	r3, [r0]
+	.loc 3 1424 32
 	sxtb	r1, r2
 	ldr	r3, [r3, #124]
 	blx	r3
-	.loc 3 1417 25
+	.loc 3 1425 25
 	ldr	r3, [sp, #104]
 	str	r3, [r7, #48]
-.L524:
+.L528:
 .LBB5195:
-	.loc 3 1426 5
+	.loc 3 1434 5
 	ldr	r3, [r4, #192]
 	cmp	r3, #0
-	beq	.L525
-	.loc 3 1426 23 discriminator 1
+	beq	.L529
+	.loc 3 1434 23 discriminator 1
 	cmp	r8, #0
-	beq	.L525
-	.loc 3 1426 31 discriminator 2
+	beq	.L529
+	.loc 3 1434 31 discriminator 2
 	tst	r9, #64
-	beq	.L525
+	beq	.L529
 .LBB5193:
 .LBB5186:
 .LBB5187:
@@ -17032,7 +17067,7 @@
 .LBE5183:
 .LBE5182:
 .LBE5181:
-	.loc 3 1428 30
+	.loc 3 1436 30
 	cmp	r0, r3
 .LBE5189:
 .LBB5190:
@@ -17042,12 +17077,12 @@
 .LBE5188:
 .LBE5190:
 .LBB5191:
-	.loc 3 1428 30
-	beq	.L525
-	.loc 3 1428 30 is_stmt 0 discriminator 1
+	.loc 3 1436 30
+	beq	.L529
+	.loc 3 1436 30 is_stmt 0 discriminator 1
 	ldr	r3, [r0, #32]
 	cmp	r3, #0
-	beq	.L525
+	beq	.L529
 .LBB5184:
 .LBB5166:
 .LBB5167:
@@ -17089,7 +17124,7 @@
 .LBE5163:
 .LBE5162:
 .LBE5161:
-	.loc 3 1430 13
+	.loc 3 1438 13
 	cmp	r0, r3
 .LBE5177:
 .LBB5178:
@@ -17099,139 +17134,139 @@
 .LBE5174:
 .LBE5178:
 .LBB5179:
-	.loc 3 1430 13
-	beq	.L525
+	.loc 3 1438 13
+	beq	.L529
 .LBB5164:
-	.loc 3 1431 17
+	.loc 3 1439 17
 	ldrb	r3, [r0, #32]	@ zero_extendqisi2
 	cmp	r3, #0
-	beq	.L526
-	.loc 3 1434 30
+	beq	.L530
+	.loc 3 1442 30
 	ldr	r0, [r4, #192]
-	.loc 3 1434 64
-	ldr	r3, [r0]
-	.loc 3 1434 63
+	.loc 3 1442 64
+	ldr	r3, [r0]
+	.loc 3 1442 63
 	ldr	r3, [r3, #8]
 	blx	r3
-	.loc 3 1434 28
+	.loc 3 1442 28
 	ldrb	r3, [sp, #24]	@ zero_extendqisi2
 	bfi	r3, r0, #0, #3
 	strb	r3, [sp, #24]
-	.loc 3 1435 40
+	.loc 3 1443 40
 	mov	r2, r8
 	ldr	r3, [sp, #16]
 	movs	r1, #13
 	mov	r0, r4
 	bl	_ZN12RadioShuttle10GetDataSumEiPvi
-	.loc 3 1435 28
+	.loc 3 1443 28
 	ldrh	r3, [sp, #24]
-	.loc 3 1436 40
+	.loc 3 1444 40
 	ldrh	r2, [sp, #34]
-	.loc 3 1435 28
+	.loc 3 1443 28
 	bfi	r3, r0, #3, #13
 	strh	r3, [sp, #24]	@ movhi
-	.loc 3 1436 28
+	.loc 3 1444 28
 	ldrh	r3, [sp, #26]
-	.loc 3 1441 28
+	.loc 3 1449 28
 	ldr	r0, [r4, #192]
-	.loc 3 1436 28
+	.loc 3 1444 28
 	bfi	r3, r2, #0, #11
-	.loc 3 1437 38
+	.loc 3 1445 38
 	ldrb	r2, [sp, #35]	@ zero_extendqisi2
-	.loc 3 1436 28
+	.loc 3 1444 28
 	strh	r3, [sp, #26]	@ movhi
-	.loc 3 1437 26
+	.loc 3 1445 26
 	lsrs	r2, r2, #3
 	ubfx	r3, r3, #8, #8
 	bfi	r3, r2, #3, #5
 	strb	r3, [sp, #27]
-	.loc 3 1438 27
+	.loc 3 1446 27
 	ldr	r3, [r6, #36]
 	str	r3, [sp, #28]
-	.loc 3 1440 30
+	.loc 3 1448 30
 	ldr	r3, [sp, #16]
 	add	r6, r3, #8
-	.loc 3 1441 66
-	ldr	r3, [r0]
-	.loc 3 1441 65
+	.loc 3 1449 66
+	ldr	r3, [r0]
+	.loc 3 1449 65
 	ldr	r3, [r3, #20]
 	blx	r3
-	.loc 3 1442 21
+	.loc 3 1450 21
 	sdiv	r3, r6, r0
 	mls	r3, r0, r3, r6
-	.loc 3 1443 17
-	cbz	r3, .L527
-	.loc 3 1444 37
+	.loc 3 1451 17
+	cbz	r3, .L531
+	.loc 3 1452 37
 	subs	r0, r0, r3
-	.loc 3 1444 28
+	.loc 3 1452 28
 	add	r6, r6, r0
-.L527:
-	.loc 3 1445 54
+.L531:
+	.loc 3 1453 54
 	mov	r0, r6
 	bl	_Znaj
 	mov	fp, r0
-	.loc 3 1446 49
+	.loc 3 1454 49
 	mov	r0, r6
 	bl	_Znaj
 	mov	r9, r0
-	.loc 3 1447 17
+	.loc 3 1455 17
 	cmp	fp, #0
-	beq	.L528
-	.loc 3 1447 37 discriminator 1
-	cbnz	r0, .L529
-	.loc 3 1449 34 discriminator 1
+	beq	.L532
+	.loc 3 1455 37 discriminator 1
+	cbnz	r0, .L533
+	.loc 3 1457 34 discriminator 1
 	mov	r0, fp
 	bl	_ZdaPv
-.L528:
-	.loc 3 1450 45
+.L532:
+	.loc 3 1458 45
 	ldr	r3, [r7, #128]
 	adds	r3, r3, #1
 	str	r3, [r7, #128]
-	.loc 3 1451 28
-	b	.L526
-.L521:
+	.loc 3 1459 28
+	b	.L530
+.L525:
 .LBE5164:
 .LBE5179:
 .LBE5184:
 .LBE5191:
 .LBE5193:
 .LBE5195:
-	.loc 3 1406 9
+	.loc 3 1414 9
 	ldr	r3, [sp, #20]
 	cmp	r3, #16
-	bne	.L522
-	.loc 3 1407 37
+	bne	.L526
+	.loc 3 1415 37
 	strh	r6, [sp, #38]	@ movhi
-	b	.L522
-.L584:
-	.align	2
-.L583:
+	b	.L526
+.L588:
+	.align	2
+.L587:
 	.word	2097151
 	.word	.LC30
-.L529:
+.L533:
 .LBB5196:
 .LBB5194:
 .LBB5192:
 .LBB5185:
 .LBB5180:
 .LBB5165:
-	.loc 3 1453 23
+	.loc 3 1461 23
 	movs	r2, #8
 	add	r1, sp, #24
 	mov	r0, fp
 	bl	memcpy
-	.loc 3 1454 23
+	.loc 3 1462 23
 	ldr	r2, [sp, #16]
 	mov	r1, r8
 	add	r0, fp, #8
 	bl	memcpy
-	.loc 3 1456 33
+	.loc 3 1464 33
 	ldr	r0, [r4, #192]
-	.loc 3 1456 71
+	.loc 3 1464 71
 	ldrb	r2, [r10, #36]	@ zero_extendqisi2
-	.loc 3 1456 109
-	ldr	r3, [r0]
-	.loc 3 1456 71
+	.loc 3 1464 109
+	ldr	r3, [r0]
+	.loc 3 1464 71
 	movs	r1, #0
 	str	r1, [sp]
 	ldr	r3, [r3, #24]
@@ -17240,11 +17275,11 @@
 	ldr	r1, [r10, #32]
 	blx	r5
 	mov	r10, r0
-	.loc 3 1457 17
+	.loc 3 1465 17
 	ldr	r0, [r4, #192]
-	.loc 3 1457 84
-	ldr	r3, [r0]
-	.loc 3 1457 46
+	.loc 3 1465 84
+	ldr	r3, [r0]
+	.loc 3 1465 46
 	str	r6, [sp]
 	ldr	r3, [r3, #32]
 	mov	r2, fp
@@ -17252,27 +17287,27 @@
 	mov	r1, r10
 	mov	r3, r9
 	blx	r5
-	.loc 3 1458 17
+	.loc 3 1466 17
 	ldr	r0, [r4, #192]
-	.loc 3 1458 64
-	ldr	r3, [r0]
-	.loc 3 1458 56
+	.loc 3 1466 64
+	ldr	r3, [r0]
+	.loc 3 1466 56
 	mov	r1, r10
 	ldr	r3, [r3, #28]
 	blx	r3
-	.loc 3 1459 26
+	.loc 3 1467 26
 	mov	r0, fp
 	bl	_ZdaPv
-	.loc 3 1460 17
+	.loc 3 1468 17
 	ldrb	r3, [r4, #180]	@ zero_extendqisi2
-	cbz	r3, .L531
-	.loc 3 1461 10
+	cbz	r3, .L535
+	.loc 3 1469 10
 	movs	r3, #0
 	mov	r2, r6
 	mov	r1, r9
-	ldr	r0, .L585
+	ldr	r0, .L589
 	bl	_Z4dumpPKcPKvib
-.L531:
+.L535:
 	ldrd	r2, r3, [sp, #16]
 .LBE5165:
 .LBE5180:
@@ -17280,105 +17315,105 @@
 .LBE5192:
 .LBE5194:
 .LBE5196:
-	.loc 3 1469 9
+	.loc 3 1477 9
 	ldr	r0, [r4, #188]
 	add	fp, r2, r3
-	.loc 3 1469 5
-	cbz	r0, .L532
-	.loc 3 1470 67
-	ldr	r3, [r0]
-	.loc 3 1470 29
+	.loc 3 1477 5
+	cbz	r0, .L536
+	.loc 3 1478 67
+	ldr	r3, [r0]
+	.loc 3 1478 29
 	ldr	r2, [sp, #104]
 	str	r2, [sp]
 	ldr	r10, [r3, #8]
 	ldrd	r1, r2, [sp, #92]
 	mov	r3, fp
 	blx	r10
-.L532:
+.L536:
 	ldr	r0, [r7]
 	ldrsh	r2, [sp, #20]
 	ldr	r3, [r0]
 	ldr	r10, [r3, #48]
-	.loc 3 1471 5
+	.loc 3 1479 5
 	cmp	r8, #0
-	bne	.L533
-	.loc 3 1472 24
+	bne	.L537
+	.loc 3 1480 24
 	str	r8, [sp]
 	mov	r3, r8
 	add	r1, sp, #32
-.L582:
-	.loc 3 1477 28
+.L586:
+	.loc 3 1485 28
 	blx	r10
-	.loc 3 1479 24
+	.loc 3 1487 24
 	movs	r3, #0
-	.loc 3 1481 16
+	.loc 3 1489 16
 	ldr	r2, [sp, #16]
-	.loc 3 1479 24
+	.loc 3 1487 24
 	strb	r3, [r7, #172]
-	.loc 3 1481 16
+	.loc 3 1489 16
 	cmp	r8, r3
 	it	eq
 	moveq	r2, r3
 	movs	r6, #1
 	strd	r3, r2, [sp, #12]
 	strd	r8, r2, [sp]
-	.loc 3 1480 20
+	.loc 3 1488 20
 	strh	fp, [r7, #46]	@ movhi
-	.loc 3 1481 16
+	.loc 3 1489 16
 	str	r6, [sp, #8]
 	add	r3, sp, #32
-	ldr	r2, .L585+4
+	ldr	r2, .L589+4
 	mov	r1, r7
 	mov	r0, r4
 	bl	_ZN12RadioShuttle11PacketTraceEPNS_10RadioEntryEPKcPNS_11RadioHeaderEPvibPNS_16ReceivedMsgEntryE
-	.loc 3 1483 5
+	.loc 3 1491 5
 	cmp	r9, #0
-	beq	.L540
-	.loc 3 1484 18 discriminator 1
+	beq	.L544
+	.loc 3 1492 18 discriminator 1
 	mov	r0, r9
 	bl	_ZdaPv
-.L540:
-	.loc 3 1486 12
+.L544:
+	.loc 3 1494 12
 	mov	r0, r6
-	b	.L541
-.L525:
-	.loc 3 1424 9
+	b	.L545
+.L529:
+	.loc 3 1432 9
 	movs	r6, #0
-	.loc 3 1423 14
+	.loc 3 1431 14
 	mov	r9, r6
-	b	.L531
-.L533:
-	.loc 3 1475 28
+	b	.L535
+.L537:
+	.loc 3 1483 28
 	str	r2, [sp]
 	add	r3, sp, #32
-	.loc 3 1474 9
+	.loc 3 1482 9
 	cmp	r9, #0
-	beq	.L535
-	.loc 3 1475 28
+	beq	.L539
+	.loc 3 1483 28
 	sxth	r2, r6
 	mov	r1, r9
-	b	.L582
-.L535:
-	.loc 3 1477 28
+	b	.L586
+.L539:
+	.loc 3 1485 28
 	ldrsh	r2, [sp, #16]
 	mov	r1, r8
-	b	.L582
-.L519:
-	.loc 3 1393 39
+	b	.L586
+.L523:
+	.loc 3 1401 39
 	cmp	r5, #0
-	beq	.L537
-.L518:
-	.loc 3 1410 33
+	beq	.L541
+.L522:
+	.loc 3 1418 33
 	ldrd	r2, r3, [sp, #16]
 	add	r3, r3, r2
-	.loc 3 1410 27
+	.loc 3 1418 27
 	ldrh	r2, [sp, #34]
 	bfi	r2, r3, #0, #11
 	strh	r2, [sp, #34]	@ movhi
-	b	.L522
-.L586:
-	.align	2
-.L585:
+	b	.L526
+.L590:
+	.align	2
+.L589:
 	.word	.LC31
 	.word	.LC32
 	.cfi_endproc
@@ -17394,7 +17429,7 @@
 	.type	_ZN12RadioShuttle14ReceiveMessageEPNS_16ReceivedMsgEntryEPPvRiS4_S4_S4_RmS5_S4_RhS6_, %function
 _ZN12RadioShuttle14ReceiveMessageEPNS_16ReceivedMsgEntryEPPvRiS4_S4_S4_RmS5_S4_RhS6_:
 .LFB2608:
-	.loc 3 1596 1
+	.loc 3 1607 1
 	.cfi_startproc
 	@ args = 32, pretend = 0, frame = 16
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -17409,35 +17444,35 @@
 	.cfi_offset 10, -12
 	.cfi_offset 11, -8
 	.cfi_offset 14, -4
-	.loc 3 1597 18
+	.loc 3 1608 18
 	ldr	r7, [r1]
-	.loc 3 1596 1
+	.loc 3 1607 1
 	sub	sp, sp, #36
 	.cfi_def_cfa_offset 72
-	.loc 3 1596 1
+	.loc 3 1607 1
 	mov	fp, r0
 	str	r3, [sp, #16]
-	.loc 3 1600 30
+	.loc 3 1611 30
 	ldrb	r3, [r7]	@ zero_extendqisi2
-	.loc 3 1596 1
+	.loc 3 1607 1
 	ldr	r10, [sp, #76]
-	.loc 3 1600 30
+	.loc 3 1611 30
 	and	r3, r3, #127
-	.loc 3 1600 5
+	.loc 3 1611 5
 	cmp	r3, #27
-	.loc 3 1596 1
+	.loc 3 1607 1
 	mov	r4, r1
 	mov	r8, r2
 	ldrd	r6, r9, [sp, #88]
-	.loc 3 1600 5
-	beq	.L607
-	.loc 3 1603 14
+	.loc 3 1611 5
+	beq	.L611
+	.loc 3 1614 14
 	cmp	r3, #43
 	ite	ne
 	movne	r3, #0
 	moveq	r3, #12
-.L588:
-	.loc 3 1605 16
+.L592:
+	.loc 3 1616 16
 	movs	r2, #0
 	str	r2, [sp, #8]
 	ldr	r2, [r4, #4]
@@ -17446,259 +17481,259 @@
 	add	r3, r3, r7
 	str	r2, [sp, #4]
 	str	r3, [sp]
-	ldr	r2, .L636
+	ldr	r2, .L640
 	ldr	r1, [r4, #16]
 	mov	r3, r7
 	mov	r0, fp
 	bl	_ZN12RadioShuttle11PacketTraceEPNS_10RadioEntryEPKcPNS_11RadioHeaderEPvibPNS_16ReceivedMsgEntryE
-	.loc 3 1606 5
+	.loc 3 1617 5
 	ldrb	r3, [fp, #181]	@ zero_extendqisi2
-	cbz	r3, .L589
-	.loc 3 1607 52
+	cbz	r3, .L593
+	.loc 3 1618 52
 	ldr	r2, [r4, #16]
-	.loc 3 1607 56
+	.loc 3 1618 56
 	ldr	r0, [r2]
-	.loc 3 1607 80
+	.loc 3 1618 80
 	ldrb	r1, [r2, #44]	@ zero_extendqisi2
-	.loc 3 1607 95
-	ldr	r3, [r0]
-	.loc 3 1607 80
+	.loc 3 1618 95
+	ldr	r3, [r0]
+	.loc 3 1618 80
 	ldr	r3, [r3, #88]
 	blx	r3
-	.loc 3 1607 13
+	.loc 3 1618 13
 	mov	r1, r0
-	ldr	r0, .L636+4
+	ldr	r0, .L640+4
 	bl	_Z7dprintfPKcz
-.L589:
-	.loc 3 1609 19
+.L593:
+	.loc 3 1620 19
 	ldrb	r3, [r7]	@ zero_extendqisi2
-	.loc 3 1609 5
+	.loc 3 1620 5
 	and	r2, r3, #15
 	cmp	r2, #11
-	beq	.L590
-.L635:
-	.loc 3 1614 14
+	beq	.L594
+.L639:
+	.loc 3 1625 14
 	ldr	r2, [r4, #16]
-	.loc 3 1614 43
+	.loc 3 1625 43
 	ldr	r3, [r2, #116]
 	adds	r3, r3, #1
 	str	r3, [r2, #116]
-.L609:
+.L613:
 .LBB5197:
 .LBB5198:
 .LBB5199:
 .LBB5200:
 .LBB5201:
 	movs	r6, #0
-	b	.L591
-.L607:
+	b	.L595
+.L611:
 .LBE5201:
 .LBE5200:
 .LBE5199:
 .LBE5198:
 .LBE5197:
-	.loc 3 1601 14
+	.loc 3 1612 14
 	movs	r3, #16
-	b	.L588
-.L590:
-	.loc 3 1613 23
+	b	.L592
+.L594:
+	.loc 3 1624 23
 	and	r3, r3, #112
-	.loc 3 1613 5
+	.loc 3 1624 5
 	cmp	r3, #16
-	beq	.L592
-	.loc 3 1613 9 discriminator 1
+	beq	.L596
+	.loc 3 1624 9 discriminator 1
 	cmp	r3, #32
-	bne	.L635
-.L592:
-	.loc 3 1619 13
+	bne	.L639
+.L596:
+	.loc 3 1630 13
 	ldr	r2, [sp, #96]
-	.loc 3 1618 11
+	.loc 3 1629 11
 	movs	r3, #0
 	str	r3, [r8]
-	.loc 3 1619 13
+	.loc 3 1630 13
 	strb	r3, [r2]
-	.loc 3 1620 12
+	.loc 3 1631 12
 	ldr	r2, [sp, #100]
 	strb	r3, [r2]
-	.loc 3 1622 17
+	.loc 3 1633 17
 	ldrh	r3, [r7]
 	ldr	r2, [sp, #80]
-	.loc 3 1624 21
+	.loc 3 1635 21
 	ldrb	r5, [r7]	@ zero_extendqisi2
-	.loc 3 1622 17
+	.loc 3 1633 17
 	lsrs	r3, r3, #7
 	str	r3, [r2]
-	.loc 3 1623 24
+	.loc 3 1634 24
 	ldrb	r3, [r7, #3]	@ zero_extendqisi2
 	ldr	r2, [sp, #72]
 	lsrs	r3, r3, #3
-	.loc 3 1624 5
+	.loc 3 1635 5
 	and	r5, r5, #112
-	.loc 3 1623 24
+	.loc 3 1634 24
 	str	r3, [r2]
-	.loc 3 1624 5
+	.loc 3 1635 5
 	cmp	r5, #16
-	.loc 3 1625 31
+	.loc 3 1636 31
 	ldrh	r3, [r7, #4]
-	.loc 3 1624 5
-	bne	.L593
-	.loc 3 1625 31
+	.loc 3 1635 5
+	bne	.L597
+	.loc 3 1636 31
 	str	r3, [r10]
-	.loc 3 1627 21
+	.loc 3 1638 21
 	ldr	r2, [sp, #84]
-	.loc 3 1626 36
+	.loc 3 1637 36
 	ldrh	r3, [r7, #6]
 	str	r3, [r9]
-	.loc 3 1627 37
+	.loc 3 1638 37
 	ldr	r3, [r7, #8]
-	.loc 3 1627 21
+	.loc 3 1638 21
 	str	r3, [r2]
-	.loc 3 1628 32
+	.loc 3 1639 32
 	ldr	r3, [r7, #12]
-	.loc 3 1628 16
+	.loc 3 1639 16
 	str	r3, [r6]
-.L594:
-	.loc 3 1638 15
+.L598:
+	.loc 3 1649 15
 	ldr	r3, [sp, #80]
 	ldr	r3, [r3]
-	.loc 3 1638 5
+	.loc 3 1649 5
 	ands	r3, r3, #256
-	beq	.L595
-	.loc 3 1639 13
+	beq	.L599
+	.loc 3 1650 13
 	ldr	r3, [sp, #16]
-	.loc 3 1640 17
+	.loc 3 1651 17
 	ldr	r2, [sp, #96]
-	.loc 3 1639 13
+	.loc 3 1650 13
 	str	r5, [r3]
-	.loc 3 1640 32
+	.loc 3 1651 32
 	ldrb	r3, [r7, #2]	@ zero_extendqisi2
 	ubfx	r3, r3, #0, #4
-	.loc 3 1640 17
+	.loc 3 1651 17
 	strb	r3, [r2]
-	.loc 3 1641 31
+	.loc 3 1652 31
 	ldrb	r3, [r7, #2]	@ zero_extendqisi2
-	.loc 3 1641 16
+	.loc 3 1652 16
 	ldr	r2, [sp, #100]
-	.loc 3 1641 31
+	.loc 3 1652 31
 	ubfx	r3, r3, #4, #3
-	.loc 3 1641 16
+	.loc 3 1652 16
 	strb	r3, [r2]
-	.loc 3 1642 37
+	.loc 3 1653 37
 	ldrh	r3, [r7, #2]
 	ubfx	r2, r3, #7, #4
-	.loc 3 1642 20
+	.loc 3 1653 20
 	ldr	r3, [r9]
 	lsls	r3, r3, r2
 	str	r3, [r9]
-.L596:
-	.loc 3 1653 9
+.L600:
+	.loc 3 1664 9
 	ldr	r3, [sp, #84]
 	ldr	r3, [r3]
-	.loc 3 1653 5
-	cbz	r3, .L597
-	.loc 3 1653 35 discriminator 1
+	.loc 3 1664 5
+	cbz	r3, .L601
+	.loc 3 1664 35 discriminator 1
 	ldr	r2, [fp, #4]
 	cmp	r3, r2
-	beq	.L597
-	.loc 3 1654 14
+	beq	.L601
+	.loc 3 1665 14
 	ldr	r2, [r4, #16]
-	.loc 3 1654 38
+	.loc 3 1665 38
 	ldr	r3, [r2, #124]
 	adds	r3, r3, #1
 	str	r3, [r2, #124]
-	b	.L609
-.L593:
-	.loc 3 1631 32
+	b	.L613
+.L597:
+	.loc 3 1642 32
 	ubfx	r3, r3, #0, #11
 	str	r3, [r10]
-	.loc 3 1632 37
+	.loc 3 1643 37
 	ldrh	r3, [r7, #8]
-	.loc 3 1633 21
+	.loc 3 1644 21
 	ldr	r2, [sp, #84]
-	.loc 3 1632 37
+	.loc 3 1643 37
 	ubfx	r3, r3, #0, #11
 	str	r3, [r9]
-	.loc 3 1633 38
+	.loc 3 1644 38
 	ldr	r3, [r7, #4]
 	ubfx	r3, r3, #11, #21
-	.loc 3 1633 21
+	.loc 3 1644 21
 	str	r3, [r2]
-	.loc 3 1634 33
+	.loc 3 1645 33
 	ldr	r3, [r7, #8]
 	ubfx	r3, r3, #11, #21
-	.loc 3 1634 16
+	.loc 3 1645 16
 	str	r3, [r6]
-	.loc 3 1635 14
+	.loc 3 1646 14
 	movs	r5, #12
-	b	.L594
-.L595:
-	.loc 3 1644 23
+	b	.L598
+.L599:
+	.loc 3 1655 23
 	ldrh	r2, [r7, #2]
-	.loc 3 1644 10
+	.loc 3 1655 10
 	ldr	r1, [sp, #16]
-	.loc 3 1644 23
+	.loc 3 1655 23
 	ubfx	r2, r2, #0, #11
-	.loc 3 1644 31
+	.loc 3 1655 31
 	subs	r2, r2, r5
-	.loc 3 1645 9
+	.loc 3 1656 9
 	cmp	r2, #0
-	.loc 3 1644 10
+	.loc 3 1655 10
 	str	r2, [r1]
-	.loc 3 1645 9
-	bge	.L596
-	.loc 3 1646 18
+	.loc 3 1656 9
+	bge	.L600
+	.loc 3 1657 18
 	ldr	r1, [r4, #16]
-	.loc 3 1646 42
+	.loc 3 1657 42
 	ldr	r2, [r1, #124]
 	adds	r2, r2, #1
 	str	r2, [r1, #124]
-	b	.L609
-.L597:
-	.loc 3 1658 5
+	b	.L613
+.L601:
+	.loc 3 1669 5
 	ldr	r3, [r4, #4]
-	.loc 3 1661 25
+	.loc 3 1672 25
 	ldr	r2, [r4, #8]
 	ldr	r1, [r6]
-	.loc 3 1658 5
+	.loc 3 1669 5
 	cmp	r3, r5
-	.loc 3 1659 37
+	.loc 3 1670 37
 	ittt	gt
 	ldrgt	r3, [r4]
 	addgt	r3, r3, r5
-	.loc 3 1659 12
+	.loc 3 1670 12
 	strgt	r3, [r8]
-	.loc 3 1661 25
+	.loc 3 1672 25
 	mov	r0, fp
 	bl	_ZN12RadioShuttle20UpdateSignalStrengthEmi
 .LBB5230:
-	.loc 3 1665 5
+	.loc 3 1676 5
 	ldr	r3, [fp, #192]
-	cbnz	r3, .L599
-.L600:
+	cbnz	r3, .L603
+.L604:
 .LBE5230:
-	.loc 3 1707 12
+	.loc 3 1718 12
 	movs	r6, #1
-.L591:
-	.loc 3 1708 1 discriminator 4
+.L595:
+	.loc 3 1719 1 discriminator 4
 	mov	r0, r6
 	add	sp, sp, #36
 	.cfi_remember_state
 	.cfi_def_cfa_offset 36
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, r10, fp, pc}
-.L599:
+.L603:
 	.cfi_restore_state
 .LBB5231:
-	.loc 3 1665 23 discriminator 1
+	.loc 3 1676 23 discriminator 1
 	ldr	r3, [r8]
 	cmp	r3, #0
-	beq	.L600
-	.loc 3 1665 41 discriminator 2
+	beq	.L604
+	.loc 3 1676 41 discriminator 2
 	ldr	r3, [sp, #80]
 	ldr	r3, [r3]
-	.loc 3 1665 32 discriminator 2
+	.loc 3 1676 32 discriminator 2
 	lsls	r3, r3, #25
-	bpl	.L600
+	bpl	.L604
 .LBB5224:
 .LBB5225:
 	.loc 12 1169 29
@@ -17716,7 +17751,7 @@
 .LBE5222:
 .LBE5221:
 .LBE5220:
-	.loc 3 1667 30
+	.loc 3 1678 30
 	cmp	r0, r3
 .LBE5227:
 .LBB5228:
@@ -17726,12 +17761,12 @@
 .LBE5226:
 .LBE5228:
 .LBB5229:
-	.loc 3 1667 30
-	beq	.L600
-	.loc 3 1667 30 is_stmt 0 discriminator 1
+	.loc 3 1678 30
+	beq	.L604
+	.loc 3 1678 30 is_stmt 0 discriminator 1
 	ldr	r3, [r0, #32]
 	cmp	r3, #0
-	beq	.L600
+	beq	.L604
 .LBB5223:
 .LBB5206:
 .LBB5207:
@@ -17773,7 +17808,7 @@
 .LBE5204:
 .LBE5203:
 .LBE5202:
-	.loc 3 1669 13
+	.loc 3 1680 13
 	cmp	r0, r3
 .LBE5217:
 .LBB5218:
@@ -17783,188 +17818,188 @@
 .LBE5214:
 .LBE5218:
 .LBB5219:
-	.loc 3 1669 13
-	beq	.L600
+	.loc 3 1680 13
+	beq	.L604
 .LBB5205:
-	.loc 3 1671 42
+	.loc 3 1682 42
 	ldr	r0, [fp, #192]
-	.loc 3 1671 33
+	.loc 3 1682 33
 	ldr	r6, [r4, #4]
-	.loc 3 1671 80
-	ldr	r3, [r0]
-	.loc 3 1671 79
+	.loc 3 1682 80
+	ldr	r3, [r0]
+	.loc 3 1682 79
 	ldr	r3, [r3, #20]
 	blx	r3
-	.loc 3 1671 33
+	.loc 3 1682 33
 	subs	r6, r6, r5
-	.loc 3 1671 40
+	.loc 3 1682 40
 	sdiv	r3, r6, r0
 	mls	r0, r3, r0, r6
-	.loc 3 1671 17
+	.loc 3 1682 17
 	cmp	r0, #0
-	bgt	.L609
-	.loc 3 1673 63
+	bgt	.L613
+	.loc 3 1684 63
 	ldr	r0, [r4, #4]
-	.loc 3 1673 68
+	.loc 3 1684 68
 	subs	r0, r0, r5
 	bl	_Znaj
-	.loc 3 1674 17
+	.loc 3 1685 17
 	mov	r6, r0
-	cbnz	r0, .L601
-	.loc 3 1675 26
+	cbnz	r0, .L605
+	.loc 3 1686 26
 	ldr	r2, [r4, #16]
-	.loc 3 1675 50
+	.loc 3 1686 50
 	ldr	r3, [r2, #128]
 	adds	r3, r3, #1
 	str	r3, [r2, #128]
-	.loc 3 1676 28
-	b	.L591
-.L601:
-	.loc 3 1678 55
+	.loc 3 1687 28
+	b	.L595
+.L605:
+	.loc 3 1689 55
 	ldr	r2, [r4, #4]
-	.loc 3 1678 23
+	.loc 3 1689 23
 	ldr	r1, [r8]
 	subs	r2, r2, r5
 	bl	memcpy
-	.loc 3 1680 33
+	.loc 3 1691 33
 	ldr	r0, [fp, #192]
-	.loc 3 1680 71
+	.loc 3 1691 71
 	ldrb	r2, [r7, #36]	@ zero_extendqisi2
-	.loc 3 1680 109
+	.loc 3 1691 109
 	ldr	r1, [r0]
-	.loc 3 1680 71
+	.loc 3 1691 71
 	movs	r3, #0
 	str	r3, [sp]
 	ldr	r9, [r1, #24]
 	ldr	r1, [r7, #32]
 	blx	r9
-	.loc 3 1681 46
+	.loc 3 1692 46
 	ldr	r3, [r4, #4]
-	.loc 3 1680 71
+	.loc 3 1691 71
 	mov	r7, r0
-	.loc 3 1681 17
+	.loc 3 1692 17
 	ldr	r0, [fp, #192]
-	.loc 3 1681 46
+	.loc 3 1692 46
 	subs	r3, r3, r5
-	.loc 3 1681 92
+	.loc 3 1692 92
 	ldr	r2, [r0]
-	.loc 3 1681 46
+	.loc 3 1692 46
 	str	r3, [sp]
 	ldr	r9, [r2, #36]
 	ldr	r3, [r8]
 	mov	r2, r6
 	mov	r1, r7
 	blx	r9
-	.loc 3 1682 17
+	.loc 3 1693 17
 	ldr	r0, [fp, #192]
-	.loc 3 1682 64
-	ldr	r3, [r0]
-	.loc 3 1682 56
+	.loc 3 1693 64
+	ldr	r3, [r0]
+	.loc 3 1693 56
 	mov	r1, r7
 	ldr	r3, [r3, #28]
 	blx	r3
-	.loc 3 1683 26
+	.loc 3 1694 26
 	mov	r0, r6
 	bl	_ZdaPv
-	.loc 3 1684 35
+	.loc 3 1695 35
 	ldr	r7, [r8]
-	.loc 3 1685 44
+	.loc 3 1696 44
 	add	r3, r7, #8
-	.loc 3 1685 23
+	.loc 3 1696 23
 	str	r3, [r8]
-	.loc 3 1687 36
+	.loc 3 1698 36
 	ldr	r0, [fp, #192]
-	.loc 3 1687 25
+	.loc 3 1698 25
 	ldrb	r9, [r7]	@ zero_extendqisi2
-	.loc 3 1687 70
-	ldr	r3, [r0]
-	.loc 3 1687 69
+	.loc 3 1698 70
+	ldr	r3, [r0]
+	.loc 3 1698 69
 	ldr	r3, [r3, #8]
 	blx	r3
-	.loc 3 1689 46
+	.loc 3 1700 46
 	ldr	r3, [r8]
-	.loc 3 1689 71
+	.loc 3 1700 71
 	ldrh	r8, [r7, #2]
-	.loc 3 1689 46
+	.loc 3 1700 46
 	str	r3, [sp, #20]
-	.loc 3 1689 71
+	.loc 3 1700 71
 	ubfx	r8, r8, #0, #11
-	.loc 3 1689 46
+	.loc 3 1700 46
 	sub	r3, r8, r5
-	.loc 3 1687 69
+	.loc 3 1698 69
 	mov	r6, r0
-	.loc 3 1689 46
+	.loc 3 1700 46
 	ldr	r2, [sp, #20]
 	movs	r1, #13
 	mov	r0, fp
 	bl	_ZN12RadioShuttle10GetDataSumEiPvi
-	.loc 3 1689 25
+	.loc 3 1700 25
 	ldrh	r3, [r7]
-	.loc 3 1689 17
+	.loc 3 1700 17
 	cmp	r0, r3, lsr #3
-	.loc 3 1687 25
+	.loc 3 1698 25
 	and	r9, r9, #7
-	.loc 3 1689 17
-	bne	.L610
-	.loc 3 1687 17
+	.loc 3 1700 17
+	bne	.L614
+	.loc 3 1698 17
 	subs	r3, r9, r6
 	it	ne
 	movne	r3, #1
-.L602:
-	.loc 3 1691 17
+.L606:
+	.loc 3 1702 17
 	ldr	r2, [sp, #72]
-	.loc 3 1691 25
+	.loc 3 1702 25
 	ldrb	r1, [r7, #3]	@ zero_extendqisi2
-	.loc 3 1691 17
+	.loc 3 1702 17
 	ldr	r2, [r2]
-	.loc 3 1692 34
+	.loc 3 1703 34
 	cmp	r2, r1, lsr #3
-	.loc 3 1693 17
+	.loc 3 1704 17
 	ldr	r2, [r10, #36]
 	ldr	r1, [r7, #4]
-	.loc 3 1692 34
+	.loc 3 1703 34
 	it	ne
 	movne	r3, #1
-	.loc 3 1694 34
+	.loc 3 1705 34
 	cmp	r1, r2
 	it	ne
 	movne	r3, #1
-	.loc 3 1695 37
+	.loc 3 1706 37
 	ldr	r2, [sp, #16]
 	ldr	r2, [r2]
-	.loc 3 1695 41
+	.loc 3 1706 41
 	add	r5, r5, r2
-	.loc 3 1695 17
+	.loc 3 1706 17
 	cmp	r8, r5
-	bne	.L605
-	.loc 3 1697 17
-	cbz	r3, .L606
-.L605:
-	.loc 3 1698 26
+	bne	.L609
+	.loc 3 1708 17
+	cbz	r3, .L610
+.L609:
+	.loc 3 1709 26
 	ldr	r2, [r4, #16]
-	.loc 3 1698 49
+	.loc 3 1709 49
 	ldr	r3, [r2, #132]
 	adds	r3, r3, #1
 	str	r3, [r2, #132]
-	b	.L609
-.L610:
-	.loc 3 1690 34
+	b	.L613
+.L614:
+	.loc 3 1701 34
 	movs	r3, #1
-	b	.L602
-.L606:
-	.loc 3 1701 39
+	b	.L606
+.L610:
+	.loc 3 1712 39
 	ldrb	r6, [fp, #181]	@ zero_extendqisi2
-	.loc 3 1701 17
+	.loc 3 1712 17
 	cmp	r6, #0
-	beq	.L600
-	.loc 3 1702 22
+	beq	.L604
+	.loc 3 1713 22
 	ldr	r1, [sp, #20]
-	ldr	r0, .L636+8
+	ldr	r0, .L640+8
 	bl	_Z4dumpPKcPKvib
-	b	.L591
-.L637:
-	.align	2
-.L636:
+	b	.L595
+.L641:
+	.align	2
+.L640:
 	.word	.LC33
 	.word	.LC34
 	.word	.LC35
@@ -18026,10 +18061,10 @@
 .LBE5312:
 	.loc 5 2050 12
 	movs	r0, #1
-.L639:
+.L643:
 	.loc 5 2051 18
 	cmp	r8, #0
-	beq	.L640
+	beq	.L644
 .LBB5313:
 .LBB5314:
 	.loc 14 386 20
@@ -18039,36 +18074,36 @@
 .LBE5314:
 .LBE5313:
 	.loc 5 2055 17
-	cbz	r0, .L641
+	cbz	r0, .L645
 	.loc 5 2055 26
 	ldr	r3, [r8, #8]
-.L642:
+.L646:
 .LBE5319:
 .LBE5322:
 	.loc 5 2098 5
 	mov	r5, r8
 	mov	r8, r3
-	b	.L639
-.L641:
+	b	.L643
+.L645:
 .LBB5323:
 .LBB5320:
 	.loc 5 2055 42
 	ldr	r3, [r8, #12]
-	b	.L642
-.L640:
+	b	.L646
+.L644:
 	.loc 5 2058 7
-	cbz	r0, .L649
+	cbz	r0, .L653
 	.loc 5 2060 4
 	ldr	r3, [r7, #12]
 	cmp	r3, r5
-	beq	.L645
+	beq	.L649
 .LBB5315:
 .LBB5316:
 	.loc 5 302 30
 	mov	r0, r5
 	bl	_ZSt18_Rb_tree_decrementPSt18_Rb_tree_node_base
 	mov	r8, r0
-.L643:
+.L647:
 .LBE5316:
 .LBE5315:
 .LBB5317:
@@ -18080,18 +18115,18 @@
 .LBE5318:
 .LBE5317:
 	.loc 5 2065 7
-	cbz	r0, .L646
-.L645:
+	cbz	r0, .L650
+.L649:
 .LBE5320:
 .LBE5323:
 .LBB5324:
 	.loc 5 2109 7
-	cbz	r5, .L650
+	cbz	r5, .L654
 .LBB5325:
 .LBB5326:
 	.loc 5 1765 33
 	cmp	r9, r5
-	beq	.L651
+	beq	.L655
 .LBB5327:
 .LBB5328:
 	.loc 14 386 20
@@ -18099,7 +18134,7 @@
 	mov	r0, r4
 	bl	_ZStltImiEbRKSt4pairIT_T0_ES5_
 	mov	r10, r0
-.L647:
+.L651:
 .LBE5328:
 .LBE5327:
 .LBB5329:
@@ -18172,7 +18207,7 @@
 .LBB5348:
 	.loc 13 249 31
 	movs	r3, #1
-.L655:
+.L659:
 .LBE5348:
 .LBE5349:
 .LBE5351:
@@ -18187,13 +18222,13 @@
 	.loc 5 2118 5
 	mov	r0, r6
 	pop	{r4, r5, r6, r7, r8, r9, r10, pc}
-.L649:
+.L653:
 .LBB5358:
 .LBB5321:
 	.loc 5 2058 7
 	mov	r8, r5
-	b	.L643
-.L651:
+	b	.L647
+.L655:
 .LBE5321:
 .LBE5358:
 .LBB5359:
@@ -18201,12 +18236,12 @@
 .LBB5344:
 	.loc 5 1766 10
 	mov	r10, #1
-	b	.L647
-.L650:
+	b	.L651
+.L654:
 .LBE5344:
 .LBE5352:
 	mov	r8, r5
-.L646:
+.L650:
 .LBE5359:
 .LBB5360:
 .LBB5357:
@@ -18214,7 +18249,7 @@
 	.loc 13 249 31
 	str	r8, [r6]
 	movs	r3, #0
-	b	.L655
+	b	.L659
 .LBE5356:
 .LBE5357:
 .LBE5360:
@@ -18231,7 +18266,7 @@
 	.type	_ZN12RadioShuttle21ProcessRequestMessageEPNS_16ReceivedMsgEntryEPNS_8AppEntryEiPviimmhh, %function
 _ZN12RadioShuttle21ProcessRequestMessageEPNS_16ReceivedMsgEntryEPNS_8AppEntryEiPviimmhh:
 .LFB2601:
-	.loc 3 1177 1
+	.loc 3 1183 1
 	.cfi_startproc
 	@ args = 28, pretend = 0, frame = 184
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -18249,34 +18284,34 @@
 	mov	r9, r3
 	sub	sp, sp, #196
 	.cfi_def_cfa_offset 232
-	.loc 3 1181 5
+	.loc 3 1187 5
 	ldrb	r3, [r0, #181]	@ zero_extendqisi2
-	.loc 3 1177 1
+	.loc 3 1183 1
 	str	r1, [sp, #12]
 	mov	r4, r0
 	mov	r5, r2
 	ldrd	r10, r7, [sp, #232]
 	ldr	r6, [sp, #244]
-	.loc 3 1181 5
-	cbz	r3, .L657
-	.loc 3 1182 13
+	.loc 3 1187 5
+	cbz	r3, .L661
+	.loc 3 1188 13
 	mov	r2, r9
 	mov	r1, r7
-	ldr	r0, .L702
+	ldr	r0, .L706
 	bl	_Z7dprintfPKcz
-.L657:
+.L661:
 .LBB5414:
-	.loc 3 1184 5
+	.loc 3 1190 5
 	cmp	r10, #0
-	bne	.L658
+	bne	.L662
 .LBB5415:
-	.loc 3 1185 26
+	.loc 3 1191 26
 	add	r8, sp, #76
 	movs	r2, #116
 	mov	r1, r10
 	mov	r0, r8
 	bl	memset
-	.loc 3 1185 25
+	.loc 3 1191 25
 	mov	r1, r8
 	add	r0, r4, #96
 	bl	_ZNSt7__cxx114listIN12RadioShuttle12SendMsgEntryESaIS2_EE9push_backERKS2_
@@ -18288,327 +18323,346 @@
 .LBE5418:
 .LBE5417:
 .LBE5416:
-	.loc 3 1187 15
+	.loc 3 1193 15
 	movs	r2, #116
 	mov	r1, r10
 	add	r0, r7, #8
 	bl	memset
-	.loc 3 1189 24
+	.loc 3 1195 17
 	ldr	r3, [r5]
-	.loc 3 1189 17
 	str	r3, [r7, #8]
 .LBB5419:
-	.loc 3 1190 9
+	.loc 3 1197 9
 	tst	r9, #32
-	beq	.L659
-	.loc 3 1190 35 discriminator 1
-	ldr	r2, [r4, #192]
-	cmp	r2, #0
-	beq	.L659
+.LBE5419:
+	.loc 3 1196 13
+	movw	r3, #9999
+	str	r3, [r7, #28]
+.LBB5479:
+	.loc 3 1197 9
+	beq	.L663
+	.loc 3 1197 35 discriminator 1
+	ldr	r3, [r4, #192]
+	cmp	r3, #0
+	beq	.L663
 .LBB5420:
 .LBB5421:
 .LBB5422:
 	.loc 12 1169 29
 	add	r9, r4, #72
-	mov	r1, r8
-	mov	r0, r9
 .LBE5422:
 .LBE5421:
-.LBB5425:
 .LBB5426:
 .LBB5427:
-	.loc 13 249 31
-	strd	r6, r3, [sp, #76]
+.LBB5428:
+	.loc 13 249 31
+	ldr	r3, [r5]
+	str	r6, [sp, #76]
+.LBE5428:
 .LBE5427:
 .LBE5426:
-.LBE5425:
-.LBB5428:
+.LBB5431:
 .LBB5423:
 	.loc 12 1169 29
+	mov	r1, r8
+	mov	r0, r9
+.LBE5423:
+.LBE5431:
+.LBB5432:
+.LBB5430:
+.LBB5429:
+	.loc 13 249 31
+	str	r3, [sp, #80]
+.LBE5429:
+.LBE5430:
+.LBE5432:
+.LBB5433:
+.LBB5424:
+	.loc 12 1169 29
 	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE4findERS2_
-.LBE5423:
-.LBE5428:
-.LBB5429:
-.LBB5430:
-.LBB5431:
-.LBB5432:
+.LBE5424:
+.LBE5433:
+.LBB5434:
+.LBB5435:
+.LBB5436:
+.LBB5437:
 	.loc 5 985 49
 	adds	r4, r4, #76
-.LBE5432:
-.LBE5431:
-.LBE5430:
-	.loc 3 1193 13
+.LBE5437:
+.LBE5436:
+.LBE5435:
+	.loc 3 1200 13
 	cmp	r0, r4
-.LBE5429:
-.LBB5472:
-.LBB5424:
+.LBE5434:
+.LBB5477:
+.LBB5425:
 	.loc 12 1169 29
 	mov	fp, r0
-.LBE5424:
-.LBE5472:
-.LBB5473:
-	.loc 3 1193 13
-	bne	.L660
-.LBB5433:
-	.loc 3 1196 23
+.LBE5425:
+.LBE5477:
+.LBB5478:
+	.loc 3 1200 13
+	bne	.L664
+.LBB5438:
+	.loc 3 1203 23
 	movs	r2, #20
 	mov	r1, r10
 	add	r0, sp, #28
 	bl	memset
-	.loc 3 1198 32
+	.loc 3 1205 32
 	ldr	fp, [r5]
-	.loc 3 1198 25
+	.loc 3 1205 25
 	str	fp, [sp, #32]
-	.loc 3 1197 29
+	.loc 3 1204 29
 	str	r6, [sp, #28]
-	.loc 3 1199 30
+	.loc 3 1206 30
 	strb	r10, [sp, #36]
 	add	r4, sp, #28
 	ldmia	r4!, {r0, r1, r2, r3}
 	mov	ip, r8
 	stmia	ip!, {r0, r1, r2, r3}
-.LBB5434:
-.LBB5435:
-.LBB5436:
-.LBB5437:
+.LBB5439:
+.LBB5440:
+.LBB5441:
+.LBB5442:
 	.loc 13 249 31
 	mov	ip, r8
 	ldmia	ip!, {r0, r1, r2, r3}
 	ldr	lr, [r4]
-.LBE5437:
-.LBE5436:
-.LBE5435:
-.LBE5434:
-.LBB5444:
-.LBB5445:
-.LBB5446:
+.LBE5442:
+.LBE5441:
+.LBE5440:
+.LBE5439:
+.LBB5449:
+.LBB5450:
+.LBB5451:
 	.loc 13 277 39
 	strd	r6, fp, [sp, #48]
-.LBE5446:
-.LBE5445:
-.LBE5444:
-.LBB5453:
-.LBB5442:
-.LBB5440:
-.LBB5438:
+.LBE5451:
+.LBE5450:
+.LBE5449:
+.LBB5458:
+.LBB5447:
+.LBB5445:
+.LBB5443:
 	.loc 13 249 31
 	add	r4, sp, #56
 	stmia	r4!, {r0, r1, r2, r3}
-.LBE5438:
-.LBE5440:
-.LBE5442:
-.LBE5453:
-.LBB5454:
-.LBB5450:
-.LBB5447:
+.LBE5443:
+.LBE5445:
+.LBE5447:
+.LBE5458:
+.LBB5459:
+.LBB5455:
+.LBB5452:
 	.loc 13 277 39
 	add	r3, sp, #48
 	ldm	r3, {r0, r1}
 	add	ip, sp, #56
 	stm	r8, {r0, r1}
 	ldmia	ip!, {r0, r1, r2, r3}
-.LBE5447:
-.LBE5450:
-.LBE5454:
-.LBB5455:
-.LBB5443:
-.LBB5441:
-.LBB5439:
+.LBE5452:
+.LBE5455:
+.LBE5459:
+.LBB5460:
+.LBB5448:
+.LBB5446:
+.LBB5444:
 	.loc 13 249 31
 	str	lr, [r4]
-.LBE5439:
-.LBE5441:
-.LBE5443:
-.LBE5455:
+.LBE5444:
+.LBE5446:
+.LBE5448:
+.LBE5460:
+.LBB5461:
 .LBB5456:
-.LBB5451:
-.LBB5448:
+.LBB5453:
 	.loc 13 277 39
 	add	r4, sp, #84
 	stmia	r4!, {r0, r1, r2, r3}
-.LBE5448:
-.LBE5451:
+.LBE5453:
 .LBE5456:
-.LBB5457:
-.LBB5458:
+.LBE5461:
+.LBB5462:
+.LBB5463:
 	.loc 12 802 41
 	mov	r2, r8
 	mov	r1, r9
 	add	r0, sp, #20
-.LBE5458:
-.LBE5457:
-.LBB5460:
-.LBB5452:
-.LBB5449:
+.LBE5463:
+.LBE5462:
+.LBB5465:
+.LBB5457:
+.LBB5454:
 	.loc 13 277 39
 	str	lr, [r4]
-.LBE5449:
-.LBE5452:
-.LBE5460:
-.LBB5461:
-.LBB5459:
+.LBE5454:
+.LBE5457:
+.LBE5465:
+.LBB5466:
+.LBB5464:
 	.loc 12 802 41
 	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE16_M_insert_uniqueERKS5_
-.LBE5459:
-.LBE5461:
-.LBB5462:
-.LBB5463:
-.LBB5464:
+.LBE5464:
+.LBE5466:
+.LBB5467:
+.LBB5468:
+.LBB5469:
 	.loc 13 249 31
 	ldr	r3, [r5]
 	str	r6, [sp, #76]
-.LBE5464:
-.LBE5463:
-.LBE5462:
-.LBB5467:
-.LBB5468:
+.LBE5469:
+.LBE5468:
+.LBE5467:
+.LBB5472:
+.LBB5473:
 	.loc 12 1169 29
 	mov	r1, r8
 	mov	r0, r9
-.LBE5468:
-.LBE5467:
+.LBE5473:
+.LBE5472:
+.LBB5475:
+.LBB5471:
 .LBB5470:
-.LBB5466:
-.LBB5465:
 	.loc 13 249 31
 	str	r3, [sp, #80]
-.LBE5465:
-.LBE5466:
 .LBE5470:
-.LBB5471:
-.LBB5469:
+.LBE5471:
+.LBE5475:
+.LBB5476:
+.LBB5474:
 	.loc 12 1169 29
 	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE4findERS2_
 	mov	fp, r0
-.L660:
-.LBE5469:
-.LBE5471:
-.LBE5433:
-.LBE5473:
-	.loc 3 1203 47 discriminator 1
+.L664:
+.LBE5474:
+.LBE5476:
+.LBE5438:
+.LBE5478:
+	.loc 3 1210 47 discriminator 1
 	ldr	r3, [sp, #12]
 	ldr	r3, [r3, #16]
-	.loc 3 1203 60 discriminator 1
+	.loc 3 1210 60 discriminator 1
 	movs	r0, #0
-	.loc 3 1203 47 discriminator 1
+	.loc 3 1210 47 discriminator 1
 	ldr	r4, [r3, #180]
-	.loc 3 1203 60 discriminator 1
+	.loc 3 1210 60 discriminator 1
 	bl	time
-	.loc 3 1204 47 discriminator 1
+	.loc 3 1211 47 discriminator 1
 	ldr	r3, [sp, #12]
-	.loc 3 1203 54 discriminator 1
+	.loc 3 1210 54 discriminator 1
 	add	r0, r0, r4
-	.loc 3 1204 47 discriminator 1
+	.loc 3 1211 47 discriminator 1
 	ldr	r3, [r3, #16]
-	.loc 3 1203 35 discriminator 1
+	.loc 3 1210 35 discriminator 1
 	str	r0, [fp, #36]
-	.loc 3 1204 61 discriminator 1
+	.loc 3 1211 61 discriminator 1
 	movs	r0, #0
-	.loc 3 1204 47 discriminator 1
+	.loc 3 1211 47 discriminator 1
 	ldr	r4, [r3, #184]
-	.loc 3 1204 61 discriminator 1
+	.loc 3 1211 61 discriminator 1
 	bl	time
-	.loc 3 1206 34 discriminator 1
+	.loc 3 1213 34 discriminator 1
 	add	r3, fp, #36
-	.loc 3 1204 55 discriminator 1
+	.loc 3 1211 55 discriminator 1
 	add	r0, r0, r4
-	.loc 3 1204 35 discriminator 1
+	.loc 3 1211 35 discriminator 1
 	str	r0, [fp, #40]
-	.loc 3 1208 21 discriminator 1
+	.loc 3 1215 21 discriminator 1
 	movs	r2, #8
-	.loc 3 1206 20 discriminator 1
+	.loc 3 1213 20 discriminator 1
 	str	r3, [r7, #12]
-	.loc 3 1208 21 discriminator 1
+	.loc 3 1215 21 discriminator 1
 	movs	r3, #33
 	strd	r2, r3, [r7, #16]
-	.loc 3 1209 21 discriminator 1
+	.loc 3 1216 21 discriminator 1
 	add	r3, fp, #24
-.L698:
+.L702:
 .LBE5420:
-	.loc 3 1215 19
+	.loc 3 1222 19
 	str	r3, [r7, #48]
-.LBE5419:
-	.loc 3 1218 17
+.LBE5479:
+	.loc 3 1225 17
 	ldr	r3, [sp, #240]
 	str	r3, [r7, #32]
 	movs	r3, #0
 	str	r3, [r7, #56]
-	.loc 3 1227 19
+	.loc 3 1234 19
 	strh	r3, [r7, #80]	@ movhi
-	.loc 3 1229 19
+	.loc 3 1236 19
 	strb	r3, [r7, #52]
-	.loc 3 1230 22
+	.loc 3 1237 22
 	movs	r3, #2
-	.loc 3 1217 21
+	.loc 3 1224 21
 	str	r6, [r7, #24]
-	.loc 3 1219 15
+	.loc 3 1226 15
 	str	r5, [r7, #44]
-	.loc 3 1230 22
+	.loc 3 1237 22
 	str	r3, [r7, #36]
-.L700:
+.L704:
 .LBE5415:
 .LBE5414:
-	.loc 3 1290 12
+	.loc 3 1298 12
 	movs	r0, #1
-.LBB5476:
-.LBB5477:
-	b	.L697
-.L659:
-.LBE5477:
-.LBE5476:
-.LBB5496:
-.LBB5475:
-.LBB5474:
-	.loc 3 1212 17
+.LBB5482:
+.LBB5483:
+	b	.L701
+.L663:
+.LBE5483:
+.LBE5482:
+.LBB5502:
+.LBB5481:
+.LBB5480:
+	.loc 3 1219 17
 	movs	r3, #0
-	.loc 3 1214 18
+	.loc 3 1221 18
 	movs	r2, #1
-	.loc 3 1213 16
+	.loc 3 1220 16
 	strd	r3, r3, [r7, #12]
-	.loc 3 1214 18
+	.loc 3 1221 18
 	str	r2, [r7, #20]
-	b	.L698
-.L664:
-.LBE5474:
-.LBE5475:
-.LBE5496:
-.LBB5497:
-.LBB5479:
-.LBB5480:
-	.loc 3 1241 26
+	b	.L702
+.L668:
+.LBE5480:
+.LBE5481:
+.LBE5502:
+.LBB5503:
+.LBB5485:
+.LBB5486:
+	.loc 3 1248 26
 	ldr	r0, [r4, #192]
-	.loc 3 1241 58
-	ldr	r3, [r0]
-	.loc 3 1241 57
+	.loc 3 1248 58
+	ldr	r3, [r0]
+	.loc 3 1248 57
 	ldr	r3, [r3, #12]
 	blx	r3
-	.loc 3 1242 13
+	.loc 3 1249 13
 	cmp	r7, r0
-	.loc 3 1241 57
+	.loc 3 1248 57
 	str	r0, [sp, #8]
-	.loc 3 1242 13
-	bne	.L665
-	.loc 3 1245 46
+	.loc 3 1249 13
+	bne	.L669
+	.loc 3 1252 46
 	bl	_Znaj
-	.loc 3 1246 13
+	.loc 3 1253 13
 	mov	r7, r0
-	cbnz	r0, .L666
-	.loc 3 1247 22
+	cbnz	r0, .L670
+	.loc 3 1254 22
 	ldr	r3, [sp, #12]
 	ldr	r2, [r3, #16]
-	.loc 3 1247 46
+	.loc 3 1254 46
 	ldr	r3, [r2, #128]
 	adds	r3, r3, #1
 	str	r3, [r2, #128]
-	b	.L665
-.L666:
-	.loc 3 1250 13
+	b	.L669
+.L670:
+	.loc 3 1257 13
 	ldr	r0, [r4, #192]
-	.loc 3 1250 40
+	.loc 3 1257 40
 	ldrb	r2, [r5, #16]	@ zero_extendqisi2
-	.loc 3 1250 122
-	ldr	r3, [r0]
-	.loc 3 1250 40
+	.loc 3 1257 122
+	ldr	r3, [r0]
+	.loc 3 1257 40
 	str	r2, [sp]
 	str	r7, [sp, #4]
 	ldr	r8, [r3, #16]
@@ -18616,186 +18670,190 @@
 	movs	r2, #8
 	add	r1, fp, #36
 	blx	r8
-	.loc 3 1251 23
+	.loc 3 1258 23
 	ldr	r2, [sp, #8]
 	mov	r1, r7
 	mov	r0, r10
 	bl	memcmp
 	ldrb	r3, [r4, #181]	@ zero_extendqisi2
-	.loc 3 1251 13
-	cbnz	r0, .L667
-	.loc 3 1252 17
-	cbz	r3, .L668
-	.loc 3 1253 25
-	ldr	r0, .L702+4
+	.loc 3 1258 13
+	cbnz	r0, .L671
+	.loc 3 1259 17
+	cbz	r3, .L672
+	.loc 3 1260 25
+	ldr	r0, .L706+4
 	bl	_Z7dprintfPKcz
-.L668:
-	.loc 3 1255 40
+.L672:
+	.loc 3 1262 40
 	movs	r3, #1
 	strb	r3, [fp, #32]
-	.loc 3 1254 26
+	.loc 3 1261 26
 	mov	r8, #32
-.L669:
-	.loc 3 1261 22
+.L673:
+	.loc 3 1268 22
 	mov	r0, r7
 	bl	_ZdaPv
-	.loc 3 1262 49
+	.loc 3 1269 49
 	tst	r8, #128
-	bne	.L670
-	.loc 3 1262 49 is_stmt 0 discriminator 1
+	bne	.L674
+	.loc 3 1269 49 is_stmt 0 discriminator 1
 	ldrb	r3, [fp, #32]	@ zero_extendqisi2
-	cbz	r3, .L671
-	.loc 3 1263 29 is_stmt 1
+	cbz	r3, .L675
+	.loc 3 1270 29 is_stmt 1
 	ldr	r3, [sp, #8]
 	ldr	r7, [r5, #4]
 	strd	r10, r3, [sp]
 	movs	r3, #8
-.L701:
-	.loc 3 1266 29
+.L705:
+	.loc 3 1273 29
 	ldr	r2, [sp, #240]
 	ldr	r0, [r5]
 	mov	r1, r6
-	b	.L699
-.L667:
-	.loc 3 1257 17
-	cbz	r3, .L675
-	.loc 3 1258 28
-	ldr	r0, .L702+8
+	b	.L703
+.L671:
+	.loc 3 1264 17
+	cbz	r3, .L679
+	.loc 3 1265 28
+	ldr	r0, .L706+8
 	bl	_Z7dprintfPKcz
-.L675:
-	.loc 3 1259 26
+.L679:
+	.loc 3 1266 26
 	mov	r8, #160
-	b	.L669
-.L663:
-.LBE5480:
-	.loc 3 1270 22
+	b	.L673
+.L667:
+.LBE5486:
+	.loc 3 1277 22
 	strd	r10, r7, [sp]
 	ldr	r2, [sp, #240]
 	ldr	r7, [r5, #4]
 	movs	r3, #3
 	mov	r1, r6
-.L699:
+.L703:
 	blx	r7
-.L671:
-.LBE5479:
-.LBB5493:
-	.loc 3 1272 6
+.L675:
+.LBE5485:
+.LBB5499:
+	.loc 3 1279 6
 	tst	r9, #2
-	beq	.L700
-.LBB5478:
-	.loc 3 1274 16
+	beq	.L704
+.LBB5484:
+	.loc 3 1281 16
 	movs	r2, #116
 	movs	r1, #0
 	add	r0, sp, #76
 	bl	memset
-	.loc 3 1275 18
+	.loc 3 1282 18
 	ldr	r3, [r5]
 	str	r3, [sp, #76]
-	.loc 3 1278 32
+	.loc 3 1285 32
 	orr	r2, r8, #1
-	.loc 3 1276 17
+	.loc 3 1283 10
 	movs	r3, #0
-	.loc 3 1277 16
-	strd	r3, r3, [sp, #80]
-	.loc 3 1279 22
+	.loc 3 1286 22
 	strd	r2, r6, [sp, #88]
-	.loc 3 1282 16
+	.loc 3 1287 13
+	movw	r2, #9999
+	.loc 3 1284 16
+	strd	r3, r3, [sp, #80]
+	.loc 3 1287 13
+	str	r2, [sp, #96]
+	.loc 3 1290 16
 	strd	r5, r3, [sp, #112]
-	.loc 3 1280 18
+	.loc 3 1288 18
 	ldr	r2, [sp, #240]
-	.loc 3 1283 26
+	.loc 3 1291 16
 	str	r3, [sp, #124]
-	.loc 3 1284 20
+	.loc 3 1292 20
 	strb	r3, [sp, #120]
-	.loc 3 1287 26
+	.loc 3 1295 26
 	add	r1, sp, #76
-	.loc 3 1285 23
+	.loc 3 1293 23
 	movs	r3, #2
-	.loc 3 1287 26
+	.loc 3 1295 26
 	add	r0, r4, #96
-	.loc 3 1280 18
+	.loc 3 1288 18
 	str	r2, [sp, #100]
-	.loc 3 1285 23
+	.loc 3 1293 23
 	str	r3, [sp, #104]
-	.loc 3 1287 26
+	.loc 3 1295 26
 	bl	_ZNSt7__cxx114listIN12RadioShuttle12SendMsgEntryESaIS2_EE9push_backERKS2_
-	b	.L700
-.L670:
-.LBE5478:
-.LBE5493:
-.LBB5494:
-.LBB5491:
-	.loc 3 1266 29
+	b	.L704
+.L674:
+.LBE5484:
+.LBE5499:
+.LBB5500:
+.LBB5497:
+	.loc 3 1273 29
 	ldr	r3, [sp, #8]
 	ldr	r7, [r5, #4]
 	strd	r10, r3, [sp]
 	movs	r3, #7
-	b	.L701
-.L658:
-.LBE5491:
-.LBE5494:
-	.loc 3 1234 14
+	b	.L705
+.L662:
+.LBE5497:
+.LBE5500:
+	.loc 3 1241 14
 	ands	r8, r9, #1
-	bne	.L700
-.LBB5495:
-	.loc 3 1235 9
+	bne	.L704
+.LBB5501:
+	.loc 3 1242 9
 	tst	r9, #32
 	ldr	r0, [r5]
-	beq	.L663
-	.loc 3 1235 35 discriminator 1
+	beq	.L667
+	.loc 3 1242 35 discriminator 1
 	ldr	r3, [r4, #192]
 	cmp	r3, #0
-	beq	.L663
-.LBB5492:
-.LBB5481:
-.LBB5482:
-.LBB5483:
+	beq	.L667
+.LBB5498:
+.LBB5487:
+.LBB5488:
+.LBB5489:
 	.loc 13 249 31
 	strd	r6, r0, [sp, #76]
-.LBE5483:
-.LBE5482:
-.LBE5481:
-.LBB5484:
-.LBB5485:
+.LBE5489:
+.LBE5488:
+.LBE5487:
+.LBB5490:
+.LBB5491:
 	.loc 12 1169 29
 	add	r1, sp, #76
 	add	r0, r4, #72
 	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE4findERS2_
-.LBE5485:
-.LBE5484:
-.LBB5487:
-.LBB5488:
-.LBB5489:
+.LBE5491:
+.LBE5490:
+.LBB5493:
+.LBB5494:
+.LBB5495:
 	.loc 5 985 49
 	add	r3, r4, #76
-.LBE5489:
-.LBE5488:
-.LBE5487:
-	.loc 3 1238 13
+.LBE5495:
+.LBE5494:
+.LBE5493:
+	.loc 3 1245 13
 	cmp	r0, r3
-.LBB5490:
-.LBB5486:
+.LBB5496:
+.LBB5492:
 	.loc 12 1169 29
 	mov	fp, r0
-.LBE5486:
-.LBE5490:
-	.loc 3 1238 13
-	bne	.L664
-.L665:
 .LBE5492:
-.LBE5495:
-.LBE5497:
-	.loc 3 1290 12
+.LBE5496:
+	.loc 3 1245 13
+	bne	.L668
+.L669:
+.LBE5498:
+.LBE5501:
+.LBE5503:
+	.loc 3 1298 12
 	movs	r0, #0
-.L697:
-	.loc 3 1291 1
+.L701:
+	.loc 3 1299 1
 	add	sp, sp, #196
 	.cfi_def_cfa_offset 36
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, r10, fp, pc}
-.L703:
-	.align	2
-.L702:
+.L707:
+	.align	2
+.L706:
 	.word	.LC36
 	.word	.LC37
 	.word	.LC38
@@ -18812,7 +18870,7 @@
 	.type	_ZN12RadioShuttle23ProcessReceivedMessagesEv, %function
 _ZN12RadioShuttle23ProcessReceivedMessagesEv:
 .LFB2599:
-	.loc 3 1016 1
+	.loc 3 1022 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 56
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -18826,21 +18884,21 @@
 	.cfi_offset 9, -12
 	.cfi_offset 10, -8
 	.cfi_offset 14, -4
-	.loc 3 1019 24
+	.loc 3 1025 24
 	mov	r8, r0
-	ldr	r9, .L741
+	ldr	r9, .L745
 	ldr	r5, [r8, #108]!
-	.loc 3 1016 1
+	.loc 3 1022 1
 	sub	sp, sp, #88
 	.cfi_def_cfa_offset 120
-	.loc 3 1016 1
+	.loc 3 1022 1
 	mov	r4, r0
-.L720:
-	.loc 3 1020 15
+.L724:
+	.loc 3 1026 15
 	cmp	r5, r8
-	beq	.L704
-.LBB5559:
-	.loc 3 1032 28
+	beq	.L708
+.LBB5565:
+	.loc 3 1038 28
 	add	r3, sp, #35
 	str	r3, [sp, #28]
 	add	r3, sp, #34
@@ -18852,15 +18910,15 @@
 	add	r3, sp, #44
 	str	r3, [sp, #12]
 	add	r3, sp, #60
-.LBB5560:
-.LBB5561:
-.LBB5562:
+.LBB5566:
+.LBB5567:
+.LBB5568:
 	.loc 4 174 62
 	add	r7, r5, #8
-.LBE5562:
-.LBE5561:
-.LBE5560:
-	.loc 3 1032 28
+.LBE5568:
+.LBE5567:
+.LBE5566:
+	.loc 3 1038 28
 	str	r3, [sp, #8]
 	add	r6, sp, #36
 	add	r3, sp, #64
@@ -18871,210 +18929,210 @@
 	mov	r1, r7
 	mov	r0, r4
 	bl	_ZN12RadioShuttle14ReceiveMessageEPNS_16ReceivedMsgEntryEPPvRiS4_S4_S4_RmS5_S4_RhS6_
-	.loc 3 1032 9
-	cbz	r0, .L707
-	.loc 3 1035 9
+	.loc 3 1038 9
+	cbz	r0, .L711
+	.loc 3 1041 9
 	ldr	r3, [r5, #24]
-	.loc 3 1035 35
+	.loc 3 1041 35
 	ldr	r2, [sp, #48]
 	str	r2, [r3, #144]
-.LBB5563:
-	.loc 3 1037 25
+.LBB5569:
+	.loc 3 1043 25
 	ldr	r2, [sp, #44]
-	.loc 3 1037 9
-	cbz	r2, .L708
-	.loc 3 1037 40 discriminator 1
+	.loc 3 1043 9
+	cbz	r2, .L712
+	.loc 3 1043 40 discriminator 1
 	ldr	r1, [r4, #4]
 	cmp	r2, r1
-	beq	.L708
-	.loc 3 1037 68 discriminator 2
+	beq	.L712
+	.loc 3 1043 68 discriminator 2
 	ldr	r2, [sp, #60]
 	lsls	r1, r2, #31
-	bpl	.L708
-.LBB5564:
-	.loc 3 1038 38
+	bpl	.L712
+.LBB5570:
+	.loc 3 1044 38
 	ldr	r0, [r3]
-	.loc 3 1038 54
+	.loc 3 1044 54
 	ldrb	r1, [r3, #44]	@ zero_extendqisi2
-	.loc 3 1038 78
+	.loc 3 1044 78
 	ldr	r2, [r0]
-	.loc 3 1038 54
+	.loc 3 1044 54
 	ldr	r10, [r2, #44]
 	ldrsh	r2, [r9]
 	blx	r10
-.LBB5565:
-.LBB5566:
-	.loc 3 1323 38
+.LBB5571:
+.LBB5572:
+	.loc 3 1331 38
 	ldr	r0, [r4, #160]
 	bl	_ZN4mbed5Timer7read_msEv
-	.loc 3 1326 11
+	.loc 3 1334 11
 	movs	r2, #20
 	movs	r1, #0
 	add	r0, sp, #68
 	bl	memset
-.L708:
-.LBE5566:
-.LBE5565:
-.LBE5564:
-.LBE5563:
-	.loc 3 1042 17
+.L712:
+.LBE5572:
+.LBE5571:
+.LBE5570:
+.LBE5569:
+	.loc 3 1048 17
 	ldr	r3, [sp, #56]
 	str	r3, [r9]
-.LBB5567:
-.LBB5568:
+.LBB5573:
+.LBB5574:
 	.loc 12 1169 29
 	mov	r1, r6
 	add	r0, r4, #48
 	bl	_ZNSt8_Rb_treeIiSt4pairIKiN12RadioShuttle8AppEntryEESt10_Select1stIS4_ESt4lessIiESaIS4_EE4findERS1_
-.LBE5568:
-.LBE5567:
-.LBB5569:
-.LBB5570:
-.LBB5571:
-	.loc 5 985 49
-	add	r3, r4, #52
-.LBE5571:
-.LBE5570:
-.LBE5569:
-	.loc 3 1047 9
-	cmp	r0, r3
-	bne	.L709
-.L740:
-	.loc 3 1054 18
-	ldr	r2, [r5, #24]
-	.loc 3 1054 44
-	ldr	r3, [r2, #120]
-	adds	r3, r3, #1
-	str	r3, [r2, #120]
-.L707:
-.LBB5572:
-.LBB5573:
-.LBB5574:
+.LBE5574:
+.LBE5573:
 .LBB5575:
 .LBB5576:
 .LBB5577:
-	.loc 4 418 62
-	ldr	r3, [r4, #116]
+	.loc 5 985 49
+	add	r3, r4, #52
 .LBE5577:
 .LBE5576:
 .LBE5575:
-.LBE5574:
+	.loc 3 1053 9
+	cmp	r0, r3
+	bne	.L713
+.L744:
+	.loc 3 1060 18
+	ldr	r2, [r5, #24]
+	.loc 3 1060 44
+	ldr	r3, [r2, #120]
+	adds	r3, r3, #1
+	str	r3, [r2, #120]
+.L711:
+.LBB5578:
+.LBB5579:
+.LBB5580:
+.LBB5581:
+.LBB5582:
+.LBB5583:
+	.loc 4 418 62
+	ldr	r3, [r4, #116]
+.LBE5583:
+.LBE5582:
+.LBE5581:
+.LBE5580:
 	.loc 11 157 16
 	ldr	r6, [r5]
-.LBB5587:
+.LBB5593:
+.LBB5592:
 .LBB5586:
-.LBB5580:
-.LBB5578:
+.LBB5584:
 	.loc 4 418 62
 	subs	r3, r3, #1
-.LBE5578:
-.LBE5580:
+.LBE5584:
+.LBE5586:
 	.loc 4 1914 2
 	mov	r0, r5
-.LBB5581:
-.LBB5579:
+.LBB5587:
+.LBB5585:
 	.loc 4 418 38
 	str	r3, [r4, #116]
-.LBE5579:
-.LBE5581:
+.LBE5585:
+.LBE5587:
 	.loc 4 1914 2
 	bl	_ZNSt8__detail15_List_node_base9_M_unhookEv
-.LBB5582:
-.LBB5583:
-.LBB5584:
-.LBB5585:
+.LBB5588:
+.LBB5589:
+.LBB5590:
+.LBB5591:
 	.loc 9 125 19
 	mov	r0, r5
 	bl	_ZdlPv
-.LBE5585:
-.LBE5584:
-.LBE5583:
-.LBE5582:
-.LBE5586:
-.LBE5587:
-.LBE5573:
-.LBE5572:
-	.loc 3 1121 31
+.LBE5591:
+.LBE5590:
+.LBE5589:
+.LBE5588:
+.LBE5592:
+.LBE5593:
+.LBE5579:
+.LBE5578:
+	.loc 3 1127 31
 	mov	r5, r6
-.LBE5559:
-	.loc 3 1020 5
-	b	.L720
-.L709:
-.LBB5608:
-	.loc 3 1053 25
+.LBE5565:
+	.loc 3 1026 5
+	b	.L724
+.L713:
+.LBB5614:
+	.loc 3 1059 25
 	ldr	r3, [sp, #44]
-	.loc 3 1053 9
-	cbz	r3, .L710
-	.loc 3 1053 40 discriminator 1
+	.loc 3 1059 9
+	cbz	r3, .L714
+	.loc 3 1059 40 discriminator 1
 	ldr	r2, [r4, #4]
 	cmp	r3, r2
-	bne	.L740
-.L710:
-.LBB5588:
-	.loc 3 1058 9
+	bne	.L744
+.L714:
+.LBB5594:
+	.loc 3 1064 9
 	ldr	r3, [r0, #32]
-.LBE5588:
-	.loc 3 1051 13
+.LBE5594:
+	.loc 3 1057 13
 	add	r10, r0, #20
-.LBB5603:
-	.loc 3 1058 9
+.LBB5609:
+	.loc 3 1064 9
 	cmp	r3, #0
-	beq	.L711
-	.loc 3 1058 41 discriminator 1
+	beq	.L715
+	.loc 3 1064 41 discriminator 1
 	ldr	r6, [sp, #60]
-	.loc 3 1058 27 discriminator 1
+	.loc 3 1064 27 discriminator 1
 	ands	r6, r6, #32
-	bne	.L711
-.LBB5589:
-.LBB5590:
-.LBB5591:
-.LBB5592:
+	bne	.L715
+.LBB5595:
+.LBB5596:
+.LBB5597:
+.LBB5598:
 	.loc 13 249 31
 	ldr	r3, [sp, #48]
 	str	r3, [sp, #68]
-.LBE5592:
-.LBE5591:
-.LBE5590:
-.LBB5595:
-.LBB5596:
+.LBE5598:
+.LBE5597:
+.LBE5596:
+.LBB5601:
+.LBB5602:
 	.loc 12 1169 29
 	add	r1, sp, #68
-.LBE5596:
-.LBE5595:
-.LBB5598:
-.LBB5594:
-.LBB5593:
+.LBE5602:
+.LBE5601:
+.LBB5604:
+.LBB5600:
+.LBB5599:
 	.loc 13 249 31
 	ldr	r3, [sp, #36]
 	str	r3, [sp, #72]
-.LBE5593:
-.LBE5594:
-.LBE5598:
-.LBB5599:
-.LBB5597:
+.LBE5599:
+.LBE5600:
+.LBE5604:
+.LBB5605:
+.LBB5603:
 	.loc 12 1169 29
 	add	r0, r4, #72
 	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE4findERS2_
-.LBE5597:
-.LBE5599:
-.LBB5600:
-.LBB5601:
-.LBB5602:
+.LBE5603:
+.LBE5605:
+.LBB5606:
+.LBB5607:
+.LBB5608:
 	.loc 5 985 49
 	add	r3, r4, #76
-.LBE5602:
-.LBE5601:
-.LBE5600:
-	.loc 3 1072 13
+.LBE5608:
+.LBE5607:
+.LBE5606:
+	.loc 3 1078 13
 	cmp	r0, r3
-	bne	.L712
-	.loc 3 1073 22
+	bne	.L716
+	.loc 3 1079 22
 	ldr	r2, [r5, #24]
-	.loc 3 1073 51
+	.loc 3 1079 51
 	ldr	r3, [r2, #112]
 	adds	r3, r3, #1
 	str	r3, [r2, #112]
-	.loc 3 1078 37
+	.loc 3 1084 37
 	ldrb	r3, [sp, #35]	@ zero_extendqisi2
 	str	r3, [sp, #8]
 	ldrb	r3, [sp, #34]	@ zero_extendqisi2
@@ -19086,40 +19144,40 @@
 	mov	r1, r7
 	mov	r0, r4
 	bl	_ZN12RadioShuttle20MessageSecurityErrorEPNS_16ReceivedMsgEntryEPNS_8AppEntryEimhh
-	.loc 3 1079 22
-	b	.L707
-.L712:
-	.loc 3 1082 13
+	.loc 3 1085 22
+	b	.L711
+.L716:
+	.loc 3 1088 13
 	ldrb	r3, [r0, #32]	@ zero_extendqisi2
-	cbnz	r3, .L713
-	.loc 3 1083 22
+	cbnz	r3, .L717
+	.loc 3 1089 22
 	ldr	r2, [r5, #24]
-	.loc 3 1083 51
+	.loc 3 1089 51
 	ldr	r3, [r2, #112]
 	adds	r3, r3, #1
 	str	r3, [r2, #112]
-	.loc 3 1084 22
-	b	.L707
-.L713:
-	.loc 3 1086 72
+	.loc 3 1090 22
+	b	.L711
+.L717:
+	.loc 3 1092 72
 	ldr	r3, [sp, #60]
 	and	r3, r3, #161
-	.loc 3 1086 13
+	.loc 3 1092 13
 	cmp	r3, #129
-	bne	.L711
-	.loc 3 1091 17
+	bne	.L715
+	.loc 3 1097 17
 	ldr	r3, [r4, #192]
 	cmp	r3, #0
-	beq	.L707
-	.loc 3 1092 40
+	beq	.L711
+	.loc 3 1098 40
 	strb	r6, [r0, #32]
-	.loc 3 1093 39
+	.loc 3 1099 39
 	ldr	r0, [r4, #192]
-	.loc 3 1093 25
+	.loc 3 1099 25
 	ldr	r7, [sp, #36]
-	.loc 3 1093 71
-	ldr	r3, [r0]
-	.loc 3 1093 25
+	.loc 3 1099 71
+	ldr	r3, [r0]
+	.loc 3 1099 25
 	ldr	r3, [r3, #12]
 	blx	r3
 	movw	r3, #9999
@@ -19134,50 +19192,50 @@
 	mov	r1, r7
 	mov	r0, r4
 	bl	_ZN12RadioShuttle7SendMsgEiPviimiPi
-	b	.L707
-.L711:
+	b	.L711
+.L715:
 	ldrd	r3, r6, [sp, #60]
-.LBE5589:
-.LBE5603:
-.LBB5604:
-	.loc 3 1102 9
+.LBE5595:
+.LBE5609:
+.LBB5610:
+	.loc 3 1108 9
 	lsls	r2, r3, #31
-	bpl	.L715
-.LBB5605:
-	.loc 3 1105 35
+	bpl	.L719
+.LBB5611:
+	.loc 3 1111 35
 	mov	r0, r4
 	ldr	r1, [r0, #96]!
-.L719:
-	.loc 3 1105 41 discriminator 1
+.L723:
+	.loc 3 1111 41 discriminator 1
 	cmp	r1, r0
-	beq	.L716
-	.loc 3 1106 41
+	beq	.L720
+	.loc 3 1112 41
 	ldr	r2, [r1, #32]
 	and	r2, r2, #31
-	.loc 3 1106 17
+	.loc 3 1112 17
 	cmp	r2, r6
-	bne	.L717
-	.loc 3 1111 10
+	bne	.L721
+	.loc 3 1117 10
 	adds	r1, r1, #8
-	bne	.L739
-.L716:
-	.loc 3 1112 22
+	bne	.L743
+.L720:
+	.loc 3 1118 22
 	ldr	r2, [r5, #24]
-	.loc 3 1112 51
+	.loc 3 1118 51
 	ldr	r3, [r2, #116]
 	adds	r3, r3, #1
 	str	r3, [r2, #116]
-	b	.L707
-.L717:
-.LBB5606:
-.LBB5607:
+	b	.L711
+.L721:
+.LBB5612:
+.LBB5613:
 	.loc 4 227 21
 	ldr	r1, [r1]
-	b	.L719
-.L739:
-.LBE5607:
-.LBE5606:
-	.loc 3 1116 35
+	b	.L723
+.L743:
+.LBE5613:
+.LBE5612:
+	.loc 3 1122 35
 	ldrb	r2, [sp, #35]	@ zero_extendqisi2
 	str	r2, [sp, #24]
 	ldrb	r2, [sp, #34]	@ zero_extendqisi2
@@ -19195,10 +19253,10 @@
 	mov	r2, r10
 	mov	r1, r7
 	bl	_ZN12RadioShuttle22ProcessResponseMessageEPNS_16ReceivedMsgEntryEPNS_8AppEntryEPNS_12SendMsgEntryEiPvimmhh
-.LBE5605:
-	b	.L707
-.L715:
-	.loc 3 1118 34
+.LBE5611:
+	b	.L711
+.L719:
+	.loc 3 1124 34
 	ldrb	r2, [sp, #35]	@ zero_extendqisi2
 	str	r2, [sp, #24]
 	ldrb	r2, [sp, #34]	@ zero_extendqisi2
@@ -19215,18 +19273,18 @@
 	mov	r2, r10
 	mov	r0, r4
 	bl	_ZN12RadioShuttle21ProcessRequestMessageEPNS_16ReceivedMsgEntryEPNS_8AppEntryEiPviimmhh
-	b	.L707
-.L704:
-.LBE5604:
-.LBE5608:
-	.loc 3 1124 1
+	b	.L711
+.L708:
+.LBE5610:
+.LBE5614:
+	.loc 3 1130 1
 	add	sp, sp, #88
 	.cfi_def_cfa_offset 32
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, r10, pc}
-.L742:
-	.align	2
-.L741:
+.L746:
+	.align	2
+.L745:
 	.word	.LANCHOR5
 	.cfi_endproc
 .LFE2599:
@@ -19241,7 +19299,7 @@
 	.type	_ZN12RadioShuttle10RunShuttleEv, %function
 _ZN12RadioShuttle10RunShuttleEv:
 .LFB2598:
-	.loc 3 717 1
+	.loc 3 723 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 40
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -19256,426 +19314,426 @@
 	.cfi_offset 10, -12
 	.cfi_offset 11, -8
 	.cfi_offset 14, -4
-	.loc 3 721 9
+	.loc 3 727 9
 	ldrb	r3, [r0, #172]	@ zero_extendqisi2
-	.loc 3 717 1
+	.loc 3 723 1
 	mov	r5, r0
 	sub	sp, sp, #76
 	.cfi_def_cfa_offset 112
-	.loc 3 721 5
+	.loc 3 727 5
 	and	r8, r3, #255
 	movs	r0, #1
 	cmp	r3, #0
-	bne	.L743
-.LBB6275:
-.LBB6276:
-.LBB6277:
-	.loc 3 731 28
+	bne	.L747
+.LBB6281:
+.LBB6282:
+.LBB6283:
+	.loc 3 737 28
 	mov	r9, r5
-.LBE6277:
-	.loc 3 723 19
+.LBE6283:
+	.loc 3 729 19
 	strb	r0, [r5, #172]
-.LBB6313:
-	.loc 3 731 28
+.LBB6319:
+	.loc 3 737 28
 	ldr	r6, [r9, #36]!
-.LBB6278:
-	.loc 3 734 21
-	ldr	r10, .L899+12
-.L754:
-.LBE6278:
-	.loc 3 731 34
+.LBB6284:
+	.loc 3 740 21
+	ldr	r10, .L903+12
+.L758:
+.LBE6284:
+	.loc 3 737 34
 	cmp	r6, r9
-	beq	.L745
-.LBB6310:
-	.loc 3 732 17
+	beq	.L749
+.LBB6316:
+	.loc 3 738 17
 	ldr	r1, [r6, #184]
-	.loc 3 732 9
-	cbz	r1, .L746
-	.loc 3 733 13
+	.loc 3 738 9
+	cbz	r1, .L750
+	.loc 3 739 13
 	ldrb	r3, [r5, #180]	@ zero_extendqisi2
-	cbnz	r3, .L747
-	.loc 3 733 41
+	cbnz	r3, .L751
+	.loc 3 739 41
 	ldrb	r3, [r5, #181]	@ zero_extendqisi2
-	cbz	r3, .L748
-.L747:
-	.loc 3 734 21
+	cbz	r3, .L752
+.L751:
+	.loc 3 740 21
 	mov	r0, r10
 	bl	_Z7dprintfPKcz
-.L748:
-	.loc 3 735 32
+.L752:
+	.loc 3 741 32
 	str	r8, [r6, #184]
-.L746:
-	.loc 3 737 17
+.L750:
+	.loc 3 743 17
 	ldrb	r3, [r6, #180]	@ zero_extendqisi2
-	.loc 3 737 9
-	cbz	r3, .L750
-	.loc 3 738 32
+	.loc 3 743 9
+	cbz	r3, .L754
+	.loc 3 744 32
 	strb	r8, [r6, #180]
-	.loc 3 739 17
+	.loc 3 745 17
 	ldr	r0, [r5, #188]
-	.loc 3 739 13
-	cbz	r0, .L750
-	.loc 3 740 41
-	ldr	r3, [r0]
-	.loc 3 740 40
+	.loc 3 745 13
+	cbz	r0, .L754
+	.loc 3 746 41
+	ldr	r3, [r0]
+	.loc 3 746 40
 	ldr	r3, [r3, #12]
 	blx	r3
-.L750:
-.LBB6279:
-	.loc 3 742 9
+.L754:
+.LBB6285:
+	.loc 3 748 9
 	ldr	r3, [r6, #64]
 	cmp	r3, #0
-	beq	.L752
-.LBB6280:
-	.loc 3 744 16
+	beq	.L756
+.LBB6286:
+	.loc 3 750 16
 	movs	r2, #20
 	movs	r1, #0
 	add	r0, sp, #52
 	bl	memset
-	.loc 3 745 19
+	.loc 3 751 19
 	ldr	r3, [r6, #64]
 	str	r3, [sp, #52]
-	.loc 3 746 19
+	.loc 3 752 19
 	ldr	r3, [r6, #68]
 	str	r3, [sp, #56]
-	.loc 3 747 17
+	.loc 3 753 17
 	ldr	r3, [r6, #72]
 	str	r3, [sp, #60]
-	.loc 3 748 16
+	.loc 3 754 16
 	ldr	r3, [r6, #76]
 	str	r3, [sp, #64]
-.LBB6281:
-.LBB6282:
-.LBB6283:
-.LBB6284:
-.LBB6285:
-.LBB6286:
 .LBB6287:
 .LBB6288:
+.LBB6289:
+.LBB6290:
+.LBB6291:
+.LBB6292:
+.LBB6293:
+.LBB6294:
 	.loc 9 111 41
 	movs	r0, #28
+.LBE6294:
+.LBE6293:
+.LBE6292:
+.LBE6291:
+.LBE6290:
+.LBE6289:
 .LBE6288:
 .LBE6287:
-.LBE6286:
-.LBE6285:
-.LBE6284:
-.LBE6283:
-.LBE6282:
-.LBE6281:
-.LBB6306:
-.LBB6307:
-.LBB6308:
+.LBB6312:
+.LBB6313:
+.LBB6314:
 	.loc 4 174 62
 	add	r3, r6, #8
-.LBE6308:
-.LBE6307:
-.LBE6306:
-	.loc 3 749 18
+.LBE6314:
+.LBE6313:
+.LBE6312:
+	.loc 3 755 18
 	str	r3, [sp, #68]
-.LBB6309:
-.LBB6305:
-.LBB6304:
+.LBB6315:
+.LBB6311:
+.LBB6310:
+.LBB6307:
 .LBB6301:
+.LBB6299:
+.LBB6297:
 .LBB6295:
-.LBB6293:
-.LBB6291:
-.LBB6289:
 	.loc 9 111 41
 	bl	_Znwj
-.LBE6289:
-.LBE6291:
-.LBE6293:
 .LBE6295:
-.LBB6296:
-.LBB6297:
+.LBE6297:
+.LBE6299:
+.LBE6301:
+.LBB6302:
+.LBB6303:
 	.loc 9 146 9
 	add	r4, sp, #52
-.LBE6297:
-.LBE6296:
-.LBB6299:
-.LBB6294:
-.LBB6292:
-.LBB6290:
+.LBE6303:
+.LBE6302:
+.LBB6305:
+.LBB6300:
+.LBB6298:
+.LBB6296:
 	.loc 9 111 41
 	mov	ip, r0
-.LBE6290:
-.LBE6292:
-.LBE6294:
-.LBE6299:
-.LBB6300:
-.LBB6298:
+.LBE6296:
+.LBE6298:
+.LBE6300:
+.LBE6305:
+.LBB6306:
+.LBB6304:
 	.loc 9 146 9
 	add	r7, r0, #8
 	ldmia	r4!, {r0, r1, r2, r3}
 	stmia	r7!, {r0, r1, r2, r3}
 	ldr	r3, [r4]
 	str	r3, [r7]
-.LBE6298:
-.LBE6300:
-.LBE6301:
+.LBE6304:
+.LBE6306:
+.LBE6307:
 	.loc 4 1895 2
 	mov	r0, ip
 	add	r1, r5, #108
 	bl	_ZNSt8__detail15_List_node_base7_M_hookEPS0_
-.LBB6302:
-.LBB6303:
+.LBB6308:
+.LBB6309:
 	.loc 4 416 62
 	ldr	r3, [r5, #116]
 	adds	r3, r3, #1
 	.loc 4 416 38
 	str	r3, [r5, #116]
-.LBE6303:
-.LBE6302:
-.LBE6304:
-.LBE6305:
 .LBE6309:
-	.loc 3 753 30
+.LBE6308:
+.LBE6310:
+.LBE6311:
+.LBE6315:
+	.loc 3 759 30
 	str	r8, [r6, #64]
-	.loc 3 754 17
+	.loc 3 760 17
 	ldr	r0, [r5, #188]
-	.loc 3 754 13
-	cbz	r0, .L752
-	.loc 3 755 84
-	ldr	r3, [r0]
-	.loc 3 755 36
+	.loc 3 760 13
+	cbz	r0, .L756
+	.loc 3 761 84
+	ldr	r3, [r0]
+	.loc 3 761 36
 	ldr	r1, [r6, #68]
 	ldr	r4, [r3, #16]
 	ldrd	r2, r3, [r6, #72]
 	blx	r4
-.L752:
-.LBE6280:
-.LBE6279:
-.LBE6310:
-.LBB6311:
-.LBB6312:
+.L756:
+.LBE6286:
+.LBE6285:
+.LBE6316:
+.LBB6317:
+.LBB6318:
 	.loc 4 227 21
 	ldr	r6, [r6]
-	b	.L754
-.L745:
-.LBE6312:
-.LBE6311:
-.LBE6313:
-	.loc 3 763 5
+	b	.L758
+.L749:
+.LBE6318:
+.LBE6317:
+.LBE6319:
+	.loc 3 769 5
 	ldr	r3, [r5, #116]
-	cbz	r3, .L756
-	.loc 3 764 32
+	cbz	r3, .L760
+	.loc 3 770 32
 	mov	r0, r5
 	bl	_ZN12RadioShuttle23ProcessReceivedMessagesEv
-	.loc 3 765 10
+	.loc 3 771 10
 	ldr	r0, [r5, #188]
-	.loc 3 765 22
-	cbz	r0, .L756
+	.loc 3 771 22
+	cbz	r0, .L760
 	ldr	r3, [r5, #116]
-	cbnz	r3, .L756
-	.loc 3 766 35
-	ldr	r3, [r0]
-	.loc 3 766 34
+	cbnz	r3, .L760
+	.loc 3 772 35
+	ldr	r3, [r0]
+	.loc 3 772 34
 	ldr	r3, [r3, #20]
 	blx	r3
-.L756:
-	.loc 3 776 38
+.L760:
+	.loc 3 782 38
 	ldr	r0, [r5, #160]
 	bl	_ZN4mbed5Timer7read_msEv
-	.loc 3 775 14
+	.loc 3 781 14
 	mov	r8, #0
-.LBB6314:
-	.loc 3 778 27
+.LBB6320:
+	.loc 3 784 27
 	ldr	r4, [r5, #96]
-.LBE6314:
-	.loc 3 776 38
+.LBE6320:
+	.loc 3 782 38
 	mov	r9, r0
+.LBB6339:
+.LBB6321:
+.LBB6322:
+.LBB6323:
+	.loc 3 835 29
+	mov	r10, r8
+.L789:
+.LBE6323:
+.LBE6322:
+.LBE6321:
 .LBB6333:
-.LBB6315:
-.LBB6316:
-.LBB6317:
-	.loc 3 829 29
-	mov	r10, r8
-.L785:
-.LBE6317:
-.LBE6316:
-.LBE6315:
-.LBB6327:
-.LBB6328:
+.LBB6334:
 	.loc 4 972 47
 	add	r3, r5, #96
-.LBE6328:
-.LBE6327:
-	.loc 3 778 33
+.LBE6334:
+.LBE6333:
+	.loc 3 784 33
 	cmp	r4, r3
-	beq	.L758
-.LBB6329:
-	.loc 3 779 17
+	beq	.L762
+.LBB6335:
+	.loc 3 785 17
 	ldr	r2, [r4, #64]
-	.loc 3 779 9
+	.loc 3 785 9
 	cmp	r9, r2
-	bcs	.L759
-	.loc 3 780 30
+	bcs	.L763
+	.loc 3 786 30
 	str	r9, [r4, #64]
-	.loc 3 781 25
+	.loc 3 787 25
 	movs	r3, #4
-.L898:
-	.loc 3 799 33
+.L902:
+	.loc 3 805 33
 	strb	r3, [r4, #52]
-.L760:
-.LBE6329:
-.LBB6330:
-.LBB6331:
+.L764:
+.LBE6335:
+.LBB6336:
+.LBB6337:
 	.loc 4 227 21
 	ldr	r4, [r4]
-	b	.L785
-.L759:
-.LBE6331:
-.LBE6330:
-.LBB6332:
-	.loc 3 788 9
+	b	.L789
+.L763:
+.LBE6337:
+.LBE6336:
+.LBB6338:
+	.loc 3 794 9
 	ldrb	r3, [r4, #52]	@ zero_extendqisi2
 	cmp	r3, #3
-	bhi	.L760
+	bhi	.L764
 	tbb	[pc, r3]
-.L762:
-	.byte	(.L764-.L762)/2
-	.byte	(.L761-.L762)/2
-	.byte	(.L763-.L762)/2
-	.byte	(.L761-.L762)/2
+.L766:
+	.byte	(.L768-.L766)/2
+	.byte	(.L765-.L766)/2
+	.byte	(.L767-.L766)/2
+	.byte	(.L765-.L766)/2
 	.p2align 1
-.L761:
-	.loc 3 797 76
+.L765:
+	.loc 3 803 76
 	ldr	r1, [r4, #36]
 	ldr	r3, [r4, #68]
 	cmp	r1, #2
 	add	r3, r3, r2
-	ble	.L765
-	.loc 3 797 56
-	cbz	r2, .L765
-	.loc 3 798 67
+	ble	.L769
+	.loc 3 803 56
+	cbz	r2, .L769
+	.loc 3 804 67
 	ldr	r2, [r4, #72]
 	add	r2, r2, r3
-	.loc 3 797 76
+	.loc 3 803 76
 	cmp	r9, r2
-	bhi	.L766
-.L765:
-	.loc 3 801 76
+	bhi	.L770
+.L769:
+	.loc 3 807 76
 	ldr	r2, [r4, #76]
 	add	r3, r3, r2
-	.loc 3 801 24
+	.loc 3 807 24
 	cmp	r9, r3
-	bls	.L760
-.L764:
-.LBB6325:
-	.loc 3 822 32
+	bls	.L764
+.L768:
+.LBB6331:
+	.loc 3 828 32
 	ldr	r7, [r5, #36]
-.L784:
-	.loc 3 822 38
+.L788:
+	.loc 3 828 38
 	cmp	r6, r7
-	beq	.L760
-.LBB6321:
-	.loc 3 828 13
+	beq	.L764
+.LBB6327:
+	.loc 3 834 13
 	ldr	r3, [r7, #176]
 	cmp	r9, r3
-	.loc 3 829 29
+	.loc 3 835 29
 	it	cc
 	strcc	r10, [r7, #176]
-.LBB6318:
-	.loc 3 830 21
+.LBB6324:
+	.loc 3 836 21
 	ldr	r1, [r7, #176]
-	.loc 3 830 32
-	cbz	r1, .L768
-	.loc 3 830 83
+	.loc 3 836 32
+	cbz	r1, .L772
+	.loc 3 836 83
 	ldr	r2, [r7, #60]
 	movs	r3, #5
 	sdiv	r3, r2, r3
-	.loc 3 830 60
+	.loc 3 836 60
 	add	r3, r3, r1
-	.loc 3 830 32
+	.loc 3 836 32
 	cmp	r9, r3
-	bls	.L769
-.L768:
-.LBE6318:
-	.loc 3 840 36
+	bls	.L773
+.L772:
+.LBE6324:
+	.loc 3 846 36
 	ldr	r0, [r7, #8]
-	.loc 3 840 53
-	ldr	r3, [r0]
-	.loc 3 840 52
+	.loc 3 846 53
+	ldr	r3, [r0]
+	.loc 3 846 52
 	ldr	r3, [r3, #12]
 	blx	r3
-	.loc 3 841 13
+	.loc 3 847 13
 	cmp	r0, #2
-	bne	.L896
-.L770:
-.LBE6321:
-.LBB6322:
-.LBB6323:
+	bne	.L900
+.L774:
+.LBE6327:
+.LBB6328:
+.LBB6329:
 	.loc 4 227 21
 	ldr	r7, [r7]
-	b	.L784
-.L766:
-.LBE6323:
-.LBE6322:
-.LBE6325:
-	.loc 3 799 33
+	b	.L788
+.L770:
+.LBE6329:
+.LBE6328:
+.LBE6331:
+	.loc 3 805 33
 	movs	r3, #6
-	b	.L898
-.L763:
-	.loc 3 806 17
+	b	.L902
+.L767:
+	.loc 3 812 17
 	ldr	r3, [r4, #60]
 	cmp	r9, r3
-	bcc	.L760
-	b	.L764
-.L769:
+	bcc	.L764
+	b	.L768
+.L773:
+.LBB6332:
+.LBB6330:
 .LBB6326:
-.LBB6324:
-.LBB6320:
-.LBB6319:
-	.loc 3 831 75
+.LBB6325:
+	.loc 3 837 75
 	sub	r3, r3, r9
-	.loc 3 833 35
+	.loc 3 839 35
 	cmp	r8, r3
 	it	ge
 	movge	r8, r3
-	b	.L770
-.L896:
-.LBE6319:
-.LBE6320:
-	.loc 3 844 13
+	b	.L774
+.L900:
+.LBE6325:
+.LBE6326:
+	.loc 3 850 13
 	cmp	r0, #1
-	bne	.L772
-	.loc 3 845 25
+	bne	.L776
+	.loc 3 851 25
 	ldr	r0, [r7, #8]
-	.loc 3 845 48
-	ldr	r3, [r0]
-	.loc 3 845 47
+	.loc 3 851 48
+	ldr	r3, [r0]
+	.loc 3 851 47
 	ldr	r3, [r3, #68]
 	blx	r3
-	.loc 3 845 17
+	.loc 3 851 17
 	cmp	r0, #0
-	bne	.L773
-.L776:
-	.loc 3 861 21
+	bne	.L777
+.L780:
+	.loc 3 867 21
 	ldrb	r0, [r4, #52]	@ zero_extendqisi2
-	.loc 3 859 27
+	.loc 3 865 27
 	ldr	r3, [r4, #16]
-	.loc 3 861 68
+	.loc 3 867 68
 	cmp	r0, #1
-	bls	.L774
+	bls	.L778
 	cmp	r0, #3
-	bne	.L817
-.L774:
-	.loc 3 862 25
+	bne	.L821
+.L778:
+	.loc 3 868 25
 	ldr	r1, [r4, #20]
-	.loc 3 862 17
+	.loc 3 868 17
 	ands	r2, r1, #1
-	beq	.L778
-	.loc 3 864 21
+	beq	.L782
+	.loc 3 870 21
 	ands	r2, r1, #32
-	beq	.L777
-	.loc 3 865 30
+	beq	.L781
+	.loc 3 871 30
 	ldr	r2, [r4, #12]
-.L777:
-	.loc 3 873 13
+.L781:
+	.loc 3 879 13
 	cmp	r0, #2
-	beq	.L780
-.L779:
-	.loc 3 877 24
+	beq	.L784
+.L783:
+	.loc 3 883 24
 	ldrb	r0, [r4, #81]	@ zero_extendqisi2
 	str	r0, [sp, #28]
 	ldrb	r0, [r4, #80]	@ zero_extendqisi2
@@ -19693,240 +19751,240 @@
 	mov	r0, r5
 	add	r1, r7, #8
 	bl	_ZN12RadioShuttle11SendMessageEPNS_10RadioEntryEPviiimiiihh
-	.loc 3 879 27
+	.loc 3 885 27
 	ldr	r3, [r4, #36]
-	.loc 3 882 37
+	.loc 3 888 37
 	ldr	r0, [r7, #8]
-	.loc 3 882 53
+	.loc 3 888 53
 	ldrsh	r2, [r7, #54]
 	ldrb	r1, [r7, #52]	@ zero_extendqisi2
-	.loc 3 880 21
+	.loc 3 886 21
 	str	r9, [r4, #64]
-	.loc 3 879 27
+	.loc 3 885 27
 	adds	r3, r3, #1
 	str	r3, [r4, #36]
-	.loc 3 881 26
+	.loc 3 887 26
 	ldr	r3, [r7, #172]
 	str	r3, [r4, #76]
-	.loc 3 882 79
-	ldr	r3, [r0]
-	.loc 3 882 53
+	.loc 3 888 79
+	ldr	r3, [r0]
+	.loc 3 888 53
 	ldr	r3, [r3, #44]
 	blx	r3
-	.loc 3 882 31
+	.loc 3 888 31
 	str	r0, [r4, #68]
-	.loc 3 883 38
+	.loc 3 889 38
 	ldr	r0, [r7, #8]
-	.loc 3 883 54
+	.loc 3 889 54
 	ldrb	r1, [r7, #52]	@ zero_extendqisi2
-	.loc 3 883 85
-	ldr	r3, [r0]
-	.loc 3 883 54
+	.loc 3 889 85
+	ldr	r3, [r0]
+	.loc 3 889 54
 	movs	r2, #16
 	ldr	r3, [r3, #44]
 	blx	r3
-	.loc 3 885 47
+	.loc 3 891 47
 	ldrb	r3, [r4, #52]	@ zero_extendqisi2
-	.loc 3 883 87
+	.loc 3 889 87
 	adds	r0, r0, #20
-	.loc 3 885 47
+	.loc 3 891 47
 	cmp	r3, #2
-	.loc 3 883 32
+	.loc 3 889 32
 	str	r0, [r4, #72]
-	.loc 3 885 47
-	bne	.L781
-	.loc 3 885 62
+	.loc 3 891 47
+	bne	.L785
+	.loc 3 891 62
 	ldr	r3, [r4, #20]
-	.loc 3 885 47
+	.loc 3 891 47
 	lsls	r1, r3, #30
-	.loc 3 886 29
+	.loc 3 892 29
 	itt	pl
 	movpl	r3, #4
 	strbpl	r3, [r4, #52]
-.L781:
-	.loc 3 887 21
+.L785:
+	.loc 3 893 21
 	ldrb	r3, [r4, #52]	@ zero_extendqisi2
-	.loc 3 887 42
-	cbz	r3, .L782
+	.loc 3 893 42
+	cbz	r3, .L786
 	cmp	r3, #3
-	bne	.L783
-.L782:
-	.loc 3 888 17
+	bne	.L787
+.L786:
+	.loc 3 894 17
 	movs	r3, #1
 	strb	r3, [r4, #52]
-	b	.L770
-.L773:
-	.loc 3 846 48
+	b	.L774
+.L777:
+	.loc 3 852 48
 	ldr	r3, [r7, #100]
 	adds	r3, r3, #1
 	str	r3, [r7, #100]
-	b	.L770
-.L772:
-	.loc 3 851 30
+	b	.L774
+.L776:
+	.loc 3 857 30
 	add	r1, r7, #8
 	mov	r0, r5
 	bl	_ZN12RadioShuttle12CadDetectionEPNS_10RadioEntryE
-	.loc 3 851 14
+	.loc 3 857 14
 	cmp	r0, #0
-	beq	.L776
-	b	.L770
-.L778:
-	.loc 3 868 56
+	beq	.L780
+	b	.L774
+.L782:
+	.loc 3 874 56
 	ldrb	ip, [r5, #28]	@ zero_extendqisi2
 	cmp	ip, #3
-	.loc 3 867 30
+	.loc 3 873 30
 	and	r1, r1, #44
-	.loc 3 868 56
-	bls	.L777
+	.loc 3 874 56
+	bls	.L781
 	cmp	r0, #2
-	bne	.L820
-.L780:
-	.loc 3 874 26
+	bne	.L824
+.L784:
+	.loc 3 880 26
 	ldr	r1, [r4, #20]
-	.loc 3 875 22
+	.loc 3 881 22
 	ldr	r2, [r4, #12]
-	.loc 3 874 26
+	.loc 3 880 26
 	and	r1, r1, #110
-	b	.L779
-.L817:
-	.loc 3 858 19
+	b	.L783
+.L821:
+	.loc 3 864 19
 	movs	r2, #0
-	.loc 3 857 17
+	.loc 3 863 17
 	mov	r1, r2
-	b	.L777
-.L820:
-	.loc 3 869 29
+	b	.L781
+.L824:
+	.loc 3 875 29
 	mov	r3, r2
-	b	.L779
-.L783:
-	.loc 3 889 13
+	b	.L783
+.L787:
+	.loc 3 895 13
 	cmp	r3, #2
-	.loc 3 890 29
+	.loc 3 896 29
 	ittt	eq
 	moveq	r3, #3
 	strbeq	r3, [r4, #52]
-	.loc 3 891 31
+	.loc 3 897 31
 	streq	r10, [r4, #60]
-	b	.L770
-.L758:
-.LBE6324:
-.LBE6326:
+	b	.L774
+.L762:
+.LBE6330:
 .LBE6332:
-.LBE6333:
-.LBB6334:
-.LBB6335:
-.LBB6336:
-.LBB6337:
-.LBB6338:
+.LBE6338:
+.LBE6339:
+.LBB6340:
+.LBB6341:
+.LBB6342:
+.LBB6343:
+.LBB6344:
 	.loc 12 1169 29
 	add	r3, r5, #48
-.LBE6338:
-.LBE6337:
-.LBE6336:
-.LBE6335:
-.LBE6334:
-	.loc 3 901 23
+.LBE6344:
+.LBE6343:
+.LBE6342:
+.LBE6341:
+.LBE6340:
+	.loc 3 907 23
 	ldr	r7, [r5, #96]
+.LBB6369:
 .LBB6363:
-.LBB6357:
-.LBB6354:
-.LBB6342:
-.LBB6339:
+.LBB6360:
+.LBB6348:
+.LBB6345:
 	.loc 12 1169 29
 	str	r3, [sp, #36]
-.LBE6339:
-.LBE6342:
-.LBB6343:
-.LBB6344:
-.LBB6345:
-.LBB6346:
+.LBE6345:
+.LBE6348:
+.LBB6349:
+.LBB6350:
+.LBB6351:
+.LBB6352:
 	.loc 5 985 49
 	add	fp, r5, #52
-.L786:
-.LBE6346:
-.LBE6345:
-.LBE6344:
-.LBE6343:
-.LBE6354:
-.LBE6357:
+.L790:
+.LBE6352:
+.LBE6351:
+.LBE6350:
+.LBE6349:
+.LBE6360:
 .LBE6363:
-	.loc 3 902 14
+.LBE6369:
+	.loc 3 908 14
 	cmp	r4, r7
-	beq	.L787
+	beq	.L791
+.LBB6370:
 .LBB6364:
-.LBB6358:
-	.loc 3 904 94
+	.loc 3 910 94
 	ldrb	r3, [r7, #52]	@ zero_extendqisi2
 	subs	r3, r3, #4
 	cmp	r3, #2
-	bls	.L788
-.LBE6358:
-.LBB6359:
-.LBB6360:
+	bls	.L792
+.LBE6364:
+.LBB6365:
+.LBB6366:
 	.loc 4 227 21
 	ldr	r7, [r7]
-	b	.L786
-.L788:
-.LBE6360:
-.LBE6359:
+	b	.L790
+.L792:
+.LBE6366:
+.LBE6365:
+.LBB6367:
 .LBB6361:
 .LBB6355:
-.LBB6349:
-.LBB6340:
+.LBB6346:
 	.loc 12 1169 29
 	add	r1, r7, #8
 	ldr	r0, [sp, #36]
 	bl	_ZNSt8_Rb_treeIiSt4pairIKiN12RadioShuttle8AppEntryEESt10_Select1stIS4_ESt4lessIiESaIS4_EE4findERS1_
-.LBE6340:
-.LBE6349:
-.LBB6350:
-	.loc 3 908 13
+.LBE6346:
+.LBE6355:
+.LBB6356:
+	.loc 3 914 13
 	cmp	r0, fp
-.LBE6350:
-.LBB6351:
-.LBB6341:
+.LBE6356:
+.LBB6357:
+.LBB6347:
 	.loc 12 1169 29
 	mov	r10, r0
-.LBE6341:
-.LBE6351:
-.LBB6352:
-	.loc 3 908 13
-	beq	.L790
-.LBB6347:
-	.loc 3 910 25
+.LBE6347:
+.LBE6357:
+.LBB6358:
+	.loc 3 914 13
+	beq	.L794
+.LBB6353:
+	.loc 3 916 25
 	ldrb	r3, [r7, #52]	@ zero_extendqisi2
-	.loc 3 910 17
+	.loc 3 916 17
 	cmp	r3, #6
-	beq	.L821
-	.loc 3 914 22
+	beq	.L825
+	.loc 3 920 22
 	subs	r2, r3, #5
 	rsbs	r9, r2, #0
 	adc	r9, r9, r2
-.L791:
-	.loc 3 917 17
+.L795:
+	.loc 3 923 17
 	ldr	r2, [r7, #20]
 	cmp	r2, #1
-	beq	.L790
-	.loc 3 918 21
+	beq	.L794
+	.loc 3 924 21
 	cmp	r3, #6
-	bne	.L793
-	.loc 3 919 45
+	bne	.L797
+	.loc 3 925 45
 	ldr	r1, [r7, #24]
 	mov	r0, r5
 	bl	_ZN12RadioShuttle20DeleteSignalStrengthEm
-	.loc 3 920 29
+	.loc 3 926 29
 	ldr	r0, [r5, #188]
-	.loc 3 920 25
-	cbz	r0, .L793
-	.loc 3 921 81
-	ldr	r3, [r0]
-	.loc 3 921 56
+	.loc 3 926 25
+	cbz	r0, .L797
+	.loc 3 927 81
+	ldr	r3, [r0]
+	.loc 3 927 56
 	ldr	r2, [r7, #24]
 	ldr	r3, [r3, #24]
 	ldr	r1, [r7, #8]
 	blx	r3
-.L793:
-	.loc 3 923 39
+.L797:
+	.loc 3 929 39
 	ldr	r3, [r7, #16]
 	str	r3, [sp, #4]
 	ldr	r3, [r7, #12]
@@ -19937,255 +19995,255 @@
 	ldr	r0, [r7, #8]
 	mov	r3, r9
 	blx	r10
-.L790:
-.LBE6347:
-.LBE6352:
-.LBE6355:
+.L794:
+.LBE6353:
+.LBE6358:
 .LBE6361:
-	.loc 3 929 13
+.LBE6367:
+	.loc 3 935 13
 	ldrb	r3, [r7, #40]	@ zero_extendqisi2
-	cbz	r3, .L795
-	.loc 3 930 26
+	cbz	r3, .L799
+	.loc 3 936 26
 	ldr	r0, [r7, #12]
-	.loc 3 930 45
-	cbz	r0, .L795
-	.loc 3 930 41
+	.loc 3 936 45
+	cbz	r0, .L799
+	.loc 3 936 41
 	bl	_ZdaPv
-.L795:
-	.loc 3 931 33
+.L799:
+	.loc 3 937 33
 	mov	r1, r7
 	mov	r0, r4
 	bl	_ZNSt7__cxx114listIN12RadioShuttle12SendMsgEntryESaIS2_EE5eraseESt14_List_iteratorIS2_E
 	mov	r7, r0
-	b	.L786
-.L821:
+	b	.L790
+.L825:
+.LBB6368:
 .LBB6362:
-.LBB6356:
-.LBB6353:
-.LBB6348:
-	.loc 3 911 28
+.LBB6359:
+.LBB6354:
+	.loc 3 917 28
 	mov	r9, #2
-	b	.L791
-.L787:
-.LBE6348:
-.LBE6353:
-.LBE6356:
+	b	.L795
+.L791:
+.LBE6354:
+.LBE6359:
 .LBE6362:
-.LBE6364:
-	.loc 3 945 29
+.LBE6368:
+.LBE6370:
+	.loc 3 951 29
 	ldr	r0, [r5, #160]
 	bl	_ZN4mbed5Timer7read_msEv
-	.loc 3 944 14
+	.loc 3 950 14
 	mov	r2, #-1
-	.loc 3 947 27
+	.loc 3 953 27
 	ldr	r3, [r5, #96]
-	.loc 3 943 14
+	.loc 3 949 14
 	mov	ip, r2
-.L800:
-	.loc 3 947 33
+.L804:
+	.loc 3 953 33
 	cmp	r4, r3
-	beq	.L796
-	.loc 3 949 17
+	beq	.L800
+	.loc 3 955 17
 	ldr	r1, [r3, #60]
-	.loc 3 949 30
-	cbz	r1, .L797
+	.loc 3 955 30
+	cbz	r1, .L801
 	cmp	ip, r1
 	it	cs
 	movcs	ip, r1
-.L797:
-	.loc 3 954 17
+.L801:
+	.loc 3 960 17
 	ldr	r7, [r3, #64]
-	.loc 3 954 30
-	cbz	r7, .L798
-	.loc 3 954 50
+	.loc 3 960 30
+	cbz	r7, .L802
+	.loc 3 960 50
 	ldr	r1, [r3, #68]
 	add	r1, r1, r7
-	.loc 3 954 70
+	.loc 3 960 70
 	ldr	r7, [r3, #76]
 	add	r1, r1, r7
 	cmp	r2, r1
 	it	cs
 	movcs	r2, r1
-.L798:
-	.loc 3 957 9
+.L802:
+	.loc 3 963 9
 	cmp	r8, #0
-	beq	.L799
+	beq	.L803
 	cmp	r2, r8
 	it	cs
 	movcs	r2, r8
-.L799:
-.LBB6365:
-.LBB6366:
+.L803:
+.LBB6371:
+.LBB6372:
 	.loc 4 227 21
 	ldr	r3, [r3]
-	b	.L800
-.L796:
+	b	.L804
+.L800:
 	cmp	ip, r2
 	mov	r7, ip
 	it	cs
 	movcs	r7, r2
-.LBE6366:
-.LBE6365:
-.LBB6367:
-	.loc 3 963 5
+.LBE6372:
+.LBE6371:
+.LBB6373:
+	.loc 3 969 5
 	adds	r3, r7, #1
-	beq	.L801
-.LBB6368:
-	.loc 3 965 9
+	beq	.L805
+.LBB6374:
+	.loc 3 971 9
 	cmp	r0, r7
-	bcs	.L823
-	.loc 3 966 20
+	bcs	.L827
+	.loc 3 972 20
 	sub	r10, r7, r0
-	.loc 3 969 9
+	.loc 3 975 9
 	cmp	r10, #5
-	bls	.L823
-	.loc 3 971 28
+	bls	.L827
+	.loc 3 977 28
 	ldr	r3, [r5, #164]
-	.loc 3 971 25
+	.loc 3 977 25
 	cmp	r3, r7
-	bne	.L802
-.L801:
-.LBE6368:
-.LBE6367:
-.LBB6391:
-	.loc 3 984 39
+	bne	.L806
+.L805:
+.LBE6374:
+.LBE6373:
+.LBB6397:
+	.loc 3 990 39
 	ldrb	r3, [r5, #28]	@ zero_extendqisi2
-	.loc 3 984 5
+	.loc 3 990 5
 	subs	r3, r3, #1
 	cmp	r3, #1
-	bhi	.L806
-.LBB6392:
-	.loc 3 987 31
+	bhi	.L810
+.LBB6398:
+	.loc 3 993 31
 	ldr	r3, [r5, #96]
-.L809:
-	.loc 3 987 37
+.L813:
+	.loc 3 993 37
 	cmp	r4, r3
-	beq	.L807
-	.loc 3 988 67
+	beq	.L811
+	.loc 3 994 67
 	ldr	r2, [r3, #64]
-	cbz	r2, .L808
-	.loc 3 988 34
+	cbz	r2, .L812
+	.loc 3 994 34
 	ldrb	r2, [r3, #52]	@ zero_extendqisi2
 	cmp	r2, #2
-	beq	.L808
-	.loc 3 988 67
+	beq	.L812
+	.loc 3 994 67
 	ldr	r2, [r3, #60]
 	cmp	r2, #0
-	beq	.L806
-.L808:
-.LBB6393:
-.LBB6394:
+	beq	.L810
+.L812:
+.LBB6399:
+.LBB6400:
 	.loc 4 227 21
 	ldr	r3, [r3]
-	b	.L809
-.L823:
-.LBE6394:
-.LBE6393:
-.LBE6392:
-.LBE6391:
-.LBB6399:
-.LBB6390:
-	.loc 3 968 20
+	b	.L813
+.L827:
+.LBE6400:
+.LBE6399:
+.LBE6398:
+.LBE6397:
+.LBB6405:
+.LBB6396:
+	.loc 3 974 20
 	mov	r10, #5
-.L802:
-.LBB6369:
-.LBB6370:
-.LBB6371:
-.LBB6372:
-.LBB6373:
+.L806:
+.LBB6375:
+.LBB6376:
+.LBB6377:
+.LBB6378:
+.LBB6379:
 	.loc 1 643 15
 	add	r8, sp, #52
 	movs	r2, #16
 	movs	r1, #0
 	mov	r0, r8
-.LBE6373:
-.LBE6372:
-.LBE6371:
-.LBE6370:
-.LBE6369:
-	.loc 3 972 13
+.LBE6379:
+.LBE6378:
+.LBE6377:
+.LBE6376:
+.LBE6375:
+	.loc 3 978 13
 	ldr	r9, [r5, #156]
+.LBB6388:
+.LBB6386:
+.LBB6384:
 .LBB6382:
 .LBB6380:
-.LBB6378:
-.LBB6376:
-.LBB6374:
 	.loc 1 643 15
 	bl	memset
 	.loc 1 644 9
-	ldr	r3, .L899
+	ldr	r3, .L903
 	str	r3, [sp, #40]
 	movs	r3, #0
 	strd	r3, r5, [sp, #44]
 	add	r3, sp, #40
 	ldm	r3, {r0, r1, r2}
 	.loc 1 645 9
-	ldr	r3, .L899+4
+	ldr	r3, .L903+4
 	.loc 1 644 9
 	stm	r8, {r0, r1, r2}
-.LBE6374:
-.LBE6376:
-.LBE6378:
 .LBE6380:
 .LBE6382:
-	.loc 3 972 81
+.LBE6384:
+.LBE6386:
+.LBE6388:
+	.loc 3 978 81
 	mov	r0, #1000
+.LBB6389:
+.LBB6387:
+.LBB6385:
 .LBB6383:
 .LBB6381:
-.LBB6379:
-.LBB6377:
-.LBB6375:
 	.loc 1 645 9
 	str	r3, [sp, #64]
-.LBE6375:
-.LBE6377:
-.LBE6379:
 .LBE6381:
 .LBE6383:
-	.loc 3 972 81
+.LBE6385:
+.LBE6387:
+.LBE6389:
+	.loc 3 978 81
 	mul	r10, r0, r10
-.LBB6384:
-.LBB6385:
+.LBB6390:
+.LBB6391:
 	.loc 7 122 41
 	bl	core_util_critical_section_enter
 	.loc 7 124 24
 	ldr	r3, [r9, #52]
-	cbnz	r3, .L803
+	cbnz	r3, .L807
 	ldrb	r3, [r9, #56]	@ zero_extendqisi2
-	cbz	r3, .L803
+	cbz	r3, .L807
 	.loc 7 125 13
 	bl	sleep_manager_lock_deep_sleep_internal
-.L803:
+.L807:
 	.loc 7 127 21
 	add	fp, r9, #40
-.LBB6386:
-.LBB6387:
+.LBB6392:
+.LBB6393:
 	.loc 1 558 9
 	cmp	fp, r8
-	beq	.L804
+	beq	.L808
 	.loc 1 559 13
 	mov	r0, fp
 	bl	_ZN4mbed8CallbackIFvvEED1Ev
-.LBB6388:
-.LBB6389:
+.LBB6394:
+.LBB6395:
 	.loc 1 97 18
 	ldr	r3, [sp, #64]
 	.loc 1 97 9
-	cbz	r3, .L805
+	cbz	r3, .L809
 	.loc 1 98 24
 	ldr	r3, [r3, #4]
 	mov	r1, r8
 	mov	r0, fp
 	blx	r3
-.L805:
+.L809:
 	.loc 1 100 9
 	ldr	r3, [sp, #64]
 	str	r3, [r9, #52]
-.L804:
-.LBE6389:
-.LBE6388:
-.LBE6387:
-.LBE6386:
+.L808:
+.LBE6395:
+.LBE6394:
+.LBE6393:
+.LBE6392:
 	.loc 7 128 14
 	movs	r3, #0
 	mov	r2, r10
@@ -20193,104 +20251,104 @@
 	bl	_ZN4mbed6Ticker5setupEy
 	.loc 7 129 40
 	bl	core_util_critical_section_exit
-.LBE6385:
-.LBE6384:
-	.loc 3 972 71
+.LBE6391:
+.LBE6390:
+	.loc 3 978 71
 	mov	r0, r8
 	bl	_ZN4mbed8CallbackIFvvEED1Ev
-	.loc 3 974 26
+	.loc 3 980 26
 	ldr	r3, [r5, #168]
-	.loc 3 973 24
+	.loc 3 979 24
 	str	r7, [r5, #164]
-	.loc 3 974 26
+	.loc 3 980 26
 	adds	r3, r3, #1
 	str	r3, [r5, #168]
-	b	.L801
-.L806:
-.LBE6390:
-.LBE6399:
-	.loc 3 1009 19
+	b	.L805
+.L810:
+.LBE6396:
+.LBE6405:
+	.loc 3 1015 19
 	movs	r0, #0
 	strb	r0, [r5, #172]
-.L743:
-.LBE6276:
-.LBE6275:
-	.loc 3 1011 1
+.L747:
+.LBE6282:
+.LBE6281:
+	.loc 3 1017 1
 	add	sp, sp, #76
 	.cfi_remember_state
 	.cfi_def_cfa_offset 36
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, r10, fp, pc}
-.L807:
+.L811:
 	.cfi_restore_state
-.LBB6402:
+.LBB6408:
+.LBB6407:
+.LBB6406:
+.LBB6404:
 .LBB6401:
-.LBB6400:
-.LBB6398:
-.LBB6395:
-	.loc 3 996 36
+	.loc 3 1002 36
 	ldr	r4, [r5, #36]
-	.loc 3 1000 29
-	ldr	r7, .L899+8
-.L815:
-	.loc 3 996 42
+	.loc 3 1006 29
+	ldr	r7, .L903+8
+.L819:
+	.loc 3 1002 42
 	cmp	r6, r4
-	beq	.L806
-	.loc 3 997 25
+	beq	.L810
+	.loc 3 1003 25
 	ldr	r0, [r4, #8]
-	.loc 3 997 42
-	ldr	r3, [r0]
-	.loc 3 997 41
+	.loc 3 1003 42
+	ldr	r3, [r0]
+	.loc 3 1003 41
 	ldr	r3, [r3, #12]
 	blx	r3
-	.loc 3 997 17
+	.loc 3 1003 17
 	cmp	r0, #1
-	bne	.L811
-	.loc 3 998 25
+	bne	.L815
+	.loc 3 1004 25
 	ldr	r0, [r4, #8]
-	.loc 3 998 38
-	ldr	r3, [r0]
-	.loc 3 998 37
+	.loc 3 1004 38
+	ldr	r3, [r0]
+	.loc 3 1004 37
 	ldr	r3, [r3, #52]
 	blx	r3
-	.loc 3 999 21
+	.loc 3 1005 21
 	ldrb	r3, [r5, #180]	@ zero_extendqisi2
-	cbnz	r3, .L812
-	.loc 3 999 49
+	cbnz	r3, .L816
+	.loc 3 1005 49
 	ldrb	r3, [r5, #181]	@ zero_extendqisi2
-	cbz	r3, .L813
-.L812:
-	.loc 3 1000 29
+	cbz	r3, .L817
+.L816:
+	.loc 3 1006 29
 	mov	r0, r7
 	bl	_Z7dprintfPKcz
-.L813:
-	.loc 3 1002 21
+.L817:
+	.loc 3 1008 21
 	ldr	r3, [r5, #44]
 	cmp	r3, #1
-	bne	.L811
-	.loc 3 1003 38
+	bne	.L815
+	.loc 3 1009 38
 	ldr	r0, [r5, #156]
 	bl	_ZN4mbed6Ticker6detachEv
-.L811:
-.LBB6396:
-.LBB6397:
+.L815:
+.LBB6402:
+.LBB6403:
 	.loc 4 227 21
 	ldr	r4, [r4]
-	b	.L815
-.L900:
-	.align	2
-.L899:
+	b	.L819
+.L904:
+	.align	2
+.L903:
 	.word	_ZN12RadioShuttle11TimeoutFuncEv
 	.word	_ZZN4mbed8CallbackIFvvEE8generateINS2_14method_contextI12RadioShuttleMS5_FvvEEEEEvRKT_E3ops
 	.word	.LC40
 	.word	.LC39
-.LBE6397:
-.LBE6396:
-.LBE6395:
-.LBE6398:
-.LBE6400:
+.LBE6403:
+.LBE6402:
 .LBE6401:
-.LBE6402:
+.LBE6404:
+.LBE6406:
+.LBE6407:
+.LBE6408:
 	.cfi_endproc
 .LFE2598:
 	.size	_ZN12RadioShuttle10RunShuttleEv, .-_ZN12RadioShuttle10RunShuttleEv
@@ -20304,7 +20362,7 @@
 	.type	_ZN12RadioShuttle7SendMsgEiPviimiPi, %function
 _ZN12RadioShuttle7SendMsgEiPviimiPi:
 .LFB2590:
-	.loc 3 490 1
+	.loc 3 496 1
 	.cfi_startproc
 	@ args = 16, pretend = 0, frame = 136
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -20320,278 +20378,278 @@
 	.cfi_offset 11, -8
 	.cfi_offset 14, -4
 	mov	r9, r3
-	.loc 3 495 13
+	.loc 3 501 13
 	ldr	r3, [r0, #32]
-	.loc 3 490 1
+	.loc 3 496 1
 	sub	sp, sp, #156
 	.cfi_def_cfa_offset 192
-	.loc 3 495 13
+	.loc 3 501 13
 	subs	r3, r3, #15
-	.loc 3 495 5
+	.loc 3 501 5
 	cmp	r3, r9
-	.loc 3 490 1
+	.loc 3 496 1
 	mov	r4, r0
 	str	r1, [sp, #28]
 	mov	r10, r2
 	ldrd	r6, r8, [sp, #192]
-	.loc 3 495 5
-	ble	.L910
-.LBB6403:
-.LBB6404:
+	.loc 3 501 5
+	ble	.L914
+.LBB6409:
+.LBB6410:
 	.loc 12 1169 29
 	add	r1, sp, #28
 	adds	r0, r0, #48
 	bl	_ZNSt8_Rb_treeIiSt4pairIKiN12RadioShuttle8AppEntryEESt10_Select1stIS4_ESt4lessIiESaIS4_EE4findERS1_
-.LBE6404:
-.LBE6403:
-.LBB6406:
-.LBB6407:
-.LBB6408:
-	.loc 5 985 49
-	add	r3, r4, #52
-.LBE6408:
-.LBE6407:
-.LBE6406:
-	.loc 3 500 5
-	cmp	r0, r3
-.LBB6409:
-.LBB6405:
-	.loc 12 1169 29
-	mov	r7, r0
-.LBE6405:
+.LBE6410:
 .LBE6409:
-	.loc 3 500 5
-	beq	.L911
-.LBB6410:
-	.loc 3 505 5
-	ldr	r5, [r0, #32]
-.LBE6410:
-	.loc 3 503 9
-	add	r3, r0, #20
-	str	r3, [sp, #20]
-.LBB6434:
-	.loc 3 505 5
-	cbz	r5, .L903
-	.loc 3 505 23 discriminator 1
-	lsls	r5, r6, #26
-	bmi	.L913
-.LBB6411:
 .LBB6412:
 .LBB6413:
 .LBB6414:
+	.loc 5 985 49
+	add	r3, r4, #52
+.LBE6414:
+.LBE6413:
+.LBE6412:
+	.loc 3 506 5
+	cmp	r0, r3
+.LBB6415:
+.LBB6411:
+	.loc 12 1169 29
+	mov	r7, r0
+.LBE6411:
+.LBE6415:
+	.loc 3 506 5
+	beq	.L915
+.LBB6416:
+	.loc 3 511 5
+	ldr	r5, [r0, #32]
+.LBE6416:
+	.loc 3 509 9
+	add	r3, r0, #20
+	str	r3, [sp, #20]
+.LBB6440:
+	.loc 3 511 5
+	cbz	r5, .L907
+	.loc 3 511 23 discriminator 1
+	lsls	r5, r6, #26
+	bmi	.L917
+.LBB6417:
+.LBB6418:
+.LBB6419:
+.LBB6420:
 	.loc 13 249 31
 	ldr	r3, [sp, #28]
 	str	r3, [sp, #40]
-.LBE6414:
-.LBE6413:
-.LBE6412:
-.LBB6417:
-.LBB6418:
+.LBE6420:
+.LBE6419:
+.LBE6418:
+.LBB6423:
+.LBB6424:
 	.loc 12 1169 29
 	add	r1, sp, #36
 	add	r0, r4, #72
-.LBE6418:
-.LBE6417:
-.LBB6420:
-.LBB6416:
-.LBB6415:
-	.loc 13 249 31
-	str	r8, [sp, #36]
-.LBE6415:
-.LBE6416:
-.LBE6420:
-.LBB6421:
-.LBB6419:
-	.loc 12 1169 29
-	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE4findERS2_
-.LBE6419:
-.LBE6421:
-.LBB6422:
-.LBB6423:
-.LBB6424:
-	.loc 5 985 49
-	add	r3, r4, #76
 .LBE6424:
 .LBE6423:
+.LBB6426:
+.LBB6422:
+.LBB6421:
+	.loc 13 249 31
+	str	r8, [sp, #36]
+.LBE6421:
 .LBE6422:
-	.loc 3 508 9
-	cmp	r0, r3
-	beq	.L914
+.LBE6426:
+.LBB6427:
 .LBB6425:
-	.loc 3 515 9
-	ldrb	r3, [r0, #32]	@ zero_extendqisi2
+	.loc 12 1169 29
+	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE4findERS2_
 .LBE6425:
-	.loc 3 511 13
-	add	r5, r0, #24
+.LBE6427:
+.LBB6428:
+.LBB6429:
 .LBB6430:
-	.loc 3 515 9
-	cbnz	r3, .L903
-.LBB6426:
-	.loc 3 519 35
+	.loc 5 985 49
+	add	r3, r4, #76
+.LBE6430:
+.LBE6429:
+.LBE6428:
+	.loc 3 514 9
+	cmp	r0, r3
+	beq	.L918
+.LBB6431:
+	.loc 3 521 9
+	ldrb	r3, [r0, #32]	@ zero_extendqisi2
+.LBE6431:
+	.loc 3 517 13
+	add	r5, r0, #24
+.LBB6436:
+	.loc 3 521 9
+	cbnz	r3, .L907
+.LBB6432:
+	.loc 3 525 35
 	mov	r2, r4
-	.loc 3 520 27
+	.loc 3 526 27
 	ldr	r1, [sp, #28]
-	.loc 3 519 35
+	.loc 3 525 35
 	ldr	r3, [r2, #96]!
-.L906:
-	.loc 3 519 41 discriminator 1
+.L910:
+	.loc 3 525 41 discriminator 1
 	cmp	r3, r2
-	beq	.L904
-	.loc 3 520 66
+	beq	.L908
+	.loc 3 526 66
 	ldr	r0, [r3, #8]
 	cmp	r0, r1
-	bne	.L905
-	.loc 3 520 53 discriminator 1
+	bne	.L909
+	.loc 3 526 53 discriminator 1
 	ldr	r0, [r3, #20]
-	.loc 3 520 40 discriminator 1
+	.loc 3 526 40 discriminator 1
 	lsls	r0, r0, #26
-	bpl	.L905
-	.loc 3 520 66 discriminator 3
+	bpl	.L909
+	.loc 3 526 66 discriminator 3
 	ldr	r0, [r3, #24]
 	cmp	r0, r8
-	beq	.L903
-.L905:
-.LBB6427:
-.LBB6428:
+	beq	.L907
+.L909:
+.LBB6433:
+.LBB6434:
 	.loc 4 227 21 discriminator 6
 	ldr	r3, [r3]
-	b	.L906
-.L913:
-.LBE6428:
-.LBE6427:
-.LBE6426:
-.LBE6430:
-.LBE6411:
+	b	.L910
+.L917:
 .LBE6434:
-	.loc 3 492 19
+.LBE6433:
+.LBE6432:
+.LBE6436:
+.LBE6417:
+.LBE6440:
+	.loc 3 498 19
 	movs	r5, #0
-.L903:
-	.loc 3 532 11
+.L907:
+	.loc 3 538 11
 	movs	r2, #116
 	movs	r1, #0
 	add	r0, sp, #36
 	bl	memset
-	.loc 3 533 13
+	.loc 3 539 13
 	ldr	r3, [sp, #28]
 	str	r3, [sp, #36]
-.LBB6435:
-	.loc 3 534 5
+.LBB6441:
+	.loc 3 540 5
 	lsls	r2, r6, #21
-	bpl	.L907
-.LBB6436:
-	.loc 3 535 43
+	bpl	.L911
+.LBB6442:
+	.loc 3 541 43
 	mov	r0, r9
 	bl	_Znaj
-	.loc 3 536 9
+	.loc 3 542 9
 	mov	fp, r0
 	cmp	r0, #0
-	beq	.L915
-	.loc 3 538 15
+	beq	.L919
+	.loc 3 544 15
 	mov	r1, r10
 	mov	r2, r9
 	bl	memcpy
-	.loc 3 540 15
+	.loc 3 546 15
 	orr	r6, r6, #512
-.LBE6436:
+.LBE6442:
 	mov	r10, fp
-.L907:
-.LBE6435:
-	.loc 3 544 21
+.L911:
+.LBE6441:
+	.loc 3 550 21
 	ubfx	r3, r6, #0, #9
-	.loc 3 544 13
+	.loc 3 550 13
 	str	r3, [sp, #48]
-	.loc 3 545 5
+	.loc 3 551 5
 	lsls	r3, r6, #22
-	.loc 3 546 23
+	.loc 3 552 23
 	itt	mi
 	movmi	r3, #1
 	strbmi	r3, [sp, #68]
-	.loc 3 548 15
+	.loc 3 554 15
 	ldr	r3, [sp, #200]
 	str	r3, [sp, #56]
-	.loc 3 549 20
+	.loc 3 555 20
 	ldr	r3, [r7, #28]
-	.loc 3 547 17
+	.loc 3 553 17
 	str	r8, [sp, #52]
-	.loc 3 549 25
+	.loc 3 555 25
 	adds	r2, r3, #1
-	.loc 3 543 11
+	.loc 3 549 11
 	strd	r10, r9, [sp, #40]
-	.loc 3 549 25
+	.loc 3 555 25
 	str	r2, [r7, #28]
-	.loc 3 550 5
+	.loc 3 556 5
 	ldr	r2, [sp, #204]
-	.loc 3 549 13
+	.loc 3 555 13
 	str	r3, [sp, #60]
-	.loc 3 550 5
-	cbz	r2, .L909
-	.loc 3 551 16
+	.loc 3 556 5
+	cbz	r2, .L913
+	.loc 3 557 16
 	str	r3, [r2]
-.L909:
-	.loc 3 553 11
+.L913:
+	.loc 3 559 11
 	ldr	r3, [sp, #20]
-	.loc 3 552 11
+	.loc 3 558 11
 	str	r5, [sp, #76]
-	.loc 3 556 21
+	.loc 3 562 21
 	add	r1, sp, #36
-	.loc 3 554 15
+	.loc 3 560 15
 	movs	r5, #0
-	.loc 3 556 21
+	.loc 3 562 21
 	add	r0, r4, #96
-	.loc 3 553 11
+	.loc 3 559 11
 	str	r3, [sp, #72]
-	.loc 3 554 15
+	.loc 3 560 15
 	strb	r5, [sp, #80]
-	.loc 3 556 21
+	.loc 3 562 21
 	bl	_ZNSt7__cxx114listIN12RadioShuttle12SendMsgEntryESaIS2_EE9push_backERKS2_
-	.loc 3 557 15
+	.loc 3 563 15
 	mov	r0, r4
 	bl	_ZN12RadioShuttle10RunShuttleEv
-	.loc 3 558 12
-	mov	r0, r5
-.L928:
-	.loc 3 559 1
+	.loc 3 564 12
+	mov	r0, r5
+.L932:
+	.loc 3 565 1
 	add	sp, sp, #156
 	.cfi_remember_state
 	.cfi_def_cfa_offset 36
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, r10, fp, pc}
-.L910:
+.L914:
 	.cfi_restore_state
-	.loc 3 496 16
+	.loc 3 502 16
 	movs	r0, #12
-	b	.L928
-.L911:
-	.loc 3 501 16
+	b	.L932
+.L915:
+	.loc 3 507 16
 	movs	r0, #2
-	b	.L928
-.L914:
+	b	.L932
+.L918:
+.LBB6444:
 .LBB6438:
-.LBB6432:
-	.loc 3 509 20
+	.loc 3 515 20
 	movs	r0, #3
-	b	.L928
-.L915:
-.LBE6432:
+	b	.L932
+.L919:
 .LBE6438:
+.LBE6444:
+.LBB6445:
+.LBB6443:
+	.loc 3 543 20
+	movs	r0, #15
+	b	.L932
+.L908:
+.LBE6443:
+.LBE6445:
+.LBB6446:
 .LBB6439:
 .LBB6437:
-	.loc 3 537 20
-	movs	r0, #15
-	b	.L928
-.L904:
-.LBE6437:
-.LBE6439:
-.LBB6440:
-.LBB6433:
-.LBB6431:
-.LBB6429:
-	.loc 3 526 38
+.LBB6435:
+	.loc 3 532 38
 	ldr	r0, [r4, #192]
 	str	r1, [sp, #24]
-	.loc 3 526 70
-	ldr	r3, [r0]
-	.loc 3 526 24
+	.loc 3 532 70
+	ldr	r3, [r0]
+	.loc 3 532 24
 	ldr	r3, [r3, #12]
 	blx	r3
 	movw	r3, #9999
@@ -20604,11 +20662,11 @@
 	ldr	r1, [sp, #24]
 	mov	r0, r4
 	bl	_ZN12RadioShuttle7SendMsgEiPviimiPi
-	b	.L903
-.LBE6429:
-.LBE6431:
-.LBE6433:
-.LBE6440:
+	b	.L907
+.LBE6435:
+.LBE6437:
+.LBE6439:
+.LBE6446:
 	.cfi_endproc
 .LFE2590:
 	.size	_ZN12RadioShuttle7SendMsgEiPviimiPi, .-_ZN12RadioShuttle7SendMsgEiPviimiPi
@@ -20622,7 +20680,7 @@
 	.type	_ZN12RadioShuttle7ConnectEim, %function
 _ZN12RadioShuttle7ConnectEim:
 .LFB2589:
-	.loc 3 455 1
+	.loc 3 461 1
 	.cfi_startproc
 	@ args = 0, pretend = 0, frame = 96
 	@ frame_needed = 0, uses_anonymous_args = 0
@@ -20638,201 +20696,201 @@
 	.cfi_offset 14, -4
 	sub	sp, sp, #112
 	.cfi_def_cfa_offset 144
-	.loc 3 455 1
+	.loc 3 461 1
 	mov	r6, r0
 	str	r1, [sp, #20]
-.LBB6467:
-.LBB6468:
+.LBB6473:
+.LBB6474:
 	.loc 12 1169 29
 	adds	r0, r0, #48
 	add	r1, sp, #20
-.LBE6468:
-.LBE6467:
-	.loc 3 455 1
+.LBE6474:
+.LBE6473:
+	.loc 3 461 1
 	mov	r8, r2
-.LBB6470:
-.LBB6469:
+.LBB6476:
+.LBB6475:
 	.loc 12 1169 29
 	bl	_ZNSt8_Rb_treeIiSt4pairIKiN12RadioShuttle8AppEntryEESt10_Select1stIS4_ESt4lessIiESaIS4_EE4findERS1_
-.LBE6469:
-.LBE6470:
-.LBB6471:
-.LBB6472:
-.LBB6473:
+.LBE6475:
+.LBE6476:
+.LBB6477:
+.LBB6478:
+.LBB6479:
 	.loc 5 985 49
 	add	r3, r6, #52
-.LBE6473:
-.LBE6472:
-.LBE6471:
-	.loc 3 459 5
+.LBE6479:
+.LBE6478:
+.LBE6477:
+	.loc 3 465 5
 	cmp	r0, r3
-	beq	.L931
-	.loc 3 462 5
+	beq	.L935
+	.loc 3 468 5
 	ldr	r3, [r0, #32]
 	cmp	r3, #0
-	beq	.L932
-	.loc 3 465 5
+	beq	.L936
+	.loc 3 471 5
 	ldr	r3, [r6, #192]
 	cmp	r3, #0
-	beq	.L933
-.LBB6474:
-.LBB6475:
+	beq	.L937
+.LBB6480:
+.LBB6481:
 	.loc 12 1169 29
 	add	r9, r6, #72
 	add	r7, sp, #84
-.LBE6475:
-.LBE6474:
-.LBB6478:
-.LBB6479:
-.LBB6480:
+.LBE6481:
+.LBE6480:
+.LBB6484:
+.LBB6485:
+.LBB6486:
 	.loc 13 249 31
 	ldr	r3, [sp, #20]
 	str	r3, [sp, #88]
-.LBE6480:
-.LBE6479:
-.LBE6478:
-.LBB6483:
-.LBB6476:
+.LBE6486:
+.LBE6485:
+.LBE6484:
+.LBB6489:
+.LBB6482:
 	.loc 12 1169 29
 	mov	r1, r7
 	mov	r0, r9
-.LBE6476:
-.LBE6483:
-.LBB6484:
-.LBB6482:
-.LBB6481:
+.LBE6482:
+.LBE6489:
+.LBB6490:
+.LBB6488:
+.LBB6487:
 	.loc 13 249 31
 	str	r8, [sp, #84]
-.LBE6481:
-.LBE6482:
-.LBE6484:
-.LBB6485:
-.LBB6477:
+.LBE6487:
+.LBE6488:
+.LBE6490:
+.LBB6491:
+.LBB6483:
 	.loc 12 1169 29
 	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE4findERS2_
-.LBE6477:
-.LBE6485:
-.LBB6486:
-.LBB6487:
-.LBB6488:
+.LBE6483:
+.LBE6491:
+.LBB6492:
+.LBB6493:
+.LBB6494:
 	.loc 5 985 49
 	add	r3, r6, #76
-.LBE6488:
-.LBE6487:
-.LBE6486:
-	.loc 3 470 5
+.LBE6494:
+.LBE6493:
+.LBE6492:
+	.loc 3 476 5
 	cmp	r3, r0
-	bne	.L934
-	.loc 3 475 8
+	bne	.L938
+	.loc 3 481 8
 	movs	r2, #20
 	movs	r1, #0
 	add	r0, sp, #36
 	bl	memset
-	.loc 3 478 18
+	.loc 3 484 18
 	movs	r4, #0
-	.loc 3 477 13
+	.loc 3 483 13
 	ldr	r10, [sp, #20]
-	.loc 3 476 17
+	.loc 3 482 17
 	str	r8, [sp, #36]
-	.loc 3 477 13
+	.loc 3 483 13
 	str	r10, [sp, #40]
-	.loc 3 478 18
+	.loc 3 484 18
 	strb	r4, [sp, #44]
 	add	r5, sp, #36
 	ldmia	r5!, {r0, r1, r2, r3}
 	mov	ip, r7
 	stmia	ip!, {r0, r1, r2, r3}
-.LBB6489:
-.LBB6490:
-.LBB6491:
-.LBB6492:
+.LBB6495:
+.LBB6496:
+.LBB6497:
+.LBB6498:
 	.loc 13 249 31
 	mov	ip, r7
 	ldmia	ip!, {r0, r1, r2, r3}
 	ldr	lr, [r5]
-.LBE6492:
-.LBE6491:
-.LBE6490:
-.LBE6489:
-.LBB6499:
-.LBB6500:
-.LBB6501:
+.LBE6498:
+.LBE6497:
+.LBE6496:
+.LBE6495:
+.LBB6505:
+.LBB6506:
+.LBB6507:
 	.loc 13 277 39
 	strd	r8, r10, [sp, #56]
-.LBE6501:
-.LBE6500:
-.LBE6499:
-.LBB6508:
-.LBB6497:
-.LBB6495:
-.LBB6493:
+.LBE6507:
+.LBE6506:
+.LBE6505:
+.LBB6514:
+.LBB6503:
+.LBB6501:
+.LBB6499:
 	.loc 13 249 31
 	add	r5, sp, #64
 	stmia	r5!, {r0, r1, r2, r3}
-.LBE6493:
-.LBE6495:
-.LBE6497:
-.LBE6508:
-.LBB6509:
-.LBB6505:
-.LBB6502:
+.LBE6499:
+.LBE6501:
+.LBE6503:
+.LBE6514:
+.LBB6515:
+.LBB6511:
+.LBB6508:
 	.loc 13 277 39
 	add	r3, sp, #56
 	ldm	r3, {r0, r1}
 	add	ip, sp, #64
 	stm	r7, {r0, r1}
 	ldmia	ip!, {r0, r1, r2, r3}
-.LBE6502:
-.LBE6505:
-.LBE6509:
-.LBB6510:
-.LBB6498:
-.LBB6496:
-.LBB6494:
+.LBE6508:
+.LBE6511:
+.LBE6515:
+.LBB6516:
+.LBB6504:
+.LBB6502:
+.LBB6500:
 	.loc 13 249 31
 	str	lr, [r5]
-.LBE6494:
-.LBE6496:
-.LBE6498:
-.LBE6510:
-.LBB6511:
-.LBB6506:
-.LBB6503:
+.LBE6500:
+.LBE6502:
+.LBE6504:
+.LBE6516:
+.LBB6517:
+.LBB6512:
+.LBB6509:
 	.loc 13 277 39
 	add	r5, sp, #92
 	stmia	r5!, {r0, r1, r2, r3}
-.LBE6503:
-.LBE6506:
-.LBE6511:
-.LBB6512:
-.LBB6513:
+.LBE6509:
+.LBE6512:
+.LBE6517:
+.LBB6518:
+.LBB6519:
 	.loc 12 802 41
 	mov	r2, r7
 	mov	r1, r9
 	add	r0, sp, #28
-.LBE6513:
-.LBE6512:
-.LBB6515:
-.LBB6507:
-.LBB6504:
+.LBE6519:
+.LBE6518:
+.LBB6521:
+.LBB6513:
+.LBB6510:
 	.loc 13 277 39
 	str	lr, [r5]
-.LBE6504:
-.LBE6507:
-.LBE6515:
-.LBB6516:
-.LBB6514:
+.LBE6510:
+.LBE6513:
+.LBE6521:
+.LBB6522:
+.LBB6520:
 	.loc 12 802 41
 	bl	_ZNSt8_Rb_treeISt4pairImiES0_IKS1_N12RadioShuttle12ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE16_M_insert_uniqueERKS5_
-.LBE6514:
-.LBE6516:
-	.loc 3 482 26
+.LBE6520:
+.LBE6522:
+	.loc 3 488 26
 	ldr	r0, [r6, #192]
-	.loc 3 482 12
+	.loc 3 488 12
 	ldr	r5, [sp, #20]
-	.loc 3 482 58
-	ldr	r3, [r0]
-	.loc 3 482 12
+	.loc 3 488 58
+	ldr	r3, [r0]
+	.loc 3 488 12
 	ldr	r3, [r3, #12]
 	blx	r3
 	movw	r3, #9999
@@ -20845,32 +20903,32 @@
 	mov	r1, r5
 	mov	r0, r6
 	bl	_ZN12RadioShuttle7SendMsgEiPviimiPi
-	.loc 3 484 12
-	mov	r0, r4
-.L930:
-	.loc 3 485 1
+	.loc 3 490 12
+	mov	r0, r4
+.L934:
+	.loc 3 491 1
 	add	sp, sp, #112
 	.cfi_remember_state
 	.cfi_def_cfa_offset 32
 	@ sp needed
 	pop	{r4, r5, r6, r7, r8, r9, r10, pc}
-.L931:
+.L935:
 	.cfi_restore_state
-	.loc 3 460 13
+	.loc 3 466 13
 	movs	r0, #2
-	b	.L930
-.L932:
-	.loc 3 463 16
+	b	.L934
+.L936:
+	.loc 3 469 16
 	movs	r0, #4
-	b	.L930
-.L933:
-	.loc 3 466 16
+	b	.L934
+.L937:
+	.loc 3 472 16
 	movs	r0, #6
-	b	.L930
-.L934:
-	.loc 3 471 16
+	b	.L934
+.L938:
+	.loc 3 477 16
 	movs	r0, #1
-	b	.L930
+	b	.L934
 	.cfi_endproc
 .LFE2589:
 	.size	_ZN12RadioShuttle7ConnectEim, .-_ZN12RadioShuttle7ConnectEim
@@ -20986,7 +21044,8 @@
 .LC8:
 	.ascii	"Packed\000"
 .LC9:
-	.ascii	"PacketTrace %s: invalid RadioHeader magic\000"
+	.ascii	"PacketTrace %s: invalid RadioHeader magic (dBm:%d S"
+	.ascii	"nr:%d)\000"
 .LC10:
 	.ascii	"Req|\000"
 .LC11:
@@ -21065,7 +21124,7 @@
 	.section	.rodata._ZN12RadioShuttle22ProcessResponseMessageEPNS_16ReceivedMsgEntryEPNS_8AppEntryEPNS_12SendMsgEntryEiPvimmhh.str1.1,"aMS",%progbits,1
 .LC29:
 	.ascii	"ProcessResponseMessage\000"
-	.section	.rodata._ZN12RadioShuttle7StartupENS_9RadioTypeE.str1.1,"aMS",%progbits,1
+	.section	.rodata._ZN12RadioShuttle7StartupENS_9RadioTypeEm.str1.1,"aMS",%progbits,1
 .LC4:
 	.ascii	"Unknown\000"
 .LC5:
@@ -21139,7 +21198,7 @@
 	.byte	0x4
 	.4byte	.LASF824
 	.4byte	.LASF825
-	.4byte	.Ldebug_ranges0+0xc68
+	.4byte	.Ldebug_ranges0+0xc88
 	.4byte	0
 	.4byte	.Ldebug_line0
 	.uleb128 0x2
@@ -25428,7 +25487,7 @@
 	.uleb128 0x8
 	.4byte	.LASF669
 	.byte	0x3
-	.2byte	0x7c6
+	.2byte	0x7d1
 	.byte	0x1
 	.4byte	.LASF670
 	.byte	0x3
@@ -25439,7 +25498,7 @@
 	.uleb128 0x1e
 	.4byte	.LASF672
 	.byte	0x3
-	.2byte	0x7b3
+	.2byte	0x7be
 	.byte	0x1
 	.4byte	.LASF674
 	.byte	0x3
@@ -25450,7 +25509,7 @@
 	.uleb128 0xb
 	.4byte	.LASF675
 	.byte	0x3
-	.2byte	0x79e
+	.2byte	0x7a9
 	.byte	0x1
 	.4byte	.LASF676
 	.4byte	.LFB2617
@@ -25460,7 +25519,7 @@
 	.uleb128 0x1f
 	.4byte	.LASF677
 	.byte	0x3
-	.2byte	0x78a
+	.2byte	0x795
 	.byte	0x1
 	.4byte	.LASF678
 	.4byte	.LFB2616
@@ -25470,7 +25529,7 @@
 	.uleb128 0x1f
 	.4byte	.LASF679
 	.byte	0x3
-	.2byte	0x77b
+	.2byte	0x786
 	.byte	0x1
 	.4byte	.LASF680
 	.4byte	.LFB2615
@@ -25480,7 +25539,7 @@
 	.uleb128 0x20
 	.4byte	.LASF681
 	.byte	0x3
-	.2byte	0x76b
+	.2byte	0x776
 	.byte	0x1
 	.4byte	.LASF683
 	.4byte	.LFB2614
@@ -25490,7 +25549,7 @@
 	.uleb128 0x20
 	.4byte	.LASF682
 	.byte	0x3
-	.2byte	0x747
+	.2byte	0x752
 	.byte	0x1
 	.4byte	.LASF684
 	.4byte	.LFB2613
@@ -25500,7 +25559,7 @@
 	.uleb128 0x1f
 	.4byte	.LASF685
 	.byte	0x3
-	.2byte	0x735
+	.2byte	0x740
 	.byte	0x1
 	.4byte	.LASF686
 	.4byte	.LFB2612
@@ -25510,7 +25569,7 @@
 	.uleb128 0x21
 	.4byte	.LASF687
 	.byte	0x3
-	.2byte	0x71c
+	.2byte	0x727
 	.byte	0x1
 	.4byte	.LASF688
 	.byte	0x3
@@ -25521,7 +25580,7 @@
 	.uleb128 0x21
 	.4byte	.LASF689
 	.byte	0x3
-	.2byte	0x6ba
+	.2byte	0x6c5
 	.byte	0x1
 	.4byte	.LASF690
 	.byte	0x3
@@ -25532,7 +25591,7 @@
 	.uleb128 0xb
 	.4byte	.LASF691
 	.byte	0x3
-	.2byte	0x6b0
+	.2byte	0x6bb
 	.byte	0x1
 	.4byte	.LASF692
 	.4byte	.LFB2609
@@ -25542,7 +25601,7 @@
 	.uleb128 0x18
 	.4byte	.LASF693
 	.byte	0x3
-	.2byte	0x63b
+	.2byte	0x646
 	.byte	0x1
 	.4byte	.LASF694
 	.byte	0x3
@@ -25556,7 +25615,7 @@
 	.4byte	.LBB5202
 	.4byte	.LBE5202-.LBB5202
 	.byte	0x3
-	.2byte	0x685
+	.2byte	0x690
 	.byte	0x29
 	.4byte	0x24d1
 	.uleb128 0xf
@@ -25572,21 +25631,21 @@
 	.4byte	.LBB5206
 	.4byte	.Ldebug_ranges0+0x828
 	.byte	0x3
-	.2byte	0x684
+	.2byte	0x68f
 	.byte	0x54
 	.uleb128 0xa
 	.4byte	0x1e2b
 	.4byte	.LBB5211
 	.4byte	.Ldebug_ranges0+0x840
 	.byte	0x3
-	.2byte	0x684
+	.2byte	0x68f
 	.byte	0x74
 	.uleb128 0x11
 	.4byte	0x1f33
 	.4byte	.LBB5220
 	.4byte	.LBE5220-.LBB5220
 	.byte	0x3
-	.2byte	0x683
+	.2byte	0x68e
 	.byte	0x1c
 	.4byte	0x251a
 	.uleb128 0xf
@@ -25602,13 +25661,13 @@
 	.4byte	.LBB5224
 	.4byte	.Ldebug_ranges0+0x860
 	.byte	0x3
-	.2byte	0x682
+	.2byte	0x68d
 	.byte	0x3b
 	.byte	0
 	.uleb128 0x18
 	.4byte	.LASF695
 	.byte	0x3
-	.2byte	0x62a
+	.2byte	0x635
 	.byte	0x1
 	.4byte	.LASF696
 	.byte	0x3
@@ -25622,14 +25681,14 @@
 	.4byte	.LBB4826
 	.4byte	.LBE4826-.LBB4826
 	.byte	0x3
-	.2byte	0x62f
+	.2byte	0x63a
 	.byte	0x4d
 	.uleb128 0x11
 	.4byte	0x1c12
 	.4byte	.LBB4828
 	.4byte	.LBE4828-.LBB4828
 	.byte	0x3
-	.2byte	0x630
+	.2byte	0x63b
 	.byte	0x1b
 	.4byte	0x2580
 	.uleb128 0xf
@@ -25645,7 +25704,7 @@
 	.4byte	.LBB4831
 	.4byte	.LBE4831-.LBB4831
 	.byte	0x3
-	.2byte	0x634
+	.2byte	0x63f
 	.byte	0x13
 	.uleb128 0x10
 	.4byte	0x1030
@@ -25699,7 +25758,7 @@
 	.uleb128 0x18
 	.4byte	.LASF697
 	.byte	0x3
-	.2byte	0x5f5
+	.2byte	0x600
 	.byte	0x1
 	.4byte	.LASF698
 	.byte	0x3
@@ -25713,14 +25772,14 @@
 	.4byte	.LBB5057
 	.4byte	.Ldebug_ranges0+0x718
 	.byte	0x3
-	.2byte	0x5f9
+	.2byte	0x604
 	.byte	0x4d
 	.uleb128 0x11
 	.4byte	0x1c12
 	.4byte	.LBB5064
 	.4byte	.LBE5064-.LBB5064
 	.byte	0x3
-	.2byte	0x5fa
+	.2byte	0x605
 	.byte	0x1b
 	.4byte	0x2651
 	.uleb128 0xf
@@ -25736,48 +25795,48 @@
 	.4byte	.LBB5070
 	.4byte	.LBE5070-.LBB5070
 	.byte	0x3
-	.2byte	0x614
+	.2byte	0x61f
 	.byte	0x22
 	.uleb128 0xf
 	.4byte	0x1bbe
 	.4byte	.LBB5072
 	.4byte	.LBE5072-.LBB5072
 	.byte	0x3
-	.2byte	0x614
+	.2byte	0x61f
 	.byte	0x3d
 	.uleb128 0xf
 	.4byte	0x1bb0
 	.4byte	.LBB5074
 	.4byte	.LBE5074-.LBB5074
 	.byte	0x3
-	.2byte	0x61a
+	.2byte	0x625
 	.byte	0x17
 	.uleb128 0xa
 	.4byte	0x1b9a
 	.4byte	.LBB5079
 	.4byte	.Ldebug_ranges0+0x740
 	.byte	0x3
-	.2byte	0x623
+	.2byte	0x62e
 	.byte	0x1a
 	.uleb128 0xa
 	.4byte	0x1b83
 	.4byte	.LBB5082
 	.4byte	.Ldebug_ranges0+0x758
 	.byte	0x3
-	.2byte	0x623
+	.2byte	0x62e
 	.byte	0x4a
 	.uleb128 0xa
 	.4byte	0x1b75
 	.4byte	.LBB5091
 	.4byte	.Ldebug_ranges0+0x778
 	.byte	0x3
-	.2byte	0x623
+	.2byte	0x62e
 	.byte	0x4a
 	.byte	0
 	.uleb128 0x18
 	.4byte	.LASF699
 	.byte	0x3
-	.2byte	0x5d3
+	.2byte	0x5db
 	.byte	0x1
 	.4byte	.LASF700
 	.byte	0x3
@@ -25791,14 +25850,14 @@
 	.4byte	.LBB4793
 	.4byte	.Ldebug_ranges0+0x5f0
 	.byte	0x3
-	.2byte	0x5d8
+	.2byte	0x5e0
 	.byte	0x4d
 	.uleb128 0x10
 	.4byte	0x1c12
 	.4byte	.LBB4797
 	.4byte	.LBE4797-.LBB4797
 	.byte	0x3
-	.2byte	0x5d9
+	.2byte	0x5e1
 	.byte	0x1b
 	.uleb128 0xf
 	.4byte	0x1252
@@ -25812,7 +25871,7 @@
 	.uleb128 0x18
 	.4byte	.LASF701
 	.byte	0x3
-	.2byte	0x53c
+	.2byte	0x544
 	.byte	0x1
 	.4byte	.LASF702
 	.byte	0x3
@@ -25826,7 +25885,7 @@
 	.4byte	.LBB5161
 	.4byte	.LBE5161-.LBB5161
 	.byte	0x3
-	.2byte	0x596
+	.2byte	0x59e
 	.byte	0x29
 	.4byte	0x274c
 	.uleb128 0xf
@@ -25842,21 +25901,21 @@
 	.4byte	.LBB5166
 	.4byte	.Ldebug_ranges0+0x7d8
 	.byte	0x3
-	.2byte	0x595
+	.2byte	0x59d
 	.byte	0x54
 	.uleb128 0xa
 	.4byte	0x1e2b
 	.4byte	.LBB5171
 	.4byte	.Ldebug_ranges0+0x7f0
 	.byte	0x3
-	.2byte	0x595
+	.2byte	0x59d
 	.byte	0x77
 	.uleb128 0x11
 	.4byte	0x1f33
 	.4byte	.LBB5181
 	.4byte	.LBE5181-.LBB5181
 	.byte	0x3
-	.2byte	0x594
+	.2byte	0x59c
 	.byte	0x1c
 	.4byte	0x2795
 	.uleb128 0xf
@@ -25872,13 +25931,13 @@
 	.4byte	.LBB5186
 	.4byte	.Ldebug_ranges0+0x810
 	.byte	0x3
-	.2byte	0x593
+	.2byte	0x59b
 	.byte	0x3b
 	.byte	0
 	.uleb128 0x6
 	.4byte	.LASF703
 	.byte	0x3
-	.2byte	0x528
+	.2byte	0x530
 	.byte	0x1
 	.4byte	.LASF704
 	.byte	0x3
@@ -25886,7 +25945,7 @@
 	.uleb128 0x21
 	.4byte	.LASF705
 	.byte	0x3
-	.2byte	0x50f
+	.2byte	0x517
 	.byte	0x1
 	.4byte	.LASF706
 	.byte	0x3
@@ -25897,7 +25956,7 @@
 	.uleb128 0x18
 	.4byte	.LASF707
 	.byte	0x3
-	.2byte	0x498
+	.2byte	0x49e
 	.byte	0x1
 	.4byte	.LASF708
 	.byte	0x3
@@ -25911,7 +25970,7 @@
 	.4byte	.LBB5416
 	.4byte	.LBE5416-.LBB5416
 	.byte	0x3
-	.2byte	0x4a2
+	.2byte	0x4a8
 	.byte	0x2c
 	.4byte	0x2811
 	.uleb128 0xf
@@ -25927,100 +25986,100 @@
 	.4byte	.LBB5421
 	.4byte	.Ldebug_ranges0+0x938
 	.byte	0x3
-	.2byte	0x4a8
+	.2byte	0x4af
 	.byte	0x79
-	.uleb128 0xf
+	.uleb128 0xa
 	.4byte	0x1e39
-	.4byte	.LBB5425
-	.4byte	.LBE5425-.LBB5425
-	.byte	0x3
-	.2byte	0x4a8
+	.4byte	.LBB5426
+	.4byte	.Ldebug_ranges0+0x960
+	.byte	0x3
+	.2byte	0x4af
 	.byte	0x54
 	.uleb128 0x11
 	.4byte	0x1e1d
-	.4byte	.LBB5430
-	.4byte	.LBE5430-.LBB5430
-	.byte	0x3
-	.2byte	0x4a9
+	.4byte	.LBB5435
+	.4byte	.LBE5435-.LBB5435
+	.byte	0x3
+	.2byte	0x4b0
 	.byte	0x29
 	.4byte	0x285a
 	.uleb128 0xf
 	.4byte	0x149d
-	.4byte	.LBB5431
-	.4byte	.LBE5431-.LBB5431
+	.4byte	.LBB5436
+	.4byte	.LBE5436-.LBB5436
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
 	.byte	0
 	.uleb128 0xe
 	.4byte	0x1e01
-	.4byte	.LBB5434
-	.4byte	.Ldebug_ranges0+0x958
-	.byte	0x3
-	.2byte	0x4b0
+	.4byte	.LBB5439
+	.4byte	.Ldebug_ranges0+0x978
+	.byte	0x3
+	.2byte	0x4b7
 	.byte	0x5d
 	.4byte	0x2881
 	.uleb128 0xa
 	.4byte	0x1487
-	.4byte	.LBB5435
-	.4byte	.Ldebug_ranges0+0x958
+	.4byte	.LBB5440
+	.4byte	.Ldebug_ranges0+0x978
 	.byte	0xd
 	.2byte	0x217
 	.byte	0x25
 	.byte	0
 	.uleb128 0xa
 	.4byte	0x1dea
-	.4byte	.LBB5444
-	.4byte	.Ldebug_ranges0+0x978
-	.byte	0x3
-	.2byte	0x4b0
+	.4byte	.LBB5449
+	.4byte	.Ldebug_ranges0+0x998
+	.byte	0x3
+	.2byte	0x4b7
 	.byte	0x5e
 	.uleb128 0xa
 	.4byte	0x1ddc
-	.4byte	.LBB5457
-	.4byte	.Ldebug_ranges0+0x9a0
-	.byte	0x3
-	.2byte	0x4b0
+	.4byte	.LBB5462
+	.4byte	.Ldebug_ranges0+0x9c0
+	.byte	0x3
+	.2byte	0x4b7
 	.byte	0x5e
 	.uleb128 0xa
 	.4byte	0x1e39
-	.4byte	.LBB5462
-	.4byte	.Ldebug_ranges0+0x9b8
-	.byte	0x3
-	.2byte	0x4b1
+	.4byte	.LBB5467
+	.4byte	.Ldebug_ranges0+0x9d8
+	.byte	0x3
+	.2byte	0x4b8
 	.byte	0x1d
 	.uleb128 0xa
 	.4byte	0x1e2b
-	.4byte	.LBB5467
-	.4byte	.Ldebug_ranges0+0x9d0
-	.byte	0x3
-	.2byte	0x4b1
+	.4byte	.LBB5472
+	.4byte	.Ldebug_ranges0+0x9f0
+	.byte	0x3
+	.2byte	0x4b8
 	.byte	0x42
 	.uleb128 0xf
 	.4byte	0x1e39
-	.4byte	.LBB5481
-	.4byte	.LBE5481-.LBB5481
-	.byte	0x3
-	.2byte	0x4d5
+	.4byte	.LBB5487
+	.4byte	.LBE5487-.LBB5487
+	.byte	0x3
+	.2byte	0x4dc
 	.byte	0x54
 	.uleb128 0xa
 	.4byte	0x1e2b
-	.4byte	.LBB5484
-	.4byte	.Ldebug_ranges0+0x9e8
-	.byte	0x3
-	.2byte	0x4d5
+	.4byte	.LBB5490
+	.4byte	.Ldebug_ranges0+0xa08
+	.byte	0x3
+	.2byte	0x4dc
 	.byte	0x79
 	.uleb128 0x10
 	.4byte	0x1e1d
-	.4byte	.LBB5487
-	.4byte	.LBE5487-.LBB5487
-	.byte	0x3
-	.2byte	0x4d6
+	.4byte	.LBB5493
+	.4byte	.LBE5493-.LBB5493
+	.byte	0x3
+	.2byte	0x4dd
 	.byte	0x29
 	.uleb128 0xf
 	.4byte	0x149d
-	.4byte	.LBB5488
-	.4byte	.LBE5488-.LBB5488
+	.4byte	.LBB5494
+	.4byte	.LBE5494-.LBB5494
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
@@ -26029,7 +26088,7 @@
 	.uleb128 0x18
 	.4byte	.LASF709
 	.byte	0x3
-	.2byte	0x468
+	.2byte	0x46e
 	.byte	0x1
 	.4byte	.LASF710
 	.byte	0x3
@@ -26043,21 +26102,21 @@
 	.4byte	.LBB5128
 	.4byte	.Ldebug_ranges0+0x7a8
 	.byte	0x3
-	.2byte	0x473
+	.2byte	0x479
 	.byte	0x54
 	.uleb128 0xa
 	.4byte	0x1e2b
 	.4byte	.LBB5133
 	.4byte	.Ldebug_ranges0+0x7c0
 	.byte	0x3
-	.2byte	0x473
+	.2byte	0x479
 	.byte	0x79
 	.uleb128 0x10
 	.4byte	0x1e1d
 	.4byte	.LBB5138
 	.4byte	.LBE5138-.LBB5138
 	.byte	0x3
-	.2byte	0x474
+	.2byte	0x47a
 	.byte	0x29
 	.uleb128 0xf
 	.4byte	0x149d
@@ -26071,7 +26130,7 @@
 	.uleb128 0x18
 	.4byte	.LASF711
 	.byte	0x3
-	.2byte	0x3f7
+	.2byte	0x3fd
 	.byte	0x1
 	.4byte	.LASF712
 	.byte	0x3
@@ -26082,90 +26141,90 @@
 	.4byte	0x2abf
 	.uleb128 0x11
 	.4byte	0x1c7a
-	.4byte	.LBB5560
-	.4byte	.LBE5560-.LBB5560
-	.byte	0x3
-	.2byte	0x408
+	.4byte	.LBB5566
+	.4byte	.LBE5566-.LBB5566
+	.byte	0x3
+	.2byte	0x40e
 	.byte	0x1f
 	.4byte	0x29af
 	.uleb128 0x12
 	.4byte	0x12c7
-	.4byte	.LBB5561
-	.4byte	.LBE5561-.LBB5561
+	.4byte	.LBB5567
+	.4byte	.LBE5567-.LBB5567
 	.byte	0x4
 	.byte	0xd2
 	.byte	0x10
 	.byte	0
 	.uleb128 0xf
 	.4byte	0x27a7
-	.4byte	.LBB5565
-	.4byte	.LBE5565-.LBB5565
-	.byte	0x3
-	.2byte	0x410
+	.4byte	.LBB5571
+	.4byte	.LBE5571-.LBB5571
+	.byte	0x3
+	.2byte	0x416
 	.byte	0x1b
 	.uleb128 0xf
 	.4byte	0x1f41
-	.4byte	.LBB5567
-	.4byte	.LBE5567-.LBB5567
-	.byte	0x3
-	.2byte	0x416
+	.4byte	.LBB5573
+	.4byte	.LBE5573-.LBB5573
+	.byte	0x3
+	.2byte	0x41c
 	.byte	0x1e
 	.uleb128 0x11
 	.4byte	0x1f33
-	.4byte	.LBB5569
-	.4byte	.LBE5569-.LBB5569
-	.byte	0x3
-	.2byte	0x417
+	.4byte	.LBB5575
+	.4byte	.LBE5575-.LBB5575
+	.byte	0x3
+	.2byte	0x41d
 	.byte	0x1c
 	.4byte	0x29f8
 	.uleb128 0xf
 	.4byte	0x1652
-	.4byte	.LBB5570
-	.4byte	.LBE5570-.LBB5570
+	.4byte	.LBB5576
+	.4byte	.LBE5576-.LBB5576
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
 	.byte	0
 	.uleb128 0x11
 	.4byte	0x1c3c
-	.4byte	.LBB5572
-	.4byte	.LBE5572-.LBB5572
-	.byte	0x3
-	.2byte	0x461
+	.4byte	.LBB5578
+	.4byte	.LBE5578-.LBB5578
+	.byte	0x3
+	.2byte	0x467
 	.byte	0x1f
 	.4byte	0x2a64
 	.uleb128 0x1a
 	.4byte	0x12b8
-	.4byte	.LBB5574
-	.4byte	.Ldebug_ranges0+0xa00
+	.4byte	.LBB5580
+	.4byte	.Ldebug_ranges0+0xa20
 	.byte	0xb
 	.byte	0x9e
 	.byte	0x7
 	.uleb128 0xa
 	.4byte	0xa59
-	.4byte	.LBB5576
-	.4byte	.Ldebug_ranges0+0xa18
+	.4byte	.LBB5582
+	.4byte	.Ldebug_ranges0+0xa38
 	.byte	0x4
 	.2byte	0x779
 	.byte	0x2
 	.uleb128 0x10
 	.4byte	0xdc9
-	.4byte	.LBB5582
-	.4byte	.LBE5582-.LBB5582
+	.4byte	.LBB5588
+	.4byte	.LBE5588-.LBB5588
 	.byte	0x4
 	.2byte	0x782
 	.byte	0xd
 	.uleb128 0x10
 	.4byte	0x7de
-	.4byte	.LBB5583
-	.4byte	.LBE5583-.LBB5583
+	.4byte	.LBB5589
+	.4byte	.LBE5589-.LBB5589
 	.byte	0x4
 	.2byte	0x1c6
 	.byte	0x27
 	.uleb128 0x12
 	.4byte	0x413
-	.4byte	.LBB5584
-	.4byte	.LBE5584-.LBB5584
+	.4byte	.LBB5590
+	.4byte	.LBE5590-.LBB5590
 	.byte	0xf
 	.byte	0x85
 	.byte	0x7
@@ -26175,60 +26234,60 @@
 	.byte	0
 	.uleb128 0xa
 	.4byte	0x1e39
-	.4byte	.LBB5590
-	.4byte	.Ldebug_ranges0+0xa38
-	.byte	0x3
-	.2byte	0x42e
+	.4byte	.LBB5596
+	.4byte	.Ldebug_ranges0+0xa58
+	.byte	0x3
+	.2byte	0x434
 	.byte	0x24
 	.uleb128 0xa
 	.4byte	0x1e2b
-	.4byte	.LBB5595
-	.4byte	.Ldebug_ranges0+0xa50
-	.byte	0x3
-	.2byte	0x42e
+	.4byte	.LBB5601
+	.4byte	.Ldebug_ranges0+0xa70
+	.byte	0x3
+	.2byte	0x434
 	.byte	0x44
 	.uleb128 0x11
 	.4byte	0x1e1d
-	.4byte	.LBB5600
-	.4byte	.LBE5600-.LBB5600
-	.byte	0x3
-	.2byte	0x430
+	.4byte	.LBB5606
+	.4byte	.LBE5606-.LBB5606
+	.byte	0x3
+	.2byte	0x436
 	.byte	0x28
 	.4byte	0x2aad
 	.uleb128 0xf
 	.4byte	0x149d
-	.4byte	.LBB5601
-	.4byte	.LBE5601-.LBB5601
+	.4byte	.LBB5607
+	.4byte	.LBE5607-.LBB5607
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
 	.byte	0
 	.uleb128 0xf
 	.4byte	0x1fe7
-	.4byte	.LBB5606
-	.4byte	.LBE5606-.LBB5606
-	.byte	0x3
-	.2byte	0x451
+	.4byte	.LBB5612
+	.4byte	.LBE5612-.LBB5612
+	.byte	0x3
+	.2byte	0x457
 	.byte	0x3c
 	.byte	0
 	.uleb128 0x7
 	.4byte	.LASF713
 	.byte	0x3
-	.2byte	0x2cc
+	.2byte	0x2d2
 	.byte	0x1
 	.4byte	.LASF714
 	.byte	0x1
 	.uleb128 0x7
 	.4byte	.LASF715
 	.byte	0x3
-	.2byte	0x2b8
+	.2byte	0x2be
 	.byte	0x1
 	.4byte	.LASF716
 	.byte	0x1
 	.uleb128 0xb
 	.4byte	.LASF717
 	.byte	0x3
-	.2byte	0x290
+	.2byte	0x296
 	.byte	0x1
 	.4byte	.LASF718
 	.4byte	.LFB2596
@@ -26238,7 +26297,7 @@
 	.uleb128 0xb
 	.4byte	.LASF719
 	.byte	0x3
-	.2byte	0x287
+	.2byte	0x28d
 	.byte	0x1
 	.4byte	.LASF720
 	.4byte	.LFB2595
@@ -26248,7 +26307,7 @@
 	.uleb128 0x15
 	.4byte	.LASF721
 	.byte	0x3
-	.2byte	0x274
+	.2byte	0x27a
 	.byte	0x1
 	.4byte	.LASF722
 	.4byte	.LFB2594
@@ -26261,13 +26320,13 @@
 	.4byte	.LBB4182
 	.4byte	.LBE4182-.LBB4182
 	.byte	0x3
-	.2byte	0x27b
+	.2byte	0x281
 	.byte	0x36
 	.byte	0
 	.uleb128 0x1f
 	.4byte	.LASF723
 	.byte	0x3
-	.2byte	0x261
+	.2byte	0x267
 	.byte	0x1
 	.4byte	.LASF724
 	.4byte	.LFB2593
@@ -26277,7 +26336,7 @@
 	.uleb128 0xd
 	.4byte	.LASF725
 	.byte	0x3
-	.2byte	0x243
+	.2byte	0x249
 	.byte	0x1
 	.4byte	.LASF726
 	.4byte	.LFB2592
@@ -26290,20 +26349,20 @@
 	.4byte	.LBB4315
 	.4byte	.LBE4315-.LBB4315
 	.byte	0x3
-	.2byte	0x24b
+	.2byte	0x251
 	.byte	0x36
 	.uleb128 0xf
 	.4byte	0x1f86
 	.4byte	.LBB4317
 	.4byte	.LBE4317-.LBB4317
 	.byte	0x3
-	.2byte	0x25a
+	.2byte	0x260
 	.byte	0x13
 	.byte	0
 	.uleb128 0xd
 	.4byte	.LASF727
 	.byte	0x3
-	.2byte	0x233
+	.2byte	0x239
 	.byte	0x1
 	.4byte	.LASF728
 	.4byte	.LFB2591
@@ -26316,13 +26375,13 @@
 	.4byte	.LBB4225
 	.4byte	.LBE4225-.LBB4225
 	.byte	0x3
-	.2byte	0x236
+	.2byte	0x23c
 	.byte	0x34
 	.byte	0
 	.uleb128 0xd
 	.4byte	.LASF729
 	.byte	0x3
-	.2byte	0x1e9
+	.2byte	0x1ef
 	.byte	0x1
 	.4byte	.LASF730
 	.4byte	.LFB2590
@@ -26332,69 +26391,69 @@
 	.4byte	0x2c66
 	.uleb128 0xa
 	.4byte	0x1f41
-	.4byte	.LBB6403
-	.4byte	.Ldebug_ranges0+0xb70
-	.byte	0x3
-	.2byte	0x1f2
+	.4byte	.LBB6409
+	.4byte	.Ldebug_ranges0+0xb90
+	.byte	0x3
+	.2byte	0x1f8
 	.byte	0x37
 	.uleb128 0x11
 	.4byte	0x1f33
-	.4byte	.LBB6406
-	.4byte	.LBE6406-.LBB6406
-	.byte	0x3
-	.2byte	0x1f4
+	.4byte	.LBB6412
+	.4byte	.LBE6412-.LBB6412
+	.byte	0x3
+	.2byte	0x1fa
 	.byte	0x18
 	.4byte	0x2c0b
 	.uleb128 0xf
 	.4byte	0x1652
-	.4byte	.LBB6407
-	.4byte	.LBE6407-.LBB6407
+	.4byte	.LBB6413
+	.4byte	.LBE6413-.LBB6413
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
 	.byte	0
 	.uleb128 0xa
 	.4byte	0x1e39
-	.4byte	.LBB6412
-	.4byte	.Ldebug_ranges0+0xb88
-	.byte	0x3
-	.2byte	0x1fa
+	.4byte	.LBB6418
+	.4byte	.Ldebug_ranges0+0xba8
+	.byte	0x3
+	.2byte	0x200
 	.byte	0x4f
 	.uleb128 0xa
 	.4byte	0x1e2b
-	.4byte	.LBB6417
-	.4byte	.Ldebug_ranges0+0xba0
-	.byte	0x3
-	.2byte	0x1fa
+	.4byte	.LBB6423
+	.4byte	.Ldebug_ranges0+0xbc0
+	.byte	0x3
+	.2byte	0x200
 	.byte	0x72
 	.uleb128 0x11
 	.4byte	0x1e1d
-	.4byte	.LBB6422
-	.4byte	.LBE6422-.LBB6422
-	.byte	0x3
-	.2byte	0x1fc
+	.4byte	.LBB6428
+	.4byte	.LBE6428-.LBB6428
+	.byte	0x3
+	.2byte	0x202
 	.byte	0x24
 	.4byte	0x2c54
 	.uleb128 0xf
 	.4byte	0x149d
-	.4byte	.LBB6423
-	.4byte	.LBE6423-.LBB6423
+	.4byte	.LBB6429
+	.4byte	.LBE6429-.LBB6429
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
 	.byte	0
 	.uleb128 0xf
 	.4byte	0x1fe7
-	.4byte	.LBB6427
-	.4byte	.LBE6427-.LBB6427
-	.byte	0x3
-	.2byte	0x207
+	.4byte	.LBB6433
+	.4byte	.LBE6433-.LBB6433
+	.byte	0x3
+	.2byte	0x20d
 	.byte	0x3c
 	.byte	0
 	.uleb128 0xd
 	.4byte	.LASF731
 	.byte	0x3
-	.2byte	0x1c6
+	.2byte	0x1cc
 	.byte	0x1
 	.4byte	.LASF732
 	.4byte	.LFB2589
@@ -26404,92 +26463,92 @@
 	.4byte	0x2d4c
 	.uleb128 0xa
 	.4byte	0x1f41
-	.4byte	.LBB6467
-	.4byte	.Ldebug_ranges0+0xbb8
-	.byte	0x3
-	.2byte	0x1c9
+	.4byte	.LBB6473
+	.4byte	.Ldebug_ranges0+0xbd8
+	.byte	0x3
+	.2byte	0x1cf
 	.byte	0x37
 	.uleb128 0x11
 	.4byte	0x1f33
-	.4byte	.LBB6471
-	.4byte	.LBE6471-.LBB6471
-	.byte	0x3
-	.2byte	0x1cb
+	.4byte	.LBB6477
+	.4byte	.LBE6477-.LBB6477
+	.byte	0x3
+	.2byte	0x1d1
 	.byte	0x19
 	.4byte	0x2cb9
 	.uleb128 0xf
 	.4byte	0x1652
-	.4byte	.LBB6472
-	.4byte	.LBE6472-.LBB6472
+	.4byte	.LBB6478
+	.4byte	.LBE6478-.LBB6478
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
 	.byte	0
 	.uleb128 0xa
 	.4byte	0x1e2b
-	.4byte	.LBB6474
-	.4byte	.Ldebug_ranges0+0xbd0
-	.byte	0x3
-	.2byte	0x1d4
+	.4byte	.LBB6480
+	.4byte	.Ldebug_ranges0+0xbf0
+	.byte	0x3
+	.2byte	0x1da
 	.byte	0x6f
 	.uleb128 0xa
 	.4byte	0x1e39
-	.4byte	.LBB6478
-	.4byte	.Ldebug_ranges0+0xbf0
-	.byte	0x3
-	.2byte	0x1d4
+	.4byte	.LBB6484
+	.4byte	.Ldebug_ranges0+0xc10
+	.byte	0x3
+	.2byte	0x1da
 	.byte	0x4c
 	.uleb128 0x11
 	.4byte	0x1e1d
-	.4byte	.LBB6486
-	.4byte	.LBE6486-.LBB6486
-	.byte	0x3
-	.2byte	0x1d6
+	.4byte	.LBB6492
+	.4byte	.LBE6492-.LBB6492
+	.byte	0x3
+	.2byte	0x1dc
 	.byte	0x21
 	.4byte	0x2d02
 	.uleb128 0xf
 	.4byte	0x149d
-	.4byte	.LBB6487
-	.4byte	.LBE6487-.LBB6487
+	.4byte	.LBB6493
+	.4byte	.LBE6493-.LBB6493
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
 	.byte	0
 	.uleb128 0xe
 	.4byte	0x1e01
-	.4byte	.LBB6489
-	.4byte	.Ldebug_ranges0+0xc08
-	.byte	0x3
-	.2byte	0x1e0
+	.4byte	.LBB6495
+	.4byte	.Ldebug_ranges0+0xc28
+	.byte	0x3
+	.2byte	0x1e6
 	.byte	0x4f
 	.4byte	0x2d29
 	.uleb128 0xa
 	.4byte	0x1487
-	.4byte	.LBB6490
-	.4byte	.Ldebug_ranges0+0xc08
+	.4byte	.LBB6496
+	.4byte	.Ldebug_ranges0+0xc28
 	.byte	0xd
 	.2byte	0x217
 	.byte	0x25
 	.byte	0
 	.uleb128 0xa
 	.4byte	0x1dea
-	.4byte	.LBB6499
-	.4byte	.Ldebug_ranges0+0xc28
-	.byte	0x3
-	.2byte	0x1e0
+	.4byte	.LBB6505
+	.4byte	.Ldebug_ranges0+0xc48
+	.byte	0x3
+	.2byte	0x1e6
 	.byte	0x50
 	.uleb128 0xa
 	.4byte	0x1ddc
-	.4byte	.LBB6512
-	.4byte	.Ldebug_ranges0+0xc50
-	.byte	0x3
-	.2byte	0x1e0
+	.4byte	.LBB6518
+	.4byte	.Ldebug_ranges0+0xc70
+	.byte	0x3
+	.2byte	0x1e6
 	.byte	0x50
 	.byte	0
 	.uleb128 0xd
 	.4byte	.LASF733
 	.byte	0x3
-	.2byte	0x1b9
+	.2byte	0x1bf
 	.byte	0x1
 	.4byte	.LASF734
 	.4byte	.LFB2588
@@ -26502,14 +26561,14 @@
 	.4byte	.LBB4579
 	.4byte	.LBE4579-.LBB4579
 	.byte	0x3
-	.2byte	0x1bb
+	.2byte	0x1c1
 	.byte	0x37
 	.uleb128 0x10
 	.4byte	0x1f33
 	.4byte	.LBB4581
 	.4byte	.LBE4581-.LBB4581
 	.byte	0x3
-	.2byte	0x1bc
+	.2byte	0x1c2
 	.byte	0x18
 	.uleb128 0xf
 	.4byte	0x1652
@@ -26523,7 +26582,7 @@
 	.uleb128 0xd
 	.4byte	.LASF735
 	.byte	0x3
-	.2byte	0x1a0
+	.2byte	0x1a6
 	.byte	0x1
 	.4byte	.LASF736
 	.4byte	.LFB2587
@@ -26536,14 +26595,14 @@
 	.4byte	.LBB4618
 	.4byte	.Ldebug_ranges0+0x4b8
 	.byte	0x3
-	.2byte	0x1a2
+	.2byte	0x1a8
 	.byte	0x37
 	.uleb128 0x11
 	.4byte	0x1f33
 	.4byte	.LBB4621
 	.4byte	.LBE4621-.LBB4621
 	.byte	0x3
-	.2byte	0x1a3
+	.2byte	0x1a9
 	.byte	0x18
 	.4byte	0x2def
 	.uleb128 0xf
@@ -26559,14 +26618,14 @@
 	.4byte	.LBB4625
 	.4byte	.LBE4625-.LBB4625
 	.byte	0x3
-	.2byte	0x1af
+	.2byte	0x1b5
 	.byte	0xf
 	.uleb128 0x10
 	.4byte	0x1e5d
 	.4byte	.LBB4627
 	.4byte	.LBE4627-.LBB4627
 	.byte	0x3
-	.2byte	0x1b2
+	.2byte	0x1b8
 	.byte	0x10
 	.uleb128 0x10
 	.4byte	0x151d
@@ -26620,7 +26679,7 @@
 	.uleb128 0xd
 	.4byte	.LASF737
 	.byte	0x3
-	.2byte	0x186
+	.2byte	0x18c
 	.byte	0x1
 	.4byte	.LASF738
 	.4byte	.LFB2586
@@ -26633,14 +26692,14 @@
 	.4byte	.LBB4756
 	.4byte	.LBE4756-.LBB4756
 	.byte	0x3
-	.2byte	0x18a
+	.2byte	0x190
 	.byte	0x37
 	.uleb128 0x11
 	.4byte	0x1f33
 	.4byte	.LBB4758
 	.4byte	.LBE4758-.LBB4758
 	.byte	0x3
-	.2byte	0x18b
+	.2byte	0x191
 	.byte	0x18
 	.4byte	0x2ed0
 	.uleb128 0xf
@@ -26656,27 +26715,27 @@
 	.4byte	.LBB4761
 	.4byte	.Ldebug_ranges0+0x588
 	.byte	0x3
-	.2byte	0x198
+	.2byte	0x19e
 	.byte	0x17
 	.uleb128 0xa
 	.4byte	0x1ef8
 	.4byte	.LBB4764
 	.4byte	.Ldebug_ranges0+0x5a0
 	.byte	0x3
-	.2byte	0x198
+	.2byte	0x19e
 	.byte	0x34
 	.uleb128 0xa
 	.4byte	0x1eea
 	.4byte	.LBB4773
 	.4byte	.Ldebug_ranges0+0x5c0
 	.byte	0x3
-	.2byte	0x198
+	.2byte	0x19e
 	.byte	0x34
 	.byte	0
 	.uleb128 0xb
 	.4byte	.LASF739
 	.byte	0x3
-	.2byte	0x17f
+	.2byte	0x185
 	.byte	0x1
 	.4byte	.LASF740
 	.4byte	.LFB2585
@@ -26686,7 +26745,7 @@
 	.uleb128 0x18
 	.4byte	.LASF741
 	.byte	0x3
-	.2byte	0x137
+	.2byte	0x13d
 	.byte	0x1
 	.4byte	.LASF742
 	.byte	0x3
@@ -26700,13 +26759,13 @@
 	.4byte	.LBB4167
 	.4byte	.LBE4167-.LBB4167
 	.byte	0x3
-	.2byte	0x140
+	.2byte	0x146
 	.byte	0x24
 	.byte	0
 	.uleb128 0xd
 	.4byte	.LASF743
 	.byte	0x3
-	.2byte	0x123
+	.2byte	0x129
 	.byte	0x1
 	.4byte	.LASF744
 	.4byte	.LFB2583
@@ -26719,7 +26778,7 @@
 	.4byte	.LBB4184
 	.4byte	.LBE4184-.LBB4184
 	.byte	0x3
-	.2byte	0x129
+	.2byte	0x12f
 	.byte	0x36
 	.byte	0
 	.uleb128 0x16
@@ -26745,14 +26804,14 @@
 	.4byte	.LBB4178
 	.4byte	.LBE4178-.LBB4178
 	.byte	0x3
-	.2byte	0x11b
+	.2byte	0x121
 	.byte	0x22
 	.uleb128 0xf
 	.4byte	0x37e3
 	.4byte	.LBB4180
 	.4byte	.LBE4180-.LBB4180
 	.byte	0x3
-	.2byte	0x11c
+	.2byte	0x122
 	.byte	0x22
 	.byte	0
 	.uleb128 0x22
@@ -27841,53 +27900,53 @@
 	.byte	0x9c
 	.uleb128 0x13
 	.4byte	0x2abf
-	.4byte	.LBB6275
-	.4byte	.Ldebug_ranges0+0xa68
-	.byte	0x3
-	.2byte	0x2cc
+	.4byte	.LBB6281
+	.4byte	.Ldebug_ranges0+0xa88
+	.byte	0x3
+	.2byte	0x2d2
 	.byte	0x1
 	.uleb128 0xe
 	.4byte	0x1cf8
-	.4byte	.LBB6281
-	.4byte	.Ldebug_ranges0+0xa80
-	.byte	0x3
-	.2byte	0x2ef
+	.4byte	.LBB6287
+	.4byte	.Ldebug_ranges0+0xaa0
+	.byte	0x3
+	.2byte	0x2f5
 	.byte	0x1d
 	.4byte	0x3a19
 	.uleb128 0x13
 	.4byte	0x1300
-	.4byte	.LBB6282
-	.4byte	.Ldebug_ranges0+0xa80
+	.4byte	.LBB6288
+	.4byte	.Ldebug_ranges0+0xaa0
 	.byte	0x4
 	.2byte	0x4c4
 	.byte	0x9
 	.uleb128 0xe
 	.4byte	0xaaa
-	.4byte	.LBB6284
-	.4byte	.Ldebug_ranges0+0xa98
+	.4byte	.LBB6290
+	.4byte	.Ldebug_ranges0+0xab8
 	.byte	0x4
 	.2byte	0x766
 	.byte	0x9
 	.4byte	0x3a06
 	.uleb128 0xe
 	.4byte	0x634
-	.4byte	.LBB6285
-	.4byte	.Ldebug_ranges0+0xab0
+	.4byte	.LBB6291
+	.4byte	.Ldebug_ranges0+0xad0
 	.byte	0x4
 	.2byte	0x270
 	.byte	0x9
 	.4byte	0x39f4
 	.uleb128 0x13
 	.4byte	0x311
-	.4byte	.LBB6286
-	.4byte	.Ldebug_ranges0+0xab0
+	.4byte	.LBB6292
+	.4byte	.Ldebug_ranges0+0xad0
 	.byte	0x4
 	.2byte	0x1c2
 	.byte	0x2c
 	.uleb128 0x19
 	.4byte	0x186
-	.4byte	.LBB6287
-	.4byte	.Ldebug_ranges0+0xab0
+	.4byte	.LBB6293
+	.4byte	.Ldebug_ranges0+0xad0
 	.byte	0xf
 	.byte	0x82
 	.byte	0x1e
@@ -27895,16 +27954,16 @@
 	.byte	0
 	.uleb128 0xa
 	.4byte	0x627
-	.4byte	.LBB6296
-	.4byte	.Ldebug_ranges0+0xad0
+	.4byte	.LBB6302
+	.4byte	.Ldebug_ranges0+0xaf0
 	.byte	0x4
 	.2byte	0x274
 	.byte	0x6
 	.byte	0
 	.uleb128 0xf
 	.4byte	0xa9b
-	.4byte	.LBB6302
-	.4byte	.LBE6302-.LBB6302
+	.4byte	.LBB6308
+	.4byte	.LBE6308-.LBB6308
 	.byte	0x4
 	.2byte	0x768
 	.byte	0x2
@@ -27912,131 +27971,131 @@
 	.byte	0
 	.uleb128 0x11
 	.4byte	0x1f4f
-	.4byte	.LBB6306
-	.4byte	.LBE6306-.LBB6306
-	.byte	0x3
-	.2byte	0x2ed
+	.4byte	.LBB6312
+	.4byte	.LBE6312-.LBB6312
+	.byte	0x3
+	.2byte	0x2f3
 	.byte	0x16
 	.4byte	0x3a3f
 	.uleb128 0x12
 	.4byte	0x176d
-	.4byte	.LBB6307
-	.4byte	.LBE6307-.LBB6307
+	.4byte	.LBB6313
+	.4byte	.LBE6313-.LBB6313
 	.byte	0x4
 	.byte	0xd2
 	.byte	0x10
 	.byte	0
 	.uleb128 0xf
 	.4byte	0x204e
-	.4byte	.LBB6311
-	.4byte	.LBE6311-.LBB6311
-	.byte	0x3
-	.2byte	0x2db
+	.4byte	.LBB6317
+	.4byte	.LBE6317-.LBB6317
+	.byte	0x3
+	.2byte	0x2e1
 	.byte	0x36
 	.uleb128 0xf
 	.4byte	0x204e
-	.4byte	.LBB6322
-	.4byte	.LBE6322-.LBB6322
-	.byte	0x3
-	.2byte	0x336
+	.4byte	.LBB6328
+	.4byte	.LBE6328-.LBB6328
+	.byte	0x3
+	.2byte	0x33c
 	.byte	0x3a
 	.uleb128 0xf
 	.4byte	0x2001
-	.4byte	.LBB6327
-	.4byte	.LBE6327-.LBB6327
-	.byte	0x3
-	.2byte	0x30a
+	.4byte	.LBB6333
+	.4byte	.LBE6333-.LBB6333
+	.byte	0x3
+	.2byte	0x310
 	.byte	0x2f
 	.uleb128 0xf
 	.4byte	0x1fe7
-	.4byte	.LBB6330
-	.4byte	.LBE6330-.LBB6330
-	.byte	0x3
-	.2byte	0x30a
+	.4byte	.LBB6336
+	.4byte	.LBE6336-.LBB6336
+	.byte	0x3
+	.2byte	0x310
 	.byte	0x34
 	.uleb128 0xa
 	.4byte	0x1f41
-	.4byte	.LBB6337
-	.4byte	.Ldebug_ranges0+0xae8
-	.byte	0x3
-	.2byte	0x38b
+	.4byte	.LBB6343
+	.4byte	.Ldebug_ranges0+0xb08
+	.byte	0x3
+	.2byte	0x391
 	.byte	0x43
 	.uleb128 0x11
 	.4byte	0x1f33
-	.4byte	.LBB6344
-	.4byte	.LBE6344-.LBB6344
-	.byte	0x3
-	.2byte	0x38c
+	.4byte	.LBB6350
+	.4byte	.LBE6350-.LBB6350
+	.byte	0x3
+	.2byte	0x392
 	.byte	0x20
 	.4byte	0x3abb
 	.uleb128 0xf
 	.4byte	0x1652
-	.4byte	.LBB6345
-	.4byte	.LBE6345-.LBB6345
+	.4byte	.LBB6351
+	.4byte	.LBE6351-.LBB6351
 	.byte	0xc
 	.2byte	0x175
 	.byte	0x19
 	.byte	0
 	.uleb128 0xf
 	.4byte	0x1fe7
-	.4byte	.LBB6359
-	.4byte	.LBE6359-.LBB6359
-	.byte	0x3
-	.2byte	0x3a5
+	.4byte	.LBB6365
+	.4byte	.LBE6365-.LBB6365
+	.byte	0x3
+	.2byte	0x3ab
 	.byte	0xc
 	.uleb128 0xf
 	.4byte	0x1fe7
-	.4byte	.LBB6365
-	.4byte	.LBE6365-.LBB6365
-	.byte	0x3
-	.2byte	0x3b3
+	.4byte	.LBB6371
+	.4byte	.LBE6371-.LBB6371
+	.byte	0x3
+	.2byte	0x3b9
 	.byte	0x34
 	.uleb128 0xe
 	.4byte	0x1cdd
-	.4byte	.LBB6369
-	.4byte	.Ldebug_ranges0+0xb10
-	.byte	0x3
-	.2byte	0x3cc
+	.4byte	.LBB6375
+	.4byte	.Ldebug_ranges0+0xb30
+	.byte	0x3
+	.2byte	0x3d2
 	.byte	0x26
 	.4byte	0x3b1b
 	.uleb128 0x13
 	.4byte	0x12ea
-	.4byte	.LBB6370
-	.4byte	.Ldebug_ranges0+0xb10
+	.4byte	.LBB6376
+	.4byte	.Ldebug_ranges0+0xb30
 	.byte	0x1
 	.2byte	0xf1b
 	.byte	0x25
 	.uleb128 0x1a
 	.4byte	0xa75
-	.4byte	.LBB6372
-	.4byte	.Ldebug_ranges0+0xb30
+	.4byte	.LBB6378
+	.4byte	.Ldebug_ranges0+0xb50
 	.byte	0x1
 	.byte	0x6e
 	.byte	0x9
 	.uleb128 0x30
-	.4byte	.Ldebug_ranges0+0xb50
+	.4byte	.Ldebug_ranges0+0xb70
 	.byte	0
 	.byte	0
 	.byte	0
 	.uleb128 0x11
 	.4byte	0x3907
-	.4byte	.LBB6384
-	.4byte	.LBE6384-.LBB6384
-	.byte	0x3
-	.2byte	0x3cc
+	.4byte	.LBB6390
+	.4byte	.LBE6390-.LBB6390
+	.byte	0x3
+	.2byte	0x3d2
 	.byte	0x1d
 	.4byte	0x3b53
 	.uleb128 0x17
 	.4byte	0x22f6
-	.4byte	.LBB6386
-	.4byte	.LBE6386-.LBB6386
+	.4byte	.LBB6392
+	.4byte	.LBE6392-.LBB6392
 	.byte	0x7
 	.byte	0x7f
 	.byte	0x15
 	.uleb128 0xf
 	.4byte	0x2312
-	.4byte	.LBB6388
-	.4byte	.LBE6388-.LBB6388
+	.4byte	.LBB6394
+	.4byte	.LBE6394-.LBB6394
 	.byte	0x1
 	.2byte	0x230
 	.byte	0xd
@@ -28044,17 +28103,17 @@
 	.byte	0
 	.uleb128 0xf
 	.4byte	0x1fe7
-	.4byte	.LBB6393
-	.4byte	.LBE6393-.LBB6393
-	.byte	0x3
-	.2byte	0x3db
+	.4byte	.LBB6399
+	.4byte	.LBE6399-.LBB6399
+	.byte	0x3
+	.2byte	0x3e1
 	.byte	0x38
 	.uleb128 0xf
 	.4byte	0x204e
-	.4byte	.LBB6396
-	.4byte	.LBE6396-.LBB6396
-	.byte	0x3
-	.2byte	0x3e4
+	.4byte	.LBB6402
+	.4byte	.LBE6402-.LBB6402
+	.byte	0x3
+	.2byte	0x3ea
 	.byte	0x3e
 	.byte	0
 	.byte	0
@@ -29762,206 +29821,214 @@
 	.4byte	0
 	.4byte	.LBB5421
 	.4byte	.LBE5421
-	.4byte	.LBB5428
-	.4byte	.LBE5428
-	.4byte	.LBB5472
-	.4byte	.LBE5472
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB5434
-	.4byte	.LBE5434
-	.4byte	.LBB5453
-	.4byte	.LBE5453
-	.4byte	.LBB5455
-	.4byte	.LBE5455
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB5444
-	.4byte	.LBE5444
-	.4byte	.LBB5454
-	.4byte	.LBE5454
-	.4byte	.LBB5456
-	.4byte	.LBE5456
+	.4byte	.LBB5431
+	.4byte	.LBE5431
+	.4byte	.LBB5433
+	.4byte	.LBE5433
+	.4byte	.LBB5477
+	.4byte	.LBE5477
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB5426
+	.4byte	.LBE5426
+	.4byte	.LBB5432
+	.4byte	.LBE5432
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB5439
+	.4byte	.LBE5439
+	.4byte	.LBB5458
+	.4byte	.LBE5458
 	.4byte	.LBB5460
 	.4byte	.LBE5460
 	.4byte	0
 	.4byte	0
-	.4byte	.LBB5457
-	.4byte	.LBE5457
+	.4byte	.LBB5449
+	.4byte	.LBE5449
+	.4byte	.LBB5459
+	.4byte	.LBE5459
 	.4byte	.LBB5461
 	.4byte	.LBE5461
+	.4byte	.LBB5465
+	.4byte	.LBE5465
 	.4byte	0
 	.4byte	0
 	.4byte	.LBB5462
 	.4byte	.LBE5462
-	.4byte	.LBB5470
-	.4byte	.LBE5470
+	.4byte	.LBB5466
+	.4byte	.LBE5466
 	.4byte	0
 	.4byte	0
 	.4byte	.LBB5467
 	.4byte	.LBE5467
-	.4byte	.LBB5471
-	.4byte	.LBE5471
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB5484
-	.4byte	.LBE5484
+	.4byte	.LBB5475
+	.4byte	.LBE5475
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB5472
+	.4byte	.LBE5472
+	.4byte	.LBB5476
+	.4byte	.LBE5476
+	.4byte	0
+	.4byte	0
 	.4byte	.LBB5490
 	.4byte	.LBE5490
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB5574
-	.4byte	.LBE5574
-	.4byte	.LBB5587
-	.4byte	.LBE5587
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB5576
-	.4byte	.LBE5576
+	.4byte	.LBB5496
+	.4byte	.LBE5496
+	.4byte	0
+	.4byte	0
 	.4byte	.LBB5580
 	.4byte	.LBE5580
-	.4byte	.LBB5581
-	.4byte	.LBE5581
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB5590
-	.4byte	.LBE5590
-	.4byte	.LBB5598
-	.4byte	.LBE5598
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB5595
-	.4byte	.LBE5595
-	.4byte	.LBB5599
-	.4byte	.LBE5599
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6275
-	.4byte	.LBE6275
-	.4byte	.LBB6402
-	.4byte	.LBE6402
+	.4byte	.LBB5593
+	.4byte	.LBE5593
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB5582
+	.4byte	.LBE5582
+	.4byte	.LBB5586
+	.4byte	.LBE5586
+	.4byte	.LBB5587
+	.4byte	.LBE5587
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB5596
+	.4byte	.LBE5596
+	.4byte	.LBB5604
+	.4byte	.LBE5604
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB5601
+	.4byte	.LBE5601
+	.4byte	.LBB5605
+	.4byte	.LBE5605
 	.4byte	0
 	.4byte	0
 	.4byte	.LBB6281
 	.4byte	.LBE6281
-	.4byte	.LBB6309
-	.4byte	.LBE6309
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6284
-	.4byte	.LBE6284
+	.4byte	.LBB6408
+	.4byte	.LBE6408
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6287
+	.4byte	.LBE6287
+	.4byte	.LBB6315
+	.4byte	.LBE6315
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6290
+	.4byte	.LBE6290
+	.4byte	.LBB6307
+	.4byte	.LBE6307
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6291
+	.4byte	.LBE6291
 	.4byte	.LBB6301
 	.4byte	.LBE6301
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6285
-	.4byte	.LBE6285
-	.4byte	.LBB6295
-	.4byte	.LBE6295
-	.4byte	.LBB6299
-	.4byte	.LBE6299
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6296
-	.4byte	.LBE6296
-	.4byte	.LBB6300
-	.4byte	.LBE6300
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6337
-	.4byte	.LBE6337
-	.4byte	.LBB6342
-	.4byte	.LBE6342
-	.4byte	.LBB6349
-	.4byte	.LBE6349
-	.4byte	.LBB6351
-	.4byte	.LBE6351
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6369
-	.4byte	.LBE6369
+	.4byte	.LBB6305
+	.4byte	.LBE6305
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6302
+	.4byte	.LBE6302
+	.4byte	.LBB6306
+	.4byte	.LBE6306
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6343
+	.4byte	.LBE6343
+	.4byte	.LBB6348
+	.4byte	.LBE6348
+	.4byte	.LBB6355
+	.4byte	.LBE6355
+	.4byte	.LBB6357
+	.4byte	.LBE6357
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6375
+	.4byte	.LBE6375
+	.4byte	.LBB6388
+	.4byte	.LBE6388
+	.4byte	.LBB6389
+	.4byte	.LBE6389
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6378
+	.4byte	.LBE6378
 	.4byte	.LBB6382
 	.4byte	.LBE6382
 	.4byte	.LBB6383
 	.4byte	.LBE6383
 	.4byte	0
 	.4byte	0
-	.4byte	.LBB6372
-	.4byte	.LBE6372
-	.4byte	.LBB6376
-	.4byte	.LBE6376
-	.4byte	.LBB6377
-	.4byte	.LBE6377
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6373
-	.4byte	.LBE6373
-	.4byte	.LBB6374
-	.4byte	.LBE6374
-	.4byte	.LBB6375
-	.4byte	.LBE6375
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6403
-	.4byte	.LBE6403
+	.4byte	.LBB6379
+	.4byte	.LBE6379
+	.4byte	.LBB6380
+	.4byte	.LBE6380
+	.4byte	.LBB6381
+	.4byte	.LBE6381
+	.4byte	0
+	.4byte	0
 	.4byte	.LBB6409
 	.4byte	.LBE6409
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6412
-	.4byte	.LBE6412
-	.4byte	.LBB6420
-	.4byte	.LBE6420
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6417
-	.4byte	.LBE6417
-	.4byte	.LBB6421
-	.4byte	.LBE6421
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6467
-	.4byte	.LBE6467
-	.4byte	.LBB6470
-	.4byte	.LBE6470
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6474
-	.4byte	.LBE6474
-	.4byte	.LBB6483
-	.4byte	.LBE6483
-	.4byte	.LBB6485
-	.4byte	.LBE6485
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6478
-	.4byte	.LBE6478
+	.4byte	.LBB6415
+	.4byte	.LBE6415
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6418
+	.4byte	.LBE6418
+	.4byte	.LBB6426
+	.4byte	.LBE6426
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6423
+	.4byte	.LBE6423
+	.4byte	.LBB6427
+	.4byte	.LBE6427
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6473
+	.4byte	.LBE6473
+	.4byte	.LBB6476
+	.4byte	.LBE6476
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6480
+	.4byte	.LBE6480
+	.4byte	.LBB6489
+	.4byte	.LBE6489
+	.4byte	.LBB6491
+	.4byte	.LBE6491
+	.4byte	0
+	.4byte	0
 	.4byte	.LBB6484
 	.4byte	.LBE6484
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6489
-	.4byte	.LBE6489
-	.4byte	.LBB6508
-	.4byte	.LBE6508
-	.4byte	.LBB6510
-	.4byte	.LBE6510
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6499
-	.4byte	.LBE6499
-	.4byte	.LBB6509
-	.4byte	.LBE6509
-	.4byte	.LBB6511
-	.4byte	.LBE6511
+	.4byte	.LBB6490
+	.4byte	.LBE6490
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6495
+	.4byte	.LBE6495
+	.4byte	.LBB6514
+	.4byte	.LBE6514
+	.4byte	.LBB6516
+	.4byte	.LBE6516
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6505
+	.4byte	.LBE6505
 	.4byte	.LBB6515
 	.4byte	.LBE6515
-	.4byte	0
-	.4byte	0
-	.4byte	.LBB6512
-	.4byte	.LBE6512
-	.4byte	.LBB6516
-	.4byte	.LBE6516
+	.4byte	.LBB6517
+	.4byte	.LBE6517
+	.4byte	.LBB6521
+	.4byte	.LBE6521
+	.4byte	0
+	.4byte	0
+	.4byte	.LBB6518
+	.4byte	.LBE6518
+	.4byte	.LBB6522
+	.4byte	.LBE6522
 	.4byte	0
 	.4byte	0
 	.4byte	.LFB3232
@@ -30392,8 +30459,6 @@
 	.ascii	"airIKS2_ImiEN12RadioShuttle12ConnectEntryEEEED2Ev\000"
 .LASF810:
 	.ascii	"_ZN4mbed14LowPowerTickerC4Ev\000"
-.LASF746:
-	.ascii	"_ZN12RadioShuttle7StartupENS_9RadioTypeE\000"
 .LASF813:
 	.ascii	"_ZN4mbed6TickerD4Ev\000"
 .LASF127:
@@ -32076,6 +32141,8 @@
 	.ascii	"ConnectEntryEESt10_Select1stIS5_ESt4lessIS1_ESaIS5_"
 	.ascii	"EE14_M_lower_boundEPSt13_Rb_tree_nodeIS5_EPSt18_Rb_"
 	.ascii	"tree_node_baseRS2_\000"
+.LASF746:
+	.ascii	"_ZN12RadioShuttle7StartupENS_9RadioTypeEm\000"
 .LASF318:
 	.ascii	"_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN12Radi"
 	.ascii	"oShuttle18TimeOnAirSlotEntryEEED2Ev\000"