From 80a23c83cf91f91c7fc110a5e9e9441712224367 Mon Sep 17 00:00:00 2001 From: kevin Date: Fri, 10 Sep 2021 20:29:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AF=BB=E5=8F=96=E5=8C=BA?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Debug/SW_APPs/APP_IDcard.su | 2 +- Debug/m3s.bin | Bin 46352 -> 46344 bytes Debug/m3s.list | 3188 +++++++++++++++++------------------ Debug/m3s.map | 482 +++--- SW_APPs/APP_IDcard.c | 43 +- 5 files changed, 1875 insertions(+), 1840 deletions(-) diff --git a/Debug/SW_APPs/APP_IDcard.su b/Debug/SW_APPs/APP_IDcard.su index c038d9b..a150d5e 100644 --- a/Debug/SW_APPs/APP_IDcard.su +++ b/Debug/SW_APPs/APP_IDcard.su @@ -1,2 +1,2 @@ APP_IDcard.c:12:6:APP_IDcard_init 16 static -APP_IDcard.c:25:6:APP_IDcard_loop 112 static +APP_IDcard.c:27:6:APP_IDcard_loop 16 static diff --git a/Debug/m3s.bin b/Debug/m3s.bin index 4d51be9ca89d4372317ba9fd483315962849c5b6..4e447905284a762354f1e5606de33c23aa1df8f5 100755 GIT binary patch delta 2684 zcmai0eNa@_6~Fhr-Lfkn-*rEr?y@0B)+&Y=h$O=z@LYCPFhB$$;Uj=c009MA#LOZS z8!QII3lj;=n8|9VPSXMQ*-6cc)TT52qh@3ir!6sm&@`!|nNFaZdCNX_x92`qq|-k- z%(>^>^EUrrDhn7yz1Ggdyu zBgHou>CB`S^r4DrTqN< zNeu2x@jdD~UN(RuVMAW^m3J;7h4~6nK=NQOK>Nxwa1A+CJ_uuE#UzX~ z71>NYLvB=TBU=tdz=n4odL1@AeyCFBWsr_+tNby)vGR{H$IqvjNqY@3WFKoc^d3V7 zcPChP!h+jz!luc0JD7}Ed)Sf=hv&22_^qFubUS)%;rUv7iRrG(-RXAV40pHN!5aTL zAGQ?1ewjqaFujTk3U37!dW9}1ob*GE0mETS3Ko$#PMI75d3k{4L|wP&Kt{R8ZBrQ; z4>E||c!7aYbf`F8CR`P{T|J)gOFzrK?M+R87YrH0JXH29d9!A7ESd}o&-im;{)!*X z_RSzf(rc5`ZU*HGD7okn>WDOp!Y4torxJ-BD4Ef3fVnG(AyPo}8`4{w=@<#F)}}#b z5Mr4=1)`q;i=JaLC<@~%qVO)*7#IN?0UKVSDq5)Q01l&9LDUjNaEqD+@eHhYie}>= zTPv*>4N+CF=uuxs6hx*V%ON8(C!WD%M_m%mP08h4*)ab3119YAP?9JAR5ZffNwN`Bt#dfT* zkB8W|0FSefnpjI*Z{DJejXNeI2@ToGA!ypOV4b9*!LTzRJPeAq3of^9+|_G)&sFru zo)-}AujNGBglj{_dw@?+EFX;qgfcSSkc2sM8^%oXFBrFw@J21JC#j98xQY}tCS+a- zP$f+0h)A@7wLGgw@H8j9!(Vs8>T^z{fGey0D_mJP>=YUIdPL!QGSQf3ythId%lz;3 zb$q0+2lgA@-ZL7Gw&EWORUBUYoP6J?jxFO@4Y_f6H!g%ib^NU$En!0??NIX4YKhrq!g8vmt^=)r zFd!AmLxuaHaGB&ZX~~>z_fLN>(yjmZ(T_^3Jc$(+Vr>Q1RbUO{I&!;7jlU)Ln^GNR z{-Q<1*sROKHvxtVhbB?Oqdn_oId_A%by+Bo@LIs{tiw+N-rJDX<`YgWv)r{-+755| zSgstd$S2$cG?DWj@d-!Q&@Mm^NT>_Y)ux;DvJS3ju`idB8lZrBKltp1-vPN4$UTzu zLCEDw%VWZFPBSSK0T*TR&hC9h;&Dz7`J~XSKAE6mEI|t3!_uGE>TGkf63@!Em zHml*Pt(x}NtXexVnigGsRaPch(_Uo`3bAld4R;98iV*7TD}hME9k5o~%L-pH+=Y;x?g1cXa|Gt{WLJy4_K3ak@QpKrZu#{`{cxeXjwm^PI%YkeKP~nGT7X4%9mTcIg;T zTen$|z7~%9E9o%LfJ~Ys6XP*RGI~kIv|dJ1(Su5k|0j}4yfw+9lT=PiDk@Of6jF(i zRH7x7vf}@di3XWO_^7Ym|KH&L7r?#-`wHwMumSiPoB~gu%_ziw2Y(6t9q7F9B%M2ZE41hffFs~y}ESz zN$dw76cPgV7PPq07ZfbMfRMlP!#y;MRM>Qt$lEhyrLZQMvg-L)+nsWJmf+)iA`{`i zfXAjIWyk-7BS=#Bq&x!FkLEqyQL>m9Cy~MgW(La#+siNYPRQi@A*?1NeVcI>Ki!uj z)4vIcQ80uS9X;UN!S+dWZ_c?XqRo9`4G^(w36I^#~NvZV`DQ~ z)I%$qNbXRtoGQx5&7qu7Bp)7@Q;v*`4}ZEE@wMmja430Y9^( zd9_FD3+s2KKurHoNx|L%U6B=83o5|zH!ktv3_^U{)I9TKv-|-*2dBB=7Ov5o_$ZFk48qw_*u$lLQCk-C5E z?qtqA=bqpBxaZvS-b?rQOz-#1h$ao|s5Y$?M`=e|6TZs-Ep39q&HUv|fq~sSx<6p; z3La_hV`M6&?FK$`2a8NySJ5!T8J#*ZPP#s6+q#1^Ge9_DTEilm zPEL1YOWNu0Xj4S0*33riEGO?W|RS~z2cp)KIW1%V?0 zZ?g5lT|C8DWIr7-tsT!KUE^KX(6A&F&6Yq=$1IxY8mCotIe9@zJ%w^AAENf8GEw-w zBzD-4*p6}-^8(o4lrTsdkjAOMZmsvCG-sO!8b8P?^D>amfR|juup|msqN4CV&}E<@ zpo>7~qjD4@SRMr*s28NyC1mj&G)##nAm340n-1D`C0`0i%~IvVuJ&Y*sw9>mD|1IY zf$8@8Y+TK^*5@%emku^$d-q2f@*HP#>PZTT2(8epEMny*VLT#&J<1Y2F@bbhWQnX1 z0ne$ZwwpOyx4f?e?vL8#$v(#!BYBe--z>2Y7k~wWn32dp3tuZ2CbJUE?U$ z`d}=3f!wsiVOb*yY*=&-j0K#7V;<+(vC4<;%`ss{daM(j{;>rGX94%iSSdOk6C5o>hp-!&UaL{3ra8xdFU8!=4icB9GzCavi~;Z)oy9 zeVQXI3P}-$cv|VEq(6y5LWHi{_cDH$nw{x}O-fpG_@nTtd~8h)%1J3C^+l=OWuSlA zw+YvRp+4iDB%82tlQuAUan8i)+=w%kSoIJqCJZQs>bT)HFx1W&hMb$8y(7wJ|IgYF zC~nn?TSDAz1-RX&dt5#E0Da)n<408cYOdEYTNy%(lbaD9#u%~?rbG{SdoIk9fFs;8 zBkWZ0I>7Hgf&UtCkE5_PBJ|C$D4r`W$Akvn?WgE@`GB!cBUsDG$5p zKbwr+vk^3*Sqrb^aWruUrZIHw?U6;p&E+q_j78wE2J$LrXmfE!H?nGj`#2`Y(AHQc z2^J{RK=uMwuV6(%yMpcE{BDEl7o5#)WYSAtu1IsIml}wTGuUnA^3Uy`Ai`=Tf-P78{2W;g$9$LM!;y9HGMe?_4zVteo9qbG<#NVOPu(+|t+TjpDd+DL?G|pbGXQTSqsL=6aW;>h zJk9w%29nK9dXi|OZ((1jbAj)MQ|pU3HNJJO1Yf7?Dc=p3+9$eHls&`r?OI=#1YcYHPmcn&~#{UeLbr0w(APs!cE&%U_&*BJh`63e$GM$F~ zIeNE6ROc^4CKJ88pX#rIt-Ma=P>IZ*dCEJ~FIMf&3YK@JO;MwQLw^UI5wwR0UMSPka0-^==TGXkXV7{5(I} zwLxV*0g4Mi2!*`Ifxiw^tL(!Y21bxZ;!}?gF=|v}iixbjNhhg$n6(#*NN;`<_Q zvW8YaHhJqbA6IVazs00BgY{vc)DEO^^drpysvjuO{t`5A0)5Qy9N5EV-ycI76}0I# z@FyL%56TWfzh66VK@XjK@Z*kedFLelaZB;}lglFD_; zTuQSqoW!O4l?&%Fex8=UHw^2{d(dvGAF{yuvmseNI+U55A#ToMf>tLxYOxoN%Q_jq zJoLlL280l|rFKsxhtM+j|NbGwk6q#y@~)9DnZ)^$plG@ZSJ89)Kk{xtQ$CX$^Z$sB HUfuO?jl@Fj diff --git a/Debug/m3s.list b/Debug/m3s.list index 6070ff2..2d4800f 100644 --- a/Debug/m3s.list +++ b/Debug/m3s.list @@ -7,43 +7,43 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, READONLY, DATA 1 .text 0000a1d8 080001e8 080001e8 000101e8 2**3 CONTENTS, ALLOC, LOAD, READONLY, CODE - 2 .rodata 00000f64 0800a3c0 0800a3c0 0001a3c0 2**3 + 2 .rodata 00000f5c 0800a3c0 0800a3c0 0001a3c0 2**3 CONTENTS, ALLOC, LOAD, READONLY, DATA - 3 .ARM.extab 00000000 0800b324 0800b324 000201e4 2**0 + 3 .ARM.extab 00000000 0800b31c 0800b31c 000201e4 2**0 CONTENTS - 4 .ARM 00000000 0800b324 0800b324 000201e4 2**0 + 4 .ARM 00000000 0800b31c 0800b31c 000201e4 2**0 CONTENTS - 5 .preinit_array 00000000 0800b324 0800b324 000201e4 2**0 + 5 .preinit_array 00000000 0800b31c 0800b31c 000201e4 2**0 CONTENTS, ALLOC, LOAD, DATA - 6 .init_array 00000004 0800b324 0800b324 0001b324 2**2 + 6 .init_array 00000004 0800b31c 0800b31c 0001b31c 2**2 CONTENTS, ALLOC, LOAD, DATA - 7 .fini_array 00000004 0800b328 0800b328 0001b328 2**2 + 7 .fini_array 00000004 0800b320 0800b320 0001b320 2**2 CONTENTS, ALLOC, LOAD, DATA - 8 .data 000001e4 20000000 0800b32c 00020000 2**2 + 8 .data 000001e4 20000000 0800b324 00020000 2**2 CONTENTS, ALLOC, LOAD, DATA - 9 .bss 00002360 200001e4 0800b510 000201e4 2**2 + 9 .bss 00002364 200001e4 0800b508 000201e4 2**2 ALLOC - 10 ._user_heap_stack 00000c04 20002544 0800b510 00022544 2**0 + 10 ._user_heap_stack 00000c00 20002548 0800b508 00022548 2**0 ALLOC 11 .ARM.attributes 00000029 00000000 00000000 000201e4 2**0 CONTENTS, READONLY - 12 .debug_info 00015b0b 00000000 00000000 0002020d 2**0 + 12 .debug_info 00015b3f 00000000 00000000 0002020d 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 13 .debug_abbrev 000036d4 00000000 00000000 00035d18 2**0 + 13 .debug_abbrev 000036de 00000000 00000000 00035d4c 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 14 .debug_aranges 00001398 00000000 00000000 000393f0 2**3 + 14 .debug_aranges 00001398 00000000 00000000 00039430 2**3 CONTENTS, READONLY, DEBUGGING, OCTETS - 15 .debug_ranges 00001240 00000000 00000000 0003a788 2**3 + 15 .debug_ranges 00001240 00000000 00000000 0003a7c8 2**3 CONTENTS, READONLY, DEBUGGING, OCTETS - 16 .debug_macro 0001d58c 00000000 00000000 0003b9c8 2**0 + 16 .debug_macro 0001d58c 00000000 00000000 0003ba08 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 17 .debug_line 00017ecb 00000000 00000000 00058f54 2**0 + 17 .debug_line 00017e8e 00000000 00000000 00058f94 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 18 .debug_str 000a0fbf 00000000 00000000 00070e1f 2**0 + 18 .debug_str 000a0fd6 00000000 00000000 00070e22 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 19 .comment 00000053 00000000 00000000 00111dde 2**0 + 19 .comment 00000053 00000000 00000000 00111df8 2**0 CONTENTS, READONLY - 20 .debug_frame 000063d4 00000000 00000000 00111e34 2**2 + 20 .debug_frame 000063cc 00000000 00000000 00111e4c 2**2 CONTENTS, READONLY, DEBUGGING, OCTETS Disassembly of section .text: @@ -1577,7 +1577,7 @@ static void MX_I2C2_Init(void) } 8001204: bf00 nop 8001206: bd80 pop {r7, pc} - 8001208: 20000218 .word 0x20000218 + 8001208: 20000214 .word 0x20000214 800120c: 40005800 .word 0x40005800 8001210: 000186a0 .word 0x000186a0 @@ -1660,7 +1660,7 @@ static void MX_SPI1_Init(void) } 8001274: bf00 nop 8001276: bd80 pop {r7, pc} - 8001278: 200002fc .word 0x200002fc + 8001278: 200002f8 .word 0x200002f8 800127c: 40013000 .word 0x40013000 08001280 : @@ -1745,7 +1745,7 @@ static void MX_TIM6_Init(void) 80012de: 46bd mov sp, r7 80012e0: bd80 pop {r7, pc} 80012e2: bf00 nop - 80012e4: 200002b4 .word 0x200002b4 + 80012e4: 200002b0 .word 0x200002b0 80012e8: 40001000 .word 0x40001000 080012ec : @@ -2194,7 +2194,7 @@ static void MX_FSMC_Init(void) 800159e: 3720 adds r7, #32 80015a0: 46bd mov sp, r7 80015a2: bd80 pop {r7, pc} - 80015a4: 2000026c .word 0x2000026c + 80015a4: 20000268 .word 0x20000268 80015a8: a0000104 .word 0xa0000104 80015ac: 40010000 .word 0x40010000 @@ -2848,7 +2848,7 @@ void TIM6_IRQHandler(void) 8001896: bf00 nop 8001898: bd80 pop {r7, pc} 800189a: bf00 nop - 800189c: 200002b4 .word 0x200002b4 + 800189c: 200002b0 .word 0x200002b0 080018a0 <_getpid>: void initialise_monitor_handles() @@ -3245,11 +3245,11 @@ LoopFillZerobss: ldr r1, =_edata 8001a64: 200001e4 .word 0x200001e4 ldr r2, =_sidata - 8001a68: 0800b32c .word 0x0800b32c + 8001a68: 0800b324 .word 0x0800b324 ldr r2, =_sbss 8001a6c: 200001e4 .word 0x200001e4 ldr r4, =_ebss - 8001a70: 20002544 .word 0x20002544 + 8001a70: 20002548 .word 0x20002548 08001a74 : * @retval : None @@ -3397,7 +3397,7 @@ __weak void HAL_IncTick(void) 8001b1c: bc80 pop {r7} 8001b1e: 4770 bx lr 8001b20: 20000008 .word 0x20000008 - 8001b24: 20000354 .word 0x20000354 + 8001b24: 20000350 .word 0x20000350 08001b28 : * @note This function is declared as __weak to be overwritten in case of other @@ -3416,7 +3416,7 @@ __weak uint32_t HAL_GetTick(void) 8001b32: 46bd mov sp, r7 8001b34: bc80 pop {r7} 8001b36: 4770 bx lr - 8001b38: 20000354 .word 0x20000354 + 8001b38: 20000350 .word 0x20000350 08001b3c : * implementations in user file. @@ -8429,7 +8429,7 @@ if (((RCC_ClkInitStruct->ClockType) & RCC_CLOCKTYPE_PCLK1) == RCC_CLOCKTYPE_PCLK 80037e6: bf00 nop 80037e8: 40022000 .word 0x40022000 80037ec: 40021000 .word 0x40021000 - 80037f0: 0800a4c8 .word 0x0800a4c8 + 80037f0: 0800a4bc .word 0x0800a4bc 80037f4: 20000000 .word 0x20000000 80037f8: 20000004 .word 0x20000004 @@ -8625,7 +8625,7 @@ uint32_t HAL_RCC_GetPCLK1Freq(void) 80038ec: 4618 mov r0, r3 80038ee: bd80 pop {r7, pc} 80038f0: 40021000 .word 0x40021000 - 80038f4: 0800a4d8 .word 0x0800a4d8 + 80038f4: 0800a4cc .word 0x0800a4cc 080038f8 : * @brief This function provides delay (in milliseconds) based on CPU cycles method. @@ -12515,7 +12515,7 @@ void LCD_Scan_Dir(uint8_t dir) 8004ed0: f043 0340 orr.w r3, r3, #64 ; 0x40 8004ed4: 81fb strh r3, [r7, #14] 8004ed6: e007 b.n 8004ee8 - 8004ed8: 20000358 .word 0x20000358 + 8004ed8: 20000354 .word 0x20000354 }else//其他驱动IC { dirreg=0X03; @@ -12784,7 +12784,7 @@ void LCD_Display_Dir(uint8_t dir) 8005082: 46bd mov sp, r7 8005084: bd80 pop {r7, pc} 8005086: bf00 nop - 8005088: 20000358 .word 0x20000358 + 8005088: 20000354 .word 0x20000354 0800508c : @@ -13039,7 +13039,7 @@ void LCDx_Init(void) } 800526c: bf00 nop 800526e: bd80 pop {r7, pc} - 8005270: 20000358 .word 0x20000358 + 8005270: 20000354 .word 0x20000354 8005274: 40010c00 .word 0x40010c00 08005278 : @@ -13201,7 +13201,7 @@ void LCD_SetCursor(uint16_t Xpos, uint16_t Ypos) 800538e: 3708 adds r7, #8 8005390: 46bd mov sp, r7 8005392: bd80 pop {r7, pc} - 8005394: 20000358 .word 0x20000358 + 8005394: 20000354 .word 0x20000354 08005398 : } @@ -13240,7 +13240,7 @@ void LCD_set_dot(uint16_t x,uint16_t y,uint16_t color) 80053ca: 3708 adds r7, #8 80053cc: 46bd mov sp, r7 80053ce: bd80 pop {r7, pc} - 80053d0: 20000358 .word 0x20000358 + 80053d0: 20000354 .word 0x20000354 80053d4: 6c000800 .word 0x6c000800 080053d8 : @@ -13342,7 +13342,7 @@ void LCD_Clear(uint16_t color) 800546e: 3710 adds r7, #16 8005470: 46bd mov sp, r7 8005472: bd80 pop {r7, pc} - 8005474: 20000358 .word 0x20000358 + 8005474: 20000354 .word 0x20000354 8005478: 6c000800 .word 0x6c000800 0800547c : @@ -13862,9 +13862,9 @@ void LCD_ShowChar(uint16_t x,uint16_t y,uint8_t num,uint8_t size,uint16_t bg,uin 80057c2: 3714 adds r7, #20 80057c4: 46bd mov sp, r7 80057c6: bd90 pop {r4, r7, pc} - 80057c8: 0800a4e0 .word 0x0800a4e0 - 80057cc: 0800a954 .word 0x0800a954 - 80057d0: 20000358 .word 0x20000358 + 80057c8: 0800a4d4 .word 0x0800a4d4 + 80057cc: 0800a948 .word 0x0800a948 + 80057d0: 20000354 .word 0x20000354 080057d4 : //width,height:区域大小 @@ -13949,7 +13949,7 @@ void LCD_ShowString(uint16_t x,uint16_t y,uint8_t *p,uint8_t size,uint16_t bg,ui 8005846: 3714 adds r7, #20 8005848: 46bd mov sp, r7 800584a: bd90 pop {r4, r7, pc} - 800584c: 20000358 .word 0x20000358 + 800584c: 20000354 .word 0x20000354 08005850 : //因为eeprom芯片的写入速度有限，每写入一个字符都需要等待一段时间才能完成写入 @@ -13987,7 +13987,7 @@ void EPPROM_SLOWWRITE_INIT() // 800587a: bc80 pop {r7} 800587c: 4770 bx lr 800587e: bf00 nop - 8005880: 20000364 .word 0x20000364 + 8005880: 20000360 .word 0x20000360 08005884 : @@ -14077,7 +14077,7 @@ void EEPROM_SLOWWRITE_SERVER() 8005906: 3708 adds r7, #8 8005908: 46bd mov sp, r7 800590a: bd80 pop {r7, pc} - 800590c: 20000364 .word 0x20000364 + 800590c: 20000360 .word 0x20000360 08005910 : @@ -14206,7 +14206,7 @@ void EEPROM_WRITE_BATY(uint16_t IN_DEVICE_ADD,char *DATAS,uint16_t LONG) 80059b6: 46bd mov sp, r7 80059b8: bd80 pop {r7, pc} 80059ba: bf00 nop - 80059bc: 20000364 .word 0x20000364 + 80059bc: 20000360 .word 0x20000360 080059c0 : @@ -14244,7 +14244,7 @@ void IIC_SAND_DATE(uint16_t DEVICE_ADD,uint16_t IN_DEVICE_ADD,char *DATAS,uint16 80059f2: 46bd mov sp, r7 80059f4: bd80 pop {r7, pc} 80059f6: bf00 nop - 80059f8: 20000218 .word 0x20000218 + 80059f8: 20000214 .word 0x20000214 080059fc : @@ -14279,7 +14279,7 @@ void IIC_READ_DATE(uint16_t DEVICE_ADD,uint16_t IN_DEVICE_ADD,char *DATAS,uint16 8005a2e: 46bd mov sp, r7 8005a30: bd80 pop {r7, pc} 8005a32: bf00 nop - 8005a34: 20000218 .word 0x20000218 + 8005a34: 20000214 .word 0x20000214 08005a38 : * 输入 ：ucAddress，寄存器地址 @@ -14335,7 +14335,7 @@ uint8_t ReadRawRC ( uint8_t ucAddress ) 8005a90: bd80 pop {r7, pc} 8005a92: bf00 nop 8005a94: 40010800 .word 0x40010800 - 8005a98: 200002fc .word 0x200002fc + 8005a98: 200002f8 .word 0x200002f8 08005a9c : * ucValue，写入寄存器的值 @@ -14388,7 +14388,7 @@ void WriteRawRC ( uint8_t ucAddress, uint8_t ucValue ) 8005aec: 46bd mov sp, r7 8005aee: bd80 pop {r7, pc} 8005af0: 40010800 .word 0x40010800 - 8005af4: 200002fc .word 0x200002fc + 8005af4: 200002f8 .word 0x200002f8 08005af8 : * ucMask，置位值 @@ -15187,1428 +15187,1434 @@ void CalulateCRC ( uint8_t * pIndata, uint8_t ucLen, uint8_t * pOutData ) 8005fcc: 46bd mov sp, r7 8005fce: bd90 pop {r4, r7, pc} -08005fd0 : +08005fd0 : + * 返回 : 状态值 + * = MI_OK，成功 + * 调用 ：外部调用 + */ +char PcdSelect ( uint8_t * pSnr ) +{ + 8005fd0: b580 push {r7, lr} + 8005fd2: b08a sub sp, #40 ; 0x28 + 8005fd4: af02 add r7, sp, #8 + 8005fd6: 6078 str r0, [r7, #4] + char ucN; + uint8_t uc; + uint8_t ucComMF522Buf [ MAXRLEN ]; + uint32_t ulLen; + ucComMF522Buf [ 0 ] = PICC_ANTICOLL1; + 8005fd8: 2393 movs r3, #147 ; 0x93 + 8005fda: 733b strb r3, [r7, #12] + ucComMF522Buf [ 1 ] = 0x70; + 8005fdc: 2370 movs r3, #112 ; 0x70 + 8005fde: 737b strb r3, [r7, #13] + ucComMF522Buf [ 6 ] = 0; + 8005fe0: 2300 movs r3, #0 + 8005fe2: 74bb strb r3, [r7, #18] + for ( uc = 0; uc < 4; uc ++ ) + 8005fe4: 2300 movs r3, #0 + 8005fe6: 77bb strb r3, [r7, #30] + 8005fe8: e015 b.n 8006016 + { + ucComMF522Buf [ uc + 2 ] = * ( pSnr + uc ); + 8005fea: 7fbb ldrb r3, [r7, #30] + 8005fec: 687a ldr r2, [r7, #4] + 8005fee: 441a add r2, r3 + 8005ff0: 7fbb ldrb r3, [r7, #30] + 8005ff2: 3302 adds r3, #2 + 8005ff4: 7812 ldrb r2, [r2, #0] + 8005ff6: f107 0120 add.w r1, r7, #32 + 8005ffa: 440b add r3, r1 + 8005ffc: f803 2c14 strb.w r2, [r3, #-20] + ucComMF522Buf [ 6 ] ^= * ( pSnr + uc ); + 8006000: 7cba ldrb r2, [r7, #18] + 8006002: 7fbb ldrb r3, [r7, #30] + 8006004: 6879 ldr r1, [r7, #4] + 8006006: 440b add r3, r1 + 8006008: 781b ldrb r3, [r3, #0] + 800600a: 4053 eors r3, r2 + 800600c: b2db uxtb r3, r3 + 800600e: 74bb strb r3, [r7, #18] + for ( uc = 0; uc < 4; uc ++ ) + 8006010: 7fbb ldrb r3, [r7, #30] + 8006012: 3301 adds r3, #1 + 8006014: 77bb strb r3, [r7, #30] + 8006016: 7fbb ldrb r3, [r7, #30] + 8006018: 2b03 cmp r3, #3 + 800601a: d9e6 bls.n 8005fea + } + CalulateCRC ( ucComMF522Buf, 7, & ucComMF522Buf [ 7 ] ); + 800601c: f107 030c add.w r3, r7, #12 + 8006020: 1dda adds r2, r3, #7 + 8006022: f107 030c add.w r3, r7, #12 + 8006026: 2107 movs r1, #7 + 8006028: 4618 mov r0, r3 + 800602a: f7ff ff84 bl 8005f36 + ClearBitMask ( Status2Reg, 0x08 ); + 800602e: 2108 movs r1, #8 + 8006030: 2008 movs r0, #8 + 8006032: f7ff fd7c bl 8005b2e + ucN = PcdComMF522 ( PCD_TRANSCEIVE, ucComMF522Buf, 9, ucComMF522Buf, & ulLen ); + 8006036: f107 020c add.w r2, r7, #12 + 800603a: f107 010c add.w r1, r7, #12 + 800603e: f107 0308 add.w r3, r7, #8 + 8006042: 9300 str r3, [sp, #0] + 8006044: 4613 mov r3, r2 + 8006046: 2209 movs r2, #9 + 8006048: 200c movs r0, #12 + 800604a: f7ff fe05 bl 8005c58 + 800604e: 4603 mov r3, r0 + 8006050: 77fb strb r3, [r7, #31] + if ( ( ucN == MI_OK ) && ( ulLen == 0x18 ) ) + 8006052: 7ffb ldrb r3, [r7, #31] + 8006054: 2b00 cmp r3, #0 + 8006056: d105 bne.n 8006064 + 8006058: 68bb ldr r3, [r7, #8] + 800605a: 2b18 cmp r3, #24 + 800605c: d102 bne.n 8006064 + { + ucN = MI_OK; + 800605e: 2300 movs r3, #0 + 8006060: 77fb strb r3, [r7, #31] + 8006062: e001 b.n 8006068 + } + else + { + ucN = MI_ERR; + 8006064: 2302 movs r3, #2 + 8006066: 77fb strb r3, [r7, #31] + } + return ucN; + 8006068: 7ffb ldrb r3, [r7, #31] + +} + 800606a: 4618 mov r0, r3 + 800606c: 3720 adds r7, #32 + 800606e: 46bd mov sp, r7 + 8006070: bd80 pop {r7, pc} + +08006072 : * 返回 : 状态值 * = MI_OK，成功 * 调用 ：外部调用 */ char PcdAuthState ( uint8_t ucAuth_mode, uint8_t ucAddr, char * pKey, uint8_t * pSnr ) { - 8005fd0: b580 push {r7, lr} - 8005fd2: b08c sub sp, #48 ; 0x30 - 8005fd4: af02 add r7, sp, #8 - 8005fd6: 60ba str r2, [r7, #8] - 8005fd8: 607b str r3, [r7, #4] - 8005fda: 4603 mov r3, r0 - 8005fdc: 73fb strb r3, [r7, #15] - 8005fde: 460b mov r3, r1 - 8005fe0: 73bb strb r3, [r7, #14] + 8006072: b580 push {r7, lr} + 8006074: b08c sub sp, #48 ; 0x30 + 8006076: af02 add r7, sp, #8 + 8006078: 60ba str r2, [r7, #8] + 800607a: 607b str r3, [r7, #4] + 800607c: 4603 mov r3, r0 + 800607e: 73fb strb r3, [r7, #15] + 8006080: 460b mov r3, r1 + 8006082: 73bb strb r3, [r7, #14] char cStatus; uint8_t uc, ucComMF522Buf [ MAXRLEN ]; uint32_t ulLen; ucComMF522Buf [ 0 ] = ucAuth_mode; - 8005fe2: 7bfb ldrb r3, [r7, #15] - 8005fe4: 753b strb r3, [r7, #20] + 8006084: 7bfb ldrb r3, [r7, #15] + 8006086: 753b strb r3, [r7, #20] ucComMF522Buf [ 1 ] = ucAddr; - 8005fe6: 7bbb ldrb r3, [r7, #14] - 8005fe8: 757b strb r3, [r7, #21] + 8006088: 7bbb ldrb r3, [r7, #14] + 800608a: 757b strb r3, [r7, #21] for ( uc = 0; uc < 6; uc ++ ) - 8005fea: 2300 movs r3, #0 - 8005fec: f887 3026 strb.w r3, [r7, #38] ; 0x26 - 8005ff0: e011 b.n 8006016 + 800608c: 2300 movs r3, #0 + 800608e: f887 3026 strb.w r3, [r7, #38] ; 0x26 + 8006092: e011 b.n 80060b8 { ucComMF522Buf [ uc + 2 ] = * ( pKey + uc ); - 8005ff2: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 - 8005ff6: 68ba ldr r2, [r7, #8] - 8005ff8: 441a add r2, r3 - 8005ffa: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 - 8005ffe: 3302 adds r3, #2 - 8006000: 7812 ldrb r2, [r2, #0] - 8006002: f107 0128 add.w r1, r7, #40 ; 0x28 - 8006006: 440b add r3, r1 - 8006008: f803 2c14 strb.w r2, [r3, #-20] + 8006094: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 + 8006098: 68ba ldr r2, [r7, #8] + 800609a: 441a add r2, r3 + 800609c: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 + 80060a0: 3302 adds r3, #2 + 80060a2: 7812 ldrb r2, [r2, #0] + 80060a4: f107 0128 add.w r1, r7, #40 ; 0x28 + 80060a8: 440b add r3, r1 + 80060aa: f803 2c14 strb.w r2, [r3, #-20] for ( uc = 0; uc < 6; uc ++ ) - 800600c: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 - 8006010: 3301 adds r3, #1 - 8006012: f887 3026 strb.w r3, [r7, #38] ; 0x26 - 8006016: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 - 800601a: 2b05 cmp r3, #5 - 800601c: d9e9 bls.n 8005ff2 + 80060ae: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 + 80060b2: 3301 adds r3, #1 + 80060b4: f887 3026 strb.w r3, [r7, #38] ; 0x26 + 80060b8: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 + 80060bc: 2b05 cmp r3, #5 + 80060be: d9e9 bls.n 8006094 } for ( uc = 0; uc < 6; uc ++ ) - 800601e: 2300 movs r3, #0 - 8006020: f887 3026 strb.w r3, [r7, #38] ; 0x26 - 8006024: e011 b.n 800604a + 80060c0: 2300 movs r3, #0 + 80060c2: f887 3026 strb.w r3, [r7, #38] ; 0x26 + 80060c6: e011 b.n 80060ec { ucComMF522Buf [ uc + 8 ] = * ( pSnr + uc ); - 8006026: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 - 800602a: 687a ldr r2, [r7, #4] - 800602c: 441a add r2, r3 - 800602e: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 - 8006032: 3308 adds r3, #8 - 8006034: 7812 ldrb r2, [r2, #0] - 8006036: f107 0128 add.w r1, r7, #40 ; 0x28 - 800603a: 440b add r3, r1 - 800603c: f803 2c14 strb.w r2, [r3, #-20] + 80060c8: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 + 80060cc: 687a ldr r2, [r7, #4] + 80060ce: 441a add r2, r3 + 80060d0: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 + 80060d4: 3308 adds r3, #8 + 80060d6: 7812 ldrb r2, [r2, #0] + 80060d8: f107 0128 add.w r1, r7, #40 ; 0x28 + 80060dc: 440b add r3, r1 + 80060de: f803 2c14 strb.w r2, [r3, #-20] for ( uc = 0; uc < 6; uc ++ ) - 8006040: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 - 8006044: 3301 adds r3, #1 - 8006046: f887 3026 strb.w r3, [r7, #38] ; 0x26 - 800604a: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 - 800604e: 2b05 cmp r3, #5 - 8006050: d9e9 bls.n 8006026 + 80060e2: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 + 80060e6: 3301 adds r3, #1 + 80060e8: f887 3026 strb.w r3, [r7, #38] ; 0x26 + 80060ec: f897 3026 ldrb.w r3, [r7, #38] ; 0x26 + 80060f0: 2b05 cmp r3, #5 + 80060f2: d9e9 bls.n 80060c8 } cStatus = PcdComMF522 ( PCD_AUTHENT, ucComMF522Buf, 12, ucComMF522Buf, & ulLen ); - 8006052: f107 0214 add.w r2, r7, #20 - 8006056: f107 0114 add.w r1, r7, #20 - 800605a: f107 0310 add.w r3, r7, #16 - 800605e: 9300 str r3, [sp, #0] - 8006060: 4613 mov r3, r2 - 8006062: 220c movs r2, #12 - 8006064: 200e movs r0, #14 - 8006066: f7ff fdf7 bl 8005c58 - 800606a: 4603 mov r3, r0 - 800606c: f887 3027 strb.w r3, [r7, #39] ; 0x27 + 80060f4: f107 0214 add.w r2, r7, #20 + 80060f8: f107 0114 add.w r1, r7, #20 + 80060fc: f107 0310 add.w r3, r7, #16 + 8006100: 9300 str r3, [sp, #0] + 8006102: 4613 mov r3, r2 + 8006104: 220c movs r2, #12 + 8006106: 200e movs r0, #14 + 8006108: f7ff fda6 bl 8005c58 + 800610c: 4603 mov r3, r0 + 800610e: f887 3027 strb.w r3, [r7, #39] ; 0x27 if ( ( cStatus != MI_OK ) || ( ! ( ReadRawRC ( Status2Reg ) & 0x08 ) ) ) - 8006070: f897 3027 ldrb.w r3, [r7, #39] ; 0x27 - 8006074: 2b00 cmp r3, #0 - 8006076: d107 bne.n 8006088 - 8006078: 2008 movs r0, #8 - 800607a: f7ff fcdd bl 8005a38 - 800607e: 4603 mov r3, r0 - 8006080: f003 0308 and.w r3, r3, #8 - 8006084: 2b00 cmp r3, #0 - 8006086: d102 bne.n 800608e + 8006112: f897 3027 ldrb.w r3, [r7, #39] ; 0x27 + 8006116: 2b00 cmp r3, #0 + 8006118: d107 bne.n 800612a + 800611a: 2008 movs r0, #8 + 800611c: f7ff fc8c bl 8005a38 + 8006120: 4603 mov r3, r0 + 8006122: f003 0308 and.w r3, r3, #8 + 8006126: 2b00 cmp r3, #0 + 8006128: d102 bne.n 8006130 { // if(cStatus != MI_OK) // printf("666") ; // else // printf("888"); cStatus = MI_ERR; - 8006088: 2302 movs r3, #2 - 800608a: f887 3027 strb.w r3, [r7, #39] ; 0x27 + 800612a: 2302 movs r3, #2 + 800612c: f887 3027 strb.w r3, [r7, #39] ; 0x27 } return cStatus; - 800608e: f897 3027 ldrb.w r3, [r7, #39] ; 0x27 + 8006130: f897 3027 ldrb.w r3, [r7, #39] ; 0x27 } - 8006092: 4618 mov r0, r3 - 8006094: 3728 adds r7, #40 ; 0x28 - 8006096: 46bd mov sp, r7 - 8006098: bd80 pop {r7, pc} + 8006134: 4618 mov r0, r3 + 8006136: 3728 adds r7, #40 ; 0x28 + 8006138: 46bd mov sp, r7 + 800613a: bd80 pop {r7, pc} -0800609a : - * 返回 : 状态值 - * = MI_OK，成功 - * 调用 ：外部调用 - */ -char PcdRead ( uint8_t ucAddr, uint8_t * pData ) -{ - 800609a: b580 push {r7, lr} - 800609c: b08a sub sp, #40 ; 0x28 - 800609e: af02 add r7, sp, #8 - 80060a0: 4603 mov r3, r0 - 80060a2: 6039 str r1, [r7, #0] - 80060a4: 71fb strb r3, [r7, #7] - char cStatus; - uint8_t uc, ucComMF522Buf [ MAXRLEN ]; - uint32_t ulLen; - ucComMF522Buf [ 0 ] = PICC_READ; - 80060a6: 2330 movs r3, #48 ; 0x30 - 80060a8: 733b strb r3, [r7, #12] - ucComMF522Buf [ 1 ] = ucAddr; - 80060aa: 79fb ldrb r3, [r7, #7] - 80060ac: 737b strb r3, [r7, #13] - CalulateCRC ( ucComMF522Buf, 2, & ucComMF522Buf [ 2 ] ); - 80060ae: f107 030c add.w r3, r7, #12 - 80060b2: 1c9a adds r2, r3, #2 - 80060b4: f107 030c add.w r3, r7, #12 - 80060b8: 2102 movs r1, #2 - 80060ba: 4618 mov r0, r3 - 80060bc: f7ff ff3b bl 8005f36 - cStatus = PcdComMF522 ( PCD_TRANSCEIVE, ucComMF522Buf, 4, ucComMF522Buf, & ulLen ); - 80060c0: f107 020c add.w r2, r7, #12 - 80060c4: f107 010c add.w r1, r7, #12 - 80060c8: f107 0308 add.w r3, r7, #8 - 80060cc: 9300 str r3, [sp, #0] - 80060ce: 4613 mov r3, r2 - 80060d0: 2204 movs r2, #4 - 80060d2: 200c movs r0, #12 - 80060d4: f7ff fdc0 bl 8005c58 - 80060d8: 4603 mov r3, r0 - 80060da: 77fb strb r3, [r7, #31] - if ( ( cStatus == MI_OK ) && ( ulLen == 0x90 ) ) - 80060dc: 7ffb ldrb r3, [r7, #31] - 80060de: 2b00 cmp r3, #0 - 80060e0: d116 bne.n 8006110 - 80060e2: 68bb ldr r3, [r7, #8] - 80060e4: 2b90 cmp r3, #144 ; 0x90 - 80060e6: d113 bne.n 8006110 - { - for ( uc = 0; uc < 16; uc ++ ) - 80060e8: 2300 movs r3, #0 - 80060ea: 77bb strb r3, [r7, #30] - 80060ec: e00c b.n 8006108 - { - * ( pData + uc ) = ucComMF522Buf [ uc ]; - 80060ee: 7fba ldrb r2, [r7, #30] - 80060f0: 7fbb ldrb r3, [r7, #30] - 80060f2: 6839 ldr r1, [r7, #0] - 80060f4: 440b add r3, r1 - 80060f6: f107 0120 add.w r1, r7, #32 - 80060fa: 440a add r2, r1 - 80060fc: f812 2c14 ldrb.w r2, [r2, #-20] - 8006100: 701a strb r2, [r3, #0] - for ( uc = 0; uc < 16; uc ++ ) - 8006102: 7fbb ldrb r3, [r7, #30] - 8006104: 3301 adds r3, #1 - 8006106: 77bb strb r3, [r7, #30] - 8006108: 7fbb ldrb r3, [r7, #30] - 800610a: 2b0f cmp r3, #15 - 800610c: d9ef bls.n 80060ee - if ( ( cStatus == MI_OK ) && ( ulLen == 0x90 ) ) - 800610e: e001 b.n 8006114 - } - } - else - { - cStatus = MI_ERR; - 8006110: 2302 movs r3, #2 - 8006112: 77fb strb r3, [r7, #31] - } - return cStatus; - 8006114: 7ffb ldrb r3, [r7, #31] - -} - 8006116: 4618 mov r0, r3 - 8006118: 3720 adds r7, #32 - 800611a: 46bd mov sp, r7 - 800611c: bd80 pop {r7, pc} - -0800611e : +0800613c : PcdHalt (); } void RC522_Init ( void ) { - 800611e: b580 push {r7, lr} - 8006120: af00 add r7, sp, #0 + 800613c: b580 push {r7, lr} + 800613e: af00 add r7, sp, #0 PcdReset (); - 8006122: f7ff fd39 bl 8005b98 + 8006140: f7ff fd2a bl 8005b98 M500PcdConfigISOType ( 'A' );//设置工作方式 - 8006126: 2041 movs r0, #65 ; 0x41 - 8006128: f7ff fd65 bl 8005bf6 + 8006144: 2041 movs r0, #65 ; 0x41 + 8006146: f7ff fd56 bl 8005bf6 } - 800612c: bf00 nop - 800612e: bd80 pop {r7, pc} + 800614a: bf00 nop + 800614c: bd80 pop {r7, pc} + ... -08006130 : +08006150 : //SPI写数据 //向触摸屏IC写入1byte数据 //num:要写入的数据 void TP_Write_Byte(char num) { - 8006130: b580 push {r7, lr} - 8006132: b084 sub sp, #16 - 8006134: af00 add r7, sp, #0 - 8006136: 4603 mov r3, r0 - 8006138: 71fb strb r3, [r7, #7] + 8006150: b580 push {r7, lr} + 8006152: b084 sub sp, #16 + 8006154: af00 add r7, sp, #0 + 8006156: 4603 mov r3, r0 + 8006158: 71fb strb r3, [r7, #7] for(uint8_t count=0;count<8;count++) - 800613a: 2300 movs r3, #0 - 800613c: 73fb strb r3, [r7, #15] - 800613e: e020 b.n 8006182 + 800615a: 2300 movs r3, #0 + 800615c: 73fb strb r3, [r7, #15] + 800615e: e020 b.n 80061a2 { if(num&0x80){TDIN(1);} - 8006140: f997 3007 ldrsb.w r3, [r7, #7] - 8006144: 2b00 cmp r3, #0 - 8006146: da06 bge.n 8006156 - 8006148: 2201 movs r2, #1 - 800614a: f44f 7100 mov.w r1, #512 ; 0x200 - 800614e: 4811 ldr r0, [pc, #68] ; (8006194 ) - 8006150: f7fb ffd1 bl 80020f6 - 8006154: e005 b.n 8006162 + 8006160: f997 3007 ldrsb.w r3, [r7, #7] + 8006164: 2b00 cmp r3, #0 + 8006166: da06 bge.n 8006176 + 8006168: 2201 movs r2, #1 + 800616a: f44f 7100 mov.w r1, #512 ; 0x200 + 800616e: 4811 ldr r0, [pc, #68] ; (80061b4 ) + 8006170: f7fb ffc1 bl 80020f6 + 8006174: e005 b.n 8006182 else {TDIN(0);} - 8006156: 2200 movs r2, #0 - 8006158: f44f 7100 mov.w r1, #512 ; 0x200 - 800615c: 480d ldr r0, [pc, #52] ; (8006194 ) - 800615e: f7fb ffca bl 80020f6 + 8006176: 2200 movs r2, #0 + 8006178: f44f 7100 mov.w r1, #512 ; 0x200 + 800617c: 480d ldr r0, [pc, #52] ; (80061b4 ) + 800617e: f7fb ffba bl 80020f6 num<<=1; - 8006162: 79fb ldrb r3, [r7, #7] - 8006164: 005b lsls r3, r3, #1 - 8006166: 71fb strb r3, [r7, #7] + 8006182: 79fb ldrb r3, [r7, #7] + 8006184: 005b lsls r3, r3, #1 + 8006186: 71fb strb r3, [r7, #7] TCLK(0); - 8006168: 2200 movs r2, #0 - 800616a: 2102 movs r1, #2 - 800616c: 480a ldr r0, [pc, #40] ; (8006198 ) - 800616e: f7fb ffc2 bl 80020f6 + 8006188: 2200 movs r2, #0 + 800618a: 2102 movs r1, #2 + 800618c: 480a ldr r0, [pc, #40] ; (80061b8 ) + 800618e: f7fb ffb2 bl 80020f6 TCLK(1); //上升沿有效 - 8006172: 2201 movs r2, #1 - 8006174: 2102 movs r1, #2 - 8006176: 4808 ldr r0, [pc, #32] ; (8006198 ) - 8006178: f7fb ffbd bl 80020f6 + 8006192: 2201 movs r2, #1 + 8006194: 2102 movs r1, #2 + 8006196: 4808 ldr r0, [pc, #32] ; (80061b8 ) + 8006198: f7fb ffad bl 80020f6 for(uint8_t count=0;count<8;count++) - 800617c: 7bfb ldrb r3, [r7, #15] - 800617e: 3301 adds r3, #1 - 8006180: 73fb strb r3, [r7, #15] - 8006182: 7bfb ldrb r3, [r7, #15] - 8006184: 2b07 cmp r3, #7 - 8006186: d9db bls.n 8006140 + 800619c: 7bfb ldrb r3, [r7, #15] + 800619e: 3301 adds r3, #1 + 80061a0: 73fb strb r3, [r7, #15] + 80061a2: 7bfb ldrb r3, [r7, #15] + 80061a4: 2b07 cmp r3, #7 + 80061a6: d9db bls.n 8006160 } } - 8006188: bf00 nop - 800618a: bf00 nop - 800618c: 3710 adds r7, #16 - 800618e: 46bd mov sp, r7 - 8006190: bd80 pop {r7, pc} - 8006192: bf00 nop - 8006194: 40011c00 .word 0x40011c00 - 8006198: 40010c00 .word 0x40010c00 + 80061a8: bf00 nop + 80061aa: bf00 nop + 80061ac: 3710 adds r7, #16 + 80061ae: 46bd mov sp, r7 + 80061b0: bd80 pop {r7, pc} + 80061b2: bf00 nop + 80061b4: 40011c00 .word 0x40011c00 + 80061b8: 40010c00 .word 0x40010c00 -0800619c : +080061bc : //SPI读数据 //从触摸屏IC读取adc值 //CMD:指令 //返回值:读到的数据 uint16_t TP_Read_AD(char CMD) { - 800619c: b580 push {r7, lr} - 800619e: b084 sub sp, #16 - 80061a0: af00 add r7, sp, #0 - 80061a2: 4603 mov r3, r0 - 80061a4: 71fb strb r3, [r7, #7] + 80061bc: b580 push {r7, lr} + 80061be: b084 sub sp, #16 + 80061c0: af00 add r7, sp, #0 + 80061c2: 4603 mov r3, r0 + 80061c4: 71fb strb r3, [r7, #7] uint16_t Num=0; - 80061a6: 2300 movs r3, #0 - 80061a8: 81fb strh r3, [r7, #14] + 80061c6: 2300 movs r3, #0 + 80061c8: 81fb strh r3, [r7, #14] TCLK(0); //先拉低时钟 - 80061aa: 2200 movs r2, #0 - 80061ac: 2102 movs r1, #2 - 80061ae: 482b ldr r0, [pc, #172] ; (800625c ) - 80061b0: f7fb ffa1 bl 80020f6 + 80061ca: 2200 movs r2, #0 + 80061cc: 2102 movs r1, #2 + 80061ce: 482b ldr r0, [pc, #172] ; (800627c ) + 80061d0: f7fb ff91 bl 80020f6 TDIN(0); //拉低数据线 - 80061b4: 2200 movs r2, #0 - 80061b6: f44f 7100 mov.w r1, #512 ; 0x200 - 80061ba: 4829 ldr r0, [pc, #164] ; (8006260 ) - 80061bc: f7fb ff9b bl 80020f6 + 80061d4: 2200 movs r2, #0 + 80061d6: f44f 7100 mov.w r1, #512 ; 0x200 + 80061da: 4829 ldr r0, [pc, #164] ; (8006280 ) + 80061dc: f7fb ff8b bl 80020f6 TCS(0); //选中触摸屏IC - 80061c0: 2200 movs r2, #0 - 80061c2: 2104 movs r1, #4 - 80061c4: 4825 ldr r0, [pc, #148] ; (800625c ) - 80061c6: f7fb ff96 bl 80020f6 + 80061e0: 2200 movs r2, #0 + 80061e2: 2104 movs r1, #4 + 80061e4: 4825 ldr r0, [pc, #148] ; (800627c ) + 80061e6: f7fb ff86 bl 80020f6 TP_Write_Byte(CMD);//发送命令字 - 80061ca: 79fb ldrb r3, [r7, #7] - 80061cc: 4618 mov r0, r3 - 80061ce: f7ff ffaf bl 8006130 + 80061ea: 79fb ldrb r3, [r7, #7] + 80061ec: 4618 mov r0, r3 + 80061ee: f7ff ffaf bl 8006150 HAL_GetTick(); //稍微延时，ad转换需要时间 - 80061d2: f7fb fca9 bl 8001b28 + 80061f2: f7fb fc99 bl 8001b28 HAL_GetTick(); - 80061d6: f7fb fca7 bl 8001b28 + 80061f6: f7fb fc97 bl 8001b28 HAL_GetTick(); - 80061da: f7fb fca5 bl 8001b28 + 80061fa: f7fb fc95 bl 8001b28 HAL_GetTick(); - 80061de: f7fb fca3 bl 8001b28 + 80061fe: f7fb fc93 bl 8001b28 HAL_GetTick(); - 80061e2: f7fb fca1 bl 8001b28 + 8006202: f7fb fc91 bl 8001b28 HAL_GetTick(); - 80061e6: f7fb fc9f bl 8001b28 + 8006206: f7fb fc8f bl 8001b28 TCLK(1); //给1个时钟，清除BUSY - 80061ea: 2201 movs r2, #1 - 80061ec: 2102 movs r1, #2 - 80061ee: 481b ldr r0, [pc, #108] ; (800625c ) - 80061f0: f7fb ff81 bl 80020f6 + 800620a: 2201 movs r2, #1 + 800620c: 2102 movs r1, #2 + 800620e: 481b ldr r0, [pc, #108] ; (800627c ) + 8006210: f7fb ff71 bl 80020f6 TCLK(0); - 80061f4: 2200 movs r2, #0 - 80061f6: 2102 movs r1, #2 - 80061f8: 4818 ldr r0, [pc, #96] ; (800625c ) - 80061fa: f7fb ff7c bl 80020f6 + 8006214: 2200 movs r2, #0 + 8006216: 2102 movs r1, #2 + 8006218: 4818 ldr r0, [pc, #96] ; (800627c ) + 800621a: f7fb ff6c bl 80020f6 for(uint8_t count=0;count<16;count++)//读出16位数据,只有高12位有效 - 80061fe: 2300 movs r3, #0 - 8006200: 737b strb r3, [r7, #13] - 8006202: e01a b.n 800623a + 800621e: 2300 movs r3, #0 + 8006220: 737b strb r3, [r7, #13] + 8006222: e01a b.n 800625a { Num<<=1; - 8006204: 89fb ldrh r3, [r7, #14] - 8006206: 005b lsls r3, r3, #1 - 8006208: 81fb strh r3, [r7, #14] + 8006224: 89fb ldrh r3, [r7, #14] + 8006226: 005b lsls r3, r3, #1 + 8006228: 81fb strh r3, [r7, #14] TCLK(0); //下降沿有效 - 800620a: 2200 movs r2, #0 - 800620c: 2102 movs r1, #2 - 800620e: 4813 ldr r0, [pc, #76] ; (800625c ) - 8006210: f7fb ff71 bl 80020f6 + 800622a: 2200 movs r2, #0 + 800622c: 2102 movs r1, #2 + 800622e: 4813 ldr r0, [pc, #76] ; (800627c ) + 8006230: f7fb ff61 bl 80020f6 TCLK(1);; - 8006214: 2201 movs r2, #1 - 8006216: 2102 movs r1, #2 - 8006218: 4810 ldr r0, [pc, #64] ; (800625c ) - 800621a: f7fb ff6c bl 80020f6 + 8006234: 2201 movs r2, #1 + 8006236: 2102 movs r1, #2 + 8006238: 4810 ldr r0, [pc, #64] ; (800627c ) + 800623a: f7fb ff5c bl 80020f6 if(TDOUT){Num++;} - 800621e: f44f 7180 mov.w r1, #256 ; 0x100 - 8006222: 480f ldr r0, [pc, #60] ; (8006260 ) - 8006224: f7fb ff50 bl 80020c8 - 8006228: 4603 mov r3, r0 - 800622a: 2b00 cmp r3, #0 - 800622c: d002 beq.n 8006234 - 800622e: 89fb ldrh r3, [r7, #14] - 8006230: 3301 adds r3, #1 - 8006232: 81fb strh r3, [r7, #14] + 800623e: f44f 7180 mov.w r1, #256 ; 0x100 + 8006242: 480f ldr r0, [pc, #60] ; (8006280 ) + 8006244: f7fb ff40 bl 80020c8 + 8006248: 4603 mov r3, r0 + 800624a: 2b00 cmp r3, #0 + 800624c: d002 beq.n 8006254 + 800624e: 89fb ldrh r3, [r7, #14] + 8006250: 3301 adds r3, #1 + 8006252: 81fb strh r3, [r7, #14] for(uint8_t count=0;count<16;count++)//读出16位数据,只有高12位有效 - 8006234: 7b7b ldrb r3, [r7, #13] - 8006236: 3301 adds r3, #1 - 8006238: 737b strb r3, [r7, #13] - 800623a: 7b7b ldrb r3, [r7, #13] - 800623c: 2b0f cmp r3, #15 - 800623e: d9e1 bls.n 8006204 + 8006254: 7b7b ldrb r3, [r7, #13] + 8006256: 3301 adds r3, #1 + 8006258: 737b strb r3, [r7, #13] + 800625a: 7b7b ldrb r3, [r7, #13] + 800625c: 2b0f cmp r3, #15 + 800625e: d9e1 bls.n 8006224 } Num>>=4; //只有高12位有效. - 8006240: 89fb ldrh r3, [r7, #14] - 8006242: 091b lsrs r3, r3, #4 - 8006244: 81fb strh r3, [r7, #14] + 8006260: 89fb ldrh r3, [r7, #14] + 8006262: 091b lsrs r3, r3, #4 + 8006264: 81fb strh r3, [r7, #14] TCS(1); //释放片选 - 8006246: 2201 movs r2, #1 - 8006248: 2104 movs r1, #4 - 800624a: 4804 ldr r0, [pc, #16] ; (800625c ) - 800624c: f7fb ff53 bl 80020f6 + 8006266: 2201 movs r2, #1 + 8006268: 2104 movs r1, #4 + 800626a: 4804 ldr r0, [pc, #16] ; (800627c ) + 800626c: f7fb ff43 bl 80020f6 return(Num); - 8006250: 89fb ldrh r3, [r7, #14] + 8006270: 89fb ldrh r3, [r7, #14] } - 8006252: 4618 mov r0, r3 - 8006254: 3710 adds r7, #16 - 8006256: 46bd mov sp, r7 - 8006258: bd80 pop {r7, pc} - 800625a: bf00 nop - 800625c: 40010c00 .word 0x40010c00 - 8006260: 40011c00 .word 0x40011c00 + 8006272: 4618 mov r0, r3 + 8006274: 3710 adds r7, #16 + 8006276: 46bd mov sp, r7 + 8006278: bd80 pop {r7, pc} + 800627a: bf00 nop + 800627c: 40010c00 .word 0x40010c00 + 8006280: 40011c00 .word 0x40011c00 -08006264 : +08006284 : //xy:指令（CMD_RDX/CMD_RDY） //返回值:读到的数据 #define READ_TIMES 5 //读取次数 #define LOST_VAL 1 //丢弃值 uint16_t TP_Read_XOY(uint8_t xy) { - 8006264: b590 push {r4, r7, lr} - 8006266: b089 sub sp, #36 ; 0x24 - 8006268: af00 add r7, sp, #0 - 800626a: 4603 mov r3, r0 - 800626c: 71fb strb r3, [r7, #7] + 8006284: b590 push {r4, r7, lr} + 8006286: b089 sub sp, #36 ; 0x24 + 8006288: af00 add r7, sp, #0 + 800628a: 4603 mov r3, r0 + 800628c: 71fb strb r3, [r7, #7] uint16_t i, j; uint16_t buf[READ_TIMES]; uint16_t sum=0; - 800626e: 2300 movs r3, #0 - 8006270: 837b strh r3, [r7, #26] + 800628e: 2300 movs r3, #0 + 8006290: 837b strh r3, [r7, #26] uint16_t temp; for(i=0;i - 8006278: 8bfc ldrh r4, [r7, #30] - 800627a: 79fb ldrb r3, [r7, #7] - 800627c: 4618 mov r0, r3 - 800627e: f7ff ff8d bl 800619c - 8006282: 4603 mov r3, r0 - 8006284: 461a mov r2, r3 - 8006286: 0063 lsls r3, r4, #1 - 8006288: f107 0120 add.w r1, r7, #32 - 800628c: 440b add r3, r1 - 800628e: f823 2c14 strh.w r2, [r3, #-20] - 8006292: 8bfb ldrh r3, [r7, #30] - 8006294: 3301 adds r3, #1 - 8006296: 83fb strh r3, [r7, #30] - 8006298: 8bfb ldrh r3, [r7, #30] - 800629a: 2b04 cmp r3, #4 - 800629c: d9ec bls.n 8006278 + 8006292: 2300 movs r3, #0 + 8006294: 83fb strh r3, [r7, #30] + 8006296: e00f b.n 80062b8 + 8006298: 8bfc ldrh r4, [r7, #30] + 800629a: 79fb ldrb r3, [r7, #7] + 800629c: 4618 mov r0, r3 + 800629e: f7ff ff8d bl 80061bc + 80062a2: 4603 mov r3, r0 + 80062a4: 461a mov r2, r3 + 80062a6: 0063 lsls r3, r4, #1 + 80062a8: f107 0120 add.w r1, r7, #32 + 80062ac: 440b add r3, r1 + 80062ae: f823 2c14 strh.w r2, [r3, #-20] + 80062b2: 8bfb ldrh r3, [r7, #30] + 80062b4: 3301 adds r3, #1 + 80062b6: 83fb strh r3, [r7, #30] + 80062b8: 8bfb ldrh r3, [r7, #30] + 80062ba: 2b04 cmp r3, #4 + 80062bc: d9ec bls.n 8006298 for(i=0;i + 80062be: 2300 movs r3, #0 + 80062c0: 83fb strh r3, [r7, #30] + 80062c2: e03b b.n 800633c { for(j=i+1;j + 80062c4: 8bfb ldrh r3, [r7, #30] + 80062c6: 3301 adds r3, #1 + 80062c8: 83bb strh r3, [r7, #28] + 80062ca: e031 b.n 8006330 { if(buf[i]>buf[j])//升序排列 - 80062ac: 8bfb ldrh r3, [r7, #30] - 80062ae: 005b lsls r3, r3, #1 - 80062b0: f107 0220 add.w r2, r7, #32 - 80062b4: 4413 add r3, r2 - 80062b6: f833 2c14 ldrh.w r2, [r3, #-20] - 80062ba: 8bbb ldrh r3, [r7, #28] - 80062bc: 005b lsls r3, r3, #1 - 80062be: f107 0120 add.w r1, r7, #32 - 80062c2: 440b add r3, r1 - 80062c4: f833 3c14 ldrh.w r3, [r3, #-20] - 80062c8: 429a cmp r2, r3 - 80062ca: d91e bls.n 800630a - { - temp=buf[i]; 80062cc: 8bfb ldrh r3, [r7, #30] 80062ce: 005b lsls r3, r3, #1 80062d0: f107 0220 add.w r2, r7, #32 80062d4: 4413 add r3, r2 - 80062d6: f833 3c14 ldrh.w r3, [r3, #-20] - 80062da: 833b strh r3, [r7, #24] + 80062d6: f833 2c14 ldrh.w r2, [r3, #-20] + 80062da: 8bbb ldrh r3, [r7, #28] + 80062dc: 005b lsls r3, r3, #1 + 80062de: f107 0120 add.w r1, r7, #32 + 80062e2: 440b add r3, r1 + 80062e4: f833 3c14 ldrh.w r3, [r3, #-20] + 80062e8: 429a cmp r2, r3 + 80062ea: d91e bls.n 800632a + { + temp=buf[i]; + 80062ec: 8bfb ldrh r3, [r7, #30] + 80062ee: 005b lsls r3, r3, #1 + 80062f0: f107 0220 add.w r2, r7, #32 + 80062f4: 4413 add r3, r2 + 80062f6: f833 3c14 ldrh.w r3, [r3, #-20] + 80062fa: 833b strh r3, [r7, #24] buf[i]=buf[j]; - 80062dc: 8bbb ldrh r3, [r7, #28] - 80062de: 8bfa ldrh r2, [r7, #30] - 80062e0: 005b lsls r3, r3, #1 - 80062e2: f107 0120 add.w r1, r7, #32 - 80062e6: 440b add r3, r1 - 80062e8: f833 1c14 ldrh.w r1, [r3, #-20] - 80062ec: 0053 lsls r3, r2, #1 - 80062ee: f107 0220 add.w r2, r7, #32 - 80062f2: 4413 add r3, r2 - 80062f4: 460a mov r2, r1 - 80062f6: f823 2c14 strh.w r2, [r3, #-20] + 80062fc: 8bbb ldrh r3, [r7, #28] + 80062fe: 8bfa ldrh r2, [r7, #30] + 8006300: 005b lsls r3, r3, #1 + 8006302: f107 0120 add.w r1, r7, #32 + 8006306: 440b add r3, r1 + 8006308: f833 1c14 ldrh.w r1, [r3, #-20] + 800630c: 0053 lsls r3, r2, #1 + 800630e: f107 0220 add.w r2, r7, #32 + 8006312: 4413 add r3, r2 + 8006314: 460a mov r2, r1 + 8006316: f823 2c14 strh.w r2, [r3, #-20] buf[j]=temp; - 80062fa: 8bbb ldrh r3, [r7, #28] - 80062fc: 005b lsls r3, r3, #1 - 80062fe: f107 0220 add.w r2, r7, #32 - 8006302: 4413 add r3, r2 - 8006304: 8b3a ldrh r2, [r7, #24] - 8006306: f823 2c14 strh.w r2, [r3, #-20] + 800631a: 8bbb ldrh r3, [r7, #28] + 800631c: 005b lsls r3, r3, #1 + 800631e: f107 0220 add.w r2, r7, #32 + 8006322: 4413 add r3, r2 + 8006324: 8b3a ldrh r2, [r7, #24] + 8006326: f823 2c14 strh.w r2, [r3, #-20] for(j=i+1;j + 800632a: 8bbb ldrh r3, [r7, #28] + 800632c: 3301 adds r3, #1 + 800632e: 83bb strh r3, [r7, #28] + 8006330: 8bbb ldrh r3, [r7, #28] + 8006332: 2b04 cmp r3, #4 + 8006334: d9ca bls.n 80062cc for(i=0;i + 8006336: 8bfb ldrh r3, [r7, #30] + 8006338: 3301 adds r3, #1 + 800633a: 83fb strh r3, [r7, #30] + 800633c: 8bfb ldrh r3, [r7, #30] + 800633e: 2b03 cmp r3, #3 + 8006340: d9c0 bls.n 80062c4 } } } sum=0; - 8006322: 2300 movs r3, #0 - 8006324: 837b strh r3, [r7, #26] + 8006342: 2300 movs r3, #0 + 8006344: 837b strh r3, [r7, #26] for(i=LOST_VAL;i - 800632c: 8bfb ldrh r3, [r7, #30] - 800632e: 005b lsls r3, r3, #1 - 8006330: f107 0220 add.w r2, r7, #32 - 8006334: 4413 add r3, r2 - 8006336: f833 2c14 ldrh.w r2, [r3, #-20] - 800633a: 8b7b ldrh r3, [r7, #26] - 800633c: 4413 add r3, r2 - 800633e: 837b strh r3, [r7, #26] - 8006340: 8bfb ldrh r3, [r7, #30] - 8006342: 3301 adds r3, #1 - 8006344: 83fb strh r3, [r7, #30] - 8006346: 8bfb ldrh r3, [r7, #30] - 8006348: 2b03 cmp r3, #3 - 800634a: d9ef bls.n 800632c + 8006346: 2301 movs r3, #1 + 8006348: 83fb strh r3, [r7, #30] + 800634a: e00c b.n 8006366 + 800634c: 8bfb ldrh r3, [r7, #30] + 800634e: 005b lsls r3, r3, #1 + 8006350: f107 0220 add.w r2, r7, #32 + 8006354: 4413 add r3, r2 + 8006356: f833 2c14 ldrh.w r2, [r3, #-20] + 800635a: 8b7b ldrh r3, [r7, #26] + 800635c: 4413 add r3, r2 + 800635e: 837b strh r3, [r7, #26] + 8006360: 8bfb ldrh r3, [r7, #30] + 8006362: 3301 adds r3, #1 + 8006364: 83fb strh r3, [r7, #30] + 8006366: 8bfb ldrh r3, [r7, #30] + 8006368: 2b03 cmp r3, #3 + 800636a: d9ef bls.n 800634c temp=sum/(READ_TIMES-2*LOST_VAL); - 800634c: 8b7b ldrh r3, [r7, #26] - 800634e: 4a05 ldr r2, [pc, #20] ; (8006364 ) - 8006350: fba2 2303 umull r2, r3, r2, r3 - 8006354: 085b lsrs r3, r3, #1 - 8006356: 833b strh r3, [r7, #24] + 800636c: 8b7b ldrh r3, [r7, #26] + 800636e: 4a05 ldr r2, [pc, #20] ; (8006384 ) + 8006370: fba2 2303 umull r2, r3, r2, r3 + 8006374: 085b lsrs r3, r3, #1 + 8006376: 833b strh r3, [r7, #24] return temp; - 8006358: 8b3b ldrh r3, [r7, #24] + 8006378: 8b3b ldrh r3, [r7, #24] } - 800635a: 4618 mov r0, r3 - 800635c: 3724 adds r7, #36 ; 0x24 - 800635e: 46bd mov sp, r7 - 8006360: bd90 pop {r4, r7, pc} - 8006362: bf00 nop - 8006364: aaaaaaab .word 0xaaaaaaab + 800637a: 4618 mov r0, r3 + 800637c: 3724 adds r7, #36 ; 0x24 + 800637e: 46bd mov sp, r7 + 8006380: bd90 pop {r4, r7, pc} + 8006382: bf00 nop + 8006384: aaaaaaab .word 0xaaaaaaab -08006368 : +08006388 : //读取x,y坐标 //x,y:读取到的坐标ADC值 void TP_Read_XY_ADC(int16_t *x,int16_t *y) { - 8006368: b580 push {r7, lr} - 800636a: b084 sub sp, #16 - 800636c: af00 add r7, sp, #0 - 800636e: 6078 str r0, [r7, #4] - 8006370: 6039 str r1, [r7, #0] + 8006388: b580 push {r7, lr} + 800638a: b084 sub sp, #16 + 800638c: af00 add r7, sp, #0 + 800638e: 6078 str r0, [r7, #4] + 8006390: 6039 str r1, [r7, #0] int16_t xtemp,ytemp; xtemp=TP_Read_XOY(CMD_RDX); - 8006372: 2090 movs r0, #144 ; 0x90 - 8006374: f7ff ff76 bl 8006264 - 8006378: 4603 mov r3, r0 - 800637a: 81fb strh r3, [r7, #14] + 8006392: 2090 movs r0, #144 ; 0x90 + 8006394: f7ff ff76 bl 8006284 + 8006398: 4603 mov r3, r0 + 800639a: 81fb strh r3, [r7, #14] ytemp=TP_Read_XOY(CMD_RDY); - 800637c: 20d0 movs r0, #208 ; 0xd0 - 800637e: f7ff ff71 bl 8006264 - 8006382: 4603 mov r3, r0 - 8006384: 81bb strh r3, [r7, #12] + 800639c: 20d0 movs r0, #208 ; 0xd0 + 800639e: f7ff ff71 bl 8006284 + 80063a2: 4603 mov r3, r0 + 80063a4: 81bb strh r3, [r7, #12] *x=xtemp; - 8006386: 687b ldr r3, [r7, #4] - 8006388: 89fa ldrh r2, [r7, #14] - 800638a: 801a strh r2, [r3, #0] + 80063a6: 687b ldr r3, [r7, #4] + 80063a8: 89fa ldrh r2, [r7, #14] + 80063aa: 801a strh r2, [r3, #0] *y=ytemp; - 800638c: 683b ldr r3, [r7, #0] - 800638e: 89ba ldrh r2, [r7, #12] - 8006390: 801a strh r2, [r3, #0] + 80063ac: 683b ldr r3, [r7, #0] + 80063ae: 89ba ldrh r2, [r7, #12] + 80063b0: 801a strh r2, [r3, #0] } - 8006392: bf00 nop - 8006394: 3710 adds r7, #16 - 8006396: 46bd mov sp, r7 - 8006398: bd80 pop {r7, pc} + 80063b2: bf00 nop + 80063b4: 3710 adds r7, #16 + 80063b6: 46bd mov sp, r7 + 80063b8: bd80 pop {r7, pc} -0800639a : +080063ba : //该函数能大大提高准确度 //x,y:读取到的坐标值 //返回值:0,失败;1,成功。 #define ERR_RANGE 10 //误差范围 uint8_t TP_Read_XY2(int16_t *x,int16_t *y) { - 800639a: b580 push {r7, lr} - 800639c: b084 sub sp, #16 - 800639e: af00 add r7, sp, #0 - 80063a0: 6078 str r0, [r7, #4] - 80063a2: 6039 str r1, [r7, #0] + 80063ba: b580 push {r7, lr} + 80063bc: b084 sub sp, #16 + 80063be: af00 add r7, sp, #0 + 80063c0: 6078 str r0, [r7, #4] + 80063c2: 6039 str r1, [r7, #0] int16_t x1,y1; int16_t x2,y2; TP_Read_XY_ADC(&x1,&y1); - 80063a4: f107 020c add.w r2, r7, #12 - 80063a8: f107 030e add.w r3, r7, #14 - 80063ac: 4611 mov r1, r2 - 80063ae: 4618 mov r0, r3 - 80063b0: f7ff ffda bl 8006368 + 80063c4: f107 020c add.w r2, r7, #12 + 80063c8: f107 030e add.w r3, r7, #14 + 80063cc: 4611 mov r1, r2 + 80063ce: 4618 mov r0, r3 + 80063d0: f7ff ffda bl 8006388 TP_Read_XY_ADC(&x2,&y2); - 80063b4: f107 0208 add.w r2, r7, #8 - 80063b8: f107 030a add.w r3, r7, #10 - 80063bc: 4611 mov r1, r2 - 80063be: 4618 mov r0, r3 - 80063c0: f7ff ffd2 bl 8006368 + 80063d4: f107 0208 add.w r2, r7, #8 + 80063d8: f107 030a add.w r3, r7, #10 + 80063dc: 4611 mov r1, r2 + 80063de: 4618 mov r0, r3 + 80063e0: f7ff ffd2 bl 8006388 if(((x2<=x1&&x1 - 80063d0: f9b7 300a ldrsh.w r3, [r7, #10] - 80063d4: 3309 adds r3, #9 - 80063d6: f9b7 200e ldrsh.w r2, [r7, #14] - 80063da: 4293 cmp r3, r2 - 80063dc: da0c bge.n 80063f8 - 80063de: f9b7 200e ldrsh.w r2, [r7, #14] - 80063e2: f9b7 300a ldrsh.w r3, [r7, #10] - 80063e6: 429a cmp r2, r3 - 80063e8: dc3a bgt.n 8006460 - 80063ea: f9b7 300e ldrsh.w r3, [r7, #14] - 80063ee: 3309 adds r3, #9 - 80063f0: f9b7 200a ldrsh.w r2, [r7, #10] - 80063f4: 4293 cmp r3, r2 - 80063f6: db33 blt.n 8006460 + 80063e4: f9b7 200a ldrsh.w r2, [r7, #10] + 80063e8: f9b7 300e ldrsh.w r3, [r7, #14] + 80063ec: 429a cmp r2, r3 + 80063ee: dc06 bgt.n 80063fe + 80063f0: f9b7 300a ldrsh.w r3, [r7, #10] + 80063f4: 3309 adds r3, #9 + 80063f6: f9b7 200e ldrsh.w r2, [r7, #14] + 80063fa: 4293 cmp r3, r2 + 80063fc: da0c bge.n 8006418 + 80063fe: f9b7 200e ldrsh.w r2, [r7, #14] + 8006402: f9b7 300a ldrsh.w r3, [r7, #10] + 8006406: 429a cmp r2, r3 + 8006408: dc3a bgt.n 8006480 + 800640a: f9b7 300e ldrsh.w r3, [r7, #14] + 800640e: 3309 adds r3, #9 + 8006410: f9b7 200a ldrsh.w r2, [r7, #10] + 8006414: 4293 cmp r3, r2 + 8006416: db33 blt.n 8006480 &&((y2<=y1&&y1 - 8006404: f9b7 3008 ldrsh.w r3, [r7, #8] - 8006408: 3309 adds r3, #9 - 800640a: f9b7 200c ldrsh.w r2, [r7, #12] - 800640e: 4293 cmp r3, r2 - 8006410: da0c bge.n 800642c - 8006412: f9b7 200c ldrsh.w r2, [r7, #12] - 8006416: f9b7 3008 ldrsh.w r3, [r7, #8] - 800641a: 429a cmp r2, r3 - 800641c: dc20 bgt.n 8006460 - 800641e: f9b7 300c ldrsh.w r3, [r7, #12] - 8006422: 3309 adds r3, #9 - 8006424: f9b7 2008 ldrsh.w r2, [r7, #8] - 8006428: 4293 cmp r3, r2 - 800642a: db19 blt.n 8006460 + 8006418: f9b7 2008 ldrsh.w r2, [r7, #8] + 800641c: f9b7 300c ldrsh.w r3, [r7, #12] + 8006420: 429a cmp r2, r3 + 8006422: dc06 bgt.n 8006432 + 8006424: f9b7 3008 ldrsh.w r3, [r7, #8] + 8006428: 3309 adds r3, #9 + 800642a: f9b7 200c ldrsh.w r2, [r7, #12] + 800642e: 4293 cmp r3, r2 + 8006430: da0c bge.n 800644c + 8006432: f9b7 200c ldrsh.w r2, [r7, #12] + 8006436: f9b7 3008 ldrsh.w r3, [r7, #8] + 800643a: 429a cmp r2, r3 + 800643c: dc20 bgt.n 8006480 + 800643e: f9b7 300c ldrsh.w r3, [r7, #12] + 8006442: 3309 adds r3, #9 + 8006444: f9b7 2008 ldrsh.w r2, [r7, #8] + 8006448: 4293 cmp r3, r2 + 800644a: db19 blt.n 8006480 { *x=(x1+x2)/2; - 800642c: f9b7 300e ldrsh.w r3, [r7, #14] - 8006430: 461a mov r2, r3 - 8006432: f9b7 300a ldrsh.w r3, [r7, #10] - 8006436: 4413 add r3, r2 - 8006438: 0fda lsrs r2, r3, #31 - 800643a: 4413 add r3, r2 - 800643c: 105b asrs r3, r3, #1 - 800643e: b21a sxth r2, r3 - 8006440: 687b ldr r3, [r7, #4] - 8006442: 801a strh r2, [r3, #0] + 800644c: f9b7 300e ldrsh.w r3, [r7, #14] + 8006450: 461a mov r2, r3 + 8006452: f9b7 300a ldrsh.w r3, [r7, #10] + 8006456: 4413 add r3, r2 + 8006458: 0fda lsrs r2, r3, #31 + 800645a: 4413 add r3, r2 + 800645c: 105b asrs r3, r3, #1 + 800645e: b21a sxth r2, r3 + 8006460: 687b ldr r3, [r7, #4] + 8006462: 801a strh r2, [r3, #0] *y=(y1+y2)/2; - 8006444: f9b7 300c ldrsh.w r3, [r7, #12] - 8006448: 461a mov r2, r3 - 800644a: f9b7 3008 ldrsh.w r3, [r7, #8] - 800644e: 4413 add r3, r2 - 8006450: 0fda lsrs r2, r3, #31 - 8006452: 4413 add r3, r2 - 8006454: 105b asrs r3, r3, #1 - 8006456: b21a sxth r2, r3 - 8006458: 683b ldr r3, [r7, #0] - 800645a: 801a strh r2, [r3, #0] + 8006464: f9b7 300c ldrsh.w r3, [r7, #12] + 8006468: 461a mov r2, r3 + 800646a: f9b7 3008 ldrsh.w r3, [r7, #8] + 800646e: 4413 add r3, r2 + 8006470: 0fda lsrs r2, r3, #31 + 8006472: 4413 add r3, r2 + 8006474: 105b asrs r3, r3, #1 + 8006476: b21a sxth r2, r3 + 8006478: 683b ldr r3, [r7, #0] + 800647a: 801a strh r2, [r3, #0] return 1; - 800645c: 2301 movs r3, #1 - 800645e: e000 b.n 8006462 + 800647c: 2301 movs r3, #1 + 800647e: e000 b.n 8006482 }else return 0; - 8006460: 2300 movs r3, #0 + 8006480: 2300 movs r3, #0 } - 8006462: 4618 mov r0, r3 - 8006464: 3710 adds r7, #16 - 8006466: 46bd mov sp, r7 - 8006468: bd80 pop {r7, pc} + 8006482: 4618 mov r0, r3 + 8006484: 3710 adds r7, #16 + 8006486: 46bd mov sp, r7 + 8006488: bd80 pop {r7, pc} ... -0800646c : +0800648c : touch_device t0;// t0 yyds~ touch_config tconfig; //触摸更新服务，状态机写法，循环获取坐标 void TP_Server() { - 800646c: b598 push {r3, r4, r7, lr} - 800646e: af00 add r7, sp, #0 + 800648c: b598 push {r3, r4, r7, lr} + 800648e: af00 add r7, sp, #0 if(TPEN==0) //如果有触摸 - 8006470: f44f 6180 mov.w r1, #1024 ; 0x400 - 8006474: 4835 ldr r0, [pc, #212] ; (800654c ) - 8006476: f7fb fe27 bl 80020c8 - 800647a: 4603 mov r3, r0 - 800647c: 2b00 cmp r3, #0 - 800647e: d155 bne.n 800652c + 8006490: f44f 6180 mov.w r1, #1024 ; 0x400 + 8006494: 4835 ldr r0, [pc, #212] ; (800656c ) + 8006496: f7fb fe17 bl 80020c8 + 800649a: 4603 mov r3, r0 + 800649c: 2b00 cmp r3, #0 + 800649e: d155 bne.n 800654c { if(TP_Read_XY2(&t0.adc_x,&t0.adc_y)) - 8006480: 4933 ldr r1, [pc, #204] ; (8006550 ) - 8006482: 4834 ldr r0, [pc, #208] ; (8006554 ) - 8006484: f7ff ff89 bl 800639a - 8006488: 4603 mov r3, r0 - 800648a: 2b00 cmp r3, #0 - 800648c: d043 beq.n 8006516 + 80064a0: 4933 ldr r1, [pc, #204] ; (8006570 ) + 80064a2: 4834 ldr r0, [pc, #208] ; (8006574 ) + 80064a4: f7ff ff89 bl 80063ba + 80064a8: 4603 mov r3, r0 + 80064aa: 2b00 cmp r3, #0 + 80064ac: d043 beq.n 8006536 {//先读取ad值 t0.pix_x=(t0.adc_x/tconfig.x_acc)-tconfig.x_offset;//转换为像素坐标 - 800648e: 4b31 ldr r3, [pc, #196] ; (8006554 ) - 8006490: 881b ldrh r3, [r3, #0] - 8006492: 4618 mov r0, r3 - 8006494: f7fa fc6e bl 8000d74 <__aeabi_i2f> - 8006498: 4602 mov r2, r0 - 800649a: 4b2f ldr r3, [pc, #188] ; (8006558 ) - 800649c: 685b ldr r3, [r3, #4] - 800649e: 4619 mov r1, r3 - 80064a0: 4610 mov r0, r2 - 80064a2: f7fa fd6f bl 8000f84 <__aeabi_fdiv> - 80064a6: 4603 mov r3, r0 - 80064a8: 461c mov r4, r3 - 80064aa: 4b2b ldr r3, [pc, #172] ; (8006558 ) - 80064ac: 68db ldr r3, [r3, #12] - 80064ae: 4618 mov r0, r3 - 80064b0: f7fa fc60 bl 8000d74 <__aeabi_i2f> - 80064b4: 4603 mov r3, r0 - 80064b6: 4619 mov r1, r3 - 80064b8: 4620 mov r0, r4 - 80064ba: f7fa fba5 bl 8000c08 <__aeabi_fsub> - 80064be: 4603 mov r3, r0 - 80064c0: 4618 mov r0, r3 - 80064c2: f7fa fdfb bl 80010bc <__aeabi_f2iz> + 80064ae: 4b31 ldr r3, [pc, #196] ; (8006574 ) + 80064b0: 881b ldrh r3, [r3, #0] + 80064b2: 4618 mov r0, r3 + 80064b4: f7fa fc5e bl 8000d74 <__aeabi_i2f> + 80064b8: 4602 mov r2, r0 + 80064ba: 4b2f ldr r3, [pc, #188] ; (8006578 ) + 80064bc: 685b ldr r3, [r3, #4] + 80064be: 4619 mov r1, r3 + 80064c0: 4610 mov r0, r2 + 80064c2: f7fa fd5f bl 8000f84 <__aeabi_fdiv> 80064c6: 4603 mov r3, r0 - 80064c8: 4a22 ldr r2, [pc, #136] ; (8006554 ) - 80064ca: 6053 str r3, [r2, #4] + 80064c8: 461c mov r4, r3 + 80064ca: 4b2b ldr r3, [pc, #172] ; (8006578 ) + 80064cc: 68db ldr r3, [r3, #12] + 80064ce: 4618 mov r0, r3 + 80064d0: f7fa fc50 bl 8000d74 <__aeabi_i2f> + 80064d4: 4603 mov r3, r0 + 80064d6: 4619 mov r1, r3 + 80064d8: 4620 mov r0, r4 + 80064da: f7fa fb95 bl 8000c08 <__aeabi_fsub> + 80064de: 4603 mov r3, r0 + 80064e0: 4618 mov r0, r3 + 80064e2: f7fa fdeb bl 80010bc <__aeabi_f2iz> + 80064e6: 4603 mov r3, r0 + 80064e8: 4a22 ldr r2, [pc, #136] ; (8006574 ) + 80064ea: 6053 str r3, [r2, #4] t0.pix_y=(t0.adc_y/tconfig.y_acc)-tconfig.y_offset; - 80064cc: 4b21 ldr r3, [pc, #132] ; (8006554 ) - 80064ce: 885b ldrh r3, [r3, #2] - 80064d0: 4618 mov r0, r3 - 80064d2: f7fa fc4f bl 8000d74 <__aeabi_i2f> - 80064d6: 4602 mov r2, r0 - 80064d8: 4b1f ldr r3, [pc, #124] ; (8006558 ) - 80064da: 689b ldr r3, [r3, #8] - 80064dc: 4619 mov r1, r3 - 80064de: 4610 mov r0, r2 - 80064e0: f7fa fd50 bl 8000f84 <__aeabi_fdiv> - 80064e4: 4603 mov r3, r0 - 80064e6: 461c mov r4, r3 - 80064e8: 4b1b ldr r3, [pc, #108] ; (8006558 ) - 80064ea: 691b ldr r3, [r3, #16] - 80064ec: 4618 mov r0, r3 - 80064ee: f7fa fc41 bl 8000d74 <__aeabi_i2f> - 80064f2: 4603 mov r3, r0 - 80064f4: 4619 mov r1, r3 - 80064f6: 4620 mov r0, r4 - 80064f8: f7fa fb86 bl 8000c08 <__aeabi_fsub> - 80064fc: 4603 mov r3, r0 - 80064fe: 4618 mov r0, r3 - 8006500: f7fa fddc bl 80010bc <__aeabi_f2iz> + 80064ec: 4b21 ldr r3, [pc, #132] ; (8006574 ) + 80064ee: 885b ldrh r3, [r3, #2] + 80064f0: 4618 mov r0, r3 + 80064f2: f7fa fc3f bl 8000d74 <__aeabi_i2f> + 80064f6: 4602 mov r2, r0 + 80064f8: 4b1f ldr r3, [pc, #124] ; (8006578 ) + 80064fa: 689b ldr r3, [r3, #8] + 80064fc: 4619 mov r1, r3 + 80064fe: 4610 mov r0, r2 + 8006500: f7fa fd40 bl 8000f84 <__aeabi_fdiv> 8006504: 4603 mov r3, r0 - 8006506: 4a13 ldr r2, [pc, #76] ; (8006554 ) - 8006508: 6093 str r3, [r2, #8] + 8006506: 461c mov r4, r3 + 8006508: 4b1b ldr r3, [pc, #108] ; (8006578 ) + 800650a: 691b ldr r3, [r3, #16] + 800650c: 4618 mov r0, r3 + 800650e: f7fa fc31 bl 8000d74 <__aeabi_i2f> + 8006512: 4603 mov r3, r0 + 8006514: 4619 mov r1, r3 + 8006516: 4620 mov r0, r4 + 8006518: f7fa fb76 bl 8000c08 <__aeabi_fsub> + 800651c: 4603 mov r3, r0 + 800651e: 4618 mov r0, r3 + 8006520: f7fa fdcc bl 80010bc <__aeabi_f2iz> + 8006524: 4603 mov r3, r0 + 8006526: 4a13 ldr r2, [pc, #76] ; (8006574 ) + 8006528: 6093 str r3, [r2, #8] t0.d=1; - 800650a: 4a12 ldr r2, [pc, #72] ; (8006554 ) - 800650c: 7b13 ldrb r3, [r2, #12] - 800650e: f043 0304 orr.w r3, r3, #4 - 8006512: 7313 strb r3, [r2, #12] - 8006514: e004 b.n 8006520 + 800652a: 4a12 ldr r2, [pc, #72] ; (8006574 ) + 800652c: 7b13 ldrb r3, [r2, #12] + 800652e: f043 0304 orr.w r3, r3, #4 + 8006532: 7313 strb r3, [r2, #12] + 8006534: e004 b.n 8006540 }else { t0.d=0; - 8006516: 4a0f ldr r2, [pc, #60] ; (8006554 ) - 8006518: 7b13 ldrb r3, [r2, #12] - 800651a: f36f 0382 bfc r3, #2, #1 - 800651e: 7313 strb r3, [r2, #12] + 8006536: 4a0f ldr r2, [pc, #60] ; (8006574 ) + 8006538: 7b13 ldrb r3, [r2, #12] + 800653a: f36f 0382 bfc r3, #2, #1 + 800653e: 7313 strb r3, [r2, #12] } t0.c=1; - 8006520: 4a0c ldr r2, [pc, #48] ; (8006554 ) - 8006522: 7b13 ldrb r3, [r2, #12] - 8006524: f043 0302 orr.w r3, r3, #2 - 8006528: 7313 strb r3, [r2, #12] + 8006540: 4a0c ldr r2, [pc, #48] ; (8006574 ) + 8006542: 7b13 ldrb r3, [r2, #12] + 8006544: f043 0302 orr.w r3, r3, #2 + 8006548: 7313 strb r3, [r2, #12] { t0.c=0; t0.pix_x=-1; t0.pix_y=-1; } } - 800652a: e00c b.n 8006546 + 800654a: e00c b.n 8006566 t0.c=0; - 800652c: 4a09 ldr r2, [pc, #36] ; (8006554 ) - 800652e: 7b13 ldrb r3, [r2, #12] - 8006530: f36f 0341 bfc r3, #1, #1 - 8006534: 7313 strb r3, [r2, #12] + 800654c: 4a09 ldr r2, [pc, #36] ; (8006574 ) + 800654e: 7b13 ldrb r3, [r2, #12] + 8006550: f36f 0341 bfc r3, #1, #1 + 8006554: 7313 strb r3, [r2, #12] t0.pix_x=-1; - 8006536: 4b07 ldr r3, [pc, #28] ; (8006554 ) - 8006538: f04f 32ff mov.w r2, #4294967295 ; 0xffffffff - 800653c: 605a str r2, [r3, #4] + 8006556: 4b07 ldr r3, [pc, #28] ; (8006574 ) + 8006558: f04f 32ff mov.w r2, #4294967295 ; 0xffffffff + 800655c: 605a str r2, [r3, #4] t0.pix_y=-1; - 800653e: 4b05 ldr r3, [pc, #20] ; (8006554 ) - 8006540: f04f 32ff mov.w r2, #4294967295 ; 0xffffffff - 8006544: 609a str r2, [r3, #8] + 800655e: 4b05 ldr r3, [pc, #20] ; (8006574 ) + 8006560: f04f 32ff mov.w r2, #4294967295 ; 0xffffffff + 8006564: 609a str r2, [r3, #8] } - 8006546: bf00 nop - 8006548: bd98 pop {r3, r4, r7, pc} - 800654a: bf00 nop - 800654c: 40011c00 .word 0x40011c00 - 8006550: 20000392 .word 0x20000392 - 8006554: 20000390 .word 0x20000390 - 8006558: 20000378 .word 0x20000378 + 8006566: bf00 nop + 8006568: bd98 pop {r3, r4, r7, pc} + 800656a: bf00 nop + 800656c: 40011c00 .word 0x40011c00 + 8006570: 2000038e .word 0x2000038e + 8006574: 2000038c .word 0x2000038c + 8006578: 20000374 .word 0x20000374 -0800655c : +0800657c : return 0; } //校准用，画一个目标坐标 //r=坐标半径，显示特效用 void TP_DrwaTrage(int x,int y,int r) { - 800655c: b590 push {r4, r7, lr} - 800655e: b087 sub sp, #28 - 8006560: af02 add r7, sp, #8 - 8006562: 60f8 str r0, [r7, #12] - 8006564: 60b9 str r1, [r7, #8] - 8006566: 607a str r2, [r7, #4] + 800657c: b590 push {r4, r7, lr} + 800657e: b087 sub sp, #28 + 8006580: af02 add r7, sp, #8 + 8006582: 60f8 str r0, [r7, #12] + 8006584: 60b9 str r1, [r7, #8] + 8006586: 607a str r2, [r7, #4] Draw_Circle(x,y,r+1,GRAY); - 8006568: 68fb ldr r3, [r7, #12] - 800656a: b298 uxth r0, r3 - 800656c: 68bb ldr r3, [r7, #8] - 800656e: b299 uxth r1, r3 - 8006570: 687b ldr r3, [r7, #4] - 8006572: b29b uxth r3, r3 - 8006574: 3301 adds r3, #1 - 8006576: b29a uxth r2, r3 - 8006578: f248 4330 movw r3, #33840 ; 0x8430 - 800657c: f7ff f803 bl 8005586 + 8006588: 68fb ldr r3, [r7, #12] + 800658a: b298 uxth r0, r3 + 800658c: 68bb ldr r3, [r7, #8] + 800658e: b299 uxth r1, r3 + 8006590: 687b ldr r3, [r7, #4] + 8006592: b29b uxth r3, r3 + 8006594: 3301 adds r3, #1 + 8006596: b29a uxth r2, r3 + 8006598: f248 4330 movw r3, #33840 ; 0x8430 + 800659c: f7fe fff3 bl 8005586 Draw_Circle(x,y,r,RED); - 8006580: 68fb ldr r3, [r7, #12] - 8006582: b298 uxth r0, r3 - 8006584: 68bb ldr r3, [r7, #8] - 8006586: b299 uxth r1, r3 - 8006588: 687b ldr r3, [r7, #4] - 800658a: b29a uxth r2, r3 - 800658c: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006590: f7fe fff9 bl 8005586 - LCD_DrawLine(x,y,x+10,y,RED); - 8006594: 68fb ldr r3, [r7, #12] - 8006596: b298 uxth r0, r3 - 8006598: 68bb ldr r3, [r7, #8] - 800659a: b299 uxth r1, r3 - 800659c: 68fb ldr r3, [r7, #12] - 800659e: b29b uxth r3, r3 - 80065a0: 330a adds r3, #10 - 80065a2: b29a uxth r2, r3 + 80065a0: 68fb ldr r3, [r7, #12] + 80065a2: b298 uxth r0, r3 80065a4: 68bb ldr r3, [r7, #8] - 80065a6: b29b uxth r3, r3 - 80065a8: f44f 4478 mov.w r4, #63488 ; 0xf800 - 80065ac: 9400 str r4, [sp, #0] - 80065ae: f7fe ff65 bl 800547c + 80065a6: b299 uxth r1, r3 + 80065a8: 687b ldr r3, [r7, #4] + 80065aa: b29a uxth r2, r3 + 80065ac: f44f 4378 mov.w r3, #63488 ; 0xf800 + 80065b0: f7fe ffe9 bl 8005586 + LCD_DrawLine(x,y,x+10,y,RED); + 80065b4: 68fb ldr r3, [r7, #12] + 80065b6: b298 uxth r0, r3 + 80065b8: 68bb ldr r3, [r7, #8] + 80065ba: b299 uxth r1, r3 + 80065bc: 68fb ldr r3, [r7, #12] + 80065be: b29b uxth r3, r3 + 80065c0: 330a adds r3, #10 + 80065c2: b29a uxth r2, r3 + 80065c4: 68bb ldr r3, [r7, #8] + 80065c6: b29b uxth r3, r3 + 80065c8: f44f 4478 mov.w r4, #63488 ; 0xf800 + 80065cc: 9400 str r4, [sp, #0] + 80065ce: f7fe ff55 bl 800547c LCD_DrawLine(x,y,x,y+10,RED); - 80065b2: 68fb ldr r3, [r7, #12] - 80065b4: b298 uxth r0, r3 - 80065b6: 68bb ldr r3, [r7, #8] - 80065b8: b299 uxth r1, r3 - 80065ba: 68fb ldr r3, [r7, #12] - 80065bc: b29a uxth r2, r3 - 80065be: 68bb ldr r3, [r7, #8] - 80065c0: b29b uxth r3, r3 - 80065c2: 330a adds r3, #10 - 80065c4: b29b uxth r3, r3 - 80065c6: f44f 4478 mov.w r4, #63488 ; 0xf800 - 80065ca: 9400 str r4, [sp, #0] - 80065cc: f7fe ff56 bl 800547c + 80065d2: 68fb ldr r3, [r7, #12] + 80065d4: b298 uxth r0, r3 + 80065d6: 68bb ldr r3, [r7, #8] + 80065d8: b299 uxth r1, r3 + 80065da: 68fb ldr r3, [r7, #12] + 80065dc: b29a uxth r2, r3 + 80065de: 68bb ldr r3, [r7, #8] + 80065e0: b29b uxth r3, r3 + 80065e2: 330a adds r3, #10 + 80065e4: b29b uxth r3, r3 + 80065e6: f44f 4478 mov.w r4, #63488 ; 0xf800 + 80065ea: 9400 str r4, [sp, #0] + 80065ec: f7fe ff46 bl 800547c LCD_DrawLine(x,y,x-10,y,RED); - 80065d0: 68fb ldr r3, [r7, #12] - 80065d2: b298 uxth r0, r3 - 80065d4: 68bb ldr r3, [r7, #8] - 80065d6: b299 uxth r1, r3 - 80065d8: 68fb ldr r3, [r7, #12] - 80065da: b29b uxth r3, r3 - 80065dc: 3b0a subs r3, #10 - 80065de: b29a uxth r2, r3 - 80065e0: 68bb ldr r3, [r7, #8] - 80065e2: b29b uxth r3, r3 - 80065e4: f44f 4478 mov.w r4, #63488 ; 0xf800 - 80065e8: 9400 str r4, [sp, #0] - 80065ea: f7fe ff47 bl 800547c + 80065f0: 68fb ldr r3, [r7, #12] + 80065f2: b298 uxth r0, r3 + 80065f4: 68bb ldr r3, [r7, #8] + 80065f6: b299 uxth r1, r3 + 80065f8: 68fb ldr r3, [r7, #12] + 80065fa: b29b uxth r3, r3 + 80065fc: 3b0a subs r3, #10 + 80065fe: b29a uxth r2, r3 + 8006600: 68bb ldr r3, [r7, #8] + 8006602: b29b uxth r3, r3 + 8006604: f44f 4478 mov.w r4, #63488 ; 0xf800 + 8006608: 9400 str r4, [sp, #0] + 800660a: f7fe ff37 bl 800547c LCD_DrawLine(x,y,x,y-10,RED); - 80065ee: 68fb ldr r3, [r7, #12] - 80065f0: b298 uxth r0, r3 - 80065f2: 68bb ldr r3, [r7, #8] - 80065f4: b299 uxth r1, r3 - 80065f6: 68fb ldr r3, [r7, #12] - 80065f8: b29a uxth r2, r3 - 80065fa: 68bb ldr r3, [r7, #8] - 80065fc: b29b uxth r3, r3 - 80065fe: 3b0a subs r3, #10 - 8006600: b29b uxth r3, r3 - 8006602: f44f 4478 mov.w r4, #63488 ; 0xf800 - 8006606: 9400 str r4, [sp, #0] - 8006608: f7fe ff38 bl 800547c + 800660e: 68fb ldr r3, [r7, #12] + 8006610: b298 uxth r0, r3 + 8006612: 68bb ldr r3, [r7, #8] + 8006614: b299 uxth r1, r3 + 8006616: 68fb ldr r3, [r7, #12] + 8006618: b29a uxth r2, r3 + 800661a: 68bb ldr r3, [r7, #8] + 800661c: b29b uxth r3, r3 + 800661e: 3b0a subs r3, #10 + 8006620: b29b uxth r3, r3 + 8006622: f44f 4478 mov.w r4, #63488 ; 0xf800 + 8006626: 9400 str r4, [sp, #0] + 8006628: f7fe ff28 bl 800547c } - 800660c: bf00 nop - 800660e: 3714 adds r7, #20 - 8006610: 46bd mov sp, r7 - 8006612: bd90 pop {r4, r7, pc} + 800662c: bf00 nop + 800662e: 3714 adds r7, #20 + 8006630: 46bd mov sp, r7 + 8006632: bd90 pop {r4, r7, pc} -08006614 : +08006634 : //触摸屏校准 //mode 校准模式，0 被动校准 ，1 主动校准 void TP_adjustment(char mode) { - 8006614: b5b0 push {r4, r5, r7, lr} - 8006616: b0a6 sub sp, #152 ; 0x98 - 8006618: af02 add r7, sp, #8 - 800661a: 4603 mov r3, r0 - 800661c: 71fb strb r3, [r7, #7] + 8006634: b5b0 push {r4, r5, r7, lr} + 8006636: b0a6 sub sp, #152 ; 0x98 + 8006638: af02 add r7, sp, #8 + 800663a: 4603 mov r3, r0 + 800663c: 71fb strb r3, [r7, #7] //判断是否需要校准，从eeprom获取数据 EEPROM_READ_BATY(16,(char *)&tconfig,sizeof(touch_config)); - 800661e: 2218 movs r2, #24 - 8006620: 4917 ldr r1, [pc, #92] ; (8006680 ) - 8006622: 2010 movs r0, #16 - 8006624: f7ff f974 bl 8005910 + 800663e: 2218 movs r2, #24 + 8006640: 4917 ldr r1, [pc, #92] ; (80066a0 ) + 8006642: 2010 movs r0, #16 + 8006644: f7ff f964 bl 8005910 if(tconfig.begin==0xab&&tconfig.end==0xcd&&mode==0) //判断校准标记 - 8006628: 4b15 ldr r3, [pc, #84] ; (8006680 ) - 800662a: 781b ldrb r3, [r3, #0] - 800662c: 2bab cmp r3, #171 ; 0xab - 800662e: d107 bne.n 8006640 - 8006630: 4b13 ldr r3, [pc, #76] ; (8006680 ) - 8006632: 7d1b ldrb r3, [r3, #20] - 8006634: 2bcd cmp r3, #205 ; 0xcd - 8006636: d103 bne.n 8006640 - 8006638: 79fb ldrb r3, [r7, #7] - 800663a: 2b00 cmp r3, #0 - 800663c: f000 82b8 beq.w 8006bb0 + 8006648: 4b15 ldr r3, [pc, #84] ; (80066a0 ) + 800664a: 781b ldrb r3, [r3, #0] + 800664c: 2bab cmp r3, #171 ; 0xab + 800664e: d107 bne.n 8006660 + 8006650: 4b13 ldr r3, [pc, #76] ; (80066a0 ) + 8006652: 7d1b ldrb r3, [r3, #20] + 8006654: 2bcd cmp r3, #205 ; 0xcd + 8006656: d103 bne.n 8006660 + 8006658: 79fb ldrb r3, [r7, #7] + 800665a: 2b00 cmp r3, #0 + 800665c: f000 82b8 beq.w 8006bd0 { return; //已经校准过了 } //校准方法比较简单，读取4个坐标计算ad值与像素的关系 char str[64]; //用于字符串提示 uint16_t y_adc,x_adc,step=0,r=10; //adc缓存，校准步骤，坐标的半径 - 8006640: 2300 movs r3, #0 - 8006642: f8a7 308e strh.w r3, [r7, #142] ; 0x8e - 8006646: 230a movs r3, #10 - 8006648: f8a7 308c strh.w r3, [r7, #140] ; 0x8c + 8006660: 2300 movs r3, #0 + 8006662: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 8006666: 230a movs r3, #10 + 8006668: f8a7 308c strh.w r3, [r7, #140] ; 0x8c uint16_t y1,y2,y3,y4,x1,x2,x3,x4; //4个点缓存 int y5,x5,xd,xl,yd,yl; //通过4个点算出xy的长边和短边 float acc_x,acc_y; //算出的关系倍率 int offset_x,offset_y; //算出的偏差 uint32_t wait=HAL_GetTick()+50000,ms100=0; //校准时间，50秒没操作就自动退出 - 800664c: f7fb fa6c bl 8001b28 - 8006650: 4603 mov r3, r0 - 8006652: f503 4343 add.w r3, r3, #49920 ; 0xc300 - 8006656: 3350 adds r3, #80 ; 0x50 - 8006658: 67bb str r3, [r7, #120] ; 0x78 - 800665a: 2300 movs r3, #0 - 800665c: 677b str r3, [r7, #116] ; 0x74 + 800666c: f7fb fa5c bl 8001b28 + 8006670: 4603 mov r3, r0 + 8006672: f503 4343 add.w r3, r3, #49920 ; 0xc300 + 8006676: 3350 adds r3, #80 ; 0x50 + 8006678: 67bb str r3, [r7, #120] ; 0x78 + 800667a: 2300 movs r3, #0 + 800667c: 677b str r3, [r7, #116] ; 0x74 //显示字符串提示 LCD_Clear(GRAY); - 800665e: f248 4030 movw r0, #33840 ; 0x8430 - 8006662: f7fe feb9 bl 80053d8 + 800667e: f248 4030 movw r0, #33840 ; 0x8430 + 8006682: f7fe fea9 bl 80053d8 LCD_ShowString(0,50,"Calibrate the touch screen",16,RED,RED); - 8006666: f44f 4378 mov.w r3, #63488 ; 0xf800 - 800666a: 9301 str r3, [sp, #4] - 800666c: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006670: 9300 str r3, [sp, #0] - 8006672: 2310 movs r3, #16 - 8006674: 4a03 ldr r2, [pc, #12] ; (8006684 ) - 8006676: 2132 movs r1, #50 ; 0x32 - 8006678: 2000 movs r0, #0 - 800667a: f7ff f8ab bl 80057d4 + 8006686: f44f 4378 mov.w r3, #63488 ; 0xf800 + 800668a: 9301 str r3, [sp, #4] + 800668c: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006690: 9300 str r3, [sp, #0] + 8006692: 2310 movs r3, #16 + 8006694: 4a03 ldr r2, [pc, #12] ; (80066a4 ) + 8006696: 2132 movs r1, #50 ; 0x32 + 8006698: 2000 movs r0, #0 + 800669a: f7ff f89b bl 80057d4 //TP_DrwaTrage(30,30,10); //开始校准 while(HAL_GetTick() - 8006680: 20000378 .word 0x20000378 - 8006684: 0800a3d0 .word 0x0800a3d0 + 800669e: e28f b.n 8006bc0 + 80066a0: 20000374 .word 0x20000374 + 80066a4: 0800a3d0 .word 0x0800a3d0 { if(TPEN==0) //如果屏幕被按下 - 8006688: f44f 6180 mov.w r1, #1024 ; 0x400 - 800668c: 48d7 ldr r0, [pc, #860] ; (80069ec ) - 800668e: f7fb fd1b bl 80020c8 - 8006692: 4603 mov r3, r0 - 8006694: 2b00 cmp r3, #0 - 8006696: d14c bne.n 8006732 + 80066a8: f44f 6180 mov.w r1, #1024 ; 0x400 + 80066ac: 48d7 ldr r0, [pc, #860] ; (8006a0c ) + 80066ae: f7fb fd0b bl 80020c8 + 80066b2: 4603 mov r3, r0 + 80066b4: 2b00 cmp r3, #0 + 80066b6: d14c bne.n 8006752 { wait=HAL_GetTick()+50000; //重置50秒 - 8006698: f7fb fa46 bl 8001b28 - 800669c: 4603 mov r3, r0 - 800669e: f503 4343 add.w r3, r3, #49920 ; 0xc300 - 80066a2: 3350 adds r3, #80 ; 0x50 - 80066a4: 67bb str r3, [r7, #120] ; 0x78 + 80066b8: f7fb fa36 bl 8001b28 + 80066bc: 4603 mov r3, r0 + 80066be: f503 4343 add.w r3, r3, #49920 ; 0xc300 + 80066c2: 3350 adds r3, #80 ; 0x50 + 80066c4: 67bb str r3, [r7, #120] ; 0x78 TP_Read_XY2(&x_adc,&y_adc); //读取xy ad值 - 80066a6: f107 020a add.w r2, r7, #10 - 80066aa: f107 0308 add.w r3, r7, #8 - 80066ae: 4611 mov r1, r2 - 80066b0: 4618 mov r0, r3 - 80066b2: f7ff fe72 bl 800639a + 80066c6: f107 020a add.w r2, r7, #10 + 80066ca: f107 0308 add.w r3, r7, #8 + 80066ce: 4611 mov r1, r2 + 80066d0: 4618 mov r0, r3 + 80066d2: f7ff fe72 bl 80063ba //将读到的值显示出来 sprintf(str,"ADC_X:%04d",x_adc); - 80066b6: 893b ldrh r3, [r7, #8] - 80066b8: 461a mov r2, r3 - 80066ba: f107 030c add.w r3, r7, #12 - 80066be: 49cc ldr r1, [pc, #816] ; (80069f0 ) - 80066c0: 4618 mov r0, r3 - 80066c2: f001 fcf7 bl 80080b4 + 80066d6: 893b ldrh r3, [r7, #8] + 80066d8: 461a mov r2, r3 + 80066da: f107 030c add.w r3, r7, #12 + 80066de: 49cc ldr r1, [pc, #816] ; (8006a10 ) + 80066e0: 4618 mov r0, r3 + 80066e2: f001 fce7 bl 80080b4 LCD_ShowString(100, 0, str, 16, RED, GRAY); - 80066c6: f107 020c add.w r2, r7, #12 - 80066ca: f248 4330 movw r3, #33840 ; 0x8430 - 80066ce: 9301 str r3, [sp, #4] - 80066d0: f44f 4378 mov.w r3, #63488 ; 0xf800 - 80066d4: 9300 str r3, [sp, #0] - 80066d6: 2310 movs r3, #16 - 80066d8: 2100 movs r1, #0 - 80066da: 2064 movs r0, #100 ; 0x64 - 80066dc: f7ff f87a bl 80057d4 + 80066e6: f107 020c add.w r2, r7, #12 + 80066ea: f248 4330 movw r3, #33840 ; 0x8430 + 80066ee: 9301 str r3, [sp, #4] + 80066f0: f44f 4378 mov.w r3, #63488 ; 0xf800 + 80066f4: 9300 str r3, [sp, #0] + 80066f6: 2310 movs r3, #16 + 80066f8: 2100 movs r1, #0 + 80066fa: 2064 movs r0, #100 ; 0x64 + 80066fc: f7ff f86a bl 80057d4 sprintf(str,"ADC_Y:%04d",y_adc); - 80066e0: 897b ldrh r3, [r7, #10] - 80066e2: 461a mov r2, r3 - 80066e4: f107 030c add.w r3, r7, #12 - 80066e8: 49c2 ldr r1, [pc, #776] ; (80069f4 ) - 80066ea: 4618 mov r0, r3 - 80066ec: f001 fce2 bl 80080b4 + 8006700: 897b ldrh r3, [r7, #10] + 8006702: 461a mov r2, r3 + 8006704: f107 030c add.w r3, r7, #12 + 8006708: 49c2 ldr r1, [pc, #776] ; (8006a14 ) + 800670a: 4618 mov r0, r3 + 800670c: f001 fcd2 bl 80080b4 LCD_ShowString(100, 16, str, 16, RED, GRAY); - 80066f0: f107 020c add.w r2, r7, #12 - 80066f4: f248 4330 movw r3, #33840 ; 0x8430 - 80066f8: 9301 str r3, [sp, #4] - 80066fa: f44f 4378 mov.w r3, #63488 ; 0xf800 - 80066fe: 9300 str r3, [sp, #0] - 8006700: 2310 movs r3, #16 - 8006702: 2110 movs r1, #16 - 8006704: 2064 movs r0, #100 ; 0x64 - 8006706: f7ff f865 bl 80057d4 + 8006710: f107 020c add.w r2, r7, #12 + 8006714: f248 4330 movw r3, #33840 ; 0x8430 + 8006718: 9301 str r3, [sp, #4] + 800671a: f44f 4378 mov.w r3, #63488 ; 0xf800 + 800671e: 9300 str r3, [sp, #0] + 8006720: 2310 movs r3, #16 + 8006722: 2110 movs r1, #16 + 8006724: 2064 movs r0, #100 ; 0x64 + 8006726: f7ff f855 bl 80057d4 //特效，半径开始收缩 if(HAL_GetTick()>ms100) - 800670a: f7fb fa0d bl 8001b28 - 800670e: 4602 mov r2, r0 - 8006710: 6f7b ldr r3, [r7, #116] ; 0x74 - 8006712: 4293 cmp r3, r2 - 8006714: d20d bcs.n 8006732 + 800672a: f7fb f9fd bl 8001b28 + 800672e: 4602 mov r2, r0 + 8006730: 6f7b ldr r3, [r7, #116] ; 0x74 + 8006732: 4293 cmp r3, r2 + 8006734: d20d bcs.n 8006752 { ms100=HAL_GetTick()+100; - 8006716: f7fb fa07 bl 8001b28 - 800671a: 4603 mov r3, r0 - 800671c: 3364 adds r3, #100 ; 0x64 - 800671e: 677b str r3, [r7, #116] ; 0x74 + 8006736: f7fb f9f7 bl 8001b28 + 800673a: 4603 mov r3, r0 + 800673c: 3364 adds r3, #100 ; 0x64 + 800673e: 677b str r3, [r7, #116] ; 0x74 if(r>0){r--;} - 8006720: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 8006724: 2b00 cmp r3, #0 - 8006726: d004 beq.n 8006732 - 8006728: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 800672c: 3b01 subs r3, #1 - 800672e: f8a7 308c strh.w r3, [r7, #140] ; 0x8c + 8006740: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 8006744: 2b00 cmp r3, #0 + 8006746: d004 beq.n 8006752 + 8006748: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 800674c: 3b01 subs r3, #1 + 800674e: f8a7 308c strh.w r3, [r7, #140] ; 0x8c } } //步骤0，将点画在（30，30）此时半径为10 if(step==0) - 8006732: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 8006736: 2b00 cmp r3, #0 - 8006738: d12b bne.n 8006792 + 8006752: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 8006756: 2b00 cmp r3, #0 + 8006758: d12b bne.n 80067b2 { TP_DrwaTrage(30,30,r); - 800673a: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 800673e: 461a mov r2, r3 - 8006740: 211e movs r1, #30 - 8006742: 201e movs r0, #30 - 8006744: f7ff ff0a bl 800655c + 800675a: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 800675e: 461a mov r2, r3 + 8006760: 211e movs r1, #30 + 8006762: 201e movs r0, #30 + 8006764: f7ff ff0a bl 800657c if(r==0)//当半径收缩为0的时候 - 8006748: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 800674c: 2b00 cmp r3, #0 - 800674e: d120 bne.n 8006792 + 8006768: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 800676c: 2b00 cmp r3, #0 + 800676e: d120 bne.n 80067b2 { //进入下一个步骤，缓存这个点的值，显示出来 step+=1; - 8006750: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 8006754: 3301 adds r3, #1 - 8006756: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 8006770: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 8006774: 3301 adds r3, #1 + 8006776: f8a7 308e strh.w r3, [r7, #142] ; 0x8e y1=y_adc; - 800675a: 897b ldrh r3, [r7, #10] - 800675c: f8a7 308a strh.w r3, [r7, #138] ; 0x8a + 800677a: 897b ldrh r3, [r7, #10] + 800677c: f8a7 308a strh.w r3, [r7, #138] ; 0x8a x1=x_adc; - 8006760: 893b ldrh r3, [r7, #8] - 8006762: f8a7 3082 strh.w r3, [r7, #130] ; 0x82 + 8006780: 893b ldrh r3, [r7, #8] + 8006782: f8a7 3082 strh.w r3, [r7, #130] ; 0x82 sprintf(str,"point_1 x:%d y:%d",x1,y1); - 8006766: f8b7 2082 ldrh.w r2, [r7, #130] ; 0x82 - 800676a: f8b7 308a ldrh.w r3, [r7, #138] ; 0x8a - 800676e: f107 000c add.w r0, r7, #12 - 8006772: 49a1 ldr r1, [pc, #644] ; (80069f8 ) - 8006774: f001 fc9e bl 80080b4 + 8006786: f8b7 2082 ldrh.w r2, [r7, #130] ; 0x82 + 800678a: f8b7 308a ldrh.w r3, [r7, #138] ; 0x8a + 800678e: f107 000c add.w r0, r7, #12 + 8006792: 49a1 ldr r1, [pc, #644] ; (8006a18 ) + 8006794: f001 fc8e bl 80080b4 LCD_ShowString(0,66,str,16,RED,RED); - 8006778: f107 020c add.w r2, r7, #12 - 800677c: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006780: 9301 str r3, [sp, #4] - 8006782: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006786: 9300 str r3, [sp, #0] - 8006788: 2310 movs r3, #16 - 800678a: 2142 movs r1, #66 ; 0x42 - 800678c: 2000 movs r0, #0 - 800678e: f7ff f821 bl 80057d4 + 8006798: f107 020c add.w r2, r7, #12 + 800679c: f44f 4378 mov.w r3, #63488 ; 0xf800 + 80067a0: 9301 str r3, [sp, #4] + 80067a2: f44f 4378 mov.w r3, #63488 ; 0xf800 + 80067a6: 9300 str r3, [sp, #0] + 80067a8: 2310 movs r3, #16 + 80067aa: 2142 movs r1, #66 ; 0x42 + 80067ac: 2000 movs r0, #0 + 80067ae: f7ff f811 bl 80057d4 } } //步骤1，等待屏幕被松开，进入下一个步骤，重置半径 if(step==1) - 8006792: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 8006796: 2b01 cmp r3, #1 - 8006798: d10f bne.n 80067ba + 80067b2: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 80067b6: 2b01 cmp r3, #1 + 80067b8: d10f bne.n 80067da { if(TPEN==1) - 800679a: f44f 6180 mov.w r1, #1024 ; 0x400 - 800679e: 4893 ldr r0, [pc, #588] ; (80069ec ) - 80067a0: f7fb fc92 bl 80020c8 - 80067a4: 4603 mov r3, r0 - 80067a6: 2b01 cmp r3, #1 - 80067a8: d107 bne.n 80067ba + 80067ba: f44f 6180 mov.w r1, #1024 ; 0x400 + 80067be: 4893 ldr r0, [pc, #588] ; (8006a0c ) + 80067c0: f7fb fc82 bl 80020c8 + 80067c4: 4603 mov r3, r0 + 80067c6: 2b01 cmp r3, #1 + 80067c8: d107 bne.n 80067da { step+=1; - 80067aa: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 80067ae: 3301 adds r3, #1 - 80067b0: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 80067ca: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 80067ce: 3301 adds r3, #1 + 80067d0: f8a7 308e strh.w r3, [r7, #142] ; 0x8e r=10; - 80067b4: 230a movs r3, #10 - 80067b6: f8a7 308c strh.w r3, [r7, #140] ; 0x8c + 80067d4: 230a movs r3, #10 + 80067d6: f8a7 308c strh.w r3, [r7, #140] ; 0x8c } } //下面几个步骤和上面一样 if(step==2) - 80067ba: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 80067be: 2b02 cmp r3, #2 - 80067c0: d12c bne.n 800681c + 80067da: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 80067de: 2b02 cmp r3, #2 + 80067e0: d12c bne.n 800683c { TP_DrwaTrage(290,30,r); - 80067c2: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 80067c6: 461a mov r2, r3 - 80067c8: 211e movs r1, #30 - 80067ca: f44f 7091 mov.w r0, #290 ; 0x122 - 80067ce: f7ff fec5 bl 800655c + 80067e2: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 80067e6: 461a mov r2, r3 + 80067e8: 211e movs r1, #30 + 80067ea: f44f 7091 mov.w r0, #290 ; 0x122 + 80067ee: f7ff fec5 bl 800657c if(r==0) - 80067d2: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 80067d6: 2b00 cmp r3, #0 - 80067d8: d120 bne.n 800681c + 80067f2: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 80067f6: 2b00 cmp r3, #0 + 80067f8: d120 bne.n 800683c { step+=1; - 80067da: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 80067de: 3301 adds r3, #1 - 80067e0: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 80067fa: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 80067fe: 3301 adds r3, #1 + 8006800: f8a7 308e strh.w r3, [r7, #142] ; 0x8e y2=y_adc; - 80067e4: 897b ldrh r3, [r7, #10] - 80067e6: f8a7 3088 strh.w r3, [r7, #136] ; 0x88 + 8006804: 897b ldrh r3, [r7, #10] + 8006806: f8a7 3088 strh.w r3, [r7, #136] ; 0x88 x2=x_adc; - 80067ea: 893b ldrh r3, [r7, #8] - 80067ec: f8a7 3080 strh.w r3, [r7, #128] ; 0x80 + 800680a: 893b ldrh r3, [r7, #8] + 800680c: f8a7 3080 strh.w r3, [r7, #128] ; 0x80 sprintf(str,"point_2 x:%d y:%d",x2,y2); - 80067f0: f8b7 2080 ldrh.w r2, [r7, #128] ; 0x80 - 80067f4: f8b7 3088 ldrh.w r3, [r7, #136] ; 0x88 - 80067f8: f107 000c add.w r0, r7, #12 - 80067fc: 497f ldr r1, [pc, #508] ; (80069fc ) - 80067fe: f001 fc59 bl 80080b4 + 8006810: f8b7 2080 ldrh.w r2, [r7, #128] ; 0x80 + 8006814: f8b7 3088 ldrh.w r3, [r7, #136] ; 0x88 + 8006818: f107 000c add.w r0, r7, #12 + 800681c: 497f ldr r1, [pc, #508] ; (8006a1c ) + 800681e: f001 fc49 bl 80080b4 LCD_ShowString(0,66+16,str,16,RED,RED); - 8006802: f107 020c add.w r2, r7, #12 - 8006806: f44f 4378 mov.w r3, #63488 ; 0xf800 - 800680a: 9301 str r3, [sp, #4] - 800680c: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006810: 9300 str r3, [sp, #0] - 8006812: 2310 movs r3, #16 - 8006814: 2152 movs r1, #82 ; 0x52 - 8006816: 2000 movs r0, #0 - 8006818: f7fe ffdc bl 80057d4 + 8006822: f107 020c add.w r2, r7, #12 + 8006826: f44f 4378 mov.w r3, #63488 ; 0xf800 + 800682a: 9301 str r3, [sp, #4] + 800682c: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006830: 9300 str r3, [sp, #0] + 8006832: 2310 movs r3, #16 + 8006834: 2152 movs r1, #82 ; 0x52 + 8006836: 2000 movs r0, #0 + 8006838: f7fe ffcc bl 80057d4 } } if(step==3) - 800681c: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 8006820: 2b03 cmp r3, #3 - 8006822: d10f bne.n 8006844 + 800683c: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 8006840: 2b03 cmp r3, #3 + 8006842: d10f bne.n 8006864 { if(TPEN==1) - 8006824: f44f 6180 mov.w r1, #1024 ; 0x400 - 8006828: 4870 ldr r0, [pc, #448] ; (80069ec ) - 800682a: f7fb fc4d bl 80020c8 - 800682e: 4603 mov r3, r0 - 8006830: 2b01 cmp r3, #1 - 8006832: d107 bne.n 8006844 + 8006844: f44f 6180 mov.w r1, #1024 ; 0x400 + 8006848: 4870 ldr r0, [pc, #448] ; (8006a0c ) + 800684a: f7fb fc3d bl 80020c8 + 800684e: 4603 mov r3, r0 + 8006850: 2b01 cmp r3, #1 + 8006852: d107 bne.n 8006864 { step+=1; - 8006834: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 8006838: 3301 adds r3, #1 - 800683a: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 8006854: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 8006858: 3301 adds r3, #1 + 800685a: f8a7 308e strh.w r3, [r7, #142] ; 0x8e r=10; - 800683e: 230a movs r3, #10 - 8006840: f8a7 308c strh.w r3, [r7, #140] ; 0x8c + 800685e: 230a movs r3, #10 + 8006860: f8a7 308c strh.w r3, [r7, #140] ; 0x8c } } if(step==4) - 8006844: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 8006848: 2b04 cmp r3, #4 - 800684a: d12b bne.n 80068a4 + 8006864: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 8006868: 2b04 cmp r3, #4 + 800686a: d12b bne.n 80068c4 { TP_DrwaTrage(30,210,r); - 800684c: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 8006850: 461a mov r2, r3 - 8006852: 21d2 movs r1, #210 ; 0xd2 - 8006854: 201e movs r0, #30 - 8006856: f7ff fe81 bl 800655c + 800686c: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 8006870: 461a mov r2, r3 + 8006872: 21d2 movs r1, #210 ; 0xd2 + 8006874: 201e movs r0, #30 + 8006876: f7ff fe81 bl 800657c if(r==0) - 800685a: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 800685e: 2b00 cmp r3, #0 - 8006860: d120 bne.n 80068a4 + 800687a: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 800687e: 2b00 cmp r3, #0 + 8006880: d120 bne.n 80068c4 { step+=1; - 8006862: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 8006866: 3301 adds r3, #1 - 8006868: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 8006882: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 8006886: 3301 adds r3, #1 + 8006888: f8a7 308e strh.w r3, [r7, #142] ; 0x8e y3=y_adc; - 800686c: 897b ldrh r3, [r7, #10] - 800686e: f8a7 3086 strh.w r3, [r7, #134] ; 0x86 + 800688c: 897b ldrh r3, [r7, #10] + 800688e: f8a7 3086 strh.w r3, [r7, #134] ; 0x86 x3=x_adc; - 8006872: 893b ldrh r3, [r7, #8] - 8006874: f8a7 307e strh.w r3, [r7, #126] ; 0x7e + 8006892: 893b ldrh r3, [r7, #8] + 8006894: f8a7 307e strh.w r3, [r7, #126] ; 0x7e sprintf(str,"point_3 x:%d y:%d",x3,y3); - 8006878: f8b7 207e ldrh.w r2, [r7, #126] ; 0x7e - 800687c: f8b7 3086 ldrh.w r3, [r7, #134] ; 0x86 - 8006880: f107 000c add.w r0, r7, #12 - 8006884: 495e ldr r1, [pc, #376] ; (8006a00 ) - 8006886: f001 fc15 bl 80080b4 + 8006898: f8b7 207e ldrh.w r2, [r7, #126] ; 0x7e + 800689c: f8b7 3086 ldrh.w r3, [r7, #134] ; 0x86 + 80068a0: f107 000c add.w r0, r7, #12 + 80068a4: 495e ldr r1, [pc, #376] ; (8006a20 ) + 80068a6: f001 fc05 bl 80080b4 LCD_ShowString(0,66+16+16,str,16,RED,RED); - 800688a: f107 020c add.w r2, r7, #12 - 800688e: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006892: 9301 str r3, [sp, #4] - 8006894: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006898: 9300 str r3, [sp, #0] - 800689a: 2310 movs r3, #16 - 800689c: 2162 movs r1, #98 ; 0x62 - 800689e: 2000 movs r0, #0 - 80068a0: f7fe ff98 bl 80057d4 + 80068aa: f107 020c add.w r2, r7, #12 + 80068ae: f44f 4378 mov.w r3, #63488 ; 0xf800 + 80068b2: 9301 str r3, [sp, #4] + 80068b4: f44f 4378 mov.w r3, #63488 ; 0xf800 + 80068b8: 9300 str r3, [sp, #0] + 80068ba: 2310 movs r3, #16 + 80068bc: 2162 movs r1, #98 ; 0x62 + 80068be: 2000 movs r0, #0 + 80068c0: f7fe ff88 bl 80057d4 } } if(step==5) - 80068a4: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 80068a8: 2b05 cmp r3, #5 - 80068aa: d10f bne.n 80068cc + 80068c4: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 80068c8: 2b05 cmp r3, #5 + 80068ca: d10f bne.n 80068ec { if(TPEN==1) - 80068ac: f44f 6180 mov.w r1, #1024 ; 0x400 - 80068b0: 484e ldr r0, [pc, #312] ; (80069ec ) - 80068b2: f7fb fc09 bl 80020c8 - 80068b6: 4603 mov r3, r0 - 80068b8: 2b01 cmp r3, #1 - 80068ba: d107 bne.n 80068cc + 80068cc: f44f 6180 mov.w r1, #1024 ; 0x400 + 80068d0: 484e ldr r0, [pc, #312] ; (8006a0c ) + 80068d2: f7fb fbf9 bl 80020c8 + 80068d6: 4603 mov r3, r0 + 80068d8: 2b01 cmp r3, #1 + 80068da: d107 bne.n 80068ec { step+=1; - 80068bc: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 80068c0: 3301 adds r3, #1 - 80068c2: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 80068dc: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 80068e0: 3301 adds r3, #1 + 80068e2: f8a7 308e strh.w r3, [r7, #142] ; 0x8e r=10; - 80068c6: 230a movs r3, #10 - 80068c8: f8a7 308c strh.w r3, [r7, #140] ; 0x8c + 80068e6: 230a movs r3, #10 + 80068e8: f8a7 308c strh.w r3, [r7, #140] ; 0x8c } } if(step==6) - 80068cc: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 80068d0: 2b06 cmp r3, #6 - 80068d2: d12c bne.n 800692e + 80068ec: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 80068f0: 2b06 cmp r3, #6 + 80068f2: d12c bne.n 800694e { TP_DrwaTrage(290,210,r); - 80068d4: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 80068d8: 461a mov r2, r3 - 80068da: 21d2 movs r1, #210 ; 0xd2 - 80068dc: f44f 7091 mov.w r0, #290 ; 0x122 - 80068e0: f7ff fe3c bl 800655c + 80068f4: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 80068f8: 461a mov r2, r3 + 80068fa: 21d2 movs r1, #210 ; 0xd2 + 80068fc: f44f 7091 mov.w r0, #290 ; 0x122 + 8006900: f7ff fe3c bl 800657c if(r==0) - 80068e4: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c - 80068e8: 2b00 cmp r3, #0 - 80068ea: d120 bne.n 800692e + 8006904: f8b7 308c ldrh.w r3, [r7, #140] ; 0x8c + 8006908: 2b00 cmp r3, #0 + 800690a: d120 bne.n 800694e { step+=1; - 80068ec: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 80068f0: 3301 adds r3, #1 - 80068f2: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 800690c: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 8006910: 3301 adds r3, #1 + 8006912: f8a7 308e strh.w r3, [r7, #142] ; 0x8e y4=y_adc; - 80068f6: 897b ldrh r3, [r7, #10] - 80068f8: f8a7 3084 strh.w r3, [r7, #132] ; 0x84 + 8006916: 897b ldrh r3, [r7, #10] + 8006918: f8a7 3084 strh.w r3, [r7, #132] ; 0x84 x4=x_adc; - 80068fc: 893b ldrh r3, [r7, #8] - 80068fe: f8a7 307c strh.w r3, [r7, #124] ; 0x7c + 800691c: 893b ldrh r3, [r7, #8] + 800691e: f8a7 307c strh.w r3, [r7, #124] ; 0x7c sprintf(str,"point_4 x:%d y:%d",x4,y4); - 8006902: f8b7 207c ldrh.w r2, [r7, #124] ; 0x7c - 8006906: f8b7 3084 ldrh.w r3, [r7, #132] ; 0x84 - 800690a: f107 000c add.w r0, r7, #12 - 800690e: 493d ldr r1, [pc, #244] ; (8006a04 ) - 8006910: f001 fbd0 bl 80080b4 + 8006922: f8b7 207c ldrh.w r2, [r7, #124] ; 0x7c + 8006926: f8b7 3084 ldrh.w r3, [r7, #132] ; 0x84 + 800692a: f107 000c add.w r0, r7, #12 + 800692e: 493d ldr r1, [pc, #244] ; (8006a24 ) + 8006930: f001 fbc0 bl 80080b4 LCD_ShowString(0,66+16+16+16,str,16,RED,RED); - 8006914: f107 020c add.w r2, r7, #12 - 8006918: f44f 4378 mov.w r3, #63488 ; 0xf800 - 800691c: 9301 str r3, [sp, #4] - 800691e: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006922: 9300 str r3, [sp, #0] - 8006924: 2310 movs r3, #16 - 8006926: 2172 movs r1, #114 ; 0x72 - 8006928: 2000 movs r0, #0 - 800692a: f7fe ff53 bl 80057d4 + 8006934: f107 020c add.w r2, r7, #12 + 8006938: f44f 4378 mov.w r3, #63488 ; 0xf800 + 800693c: 9301 str r3, [sp, #4] + 800693e: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006942: 9300 str r3, [sp, #0] + 8006944: 2310 movs r3, #16 + 8006946: 2172 movs r1, #114 ; 0x72 + 8006948: 2000 movs r0, #0 + 800694a: f7fe ff43 bl 80057d4 } } if(step==7) - 800692e: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 8006932: 2b07 cmp r3, #7 - 8006934: d10f bne.n 8006956 + 800694e: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 8006952: 2b07 cmp r3, #7 + 8006954: d10f bne.n 8006976 { if(TPEN==1) - 8006936: f44f 6180 mov.w r1, #1024 ; 0x400 - 800693a: 482c ldr r0, [pc, #176] ; (80069ec ) - 800693c: f7fb fbc4 bl 80020c8 - 8006940: 4603 mov r3, r0 - 8006942: 2b01 cmp r3, #1 - 8006944: d107 bne.n 8006956 + 8006956: f44f 6180 mov.w r1, #1024 ; 0x400 + 800695a: 482c ldr r0, [pc, #176] ; (8006a0c ) + 800695c: f7fb fbb4 bl 80020c8 + 8006960: 4603 mov r3, r0 + 8006962: 2b01 cmp r3, #1 + 8006964: d107 bne.n 8006976 { step+=1; - 8006946: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 800694a: 3301 adds r3, #1 - 800694c: f8a7 308e strh.w r3, [r7, #142] ; 0x8e + 8006966: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 800696a: 3301 adds r3, #1 + 800696c: f8a7 308e strh.w r3, [r7, #142] ; 0x8e r=10; - 8006950: 230a movs r3, #10 - 8006952: f8a7 308c strh.w r3, [r7, #140] ; 0x8c + 8006970: 230a movs r3, #10 + 8006972: f8a7 308c strh.w r3, [r7, #140] ; 0x8c } } //当4个点读取完，开始计算关系 if(step==8) - 8006956: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e - 800695a: 2b08 cmp r3, #8 - 800695c: f040 8120 bne.w 8006ba0 + 8006976: f8b7 308e ldrh.w r3, [r7, #142] ; 0x8e + 800697a: 2b08 cmp r3, #8 + 800697c: f040 8120 bne.w 8006bc0 { //其实只需要两个点就能校准，通过取平均值获得xy的长边和短边 xd=((x1+x3)/2); - 8006960: f8b7 2082 ldrh.w r2, [r7, #130] ; 0x82 - 8006964: f8b7 307e ldrh.w r3, [r7, #126] ; 0x7e - 8006968: 4413 add r3, r2 - 800696a: 0fda lsrs r2, r3, #31 - 800696c: 4413 add r3, r2 - 800696e: 105b asrs r3, r3, #1 - 8006970: 673b str r3, [r7, #112] ; 0x70 - xl=((x2+x4)/2); - 8006972: f8b7 2080 ldrh.w r2, [r7, #128] ; 0x80 - 8006976: f8b7 307c ldrh.w r3, [r7, #124] ; 0x7c - 800697a: 4413 add r3, r2 - 800697c: 0fda lsrs r2, r3, #31 - 800697e: 4413 add r3, r2 - 8006980: 105b asrs r3, r3, #1 - 8006982: 66fb str r3, [r7, #108] ; 0x6c - yd=((y1+y2)/2); - 8006984: f8b7 208a ldrh.w r2, [r7, #138] ; 0x8a - 8006988: f8b7 3088 ldrh.w r3, [r7, #136] ; 0x88 + 8006980: f8b7 2082 ldrh.w r2, [r7, #130] ; 0x82 + 8006984: f8b7 307e ldrh.w r3, [r7, #126] ; 0x7e + 8006988: 4413 add r3, r2 + 800698a: 0fda lsrs r2, r3, #31 800698c: 4413 add r3, r2 - 800698e: 0fda lsrs r2, r3, #31 - 8006990: 4413 add r3, r2 - 8006992: 105b asrs r3, r3, #1 - 8006994: 66bb str r3, [r7, #104] ; 0x68 - yl=((y3+y4)/2); - 8006996: f8b7 2086 ldrh.w r2, [r7, #134] ; 0x86 - 800699a: f8b7 3084 ldrh.w r3, [r7, #132] ; 0x84 + 800698e: 105b asrs r3, r3, #1 + 8006990: 673b str r3, [r7, #112] ; 0x70 + xl=((x2+x4)/2); + 8006992: f8b7 2080 ldrh.w r2, [r7, #128] ; 0x80 + 8006996: f8b7 307c ldrh.w r3, [r7, #124] ; 0x7c + 800699a: 4413 add r3, r2 + 800699c: 0fda lsrs r2, r3, #31 800699e: 4413 add r3, r2 - 80069a0: 0fda lsrs r2, r3, #31 - 80069a2: 4413 add r3, r2 - 80069a4: 105b asrs r3, r3, #1 - 80069a6: 667b str r3, [r7, #100] ; 0x64 + 80069a0: 105b asrs r3, r3, #1 + 80069a2: 66fb str r3, [r7, #108] ; 0x6c + yd=((y1+y2)/2); + 80069a4: f8b7 208a ldrh.w r2, [r7, #138] ; 0x8a + 80069a8: f8b7 3088 ldrh.w r3, [r7, #136] ; 0x88 + 80069ac: 4413 add r3, r2 + 80069ae: 0fda lsrs r2, r3, #31 + 80069b0: 4413 add r3, r2 + 80069b2: 105b asrs r3, r3, #1 + 80069b4: 66bb str r3, [r7, #104] ; 0x68 + yl=((y3+y4)/2); + 80069b6: f8b7 2086 ldrh.w r2, [r7, #134] ; 0x86 + 80069ba: f8b7 3084 ldrh.w r3, [r7, #132] ; 0x84 + 80069be: 4413 add r3, r2 + 80069c0: 0fda lsrs r2, r3, #31 + 80069c2: 4413 add r3, r2 + 80069c4: 105b asrs r3, r3, #1 + 80069c6: 667b str r3, [r7, #100] ; 0x64 //长边减去短边可以再获得一个点 x5=xl-xd; - 80069a8: 6efa ldr r2, [r7, #108] ; 0x6c - 80069aa: 6f3b ldr r3, [r7, #112] ; 0x70 - 80069ac: 1ad3 subs r3, r2, r3 - 80069ae: 663b str r3, [r7, #96] ; 0x60 + 80069c8: 6efa ldr r2, [r7, #108] ; 0x6c + 80069ca: 6f3b ldr r3, [r7, #112] ; 0x70 + 80069cc: 1ad3 subs r3, r2, r3 + 80069ce: 663b str r3, [r7, #96] ; 0x60 y5=yl-yd; - 80069b0: 6e7a ldr r2, [r7, #100] ; 0x64 - 80069b2: 6ebb ldr r3, [r7, #104] ; 0x68 - 80069b4: 1ad3 subs r3, r2, r3 - 80069b6: 65fb str r3, [r7, #92] ; 0x5c + 80069d0: 6e7a ldr r2, [r7, #100] ; 0x64 + 80069d2: 6ebb ldr r3, [r7, #104] ; 0x68 + 80069d4: 1ad3 subs r3, r2, r3 + 80069d6: 65fb str r3, [r7, #92] ; 0x5c //这个点如果是负数，肯定有错，可能是xy搞反了 if(x5<0||y5<0) - 80069b8: 6e3b ldr r3, [r7, #96] ; 0x60 - 80069ba: 2b00 cmp r3, #0 - 80069bc: db02 blt.n 80069c4 - 80069be: 6dfb ldr r3, [r7, #92] ; 0x5c - 80069c0: 2b00 cmp r3, #0 - 80069c2: da23 bge.n 8006a0c + 80069d8: 6e3b ldr r3, [r7, #96] ; 0x60 + 80069da: 2b00 cmp r3, #0 + 80069dc: db02 blt.n 80069e4 + 80069de: 6dfb ldr r3, [r7, #92] ; 0x5c + 80069e0: 2b00 cmp r3, #0 + 80069e2: da23 bge.n 8006a2c { //显示error sprintf(str,"ERROR"); - 80069c4: f107 030c add.w r3, r7, #12 - 80069c8: 490f ldr r1, [pc, #60] ; (8006a08 ) - 80069ca: 4618 mov r0, r3 - 80069cc: f001 fb72 bl 80080b4 + 80069e4: f107 030c add.w r3, r7, #12 + 80069e8: 490f ldr r1, [pc, #60] ; (8006a28 ) + 80069ea: 4618 mov r0, r3 + 80069ec: f001 fb62 bl 80080b4 LCD_ShowString(0,66+16+16+16+16,str,16,RED, GRAY); - 80069d0: f107 020c add.w r2, r7, #12 - 80069d4: f248 4330 movw r3, #33840 ; 0x8430 - 80069d8: 9301 str r3, [sp, #4] - 80069da: f44f 4378 mov.w r3, #63488 ; 0xf800 - 80069de: 9300 str r3, [sp, #0] - 80069e0: 2310 movs r3, #16 - 80069e2: 2182 movs r1, #130 ; 0x82 - 80069e4: 2000 movs r0, #0 - 80069e6: f7fe fef5 bl 80057d4 + 80069f0: f107 020c add.w r2, r7, #12 + 80069f4: f248 4330 movw r3, #33840 ; 0x8430 + 80069f8: 9301 str r3, [sp, #4] + 80069fa: f44f 4378 mov.w r3, #63488 ; 0xf800 + 80069fe: 9300 str r3, [sp, #0] + 8006a00: 2310 movs r3, #16 + 8006a02: 2182 movs r1, #130 ; 0x82 + 8006a04: 2000 movs r0, #0 + 8006a06: f7fe fee5 bl 80057d4 { - 80069ea: e0cf b.n 8006b8c - 80069ec: 40011c00 .word 0x40011c00 - 80069f0: 0800a3ec .word 0x0800a3ec - 80069f4: 0800a3f8 .word 0x0800a3f8 - 80069f8: 0800a404 .word 0x0800a404 - 80069fc: 0800a418 .word 0x0800a418 - 8006a00: 0800a42c .word 0x0800a42c - 8006a04: 0800a440 .word 0x0800a440 - 8006a08: 0800a454 .word 0x0800a454 + 8006a0a: e0cf b.n 8006bac + 8006a0c: 40011c00 .word 0x40011c00 + 8006a10: 0800a3ec .word 0x0800a3ec + 8006a14: 0800a3f8 .word 0x0800a3f8 + 8006a18: 0800a404 .word 0x0800a404 + 8006a1c: 0800a418 .word 0x0800a418 + 8006a20: 0800a42c .word 0x0800a42c + 8006a24: 0800a440 .word 0x0800a440 + 8006a28: 0800a454 .word 0x0800a454 }else { //计算关系倍率 //ad的长边减去短边再除去实际屏幕像素的长边减短边（260=320-30-30，180=240-30-30） acc_x=x5/260.0; - 8006a0c: 6e38 ldr r0, [r7, #96] ; 0x60 - 8006a0e: f7f9 fd65 bl 80004dc <__aeabi_i2d> - 8006a12: f04f 0200 mov.w r2, #0 - 8006a16: 4b68 ldr r3, [pc, #416] ; (8006bb8 ) - 8006a18: f7f9 fef4 bl 8000804 <__aeabi_ddiv> - 8006a1c: 4602 mov r2, r0 - 8006a1e: 460b mov r3, r1 - 8006a20: 4610 mov r0, r2 - 8006a22: 4619 mov r1, r3 - 8006a24: f7fa f89c bl 8000b60 <__aeabi_d2f> - 8006a28: 4603 mov r3, r0 - 8006a2a: 65bb str r3, [r7, #88] ; 0x58 - acc_y=y5/180.0; - 8006a2c: 6df8 ldr r0, [r7, #92] ; 0x5c + 8006a2c: 6e38 ldr r0, [r7, #96] ; 0x60 8006a2e: f7f9 fd55 bl 80004dc <__aeabi_i2d> 8006a32: f04f 0200 mov.w r2, #0 - 8006a36: 4b61 ldr r3, [pc, #388] ; (8006bbc ) + 8006a36: 4b68 ldr r3, [pc, #416] ; (8006bd8 ) 8006a38: f7f9 fee4 bl 8000804 <__aeabi_ddiv> 8006a3c: 4602 mov r2, r0 8006a3e: 460b mov r3, r1 @@ -16616,289 +16622,281 @@ void TP_adjustment(char mode) 8006a42: 4619 mov r1, r3 8006a44: f7fa f88c bl 8000b60 <__aeabi_d2f> 8006a48: 4603 mov r3, r0 - 8006a4a: 657b str r3, [r7, #84] ; 0x54 + 8006a4a: 65bb str r3, [r7, #88] ; 0x58 + acc_y=y5/180.0; + 8006a4c: 6df8 ldr r0, [r7, #92] ; 0x5c + 8006a4e: f7f9 fd45 bl 80004dc <__aeabi_i2d> + 8006a52: f04f 0200 mov.w r2, #0 + 8006a56: 4b61 ldr r3, [pc, #388] ; (8006bdc ) + 8006a58: f7f9 fed4 bl 8000804 <__aeabi_ddiv> + 8006a5c: 4602 mov r2, r0 + 8006a5e: 460b mov r3, r1 + 8006a60: 4610 mov r0, r2 + 8006a62: 4619 mov r1, r3 + 8006a64: f7fa f87c bl 8000b60 <__aeabi_d2f> + 8006a68: 4603 mov r3, r0 + 8006a6a: 657b str r3, [r7, #84] ; 0x54 //验证倍率，将实际值减去验证值就等于误差值，因为有两个点，所以计算了两个误差后求了平均值 offset_x=(((xd/acc_x)-30)+((xl/acc_x)-290))/2; - 8006a4c: 6f38 ldr r0, [r7, #112] ; 0x70 - 8006a4e: f7fa f991 bl 8000d74 <__aeabi_i2f> - 8006a52: 4603 mov r3, r0 - 8006a54: 6db9 ldr r1, [r7, #88] ; 0x58 - 8006a56: 4618 mov r0, r3 - 8006a58: f7fa fa94 bl 8000f84 <__aeabi_fdiv> - 8006a5c: 4603 mov r3, r0 - 8006a5e: 4958 ldr r1, [pc, #352] ; (8006bc0 ) - 8006a60: 4618 mov r0, r3 - 8006a62: f7fa f8d1 bl 8000c08 <__aeabi_fsub> - 8006a66: 4603 mov r3, r0 - 8006a68: 461c mov r4, r3 - 8006a6a: 6ef8 ldr r0, [r7, #108] ; 0x6c - 8006a6c: f7fa f982 bl 8000d74 <__aeabi_i2f> - 8006a70: 4603 mov r3, r0 - 8006a72: 6db9 ldr r1, [r7, #88] ; 0x58 - 8006a74: 4618 mov r0, r3 - 8006a76: f7fa fa85 bl 8000f84 <__aeabi_fdiv> - 8006a7a: 4603 mov r3, r0 - 8006a7c: 4951 ldr r1, [pc, #324] ; (8006bc4 ) - 8006a7e: 4618 mov r0, r3 - 8006a80: f7fa f8c2 bl 8000c08 <__aeabi_fsub> - 8006a84: 4603 mov r3, r0 - 8006a86: 4619 mov r1, r3 - 8006a88: 4620 mov r0, r4 - 8006a8a: f7fa f8bf bl 8000c0c <__addsf3> - 8006a8e: 4603 mov r3, r0 - 8006a90: f04f 4180 mov.w r1, #1073741824 ; 0x40000000 + 8006a6c: 6f38 ldr r0, [r7, #112] ; 0x70 + 8006a6e: f7fa f981 bl 8000d74 <__aeabi_i2f> + 8006a72: 4603 mov r3, r0 + 8006a74: 6db9 ldr r1, [r7, #88] ; 0x58 + 8006a76: 4618 mov r0, r3 + 8006a78: f7fa fa84 bl 8000f84 <__aeabi_fdiv> + 8006a7c: 4603 mov r3, r0 + 8006a7e: 4958 ldr r1, [pc, #352] ; (8006be0 ) + 8006a80: 4618 mov r0, r3 + 8006a82: f7fa f8c1 bl 8000c08 <__aeabi_fsub> + 8006a86: 4603 mov r3, r0 + 8006a88: 461c mov r4, r3 + 8006a8a: 6ef8 ldr r0, [r7, #108] ; 0x6c + 8006a8c: f7fa f972 bl 8000d74 <__aeabi_i2f> + 8006a90: 4603 mov r3, r0 + 8006a92: 6db9 ldr r1, [r7, #88] ; 0x58 8006a94: 4618 mov r0, r3 8006a96: f7fa fa75 bl 8000f84 <__aeabi_fdiv> 8006a9a: 4603 mov r3, r0 - 8006a9c: 4618 mov r0, r3 - 8006a9e: f7fa fb0d bl 80010bc <__aeabi_f2iz> - 8006aa2: 4603 mov r3, r0 - 8006aa4: 653b str r3, [r7, #80] ; 0x50 + 8006a9c: 4951 ldr r1, [pc, #324] ; (8006be4 ) + 8006a9e: 4618 mov r0, r3 + 8006aa0: f7fa f8b2 bl 8000c08 <__aeabi_fsub> + 8006aa4: 4603 mov r3, r0 + 8006aa6: 4619 mov r1, r3 + 8006aa8: 4620 mov r0, r4 + 8006aaa: f7fa f8af bl 8000c0c <__addsf3> + 8006aae: 4603 mov r3, r0 + 8006ab0: f04f 4180 mov.w r1, #1073741824 ; 0x40000000 + 8006ab4: 4618 mov r0, r3 + 8006ab6: f7fa fa65 bl 8000f84 <__aeabi_fdiv> + 8006aba: 4603 mov r3, r0 + 8006abc: 4618 mov r0, r3 + 8006abe: f7fa fafd bl 80010bc <__aeabi_f2iz> + 8006ac2: 4603 mov r3, r0 + 8006ac4: 653b str r3, [r7, #80] ; 0x50 offset_y=(((yd/acc_y)-30)+((yl/acc_y)-210))/2; - 8006aa6: 6eb8 ldr r0, [r7, #104] ; 0x68 - 8006aa8: f7fa f964 bl 8000d74 <__aeabi_i2f> - 8006aac: 4603 mov r3, r0 - 8006aae: 6d79 ldr r1, [r7, #84] ; 0x54 - 8006ab0: 4618 mov r0, r3 - 8006ab2: f7fa fa67 bl 8000f84 <__aeabi_fdiv> - 8006ab6: 4603 mov r3, r0 - 8006ab8: 4941 ldr r1, [pc, #260] ; (8006bc0 ) - 8006aba: 4618 mov r0, r3 - 8006abc: f7fa f8a4 bl 8000c08 <__aeabi_fsub> - 8006ac0: 4603 mov r3, r0 - 8006ac2: 461c mov r4, r3 - 8006ac4: 6e78 ldr r0, [r7, #100] ; 0x64 - 8006ac6: f7fa f955 bl 8000d74 <__aeabi_i2f> - 8006aca: 4603 mov r3, r0 - 8006acc: 6d79 ldr r1, [r7, #84] ; 0x54 - 8006ace: 4618 mov r0, r3 - 8006ad0: f7fa fa58 bl 8000f84 <__aeabi_fdiv> - 8006ad4: 4603 mov r3, r0 - 8006ad6: 493c ldr r1, [pc, #240] ; (8006bc8 ) - 8006ad8: 4618 mov r0, r3 - 8006ada: f7fa f895 bl 8000c08 <__aeabi_fsub> - 8006ade: 4603 mov r3, r0 - 8006ae0: 4619 mov r1, r3 - 8006ae2: 4620 mov r0, r4 - 8006ae4: f7fa f892 bl 8000c0c <__addsf3> - 8006ae8: 4603 mov r3, r0 - 8006aea: f04f 4180 mov.w r1, #1073741824 ; 0x40000000 + 8006ac6: 6eb8 ldr r0, [r7, #104] ; 0x68 + 8006ac8: f7fa f954 bl 8000d74 <__aeabi_i2f> + 8006acc: 4603 mov r3, r0 + 8006ace: 6d79 ldr r1, [r7, #84] ; 0x54 + 8006ad0: 4618 mov r0, r3 + 8006ad2: f7fa fa57 bl 8000f84 <__aeabi_fdiv> + 8006ad6: 4603 mov r3, r0 + 8006ad8: 4941 ldr r1, [pc, #260] ; (8006be0 ) + 8006ada: 4618 mov r0, r3 + 8006adc: f7fa f894 bl 8000c08 <__aeabi_fsub> + 8006ae0: 4603 mov r3, r0 + 8006ae2: 461c mov r4, r3 + 8006ae4: 6e78 ldr r0, [r7, #100] ; 0x64 + 8006ae6: f7fa f945 bl 8000d74 <__aeabi_i2f> + 8006aea: 4603 mov r3, r0 + 8006aec: 6d79 ldr r1, [r7, #84] ; 0x54 8006aee: 4618 mov r0, r3 8006af0: f7fa fa48 bl 8000f84 <__aeabi_fdiv> 8006af4: 4603 mov r3, r0 - 8006af6: 4618 mov r0, r3 - 8006af8: f7fa fae0 bl 80010bc <__aeabi_f2iz> - 8006afc: 4603 mov r3, r0 - 8006afe: 64fb str r3, [r7, #76] ; 0x4c + 8006af6: 493c ldr r1, [pc, #240] ; (8006be8 ) + 8006af8: 4618 mov r0, r3 + 8006afa: f7fa f885 bl 8000c08 <__aeabi_fsub> + 8006afe: 4603 mov r3, r0 + 8006b00: 4619 mov r1, r3 + 8006b02: 4620 mov r0, r4 + 8006b04: f7fa f882 bl 8000c0c <__addsf3> + 8006b08: 4603 mov r3, r0 + 8006b0a: f04f 4180 mov.w r1, #1073741824 ; 0x40000000 + 8006b0e: 4618 mov r0, r3 + 8006b10: f7fa fa38 bl 8000f84 <__aeabi_fdiv> + 8006b14: 4603 mov r3, r0 + 8006b16: 4618 mov r0, r3 + 8006b18: f7fa fad0 bl 80010bc <__aeabi_f2iz> + 8006b1c: 4603 mov r3, r0 + 8006b1e: 64fb str r3, [r7, #76] ; 0x4c //保存计算结果 tconfig.x_acc=acc_x; - 8006b00: 4a32 ldr r2, [pc, #200] ; (8006bcc ) - 8006b02: 6dbb ldr r3, [r7, #88] ; 0x58 - 8006b04: 6053 str r3, [r2, #4] + 8006b20: 4a32 ldr r2, [pc, #200] ; (8006bec ) + 8006b22: 6dbb ldr r3, [r7, #88] ; 0x58 + 8006b24: 6053 str r3, [r2, #4] tconfig.x_offset=offset_x; - 8006b06: 4a31 ldr r2, [pc, #196] ; (8006bcc ) - 8006b08: 6d3b ldr r3, [r7, #80] ; 0x50 - 8006b0a: 60d3 str r3, [r2, #12] + 8006b26: 4a31 ldr r2, [pc, #196] ; (8006bec ) + 8006b28: 6d3b ldr r3, [r7, #80] ; 0x50 + 8006b2a: 60d3 str r3, [r2, #12] tconfig.y_acc=acc_y; - 8006b0c: 4a2f ldr r2, [pc, #188] ; (8006bcc ) - 8006b0e: 6d7b ldr r3, [r7, #84] ; 0x54 - 8006b10: 6093 str r3, [r2, #8] + 8006b2c: 4a2f ldr r2, [pc, #188] ; (8006bec ) + 8006b2e: 6d7b ldr r3, [r7, #84] ; 0x54 + 8006b30: 6093 str r3, [r2, #8] tconfig.y_offset=offset_y; - 8006b12: 4a2e ldr r2, [pc, #184] ; (8006bcc ) - 8006b14: 6cfb ldr r3, [r7, #76] ; 0x4c - 8006b16: 6113 str r3, [r2, #16] + 8006b32: 4a2e ldr r2, [pc, #184] ; (8006bec ) + 8006b34: 6cfb ldr r3, [r7, #76] ; 0x4c + 8006b36: 6113 str r3, [r2, #16] //eeprom块标记 tconfig.begin=0xab; - 8006b18: 4b2c ldr r3, [pc, #176] ; (8006bcc ) - 8006b1a: 22ab movs r2, #171 ; 0xab - 8006b1c: 701a strb r2, [r3, #0] + 8006b38: 4b2c ldr r3, [pc, #176] ; (8006bec ) + 8006b3a: 22ab movs r2, #171 ; 0xab + 8006b3c: 701a strb r2, [r3, #0] tconfig.end=0xcd; - 8006b1e: 4b2b ldr r3, [pc, #172] ; (8006bcc ) - 8006b20: 22cd movs r2, #205 ; 0xcd - 8006b22: 751a strb r2, [r3, #20] + 8006b3e: 4b2b ldr r3, [pc, #172] ; (8006bec ) + 8006b40: 22cd movs r2, #205 ; 0xcd + 8006b42: 751a strb r2, [r3, #20] //显示计算结果 sprintf(str,"x_acc=%f y_acc=%f",acc_x,acc_y); - 8006b24: 6db8 ldr r0, [r7, #88] ; 0x58 - 8006b26: f7f9 fceb bl 8000500 <__aeabi_f2d> - 8006b2a: 4604 mov r4, r0 - 8006b2c: 460d mov r5, r1 - 8006b2e: 6d78 ldr r0, [r7, #84] ; 0x54 - 8006b30: f7f9 fce6 bl 8000500 <__aeabi_f2d> - 8006b34: 4602 mov r2, r0 - 8006b36: 460b mov r3, r1 - 8006b38: f107 000c add.w r0, r7, #12 - 8006b3c: e9cd 2300 strd r2, r3, [sp] - 8006b40: 4622 mov r2, r4 - 8006b42: 462b mov r3, r5 - 8006b44: 4922 ldr r1, [pc, #136] ; (8006bd0 ) - 8006b46: f001 fab5 bl 80080b4 + 8006b44: 6db8 ldr r0, [r7, #88] ; 0x58 + 8006b46: f7f9 fcdb bl 8000500 <__aeabi_f2d> + 8006b4a: 4604 mov r4, r0 + 8006b4c: 460d mov r5, r1 + 8006b4e: 6d78 ldr r0, [r7, #84] ; 0x54 + 8006b50: f7f9 fcd6 bl 8000500 <__aeabi_f2d> + 8006b54: 4602 mov r2, r0 + 8006b56: 460b mov r3, r1 + 8006b58: f107 000c add.w r0, r7, #12 + 8006b5c: e9cd 2300 strd r2, r3, [sp] + 8006b60: 4622 mov r2, r4 + 8006b62: 462b mov r3, r5 + 8006b64: 4922 ldr r1, [pc, #136] ; (8006bf0 ) + 8006b66: f001 faa5 bl 80080b4 LCD_ShowString(0,66+16+16+16+16,str,16,RED,RED); - 8006b4a: f107 020c add.w r2, r7, #12 - 8006b4e: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006b52: 9301 str r3, [sp, #4] - 8006b54: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006b58: 9300 str r3, [sp, #0] - 8006b5a: 2310 movs r3, #16 - 8006b5c: 2182 movs r1, #130 ; 0x82 - 8006b5e: 2000 movs r0, #0 - 8006b60: f7fe fe38 bl 80057d4 + 8006b6a: f107 020c add.w r2, r7, #12 + 8006b6e: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006b72: 9301 str r3, [sp, #4] + 8006b74: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006b78: 9300 str r3, [sp, #0] + 8006b7a: 2310 movs r3, #16 + 8006b7c: 2182 movs r1, #130 ; 0x82 + 8006b7e: 2000 movs r0, #0 + 8006b80: f7fe fe28 bl 80057d4 sprintf(str,"x_offset=%d y_offset=%d",offset_x,offset_y); - 8006b64: f107 000c add.w r0, r7, #12 - 8006b68: 6cfb ldr r3, [r7, #76] ; 0x4c - 8006b6a: 6d3a ldr r2, [r7, #80] ; 0x50 - 8006b6c: 4919 ldr r1, [pc, #100] ; (8006bd4 ) - 8006b6e: f001 faa1 bl 80080b4 + 8006b84: f107 000c add.w r0, r7, #12 + 8006b88: 6cfb ldr r3, [r7, #76] ; 0x4c + 8006b8a: 6d3a ldr r2, [r7, #80] ; 0x50 + 8006b8c: 4919 ldr r1, [pc, #100] ; (8006bf4 ) + 8006b8e: f001 fa91 bl 80080b4 LCD_ShowString(0,66+16+16+16+16+16,str,16,RED,RED); - 8006b72: f107 020c add.w r2, r7, #12 - 8006b76: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006b7a: 9301 str r3, [sp, #4] - 8006b7c: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006b80: 9300 str r3, [sp, #0] - 8006b82: 2310 movs r3, #16 - 8006b84: 2192 movs r1, #146 ; 0x92 - 8006b86: 2000 movs r0, #0 - 8006b88: f7fe fe24 bl 80057d4 + 8006b92: f107 020c add.w r2, r7, #12 + 8006b96: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006b9a: 9301 str r3, [sp, #4] + 8006b9c: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006ba0: 9300 str r3, [sp, #0] + 8006ba2: 2310 movs r3, #16 + 8006ba4: 2192 movs r1, #146 ; 0x92 + 8006ba6: 2000 movs r0, #0 + 8006ba8: f7fe fe14 bl 80057d4 } //将结果保存起来 EEPROM_WRITE_BATY(16,(char *)&tconfig,sizeof(touch_config)); - 8006b8c: 2218 movs r2, #24 - 8006b8e: 490f ldr r1, [pc, #60] ; (8006bcc ) - 8006b90: 2010 movs r0, #16 - 8006b92: f7fe fecf bl 8005934 + 8006bac: 2218 movs r2, #24 + 8006bae: 490f ldr r1, [pc, #60] ; (8006bec ) + 8006bb0: 2010 movs r0, #16 + 8006bb2: f7fe febf bl 8005934 HAL_Delay(1000); - 8006b96: f44f 707a mov.w r0, #1000 ; 0x3e8 - 8006b9a: f7fa ffcf bl 8001b3c + 8006bb6: f44f 707a mov.w r0, #1000 ; 0x3e8 + 8006bba: f7fa ffbf bl 8001b3c return; - 8006b9e: e008 b.n 8006bb2 + 8006bbe: e008 b.n 8006bd2 while(HAL_GetTick() - 8006ba4: 4602 mov r2, r0 - 8006ba6: 6fbb ldr r3, [r7, #120] ; 0x78 - 8006ba8: 4293 cmp r3, r2 - 8006baa: f63f ad6d bhi.w 8006688 - 8006bae: e000 b.n 8006bb2 + 8006bc0: f7fa ffb2 bl 8001b28 + 8006bc4: 4602 mov r2, r0 + 8006bc6: 6fbb ldr r3, [r7, #120] ; 0x78 + 8006bc8: 4293 cmp r3, r2 + 8006bca: f63f ad6d bhi.w 80066a8 + 8006bce: e000 b.n 8006bd2 return; //已经校准过了 - 8006bb0: bf00 nop + 8006bd0: bf00 nop } } } - 8006bb2: 3790 adds r7, #144 ; 0x90 - 8006bb4: 46bd mov sp, r7 - 8006bb6: bdb0 pop {r4, r5, r7, pc} - 8006bb8: 40704000 .word 0x40704000 - 8006bbc: 40668000 .word 0x40668000 - 8006bc0: 41f00000 .word 0x41f00000 - 8006bc4: 43910000 .word 0x43910000 - 8006bc8: 43520000 .word 0x43520000 - 8006bcc: 20000378 .word 0x20000378 - 8006bd0: 0800a45c .word 0x0800a45c - 8006bd4: 0800a470 .word 0x0800a470 + 8006bd2: 3790 adds r7, #144 ; 0x90 + 8006bd4: 46bd mov sp, r7 + 8006bd6: bdb0 pop {r4, r5, r7, pc} + 8006bd8: 40704000 .word 0x40704000 + 8006bdc: 40668000 .word 0x40668000 + 8006be0: 41f00000 .word 0x41f00000 + 8006be4: 43910000 .word 0x43910000 + 8006be8: 43520000 .word 0x43520000 + 8006bec: 20000374 .word 0x20000374 + 8006bf0: 0800a45c .word 0x0800a45c + 8006bf4: 0800a470 .word 0x0800a470 -08006bd8 : +08006bf8 : window *idcard_window; char idcard_str[32]; void APP_IDcard_init(window *a_window) { - 8006bd8: b580 push {r7, lr} - 8006bda: b082 sub sp, #8 - 8006bdc: af00 add r7, sp, #0 - 8006bde: 6078 str r0, [r7, #4] + 8006bf8: b580 push {r7, lr} + 8006bfa: b082 sub sp, #8 + 8006bfc: af00 add r7, sp, #0 + 8006bfe: 6078 str r0, [r7, #4] idcard_window=a_window; - 8006be0: 4a04 ldr r2, [pc, #16] ; (8006bf4 ) - 8006be2: 687b ldr r3, [r7, #4] - 8006be4: 6013 str r3, [r2, #0] + 8006c00: 4a04 ldr r2, [pc, #16] ; (8006c14 ) + 8006c02: 687b ldr r3, [r7, #4] + 8006c04: 6013 str r3, [r2, #0] RC522_Init(); - 8006be6: f7ff fa9a bl 800611e + 8006c06: f7ff fa99 bl 800613c } - 8006bea: bf00 nop - 8006bec: 3708 adds r7, #8 - 8006bee: 46bd mov sp, r7 - 8006bf0: bd80 pop {r7, pc} - 8006bf2: bf00 nop - 8006bf4: 200003d0 .word 0x200003d0 + 8006c0a: bf00 nop + 8006c0c: 3708 adds r7, #8 + 8006c0e: 46bd mov sp, r7 + 8006c10: bd80 pop {r7, pc} + 8006c12: bf00 nop + 8006c14: 200003d0 .word 0x200003d0 -08006bf8 : -unsigned char s=0x08; -char KEY[6]={0xff,0xff,0xff,0xff,0xff,0xff}; +08006c18 : uint32_t card_number_D=0; +char fundcard,PA,sele,checkkey; + void APP_IDcard_loop() { - 8006bf8: b5f0 push {r4, r5, r6, r7, lr} - 8006bfa: b097 sub sp, #92 ; 0x5c - 8006bfc: af0e add r7, sp, #56 ; 0x38 - status = PcdRequest(PICC_REQALL,CT); - 8006bfe: 496c ldr r1, [pc, #432] ; (8006db0 ) - 8006c00: 2052 movs r0, #82 ; 0x52 - 8006c02: f7ff f8fa bl 8005dfa - 8006c06: 4603 mov r3, r0 - 8006c08: 461a mov r2, r3 - 8006c0a: 4b6a ldr r3, [pc, #424] ; (8006db4 ) - 8006c0c: 701a strb r2, [r3, #0] - if(status==MI_OK) - 8006c0e: 4b69 ldr r3, [pc, #420] ; (8006db4 ) - 8006c10: 781b ldrb r3, [r3, #0] - 8006c12: 2b00 cmp r3, #0 - 8006c14: d109 bne.n 8006c2a + 8006c18: b580 push {r7, lr} + 8006c1a: b082 sub sp, #8 + 8006c1c: af02 add r7, sp, #8 + fundcard = PcdRequest(PICC_REQALL,CT); + 8006c1e: 4961 ldr r1, [pc, #388] ; (8006da4 ) + 8006c20: 2052 movs r0, #82 ; 0x52 + 8006c22: f7ff f8ea bl 8005dfa + 8006c26: 4603 mov r3, r0 + 8006c28: 461a mov r2, r3 + 8006c2a: 4b5f ldr r3, [pc, #380] ; (8006da8 ) + 8006c2c: 701a strb r2, [r3, #0] + if(fundcard==MI_OK) + 8006c2e: 4b5e ldr r3, [pc, #376] ; (8006da8 ) + 8006c30: 781b ldrb r3, [r3, #0] + 8006c32: 2b00 cmp r3, #0 + 8006c34: f040 80b2 bne.w 8006d9c { status=MI_ERR; - 8006c16: 4b67 ldr r3, [pc, #412] ; (8006db4 ) - 8006c18: 2202 movs r2, #2 - 8006c1a: 701a strb r2, [r3, #0] - status = PcdAnticoll(SN); - 8006c1c: 4866 ldr r0, [pc, #408] ; (8006db8 ) - 8006c1e: f7ff f923 bl 8005e68 - 8006c22: 4603 mov r3, r0 - 8006c24: 461a mov r2, r3 - 8006c26: 4b63 ldr r3, [pc, #396] ; (8006db4 ) - 8006c28: 701a strb r2, [r3, #0] - } - if (status==MI_OK) - 8006c2a: 4b62 ldr r3, [pc, #392] ; (8006db4 ) - 8006c2c: 781b ldrb r3, [r3, #0] - 8006c2e: 2b00 cmp r3, #0 - 8006c30: d139 bne.n 8006ca6 - { - status=MI_ERR; - 8006c32: 4b60 ldr r3, [pc, #384] ; (8006db4 ) - 8006c34: 2202 movs r2, #2 - 8006c36: 701a strb r2, [r3, #0] - card_number_D=(SN[2]<<16)+(SN[1]<<8)+(SN[0]); - 8006c38: 4b5f ldr r3, [pc, #380] ; (8006db8 ) - 8006c3a: 789b ldrb r3, [r3, #2] - 8006c3c: 041a lsls r2, r3, #16 - 8006c3e: 4b5e ldr r3, [pc, #376] ; (8006db8 ) - 8006c40: 785b ldrb r3, [r3, #1] - 8006c42: 021b lsls r3, r3, #8 - 8006c44: 4413 add r3, r2 - 8006c46: 4a5c ldr r2, [pc, #368] ; (8006db8 ) - 8006c48: 7812 ldrb r2, [r2, #0] - 8006c4a: 4413 add r3, r2 - 8006c4c: 461a mov r2, r3 - 8006c4e: 4b5b ldr r3, [pc, #364] ; (8006dbc ) - 8006c50: 601a str r2, [r3, #0] - PcdRead(0,RFID); - 8006c52: 495b ldr r1, [pc, #364] ; (8006dc0 ) - 8006c54: 2000 movs r0, #0 - 8006c56: f7ff fa20 bl 800609a - sprintf(idcard_str,"CardId:%d",card_number_D); - 8006c5a: 4b58 ldr r3, [pc, #352] ; (8006dbc ) - 8006c5c: 681b ldr r3, [r3, #0] - 8006c5e: 461a mov r2, r3 - 8006c60: 4958 ldr r1, [pc, #352] ; (8006dc4 ) - 8006c62: 4859 ldr r0, [pc, #356] ; (8006dc8 ) + 8006c38: 4b5c ldr r3, [pc, #368] ; (8006dac ) + 8006c3a: 2202 movs r2, #2 + 8006c3c: 701a strb r2, [r3, #0] + PA = PcdAnticoll(SN); + 8006c3e: 485c ldr r0, [pc, #368] ; (8006db0 ) + 8006c40: f7ff f912 bl 8005e68 + 8006c44: 4603 mov r3, r0 + 8006c46: 461a mov r2, r3 + 8006c48: 4b5a ldr r3, [pc, #360] ; (8006db4 ) + 8006c4a: 701a strb r2, [r3, #0] + if(PA==MI_OK) + 8006c4c: 4b59 ldr r3, [pc, #356] ; (8006db4 ) + 8006c4e: 781b ldrb r3, [r3, #0] + 8006c50: 2b00 cmp r3, #0 + 8006c52: f040 80a3 bne.w 8006d9c + { + sprintf(idcard_str,"CardId:%X%X",CT[0],CT[1]); + 8006c56: 4b53 ldr r3, [pc, #332] ; (8006da4 ) + 8006c58: 781b ldrb r3, [r3, #0] + 8006c5a: 461a mov r2, r3 + 8006c5c: 4b51 ldr r3, [pc, #324] ; (8006da4 ) + 8006c5e: 785b ldrb r3, [r3, #1] + 8006c60: 4955 ldr r1, [pc, #340] ; (8006db8 ) + 8006c62: 4856 ldr r0, [pc, #344] ; (8006dbc ) 8006c64: f001 fa26 bl 80080b4 - LCD_ShowString(idcard_window->x, idcard_window->y+16, idcard_str, 16, GREEN, RED); - 8006c68: 4b58 ldr r3, [pc, #352] ; (8006dcc ) + LCD_ShowString(idcard_window->x, idcard_window->y+16, idcard_str, 16, GREEN, RED); + 8006c68: 4b55 ldr r3, [pc, #340] ; (8006dc0 ) 8006c6a: 681b ldr r3, [r3, #0] 8006c6c: 8818 ldrh r0, [r3, #0] - 8006c6e: 4b57 ldr r3, [pc, #348] ; (8006dcc ) + 8006c6e: 4b54 ldr r3, [pc, #336] ; (8006dc0 ) 8006c70: 681b ldr r3, [r3, #0] 8006c72: 885b ldrh r3, [r3, #2] 8006c74: 3310 adds r3, #16 @@ -16908,174 +16906,172 @@ void APP_IDcard_loop() 8006c7e: f44f 63fc mov.w r3, #2016 ; 0x7e0 8006c82: 9300 str r3, [sp, #0] 8006c84: 2310 movs r3, #16 - 8006c86: 4a50 ldr r2, [pc, #320] ; (8006dc8 ) + 8006c86: 4a4d ldr r2, [pc, #308] ; (8006dbc ) 8006c88: f7fe fda4 bl 80057d4 + sprintf(idcard_str,"CardId:%X%X%X%X",SN[0],SN[1],SN[2],SN[3]); + 8006c8c: 4b48 ldr r3, [pc, #288] ; (8006db0 ) + 8006c8e: 781b ldrb r3, [r3, #0] + 8006c90: 4619 mov r1, r3 + 8006c92: 4b47 ldr r3, [pc, #284] ; (8006db0 ) + 8006c94: 785b ldrb r3, [r3, #1] + 8006c96: 4618 mov r0, r3 + 8006c98: 4b45 ldr r3, [pc, #276] ; (8006db0 ) + 8006c9a: 789b ldrb r3, [r3, #2] + 8006c9c: 461a mov r2, r3 + 8006c9e: 4b44 ldr r3, [pc, #272] ; (8006db0 ) + 8006ca0: 78db ldrb r3, [r3, #3] + 8006ca2: 9301 str r3, [sp, #4] + 8006ca4: 9200 str r2, [sp, #0] + 8006ca6: 4603 mov r3, r0 + 8006ca8: 460a mov r2, r1 + 8006caa: 4946 ldr r1, [pc, #280] ; (8006dc4 ) + 8006cac: 4843 ldr r0, [pc, #268] ; (8006dbc ) + 8006cae: f001 fa01 bl 80080b4 + LCD_ShowString(idcard_window->x, idcard_window->y+32, idcard_str, 16, GREEN, RED); + 8006cb2: 4b43 ldr r3, [pc, #268] ; (8006dc0 ) + 8006cb4: 681b ldr r3, [r3, #0] + 8006cb6: 8818 ldrh r0, [r3, #0] + 8006cb8: 4b41 ldr r3, [pc, #260] ; (8006dc0 ) + 8006cba: 681b ldr r3, [r3, #0] + 8006cbc: 885b ldrh r3, [r3, #2] + 8006cbe: 3320 adds r3, #32 + 8006cc0: b299 uxth r1, r3 + 8006cc2: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006cc6: 9301 str r3, [sp, #4] + 8006cc8: f44f 63fc mov.w r3, #2016 ; 0x7e0 + 8006ccc: 9300 str r3, [sp, #0] + 8006cce: 2310 movs r3, #16 + 8006cd0: 4a3a ldr r2, [pc, #232] ; (8006dbc ) + 8006cd2: f7fe fd7f bl 80057d4 - status=MI_ERR; - 8006c8c: 4b49 ldr r3, [pc, #292] ; (8006db4 ) - 8006c8e: 2202 movs r2, #2 - 8006c90: 701a strb r2, [r3, #0] - status =PcdAuthState(0,0,KEY,SN); - 8006c92: 4b49 ldr r3, [pc, #292] ; (8006db8 ) - 8006c94: 4a4e ldr r2, [pc, #312] ; (8006dd0 ) - 8006c96: 2100 movs r1, #0 - 8006c98: 2000 movs r0, #0 - 8006c9a: f7ff f999 bl 8005fd0 - 8006c9e: 4603 mov r3, r0 - 8006ca0: 461a mov r2, r3 - 8006ca2: 4b44 ldr r3, [pc, #272] ; (8006db4 ) - 8006ca4: 701a strb r2, [r3, #0] - } - if(status==MI_OK) - 8006ca6: 4b43 ldr r3, [pc, #268] ; (8006db4 ) - 8006ca8: 781b ldrb r3, [r3, #0] - 8006caa: 2b00 cmp r3, #0 - 8006cac: d11c bne.n 8006ce8 - { - LCD_ShowString(idcard_window->x, idcard_window->y+32, "KEY_OK", 16, GREEN, RED); - 8006cae: 4b47 ldr r3, [pc, #284] ; (8006dcc ) - 8006cb0: 681b ldr r3, [r3, #0] - 8006cb2: 8818 ldrh r0, [r3, #0] - 8006cb4: 4b45 ldr r3, [pc, #276] ; (8006dcc ) - 8006cb6: 681b ldr r3, [r3, #0] - 8006cb8: 885b ldrh r3, [r3, #2] - 8006cba: 3320 adds r3, #32 - 8006cbc: b299 uxth r1, r3 - 8006cbe: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006cc2: 9301 str r3, [sp, #4] - 8006cc4: f44f 63fc mov.w r3, #2016 ; 0x7e0 - 8006cc8: 9300 str r3, [sp, #0] - 8006cca: 2310 movs r3, #16 - 8006ccc: 4a41 ldr r2, [pc, #260] ; (8006dd4 ) - 8006cce: f7fe fd81 bl 80057d4 - status=MI_ERR; - 8006cd2: 4b38 ldr r3, [pc, #224] ; (8006db4 ) - 8006cd4: 2202 movs r2, #2 - 8006cd6: 701a strb r2, [r3, #0] - status=PcdRead(0,RFID); - 8006cd8: 4939 ldr r1, [pc, #228] ; (8006dc0 ) - 8006cda: 2000 movs r0, #0 - 8006cdc: f7ff f9dd bl 800609a - 8006ce0: 4603 mov r3, r0 - 8006ce2: 461a mov r2, r3 - 8006ce4: 4b33 ldr r3, [pc, #204] ; (8006db4 ) - 8006ce6: 701a strb r2, [r3, #0] - } - if(status==MI_OK) - 8006ce8: 4b32 ldr r3, [pc, #200] ; (8006db4 ) - 8006cea: 781b ldrb r3, [r3, #0] - 8006cec: 2b00 cmp r3, #0 - 8006cee: d15b bne.n 8006da8 - { + sele=PcdSelect(SN); + 8006cd6: 4836 ldr r0, [pc, #216] ; (8006db0 ) + 8006cd8: f7ff f97a bl 8005fd0 + 8006cdc: 4603 mov r3, r0 + 8006cde: b2da uxtb r2, r3 + 8006ce0: 4b39 ldr r3, [pc, #228] ; (8006dc8 ) + 8006ce2: 701a strb r2, [r3, #0] + if(sele==MI_OK) + 8006ce4: 4b38 ldr r3, [pc, #224] ; (8006dc8 ) + 8006ce6: 781b ldrb r3, [r3, #0] + 8006ce8: 2b00 cmp r3, #0 + 8006cea: d157 bne.n 8006d9c + { + LCD_ShowString(idcard_window->x, idcard_window->y+48, "SELE OK", 16, GREEN, RED); + 8006cec: 4b34 ldr r3, [pc, #208] ; (8006dc0 ) + 8006cee: 681b ldr r3, [r3, #0] + 8006cf0: 8818 ldrh r0, [r3, #0] + 8006cf2: 4b33 ldr r3, [pc, #204] ; (8006dc0 ) + 8006cf4: 681b ldr r3, [r3, #0] + 8006cf6: 885b ldrh r3, [r3, #2] + 8006cf8: 3330 adds r3, #48 ; 0x30 + 8006cfa: b299 uxth r1, r3 + 8006cfc: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006d00: 9301 str r3, [sp, #4] + 8006d02: f44f 63fc mov.w r3, #2016 ; 0x7e0 + 8006d06: 9300 str r3, [sp, #0] + 8006d08: 2310 movs r3, #16 + 8006d0a: 4a30 ldr r2, [pc, #192] ; (8006dcc ) + 8006d0c: f7fe fd62 bl 80057d4 + + checkkey=MI_ERR; + 8006d10: 4b2f ldr r3, [pc, #188] ; (8006dd0 ) + 8006d12: 2202 movs r2, #2 + 8006d14: 701a strb r2, [r3, #0] + checkkey=PcdAuthState(0x61,0,KEY,SN); + 8006d16: 4b26 ldr r3, [pc, #152] ; (8006db0 ) + 8006d18: 4a2e ldr r2, [pc, #184] ; (8006dd4 ) + 8006d1a: 2100 movs r1, #0 + 8006d1c: 2061 movs r0, #97 ; 0x61 + 8006d1e: f7ff f9a8 bl 8006072 + 8006d22: 4603 mov r3, r0 + 8006d24: 461a mov r2, r3 + 8006d26: 4b2a ldr r3, [pc, #168] ; (8006dd0 ) + 8006d28: 701a strb r2, [r3, #0] + if(checkkey==MI_OK) + 8006d2a: 4b29 ldr r3, [pc, #164] ; (8006dd0 ) + 8006d2c: 781b ldrb r3, [r3, #0] + 8006d2e: 2b00 cmp r3, #0 + 8006d30: d111 bne.n 8006d56 + { + LCD_ShowString(idcard_window->x, idcard_window->y+48+16, "KEY OK", 16, GREEN, RED); + 8006d32: 4b23 ldr r3, [pc, #140] ; (8006dc0 ) + 8006d34: 681b ldr r3, [r3, #0] + 8006d36: 8818 ldrh r0, [r3, #0] + 8006d38: 4b21 ldr r3, [pc, #132] ; (8006dc0 ) + 8006d3a: 681b ldr r3, [r3, #0] + 8006d3c: 885b ldrh r3, [r3, #2] + 8006d3e: 3340 adds r3, #64 ; 0x40 + 8006d40: b299 uxth r1, r3 + 8006d42: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006d46: 9301 str r3, [sp, #4] + 8006d48: f44f 63fc mov.w r3, #2016 ; 0x7e0 + 8006d4c: 9300 str r3, [sp, #0] + 8006d4e: 2310 movs r3, #16 + 8006d50: 4a21 ldr r2, [pc, #132] ; (8006dd8 ) + 8006d52: f7fe fd3f bl 80057d4 + //PcdRead(0,RFID); + } + checkkey=MI_ERR; + 8006d56: 4b1e ldr r3, [pc, #120] ; (8006dd0 ) + 8006d58: 2202 movs r2, #2 + 8006d5a: 701a strb r2, [r3, #0] + checkkey=PcdAuthState(0x61,32,KEY,SN); + 8006d5c: 4b14 ldr r3, [pc, #80] ; (8006db0 ) + 8006d5e: 4a1d ldr r2, [pc, #116] ; (8006dd4 ) + 8006d60: 2120 movs r1, #32 + 8006d62: 2061 movs r0, #97 ; 0x61 + 8006d64: f7ff f985 bl 8006072 + 8006d68: 4603 mov r3, r0 + 8006d6a: 461a mov r2, r3 + 8006d6c: 4b18 ldr r3, [pc, #96] ; (8006dd0 ) + 8006d6e: 701a strb r2, [r3, #0] + if(checkkey==MI_OK) + 8006d70: 4b17 ldr r3, [pc, #92] ; (8006dd0 ) + 8006d72: 781b ldrb r3, [r3, #0] + 8006d74: 2b00 cmp r3, #0 + 8006d76: d111 bne.n 8006d9c + { + LCD_ShowString(idcard_window->x, idcard_window->y+48+32, "KEY OK", 16, GREEN, RED); + 8006d78: 4b11 ldr r3, [pc, #68] ; (8006dc0 ) + 8006d7a: 681b ldr r3, [r3, #0] + 8006d7c: 8818 ldrh r0, [r3, #0] + 8006d7e: 4b10 ldr r3, [pc, #64] ; (8006dc0 ) + 8006d80: 681b ldr r3, [r3, #0] + 8006d82: 885b ldrh r3, [r3, #2] + 8006d84: 3350 adds r3, #80 ; 0x50 + 8006d86: b299 uxth r1, r3 + 8006d88: f44f 4378 mov.w r3, #63488 ; 0xf800 + 8006d8c: 9301 str r3, [sp, #4] + 8006d8e: f44f 63fc mov.w r3, #2016 ; 0x7e0 + 8006d92: 9300 str r3, [sp, #0] + 8006d94: 2310 movs r3, #16 + 8006d96: 4a10 ldr r2, [pc, #64] ; (8006dd8 ) + 8006d98: f7fe fd1c bl 80057d4 sprintf(idcard_str,"%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x",RFID[0],RFID[1],RFID[2],RFID[3],RFID[4],RFID[5],RFID[6],RFID[7],RFID[8],RFID[9],RFID[10],RFID[11],RFID[12],RFID[13],RFID[14],RFID[15]); - 8006cf0: 4b33 ldr r3, [pc, #204] ; (8006dc0 ) - 8006cf2: 781b ldrb r3, [r3, #0] - 8006cf4: 469c mov ip, r3 - 8006cf6: 4b32 ldr r3, [pc, #200] ; (8006dc0 ) - 8006cf8: 785b ldrb r3, [r3, #1] - 8006cfa: 469e mov lr, r3 - 8006cfc: 4b30 ldr r3, [pc, #192] ; (8006dc0 ) - 8006cfe: 789b ldrb r3, [r3, #2] - 8006d00: 4618 mov r0, r3 - 8006d02: 4b2f ldr r3, [pc, #188] ; (8006dc0 ) - 8006d04: 78db ldrb r3, [r3, #3] - 8006d06: 461c mov r4, r3 - 8006d08: 4b2d ldr r3, [pc, #180] ; (8006dc0 ) - 8006d0a: 791b ldrb r3, [r3, #4] - 8006d0c: 461d mov r5, r3 - 8006d0e: 4b2c ldr r3, [pc, #176] ; (8006dc0 ) - 8006d10: 795b ldrb r3, [r3, #5] - 8006d12: 461e mov r6, r3 - 8006d14: 4b2a ldr r3, [pc, #168] ; (8006dc0 ) - 8006d16: 799b ldrb r3, [r3, #6] - 8006d18: 61fb str r3, [r7, #28] - 8006d1a: 4b29 ldr r3, [pc, #164] ; (8006dc0 ) - 8006d1c: 79db ldrb r3, [r3, #7] - 8006d1e: 61bb str r3, [r7, #24] - 8006d20: 4b27 ldr r3, [pc, #156] ; (8006dc0 ) - 8006d22: 7a1b ldrb r3, [r3, #8] - 8006d24: 617b str r3, [r7, #20] - 8006d26: 4b26 ldr r3, [pc, #152] ; (8006dc0 ) - 8006d28: 7a5b ldrb r3, [r3, #9] - 8006d2a: 613b str r3, [r7, #16] - 8006d2c: 4b24 ldr r3, [pc, #144] ; (8006dc0 ) - 8006d2e: 7a9b ldrb r3, [r3, #10] - 8006d30: 60fb str r3, [r7, #12] - 8006d32: 4b23 ldr r3, [pc, #140] ; (8006dc0 ) - 8006d34: 7adb ldrb r3, [r3, #11] - 8006d36: 60bb str r3, [r7, #8] - 8006d38: 4b21 ldr r3, [pc, #132] ; (8006dc0 ) - 8006d3a: 7b1b ldrb r3, [r3, #12] - 8006d3c: 607b str r3, [r7, #4] - 8006d3e: 4b20 ldr r3, [pc, #128] ; (8006dc0 ) - 8006d40: 7b5b ldrb r3, [r3, #13] - 8006d42: 4619 mov r1, r3 - 8006d44: 4b1e ldr r3, [pc, #120] ; (8006dc0 ) - 8006d46: 7b9b ldrb r3, [r3, #14] - 8006d48: 461a mov r2, r3 - 8006d4a: 4b1d ldr r3, [pc, #116] ; (8006dc0 ) - 8006d4c: 7bdb ldrb r3, [r3, #15] - 8006d4e: 930d str r3, [sp, #52] ; 0x34 - 8006d50: 920c str r2, [sp, #48] ; 0x30 - 8006d52: 910b str r1, [sp, #44] ; 0x2c - 8006d54: 687a ldr r2, [r7, #4] - 8006d56: 920a str r2, [sp, #40] ; 0x28 - 8006d58: 68ba ldr r2, [r7, #8] - 8006d5a: 9209 str r2, [sp, #36] ; 0x24 - 8006d5c: 68fa ldr r2, [r7, #12] - 8006d5e: 9208 str r2, [sp, #32] - 8006d60: 693a ldr r2, [r7, #16] - 8006d62: 9207 str r2, [sp, #28] - 8006d64: 697a ldr r2, [r7, #20] - 8006d66: 9206 str r2, [sp, #24] - 8006d68: 69ba ldr r2, [r7, #24] - 8006d6a: 9205 str r2, [sp, #20] - 8006d6c: 69fb ldr r3, [r7, #28] - 8006d6e: 9304 str r3, [sp, #16] - 8006d70: 9603 str r6, [sp, #12] - 8006d72: 9502 str r5, [sp, #8] - 8006d74: 9401 str r4, [sp, #4] - 8006d76: 9000 str r0, [sp, #0] - 8006d78: 4673 mov r3, lr - 8006d7a: 4662 mov r2, ip - 8006d7c: 4916 ldr r1, [pc, #88] ; (8006dd8 ) - 8006d7e: 4812 ldr r0, [pc, #72] ; (8006dc8 ) - 8006d80: f001 f998 bl 80080b4 LCD_ShowString(idcard_window->x, idcard_window->y+32, idcard_str, 16, GREEN, RED); - 8006d84: 4b11 ldr r3, [pc, #68] ; (8006dcc ) - 8006d86: 681b ldr r3, [r3, #0] - 8006d88: 8818 ldrh r0, [r3, #0] - 8006d8a: 4b10 ldr r3, [pc, #64] ; (8006dcc ) - 8006d8c: 681b ldr r3, [r3, #0] - 8006d8e: 885b ldrh r3, [r3, #2] - 8006d90: 3320 adds r3, #32 - 8006d92: b299 uxth r1, r3 - 8006d94: f44f 4378 mov.w r3, #63488 ; 0xf800 - 8006d98: 9301 str r3, [sp, #4] - 8006d9a: f44f 63fc mov.w r3, #2016 ; 0x7e0 - 8006d9e: 9300 str r3, [sp, #0] - 8006da0: 2310 movs r3, #16 - 8006da2: 4a09 ldr r2, [pc, #36] ; (8006dc8 ) - 8006da4: f7fe fd16 bl 80057d4 } - +*/ } - 8006da8: bf00 nop - 8006daa: 3724 adds r7, #36 ; 0x24 - 8006dac: 46bd mov sp, r7 - 8006dae: bdf0 pop {r4, r5, r6, r7, pc} - 8006db0: 200003d4 .word 0x200003d4 - 8006db4: 200003dc .word 0x200003dc - 8006db8: 200003d8 .word 0x200003d8 - 8006dbc: 20000208 .word 0x20000208 - 8006dc0: 200003a0 .word 0x200003a0 - 8006dc4: 0800a488 .word 0x0800a488 - 8006dc8: 200003b0 .word 0x200003b0 - 8006dcc: 200003d0 .word 0x200003d0 - 8006dd0: 2000000c .word 0x2000000c - 8006dd4: 0800a494 .word 0x0800a494 - 8006dd8: 0800a49c .word 0x0800a49c + 8006d9c: bf00 nop + 8006d9e: 46bd mov sp, r7 + 8006da0: bd80 pop {r7, pc} + 8006da2: bf00 nop + 8006da4: 200003d8 .word 0x200003d8 + 8006da8: 200003e0 .word 0x200003e0 + 8006dac: 200003e2 .word 0x200003e2 + 8006db0: 200003dc .word 0x200003dc + 8006db4: 200003ac .word 0x200003ac + 8006db8: 0800a488 .word 0x0800a488 + 8006dbc: 200003b0 .word 0x200003b0 + 8006dc0: 200003d0 .word 0x200003d0 + 8006dc4: 0800a494 .word 0x0800a494 + 8006dc8: 200003e1 .word 0x200003e1 + 8006dcc: 0800a4a4 .word 0x0800a4a4 + 8006dd0: 200003d4 .word 0x200003d4 + 8006dd4: 2000000c .word 0x2000000c + 8006dd8: 0800a4ac .word 0x0800a4ac 08006ddc : IIC_SAND_DATE(MAX30102_Device_address,REG_LED2_PA,&a,1);// Choose value for ~ 10mA for LED2 @@ -17246,8 +17242,8 @@ void max30102_read_fifo(void) 8006ece: 46bd mov sp, r7 8006ed0: bd80 pop {r7, pc} 8006ed2: bf00 nop - 8006ed4: 20002530 .word 0x20002530 - 8006ed8: 20000420 .word 0x20000420 + 8006ed4: 20002534 .word 0x20002534 + 8006ed8: 20000424 .word 0x20000424 08006edc : @@ -17336,13 +17332,13 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)//10us 8006f66: 46bd mov sp, r7 8006f68: bd90 pop {r4, r7, pc} 8006f6a: bf00 nop - 8006f6c: 200002b4 .word 0x200002b4 - 8006f70: 20002530 .word 0x20002530 - 8006f74: 2000020e .word 0x2000020e - 8006f78: 20000428 .word 0x20000428 - 8006f7c: 20000420 .word 0x20000420 - 8006f80: 200014a8 .word 0x200014a8 - 8006f84: 2000020c .word 0x2000020c + 8006f6c: 200002b0 .word 0x200002b0 + 8006f70: 20002534 .word 0x20002534 + 8006f74: 2000020a .word 0x2000020a + 8006f78: 2000042c .word 0x2000042c + 8006f7c: 20000424 .word 0x20000424 + 8006f80: 200014ac .word 0x200014ac + 8006f84: 20000208 .word 0x20000208 08006f88 : extern touch_device t0; @@ -17370,13 +17366,13 @@ void main_app() { TP_adjustment(1); 8006fa4: 2001 movs r0, #1 - 8006fa6: f7ff fb35 bl 8006614 + 8006fa6: f7ff fb45 bl 8006634 8006faa: e002 b.n 8006fb2 }else { TP_adjustment(0); 8006fac: 2000 movs r0, #0 - 8006fae: f7ff fb31 bl 8006614 + 8006fae: f7ff fb41 bl 8006634 } @@ -17402,7 +17398,7 @@ void main_app() 8006fd0: f000 f877 bl 80070c2 8006fd4: 4603 mov r3, r0 8006fd6: 4618 mov r0, r3 - 8006fd8: f7ff fdfe bl 8006bd8 + 8006fd8: f7ff fe0e bl 8006bf8 //New_Window(ui,80,80,60,90,YELLOW,"YELLOW"); //New_Window(ui,120,90,70,60,MAGENTA,"MAGENTA"); @@ -17417,20 +17413,20 @@ void main_app() // 交叉编译测试 //APP_blood_loop(); APP_IDcard_loop(); - 8006fea: f7ff fe05 bl 8006bf8 + 8006fea: f7ff fe15 bl 8006c18 UI_Server(ui); 8006fee: 6c78 ldr r0, [r7, #68] ; 0x44 8006ff0: f000 fa0e bl 8007410 TP_Server(); - 8006ff4: f7ff fa3a bl 800646c + 8006ff4: f7ff fa4a bl 800648c EEPROM_SLOWWRITE_SERVER(); 8006ff8: f7fe fc44 bl 8005884 { 8006ffc: e7f5 b.n 8006fea 8006ffe: bf00 nop 8007000: 40011800 .word 0x40011800 - 8007004: 0800a4c0 .word 0x0800a4c0 + 8007004: 0800a4b4 .word 0x0800a4b4 08007008 : #include "touch.h" @@ -17464,7 +17460,7 @@ void Inteface_SetCursor(uint16_t Xpos, uint16_t Ypos) 8007032: 3708 adds r7, #8 8007034: 46bd mov sp, r7 8007036: bd80 pop {r7, pc} - 8007038: 20000358 .word 0x20000358 + 8007038: 20000354 .word 0x20000354 0800703c : //往像素坐标写入一个颜色 @@ -18471,7 +18467,7 @@ void UI_Server(UI *ui) 80075fa: 3720 adds r7, #32 80075fc: 46bd mov sp, r7 80075fe: bd80 pop {r7, pc} - 8007600: 20000390 .word 0x20000390 + 8007600: 2000038c .word 0x2000038c 08007604 <__errno>: 8007604: 4b01 ldr r3, [pc, #4] ; (800760c <__errno+0x8>) @@ -18506,10 +18502,10 @@ void UI_Server(UI *ui) 8007642: 4798 blx r3 8007644: 3601 adds r6, #1 8007646: e7f2 b.n 800762e <__libc_init_array+0x1e> - 8007648: 0800b324 .word 0x0800b324 - 800764c: 0800b324 .word 0x0800b324 - 8007650: 0800b324 .word 0x0800b324 - 8007654: 0800b328 .word 0x0800b328 + 8007648: 0800b31c .word 0x0800b31c + 800764c: 0800b31c .word 0x0800b31c + 8007650: 0800b31c .word 0x0800b31c + 8007654: 0800b320 .word 0x0800b320 08007658 : 8007658: 4b02 ldr r3, [pc, #8] ; (8007664 ) @@ -18607,7 +18603,7 @@ void UI_Server(UI *ui) 8007716: e7c9 b.n 80076ac <_free_r+0x24> 8007718: bd38 pop {r3, r4, r5, pc} 800771a: bf00 nop - 800771c: 20000210 .word 0x20000210 + 800771c: 2000020c .word 0x2000020c 08007720 <_malloc_r>: 8007720: b5f8 push {r3, r4, r5, r6, r7, lr} @@ -18686,8 +18682,8 @@ void UI_Server(UI *ui) 80077c6: d1dd bne.n 8007784 <_malloc_r+0x64> 80077c8: e7cf b.n 800776a <_malloc_r+0x4a> 80077ca: bf00 nop - 80077cc: 20000210 .word 0x20000210 - 80077d0: 20000214 .word 0x20000214 + 80077cc: 2000020c .word 0x2000020c + 80077d0: 20000210 .word 0x20000210 080077d4 <__cvt>: 80077d4: 2b00 cmp r3, #0 @@ -19111,11 +19107,11 @@ void UI_Server(UI *ui) 8007bd8: e7ee b.n 8007bb8 <_printf_float+0x2a8> 8007bda: bf00 nop 8007bdc: 7fefffff .word 0x7fefffff - 8007be0: 0800af48 .word 0x0800af48 - 8007be4: 0800af4c .word 0x0800af4c - 8007be8: 0800af54 .word 0x0800af54 - 8007bec: 0800af50 .word 0x0800af50 - 8007bf0: 0800af58 .word 0x0800af58 + 8007be0: 0800af3c .word 0x0800af3c + 8007be4: 0800af40 .word 0x0800af40 + 8007be8: 0800af48 .word 0x0800af48 + 8007bec: 0800af44 .word 0x0800af44 + 8007bf0: 0800af4c .word 0x0800af4c 8007bf4: 9a0e ldr r2, [sp, #56] ; 0x38 8007bf6: 6da3 ldr r3, [r4, #88] ; 0x58 8007bf8: 429a cmp r2, r3 @@ -19602,8 +19598,8 @@ void UI_Server(UI *ui) 8008084: 2500 movs r5, #0 8008086: f104 0619 add.w r6, r4, #25 800808a: e7f5 b.n 8008078 <_printf_i+0x230> - 800808c: 0800af5a .word 0x0800af5a - 8008090: 0800af6b .word 0x0800af6b + 800808c: 0800af4e .word 0x0800af4e + 8008090: 0800af5f .word 0x0800af5f 08008094 <_sbrk_r>: 8008094: b538 push {r3, r4, r5, lr} @@ -19619,7 +19615,7 @@ void UI_Server(UI *ui) 80080aa: b103 cbz r3, 80080ae <_sbrk_r+0x1a> 80080ac: 6023 str r3, [r4, #0] 80080ae: bd38 pop {r3, r4, r5, pc} - 80080b0: 20002534 .word 0x20002534 + 80080b0: 20002538 .word 0x20002538 080080b4 : 80080b4: b40e push {r1, r2, r3} @@ -20036,15 +20032,15 @@ void UI_Server(UI *ui) 80084e4: 3fc68a28 .word 0x3fc68a28 80084e8: 509f79fb .word 0x509f79fb 80084ec: 3fd34413 .word 0x3fd34413 - 80084f0: 0800af89 .word 0x0800af89 - 80084f4: 0800afa0 .word 0x0800afa0 + 80084f0: 0800af7d .word 0x0800af7d + 80084f4: 0800af94 .word 0x0800af94 80084f8: 7ff00000 .word 0x7ff00000 - 80084fc: 0800af85 .word 0x0800af85 - 8008500: 0800af7c .word 0x0800af7c - 8008504: 0800af59 .word 0x0800af59 + 80084fc: 0800af79 .word 0x0800af79 + 8008500: 0800af70 .word 0x0800af70 + 8008504: 0800af4d .word 0x0800af4d 8008508: 3ff80000 .word 0x3ff80000 - 800850c: 0800b098 .word 0x0800b098 - 8008510: 0800afff .word 0x0800afff + 800850c: 0800b090 .word 0x0800b090 + 8008510: 0800aff3 .word 0x0800aff3 8008514: 2301 movs r3, #1 8008516: 930b str r3, [sp, #44] ; 0x2c 8008518: e7d4 b.n 80084c4 <_dtoa_r+0x2b4> @@ -20276,8 +20272,8 @@ void UI_Server(UI *ui) 80087ac: e9cd 0104 strd r0, r1, [sp, #16] 80087b0: e7c3 b.n 800873a <_dtoa_r+0x52a> 80087b2: bf00 nop - 80087b4: 0800b098 .word 0x0800b098 - 80087b8: 0800b070 .word 0x0800b070 + 80087b4: 0800b090 .word 0x0800b090 + 80087b8: 0800b068 .word 0x0800b068 80087bc: 3ff00000 .word 0x3ff00000 80087c0: 40240000 .word 0x40240000 80087c4: 401c0000 .word 0x401c0000 @@ -20915,9 +20911,9 @@ void UI_Server(UI *ui) 8008dd8: f000 f896 bl 8008f08 <__multadd> 8008ddc: 4682 mov sl, r0 8008dde: e7eb b.n 8008db8 <_dtoa_r+0xba8> - 8008de0: 0800afff .word 0x0800afff - 8008de4: 0800af58 .word 0x0800af58 - 8008de8: 0800af7c .word 0x0800af7c + 8008de0: 0800aff3 .word 0x0800aff3 + 8008de4: 0800af4c .word 0x0800af4c + 8008de8: 0800af70 .word 0x0800af70 08008dec <_localeconv_r>: 8008dec: 4800 ldr r0, [pc, #0] ; (8008df0 <_localeconv_r+0x4>) @@ -20957,13 +20953,13 @@ void UI_Server(UI *ui) 8008e2c: 4801 ldr r0, [pc, #4] ; (8008e34 <__malloc_lock+0x8>) 8008e2e: f000 bd26 b.w 800987e <__retarget_lock_acquire_recursive> 8008e32: bf00 nop - 8008e34: 2000253c .word 0x2000253c + 8008e34: 20002540 .word 0x20002540 08008e38 <__malloc_unlock>: 8008e38: 4801 ldr r0, [pc, #4] ; (8008e40 <__malloc_unlock+0x8>) 8008e3a: f000 bd21 b.w 8009880 <__retarget_lock_release_recursive> 8008e3e: bf00 nop - 8008e40: 2000253c .word 0x2000253c + 8008e40: 20002540 .word 0x20002540 08008e44 <_Balloc>: 8008e44: b570 push {r4, r5, r6, lr} @@ -21016,8 +21012,8 @@ void UI_Server(UI *ui) 8008eb4: e9c0 3303 strd r3, r3, [r0, #12] 8008eb8: e7f7 b.n 8008eaa <_Balloc+0x66> 8008eba: bf00 nop - 8008ebc: 0800af89 .word 0x0800af89 - 8008ec0: 0800b010 .word 0x0800b010 + 8008ebc: 0800af7d .word 0x0800af7d + 8008ec0: 0800b004 .word 0x0800b004 08008ec4 <_Bfree>: 8008ec4: b570 push {r4, r5, r6, lr} @@ -21045,8 +21041,8 @@ void UI_Server(UI *ui) 8008ef8: 6021 str r1, [r4, #0] 8008efa: f843 4022 str.w r4, [r3, r2, lsl #2] 8008efe: bd70 pop {r4, r5, r6, pc} - 8008f00: 0800af89 .word 0x0800af89 - 8008f04: 0800b010 .word 0x0800b010 + 8008f00: 0800af7d .word 0x0800af7d + 8008f04: 0800b004 .word 0x0800b004 08008f08 <__multadd>: 8008f08: e92d 41f0 stmdb sp!, {r4, r5, r6, r7, r8, lr} @@ -21102,8 +21098,8 @@ void UI_Server(UI *ui) 8008f8c: 4620 mov r0, r4 8008f8e: e8bd 81f0 ldmia.w sp!, {r4, r5, r6, r7, r8, pc} 8008f92: bf00 nop - 8008f94: 0800afff .word 0x0800afff - 8008f98: 0800b010 .word 0x0800b010 + 8008f94: 0800aff3 .word 0x0800aff3 + 8008f98: 0800b004 .word 0x0800b004 08008f9c <__hi0bits>: 8008f9c: 0c02 lsrs r2, r0, #16 @@ -21195,8 +21191,8 @@ void UI_Server(UI *ui) 8009056: 6103 str r3, [r0, #16] 8009058: bd10 pop {r4, pc} 800905a: bf00 nop - 800905c: 0800afff .word 0x0800afff - 8009060: 0800b010 .word 0x0800b010 + 800905c: 0800aff3 .word 0x0800aff3 + 8009060: 0800b004 .word 0x0800b004 08009064 <__multiply>: 8009064: e92d 4ff0 stmdb sp!, {r4, r5, r6, r7, r8, r9, sl, fp, lr} @@ -21314,8 +21310,8 @@ void UI_Server(UI *ui) 800919e: d1a5 bne.n 80090ec <__multiply+0x88> 80091a0: 3f01 subs r7, #1 80091a2: e7a1 b.n 80090e8 <__multiply+0x84> - 80091a4: 0800afff .word 0x0800afff - 80091a8: 0800b010 .word 0x0800b010 + 80091a4: 0800aff3 .word 0x0800aff3 + 80091a8: 0800b004 .word 0x0800b004 080091ac <__pow5mult>: 80091ac: e92d 43f8 stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr} @@ -21383,9 +21379,9 @@ void UI_Server(UI *ui) 800924c: 4638 mov r0, r7 800924e: e8bd 83f8 ldmia.w sp!, {r3, r4, r5, r6, r7, r8, r9, pc} 8009252: bf00 nop - 8009254: 0800b160 .word 0x0800b160 - 8009258: 0800af89 .word 0x0800af89 - 800925c: 0800b010 .word 0x0800b010 + 8009254: 0800b158 .word 0x0800b158 + 8009258: 0800af7d .word 0x0800af7d + 800925c: 0800b004 .word 0x0800b004 08009260 <__lshift>: 8009260: e92d 47f0 stmdb sp!, {r4, r5, r6, r7, r8, r9, sl, lr} @@ -21464,8 +21460,8 @@ void UI_Server(UI *ui) 800932a: d8f9 bhi.n 8009320 <__lshift+0xc0> 800932c: e7ea b.n 8009304 <__lshift+0xa4> 800932e: bf00 nop - 8009330: 0800afff .word 0x0800afff - 8009334: 0800b010 .word 0x0800b010 + 8009330: 0800aff3 .word 0x0800aff3 + 8009334: 0800b004 .word 0x0800b004 08009338 <__mcmp>: 8009338: 4603 mov r3, r0 @@ -21595,8 +21591,8 @@ void UI_Server(UI *ui) 8009482: 3f01 subs r7, #1 8009484: e7e8 b.n 8009458 <__mdiff+0xe8> 8009486: bf00 nop - 8009488: 0800afff .word 0x0800afff - 800948c: 0800b010 .word 0x0800b010 + 8009488: 0800aff3 .word 0x0800aff3 + 800948c: 0800b004 .word 0x0800b004 08009490 <__d2b>: 8009490: e92d 41f3 stmdb sp!, {r0, r1, r4, r5, r6, r7, r8, lr} @@ -21667,8 +21663,8 @@ void UI_Server(UI *ui) 800953a: 6031 str r1, [r6, #0] 800953c: e7e1 b.n 8009502 <__d2b+0x72> 800953e: bf00 nop - 8009540: 0800afff .word 0x0800afff - 8009544: 0800b010 .word 0x0800b010 + 8009540: 0800aff3 .word 0x0800aff3 + 8009544: 0800b004 .word 0x0800b004 08009548 <_calloc_r>: 8009548: b538 push {r3, r4, r5, lr} @@ -21962,11 +21958,11 @@ void UI_Server(UI *ui) 8009800: f7fe fb22 bl 8007e48 <_printf_i> 8009804: e7eb b.n 80097de <_svfiprintf_r+0x1c2> 8009806: bf00 nop - 8009808: 0800b16c .word 0x0800b16c - 800980c: 0800b176 .word 0x0800b176 + 8009808: 0800b164 .word 0x0800b164 + 800980c: 0800b16e .word 0x0800b16e 8009810: 08007911 .word 0x08007911 8009814: 08009565 .word 0x08009565 - 8009818: 0800b172 .word 0x0800b172 + 8009818: 0800b16a .word 0x0800b16a 0800981c <__assert_func>: 800981c: b51f push {r0, r1, r2, r3, r4, lr} @@ -21989,9 +21985,9 @@ void UI_Server(UI *ui) 8009844: e7f3 b.n 800982e <__assert_func+0x12> 8009846: bf00 nop 8009848: 20000014 .word 0x20000014 - 800984c: 0800b17d .word 0x0800b17d - 8009850: 0800b18a .word 0x0800b18a - 8009854: 0800b1b8 .word 0x0800b1b8 + 800984c: 0800b175 .word 0x0800b175 + 8009850: 0800b182 .word 0x0800b182 + 8009854: 0800b1b0 .word 0x0800b1b0 08009858 : 8009858: b40e push {r1, r2, r3} @@ -22373,14 +22369,14 @@ void UI_Server(UI *ui) 8009bac: f7fe f94c bl 8007e48 <_printf_i> 8009bb0: e7e4 b.n 8009b7c <_vfiprintf_r+0x208> 8009bb2: bf00 nop - 8009bb4: 0800b2e4 .word 0x0800b2e4 - 8009bb8: 0800b304 .word 0x0800b304 - 8009bbc: 0800b2c4 .word 0x0800b2c4 - 8009bc0: 0800b16c .word 0x0800b16c - 8009bc4: 0800b176 .word 0x0800b176 + 8009bb4: 0800b2dc .word 0x0800b2dc + 8009bb8: 0800b2fc .word 0x0800b2fc + 8009bbc: 0800b2bc .word 0x0800b2bc + 8009bc0: 0800b164 .word 0x0800b164 + 8009bc4: 0800b16e .word 0x0800b16e 8009bc8: 08007911 .word 0x08007911 8009bcc: 08009951 .word 0x08009951 - 8009bd0: 0800b172 .word 0x0800b172 + 8009bd0: 0800b16a .word 0x0800b16a 08009bd4 <__swbuf_r>: 8009bd4: b5f8 push {r3, r4, r5, r6, r7, lr} @@ -22454,9 +22450,9 @@ void UI_Server(UI *ui) 8009c64: f04f 37ff mov.w r7, #4294967295 ; 0xffffffff 8009c68: e7ea b.n 8009c40 <__swbuf_r+0x6c> 8009c6a: bf00 nop - 8009c6c: 0800b2e4 .word 0x0800b2e4 - 8009c70: 0800b304 .word 0x0800b304 - 8009c74: 0800b2c4 .word 0x0800b2c4 + 8009c6c: 0800b2dc .word 0x0800b2dc + 8009c70: 0800b2fc .word 0x0800b2fc + 8009c74: 0800b2bc .word 0x0800b2bc 08009c78 <__ascii_wctomb>: 8009c78: 4603 mov r3, r0 @@ -22563,9 +22559,9 @@ void UI_Server(UI *ui) 8009d5c: e7f7 b.n 8009d4e <__swsetup_r+0xba> 8009d5e: bf00 nop 8009d60: 20000014 .word 0x20000014 - 8009d64: 0800b2e4 .word 0x0800b2e4 - 8009d68: 0800b304 .word 0x0800b304 - 8009d6c: 0800b2c4 .word 0x0800b2c4 + 8009d64: 0800b2dc .word 0x0800b2dc + 8009d68: 0800b2fc .word 0x0800b2fc + 8009d6c: 0800b2bc .word 0x0800b2bc 08009d70 : 8009d70: 2006 movs r0, #6 @@ -22749,9 +22745,9 @@ void UI_Server(UI *ui) 8009ef2: bf08 it eq 8009ef4: 68ec ldreq r4, [r5, #12] 8009ef6: e7da b.n 8009eae <_fflush_r+0x22> - 8009ef8: 0800b2e4 .word 0x0800b2e4 - 8009efc: 0800b304 .word 0x0800b304 - 8009f00: 0800b2c4 .word 0x0800b2c4 + 8009ef8: 0800b2dc .word 0x0800b2dc + 8009efc: 0800b2fc .word 0x0800b2fc + 8009f00: 0800b2bc .word 0x0800b2bc 08009f04 : 8009f04: 2300 movs r3, #0 @@ -22813,25 +22809,25 @@ void UI_Server(UI *ui) 8009f84: 4801 ldr r0, [pc, #4] ; (8009f8c <__sfp_lock_acquire+0x8>) 8009f86: f7ff bc7a b.w 800987e <__retarget_lock_acquire_recursive> 8009f8a: bf00 nop - 8009f8c: 20002540 .word 0x20002540 + 8009f8c: 20002544 .word 0x20002544 08009f90 <__sfp_lock_release>: 8009f90: 4801 ldr r0, [pc, #4] ; (8009f98 <__sfp_lock_release+0x8>) 8009f92: f7ff bc75 b.w 8009880 <__retarget_lock_release_recursive> 8009f96: bf00 nop - 8009f98: 20002540 .word 0x20002540 + 8009f98: 20002544 .word 0x20002544 08009f9c <__sinit_lock_acquire>: 8009f9c: 4801 ldr r0, [pc, #4] ; (8009fa4 <__sinit_lock_acquire+0x8>) 8009f9e: f7ff bc6e b.w 800987e <__retarget_lock_acquire_recursive> 8009fa2: bf00 nop - 8009fa4: 2000253b .word 0x2000253b + 8009fa4: 2000253f .word 0x2000253f 08009fa8 <__sinit_lock_release>: 8009fa8: 4801 ldr r0, [pc, #4] ; (8009fb0 <__sinit_lock_release+0x8>) 8009faa: f7ff bc69 b.w 8009880 <__retarget_lock_release_recursive> 8009fae: bf00 nop - 8009fb0: 2000253b .word 0x2000253b + 8009fb0: 2000253f .word 0x2000253f 08009fb4 <__sinit>: 8009fb4: b510 push {r4, lr} @@ -22876,7 +22872,7 @@ void UI_Server(UI *ui) 800a016: 2301 movs r3, #1 800a018: 61a3 str r3, [r4, #24] 800a01a: e7d1 b.n 8009fc0 <__sinit+0xc> - 800a01c: 0800af44 .word 0x0800af44 + 800a01c: 0800af38 .word 0x0800af38 800a020: 08009f4d .word 0x08009f4d 0800a024 <__sfp>: @@ -22931,7 +22927,7 @@ void UI_Server(UI *ui) 800a0a2: 603b str r3, [r7, #0] 800a0a4: e7ee b.n 800a084 <__sfp+0x60> 800a0a6: bf00 nop - 800a0a8: 0800af44 .word 0x0800af44 + 800a0a8: 0800af38 .word 0x0800af38 800a0ac: ffff0001 .word 0xffff0001 0800a0b0 <_fwalk_reent>: @@ -23118,7 +23114,7 @@ void UI_Server(UI *ui) 800a242: 6023 str r3, [r4, #0] 800a244: bd38 pop {r3, r4, r5, pc} 800a246: bf00 nop - 800a248: 20002534 .word 0x20002534 + 800a248: 20002538 .word 0x20002538 0800a24c <_getpid_r>: 800a24c: f7f7 bb28 b.w 80018a0 <_getpid> @@ -23199,7 +23195,7 @@ void UI_Server(UI *ui) 800a2f2: b103 cbz r3, 800a2f6 <_write_r+0x1e> 800a2f4: 6023 str r3, [r4, #0] 800a2f6: bd38 pop {r3, r4, r5, pc} - 800a2f8: 20002534 .word 0x20002534 + 800a2f8: 20002538 .word 0x20002538 0800a2fc <_close_r>: 800a2fc: b538 push {r3, r4, r5, lr} @@ -23215,7 +23211,7 @@ void UI_Server(UI *ui) 800a312: b103 cbz r3, 800a316 <_close_r+0x1a> 800a314: 6023 str r3, [r4, #0] 800a316: bd38 pop {r3, r4, r5, pc} - 800a318: 20002534 .word 0x20002534 + 800a318: 20002538 .word 0x20002538 0800a31c <_fstat_r>: 800a31c: b538 push {r3, r4, r5, lr} @@ -23233,7 +23229,7 @@ void UI_Server(UI *ui) 800a336: 6023 str r3, [r4, #0] 800a338: bd38 pop {r3, r4, r5, pc} 800a33a: bf00 nop - 800a33c: 20002534 .word 0x20002534 + 800a33c: 20002538 .word 0x20002538 0800a340 <_isatty_r>: 800a340: b538 push {r3, r4, r5, lr} @@ -23249,7 +23245,7 @@ void UI_Server(UI *ui) 800a356: b103 cbz r3, 800a35a <_isatty_r+0x1a> 800a358: 6023 str r3, [r4, #0] 800a35a: bd38 pop {r3, r4, r5, pc} - 800a35c: 20002534 .word 0x20002534 + 800a35c: 20002538 .word 0x20002538 0800a360 <_lseek_r>: 800a360: b538 push {r3, r4, r5, lr} @@ -23267,7 +23263,7 @@ void UI_Server(UI *ui) 800a37a: b103 cbz r3, 800a37e <_lseek_r+0x1e> 800a37c: 6023 str r3, [r4, #0] 800a37e: bd38 pop {r3, r4, r5, pc} - 800a380: 20002534 .word 0x20002534 + 800a380: 20002538 .word 0x20002538 0800a384 <_read_r>: 800a384: b538 push {r3, r4, r5, lr} @@ -23285,7 +23281,7 @@ void UI_Server(UI *ui) 800a39e: b103 cbz r3, 800a3a2 <_read_r+0x1e> 800a3a0: 6023 str r3, [r4, #0] 800a3a2: bd38 pop {r3, r4, r5, pc} - 800a3a4: 20002534 .word 0x20002534 + 800a3a4: 20002538 .word 0x20002538 0800a3a8 <_init>: 800a3a8: b5f8 push {r3, r4, r5, r6, r7, lr} diff --git a/Debug/m3s.map b/Debug/m3s.map index 8070c5c..30ef25f 100644 --- a/Debug/m3s.map +++ b/Debug/m3s.map @@ -147,6 +147,7 @@ __lock___arc4random_mutex 0x1 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lock.o) errno 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-reent.o) fifo_ir 0x2 ./SW_APPs/APP_blood.o +PA 0x1 ./SW_APPs/APP_IDcard.o tconfig 0x18 ./HW_Devices/touch.o hi2c2 0x54 ./Core/Src/main.o uwTick 0x4 ./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.o @@ -164,12 +165,14 @@ __lock___malloc_recursive_mutex idcard_window 0x4 ./SW_APPs/APP_IDcard.o eeprom_write_buffer 0x14 ./HW_Devices/eeprom.o +checkkey 0x1 ./SW_APPs/APP_IDcard.o CT 0x2 ./SW_APPs/APP_IDcard.o htim6 0x48 ./Core/Src/main.o lcddev 0xa ./HW_Devices/LCD.o SN 0x4 ./SW_APPs/APP_IDcard.o s2 0x1080 ./SW_APPs/APP_blood.o t0 0x10 ./HW_Devices/touch.o +fundcard 0x1 ./SW_APPs/APP_IDcard.o hspi1 0x58 ./Core/Src/main.o g_BloodWave 0x8 ./SW_APPs/APP_blood.o __lock___at_quick_exit_mutex @@ -177,6 +180,7 @@ __lock___at_quick_exit_mutex __lock___dd_hash_mutex 0x1 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lock.o) __lock___tz_mutex 0x1 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lock.o) +sele 0x1 ./SW_APPs/APP_IDcard.o fifo_red 0x2 ./SW_APPs/APP_blood.o status 0x1 ./SW_APPs/APP_IDcard.o __lock___sfp_recursive_mutex @@ -3203,10 +3207,9 @@ Discarded input sections .bss 0x0000000000000000 0x0 ./HW_Devices/rs522.o .text.PcdAntennaOff 0x0000000000000000 0x10 ./HW_Devices/rs522.o - .text.PcdSelect - 0x0000000000000000 0xa2 ./HW_Devices/rs522.o .text.PcdWrite 0x0000000000000000 0xdc ./HW_Devices/rs522.o + .text.PcdRead 0x0000000000000000 0x84 ./HW_Devices/rs522.o .text.PcdHalt 0x0000000000000000 0x38 ./HW_Devices/rs522.o .text.IC_CMT 0x0000000000000000 0x60 ./HW_Devices/rs522.o .debug_macro 0x0000000000000000 0xa9c ./HW_Devices/rs522.o @@ -3378,6 +3381,8 @@ Discarded input sections .data 0x0000000000000000 0x0 ./SW_APPs/APP_IDcard.o .bss 0x0000000000000000 0x0 ./SW_APPs/APP_IDcard.o .data.s 0x0000000000000000 0x1 ./SW_APPs/APP_IDcard.o + .bss.card_number_D + 0x0000000000000000 0x4 ./SW_APPs/APP_IDcard.o .debug_macro 0x0000000000000000 0xa9c ./SW_APPs/APP_IDcard.o .debug_macro 0x0000000000000000 0x227 ./SW_APPs/APP_IDcard.o .debug_macro 0x0000000000000000 0x2e ./SW_APPs/APP_IDcard.o @@ -4612,45 +4617,47 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id .text.CalulateCRC 0x0000000008005f36 0x9a ./HW_Devices/rs522.o 0x0000000008005f36 CalulateCRC + .text.PcdSelect + 0x0000000008005fd0 0xa2 ./HW_Devices/rs522.o + 0x0000000008005fd0 PcdSelect .text.PcdAuthState - 0x0000000008005fd0 0xca ./HW_Devices/rs522.o - 0x0000000008005fd0 PcdAuthState - .text.PcdRead 0x000000000800609a 0x84 ./HW_Devices/rs522.o - 0x000000000800609a PcdRead + 0x0000000008006072 0xca ./HW_Devices/rs522.o + 0x0000000008006072 PcdAuthState .text.RC522_Init - 0x000000000800611e 0x12 ./HW_Devices/rs522.o - 0x000000000800611e RC522_Init + 0x000000000800613c 0x12 ./HW_Devices/rs522.o + 0x000000000800613c RC522_Init + *fill* 0x000000000800614e 0x2 .text.TP_Write_Byte - 0x0000000008006130 0x6c ./HW_Devices/touch.o - 0x0000000008006130 TP_Write_Byte + 0x0000000008006150 0x6c ./HW_Devices/touch.o + 0x0000000008006150 TP_Write_Byte .text.TP_Read_AD - 0x000000000800619c 0xc8 ./HW_Devices/touch.o - 0x000000000800619c TP_Read_AD + 0x00000000080061bc 0xc8 ./HW_Devices/touch.o + 0x00000000080061bc TP_Read_AD .text.TP_Read_XOY - 0x0000000008006264 0x104 ./HW_Devices/touch.o - 0x0000000008006264 TP_Read_XOY + 0x0000000008006284 0x104 ./HW_Devices/touch.o + 0x0000000008006284 TP_Read_XOY .text.TP_Read_XY_ADC - 0x0000000008006368 0x32 ./HW_Devices/touch.o - 0x0000000008006368 TP_Read_XY_ADC + 0x0000000008006388 0x32 ./HW_Devices/touch.o + 0x0000000008006388 TP_Read_XY_ADC .text.TP_Read_XY2 - 0x000000000800639a 0xd0 ./HW_Devices/touch.o - 0x000000000800639a TP_Read_XY2 - *fill* 0x000000000800646a 0x2 + 0x00000000080063ba 0xd0 ./HW_Devices/touch.o + 0x00000000080063ba TP_Read_XY2 + *fill* 0x000000000800648a 0x2 .text.TP_Server - 0x000000000800646c 0xf0 ./HW_Devices/touch.o - 0x000000000800646c TP_Server + 0x000000000800648c 0xf0 ./HW_Devices/touch.o + 0x000000000800648c TP_Server .text.TP_DrwaTrage - 0x000000000800655c 0xb8 ./HW_Devices/touch.o - 0x000000000800655c TP_DrwaTrage + 0x000000000800657c 0xb8 ./HW_Devices/touch.o + 0x000000000800657c TP_DrwaTrage .text.TP_adjustment - 0x0000000008006614 0x5c4 ./HW_Devices/touch.o - 0x0000000008006614 TP_adjustment + 0x0000000008006634 0x5c4 ./HW_Devices/touch.o + 0x0000000008006634 TP_adjustment .text.APP_IDcard_init - 0x0000000008006bd8 0x20 ./SW_APPs/APP_IDcard.o - 0x0000000008006bd8 APP_IDcard_init + 0x0000000008006bf8 0x20 ./SW_APPs/APP_IDcard.o + 0x0000000008006bf8 APP_IDcard_init .text.APP_IDcard_loop - 0x0000000008006bf8 0x1e4 ./SW_APPs/APP_IDcard.o - 0x0000000008006bf8 APP_IDcard_loop + 0x0000000008006c18 0x1c4 ./SW_APPs/APP_IDcard.o + 0x0000000008006c18 APP_IDcard_loop .text.max30102_read_fifo 0x0000000008006ddc 0x100 ./SW_APPs/APP_blood.o 0x0000000008006ddc max30102_read_fifo @@ -4930,119 +4937,120 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id .iplt 0x000000000800a3c0 0x0 .iplt 0x000000000800a3c0 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/crtbegin.o -.rodata 0x000000000800a3c0 0xf64 +.rodata 0x000000000800a3c0 0xf5c 0x000000000800a3c0 . = ALIGN (0x4) *(.rodata) .rodata 0x000000000800a3c0 0x10 ./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.o .rodata 0x000000000800a3d0 0xb8 ./HW_Devices/touch.o - .rodata 0x000000000800a488 0x35 ./SW_APPs/APP_IDcard.o - *fill* 0x000000000800a4bd 0x3 - .rodata 0x000000000800a4c0 0x7 ./SW_APPs/Main_APP.o + .rodata 0x000000000800a488 0x2b ./SW_APPs/APP_IDcard.o + *fill* 0x000000000800a4b3 0x1 + .rodata 0x000000000800a4b4 0x7 ./SW_APPs/Main_APP.o *(.rodata*) - *fill* 0x000000000800a4c7 0x1 + *fill* 0x000000000800a4bb 0x1 .rodata.AHBPrescTable - 0x000000000800a4c8 0x10 ./Core/Src/system_stm32f1xx.o - 0x000000000800a4c8 AHBPrescTable + 0x000000000800a4bc 0x10 ./Core/Src/system_stm32f1xx.o + 0x000000000800a4bc AHBPrescTable .rodata.APBPrescTable - 0x000000000800a4d8 0x8 ./Core/Src/system_stm32f1xx.o - 0x000000000800a4d8 APBPrescTable + 0x000000000800a4cc 0x8 ./Core/Src/system_stm32f1xx.o + 0x000000000800a4cc APBPrescTable .rodata.asc2_1206 - 0x000000000800a4e0 0x474 ./HW_Devices/LCD.o - 0x000000000800a4e0 asc2_1206 + 0x000000000800a4d4 0x474 ./HW_Devices/LCD.o + 0x000000000800a4d4 asc2_1206 .rodata.asc2_1608 - 0x000000000800a954 0x5f0 ./HW_Devices/LCD.o - 0x000000000800a954 asc2_1608 + 0x000000000800a948 0x5f0 ./HW_Devices/LCD.o + 0x000000000800a948 asc2_1608 .rodata._global_impure_ptr - 0x000000000800af44 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-impure.o) - 0x000000000800af44 _global_impure_ptr + 0x000000000800af38 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-impure.o) + 0x000000000800af38 _global_impure_ptr .rodata._printf_float.str1.1 - 0x000000000800af48 0x12 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf_float.o) + 0x000000000800af3c 0x12 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf_float.o) .rodata._printf_i.str1.1 - 0x000000000800af5a 0x22 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf_i.o) + 0x000000000800af4e 0x22 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf_i.o) .rodata._dtoa_r.str1.1 - 0x000000000800af7c 0x94 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-dtoa.o) + 0x000000000800af70 0x94 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-dtoa.o) 0x96 (size before relaxing) .rodata._Balloc.str1.1 - 0x000000000800b010 0x60 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) + 0x000000000800b004 0x60 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) 0x77 (size before relaxing) .rodata.__multadd.str1.1 - 0x000000000800b070 0x11 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) + 0x000000000800b064 0x11 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) + *fill* 0x000000000800b064 0x4 .rodata.__mprec_bigtens - 0x000000000800b070 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) - 0x000000000800b070 __mprec_bigtens + 0x000000000800b068 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) + 0x000000000800b068 __mprec_bigtens .rodata.__mprec_tens - 0x000000000800b098 0xc8 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) - 0x000000000800b098 __mprec_tens + 0x000000000800b090 0xc8 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) + 0x000000000800b090 __mprec_tens .rodata.p05.6150 - 0x000000000800b160 0xc /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) + 0x000000000800b158 0xc /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) .rodata._svfprintf_r.str1.1 - 0x000000000800b16c 0x11 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-svfprintf.o) + 0x000000000800b164 0x11 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-svfprintf.o) .rodata.__assert_func.str1.1 - 0x000000000800b17d 0x3c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-assert.o) + 0x000000000800b175 0x3c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-assert.o) 0x3d (size before relaxing) .rodata._setlocale_r.str1.1 - 0x000000000800b1b9 0x8 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-locale.o) + 0x000000000800b1b1 0x8 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-locale.o) 0x9 (size before relaxing) .rodata.str1.1 - 0x000000000800b1c1 0x2 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-locale.o) + 0x000000000800b1b9 0x2 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-locale.o) .rodata._vfprintf_r.str1.1 - 0x000000000800b1c3 0x11 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf.o) + 0x000000000800b1bb 0x11 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf.o) .rodata._ctype_ - 0x000000000800b1c3 0x101 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-ctype_.o) - 0x000000000800b1c3 _ctype_ + 0x000000000800b1bb 0x101 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-ctype_.o) + 0x000000000800b1bb _ctype_ .rodata.__sf_fake_stderr - 0x000000000800b2c4 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-findfp.o) - 0x000000000800b2c4 __sf_fake_stderr + 0x000000000800b2bc 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-findfp.o) + 0x000000000800b2bc __sf_fake_stderr .rodata.__sf_fake_stdin - 0x000000000800b2e4 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-findfp.o) - 0x000000000800b2e4 __sf_fake_stdin + 0x000000000800b2dc 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-findfp.o) + 0x000000000800b2dc __sf_fake_stdin .rodata.__sf_fake_stdout - 0x000000000800b304 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-findfp.o) - 0x000000000800b304 __sf_fake_stdout - 0x000000000800b324 . = ALIGN (0x4) + 0x000000000800b2fc 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-findfp.o) + 0x000000000800b2fc __sf_fake_stdout + 0x000000000800b31c . = ALIGN (0x4) -.rel.dyn 0x000000000800b324 0x0 - .rel.iplt 0x000000000800b324 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/crtbegin.o +.rel.dyn 0x000000000800b31c 0x0 + .rel.iplt 0x000000000800b31c 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/crtbegin.o -.ARM.extab 0x000000000800b324 0x0 - 0x000000000800b324 . = ALIGN (0x4) +.ARM.extab 0x000000000800b31c 0x0 + 0x000000000800b31c . = ALIGN (0x4) *(.ARM.extab* .gnu.linkonce.armextab.*) - 0x000000000800b324 . = ALIGN (0x4) + 0x000000000800b31c . = ALIGN (0x4) -.ARM 0x000000000800b324 0x0 - 0x000000000800b324 . = ALIGN (0x4) - 0x000000000800b324 __exidx_start = . +.ARM 0x000000000800b31c 0x0 + 0x000000000800b31c . = ALIGN (0x4) + 0x000000000800b31c __exidx_start = . *(.ARM.exidx*) - 0x000000000800b324 __exidx_end = . - 0x000000000800b324 . = ALIGN (0x4) + 0x000000000800b31c __exidx_end = . + 0x000000000800b31c . = ALIGN (0x4) -.preinit_array 0x000000000800b324 0x0 - 0x000000000800b324 . = ALIGN (0x4) - 0x000000000800b324 PROVIDE (__preinit_array_start = .) +.preinit_array 0x000000000800b31c 0x0 + 0x000000000800b31c . = ALIGN (0x4) + 0x000000000800b31c PROVIDE (__preinit_array_start = .) *(.preinit_array*) - 0x000000000800b324 PROVIDE (__preinit_array_end = .) - 0x000000000800b324 . = ALIGN (0x4) + 0x000000000800b31c PROVIDE (__preinit_array_end = .) + 0x000000000800b31c . = ALIGN (0x4) -.init_array 0x000000000800b324 0x4 - 0x000000000800b324 . = ALIGN (0x4) - 0x000000000800b324 PROVIDE (__init_array_start = .) +.init_array 0x000000000800b31c 0x4 + 0x000000000800b31c . = ALIGN (0x4) + 0x000000000800b31c PROVIDE (__init_array_start = .) *(SORT_BY_NAME(.init_array.*)) *(.init_array*) - .init_array 0x000000000800b324 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/crtbegin.o - 0x000000000800b328 PROVIDE (__init_array_end = .) - 0x000000000800b328 . = ALIGN (0x4) + .init_array 0x000000000800b31c 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/crtbegin.o + 0x000000000800b320 PROVIDE (__init_array_end = .) + 0x000000000800b320 . = ALIGN (0x4) -.fini_array 0x000000000800b328 0x4 - 0x000000000800b328 . = ALIGN (0x4) +.fini_array 0x000000000800b320 0x4 + 0x000000000800b320 . = ALIGN (0x4) [!provide] PROVIDE (__fini_array_start = .) *(SORT_BY_NAME(.fini_array.*)) *(.fini_array*) - .fini_array 0x000000000800b328 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/crtbegin.o + .fini_array 0x000000000800b320 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/crtbegin.o [!provide] PROVIDE (__fini_array_end = .) - 0x000000000800b32c . = ALIGN (0x4) - 0x000000000800b32c _sidata = LOADADDR (.data) + 0x000000000800b324 . = ALIGN (0x4) + 0x000000000800b324 _sidata = LOADADDR (.data) -.data 0x0000000020000000 0x1e4 load address 0x000000000800b32c +.data 0x0000000020000000 0x1e4 load address 0x000000000800b324 0x0000000020000000 . = ALIGN (0x4) 0x0000000020000000 _sdata = . *(.data) @@ -5073,11 +5081,11 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id 0x00000000200001e4 . = ALIGN (0x4) 0x00000000200001e4 _edata = . -.igot.plt 0x00000000200001e4 0x0 load address 0x000000000800b510 +.igot.plt 0x00000000200001e4 0x0 load address 0x000000000800b508 .igot.plt 0x00000000200001e4 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/crtbegin.o 0x00000000200001e4 . = ALIGN (0x4) -.bss 0x00000000200001e4 0x2360 load address 0x000000000800b510 +.bss 0x00000000200001e4 0x2364 load address 0x000000000800b508 0x00000000200001e4 _sbss = . 0x00000000200001e4 __bss_start__ = _sbss *(.bss) @@ -5087,76 +5095,76 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id 0x0000000020000200 0x4 ./Core/Src/stm32f1xx_hal_msp.o .bss.__sbrk_heap_end 0x0000000020000204 0x4 ./Core/Src/sysmem.o - .bss.card_number_D - 0x0000000020000208 0x4 ./SW_APPs/APP_IDcard.o - 0x0000000020000208 card_number_D .bss.get_data_flag - 0x000000002000020c 0x1 ./SW_APPs/APP_blood.o - 0x000000002000020c get_data_flag - *fill* 0x000000002000020d 0x1 + 0x0000000020000208 0x1 ./SW_APPs/APP_blood.o + 0x0000000020000208 get_data_flag + *fill* 0x0000000020000209 0x1 .bss.g_fft_index - 0x000000002000020e 0x2 ./SW_APPs/APP_blood.o - 0x000000002000020e g_fft_index + 0x000000002000020a 0x2 ./SW_APPs/APP_blood.o + 0x000000002000020a g_fft_index .bss.__malloc_free_list - 0x0000000020000210 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-mallocr.o) - 0x0000000020000210 __malloc_free_list + 0x000000002000020c 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-mallocr.o) + 0x000000002000020c __malloc_free_list .bss.__malloc_sbrk_start - 0x0000000020000214 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-mallocr.o) - 0x0000000020000214 __malloc_sbrk_start + 0x0000000020000210 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-mallocr.o) + 0x0000000020000210 __malloc_sbrk_start *(COMMON) - COMMON 0x0000000020000218 0x13c ./Core/Src/main.o - 0x0000000020000218 hi2c2 - 0x000000002000026c hsram1 - 0x00000000200002b4 htim6 - 0x00000000200002fc hspi1 - COMMON 0x0000000020000354 0x4 ./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.o - 0x0000000020000354 uwTick - COMMON 0x0000000020000358 0xa ./HW_Devices/LCD.o - 0x0000000020000358 lcddev - *fill* 0x0000000020000362 0x2 - COMMON 0x0000000020000364 0x14 ./HW_Devices/eeprom.o - 0x0000000020000364 eeprom_write_buffer - COMMON 0x0000000020000378 0x28 ./HW_Devices/touch.o - 0x0000000020000378 tconfig - 0x0000000020000390 t0 - COMMON 0x00000000200003a0 0x3d ./SW_APPs/APP_IDcard.o - 0x00000000200003a0 RFID + COMMON 0x0000000020000214 0x13c ./Core/Src/main.o + 0x0000000020000214 hi2c2 + 0x0000000020000268 hsram1 + 0x00000000200002b0 htim6 + 0x00000000200002f8 hspi1 + COMMON 0x0000000020000350 0x4 ./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.o + 0x0000000020000350 uwTick + COMMON 0x0000000020000354 0xa ./HW_Devices/LCD.o + 0x0000000020000354 lcddev + *fill* 0x000000002000035e 0x2 + COMMON 0x0000000020000360 0x14 ./HW_Devices/eeprom.o + 0x0000000020000360 eeprom_write_buffer + COMMON 0x0000000020000374 0x28 ./HW_Devices/touch.o + 0x0000000020000374 tconfig + 0x000000002000038c t0 + COMMON 0x000000002000039c 0x47 ./SW_APPs/APP_IDcard.o + 0x000000002000039c RFID + 0x00000000200003ac PA 0x00000000200003b0 idcard_str 0x00000000200003d0 idcard_window - 0x00000000200003d4 CT - 0x00000000200003d8 SN - 0x00000000200003dc status - *fill* 0x00000000200003dd 0x3 - COMMON 0x00000000200003e0 0x2152 ./SW_APPs/APP_blood.o - 0x00000000200003e0 blood_str - 0x0000000020000420 fifo_ir - 0x0000000020000424 blood_win - 0x0000000020000428 s1 - 0x00000000200014a8 s2 - 0x0000000020002528 g_BloodWave - 0x0000000020002530 fifo_red - *fill* 0x0000000020002532 0x2 - COMMON 0x0000000020002534 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-reent.o) - 0x0000000020002534 errno - COMMON 0x0000000020002538 0x9 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lock.o) - 0x0000000020002538 __lock___atexit_recursive_mutex - 0x0000000020002539 __lock___arc4random_mutex - 0x000000002000253a __lock___env_recursive_mutex - 0x000000002000253b __lock___sinit_recursive_mutex - 0x000000002000253c __lock___malloc_recursive_mutex - 0x000000002000253d __lock___at_quick_exit_mutex - 0x000000002000253e __lock___dd_hash_mutex - 0x000000002000253f __lock___tz_mutex - 0x0000000020002540 __lock___sfp_recursive_mutex - 0x0000000020002544 . = ALIGN (0x4) - *fill* 0x0000000020002541 0x3 - 0x0000000020002544 _ebss = . - 0x0000000020002544 __bss_end__ = _ebss + 0x00000000200003d4 checkkey + 0x00000000200003d8 CT + 0x00000000200003dc SN + 0x00000000200003e0 fundcard + 0x00000000200003e1 sele + 0x00000000200003e2 status + *fill* 0x00000000200003e3 0x1 + COMMON 0x00000000200003e4 0x2152 ./SW_APPs/APP_blood.o + 0x00000000200003e4 blood_str + 0x0000000020000424 fifo_ir + 0x0000000020000428 blood_win + 0x000000002000042c s1 + 0x00000000200014ac s2 + 0x000000002000252c g_BloodWave + 0x0000000020002534 fifo_red + *fill* 0x0000000020002536 0x2 + COMMON 0x0000000020002538 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-reent.o) + 0x0000000020002538 errno + COMMON 0x000000002000253c 0x9 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lock.o) + 0x000000002000253c __lock___atexit_recursive_mutex + 0x000000002000253d __lock___arc4random_mutex + 0x000000002000253e __lock___env_recursive_mutex + 0x000000002000253f __lock___sinit_recursive_mutex + 0x0000000020002540 __lock___malloc_recursive_mutex + 0x0000000020002541 __lock___at_quick_exit_mutex + 0x0000000020002542 __lock___dd_hash_mutex + 0x0000000020002543 __lock___tz_mutex + 0x0000000020002544 __lock___sfp_recursive_mutex + 0x0000000020002548 . = ALIGN (0x4) + *fill* 0x0000000020002545 0x3 + 0x0000000020002548 _ebss = . + 0x0000000020002548 __bss_end__ = _ebss ._user_heap_stack - 0x0000000020002544 0xc04 load address 0x000000000800b510 + 0x0000000020002548 0xc00 load address 0x000000000800b508 0x0000000020002548 . = ALIGN (0x8) - *fill* 0x0000000020002544 0x4 [!provide] PROVIDE (end = .) 0x0000000020002548 PROVIDE (_end = .) 0x0000000020002948 . = (. + _Min_Heap_Size) @@ -5351,7 +5359,7 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libm.a LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a -.debug_info 0x0000000000000000 0x15b0b +.debug_info 0x0000000000000000 0x15b3f .debug_info 0x0000000000000000 0x141a ./Core/Src/main.o .debug_info 0x000000000000141a 0x1487 ./Core/Src/stm32f1xx_hal_msp.o .debug_info 0x00000000000028a1 0x7b4 ./Core/Src/stm32f1xx_it.o @@ -5374,12 +5382,12 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id .debug_info 0x0000000000011415 0x734 ./HW_Devices/iic.o .debug_info 0x0000000000011b49 0xd4d ./HW_Devices/rs522.o .debug_info 0x0000000000012896 0x8c1 ./HW_Devices/touch.o - .debug_info 0x0000000000013157 0x40f ./SW_APPs/APP_IDcard.o - .debug_info 0x0000000000013566 0x17f7 ./SW_APPs/APP_blood.o - .debug_info 0x0000000000014d5d 0x546 ./SW_APPs/Main_APP.o - .debug_info 0x00000000000152a3 0x868 ./SW_APPs/windows.o + .debug_info 0x0000000000013157 0x443 ./SW_APPs/APP_IDcard.o + .debug_info 0x000000000001359a 0x17f7 ./SW_APPs/APP_blood.o + .debug_info 0x0000000000014d91 0x546 ./SW_APPs/Main_APP.o + .debug_info 0x00000000000152d7 0x868 ./SW_APPs/windows.o -.debug_abbrev 0x0000000000000000 0x36d4 +.debug_abbrev 0x0000000000000000 0x36de .debug_abbrev 0x0000000000000000 0x25e ./Core/Src/main.o .debug_abbrev 0x000000000000025e 0x238 ./Core/Src/stm32f1xx_hal_msp.o .debug_abbrev 0x0000000000000496 0x176 ./Core/Src/stm32f1xx_it.o @@ -5402,10 +5410,10 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id .debug_abbrev 0x00000000000026a7 0x176 ./HW_Devices/iic.o .debug_abbrev 0x000000000000281d 0x27b ./HW_Devices/rs522.o .debug_abbrev 0x0000000000002a98 0x24f ./HW_Devices/touch.o - .debug_abbrev 0x0000000000002ce7 0x176 ./SW_APPs/APP_IDcard.o - .debug_abbrev 0x0000000000002e5d 0x3ca ./SW_APPs/APP_blood.o - .debug_abbrev 0x0000000000003227 0x1d8 ./SW_APPs/Main_APP.o - .debug_abbrev 0x00000000000033ff 0x2d5 ./SW_APPs/windows.o + .debug_abbrev 0x0000000000002ce7 0x180 ./SW_APPs/APP_IDcard.o + .debug_abbrev 0x0000000000002e67 0x3ca ./SW_APPs/APP_blood.o + .debug_abbrev 0x0000000000003231 0x1d8 ./SW_APPs/Main_APP.o + .debug_abbrev 0x0000000000003409 0x2d5 ./SW_APPs/windows.o .debug_aranges 0x0000000000000000 0x1398 .debug_aranges @@ -5612,7 +5620,7 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id .debug_macro 0x000000000001d2e5 0xa0 ./SW_APPs/Main_APP.o .debug_macro 0x000000000001d385 0x207 ./SW_APPs/windows.o -.debug_line 0x0000000000000000 0x17ecb +.debug_line 0x0000000000000000 0x17e8e .debug_line 0x0000000000000000 0x962 ./Core/Src/main.o .debug_line 0x0000000000000962 0x879 ./Core/Src/stm32f1xx_hal_msp.o .debug_line 0x00000000000011db 0x7cc ./Core/Src/stm32f1xx_it.o @@ -5635,12 +5643,12 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id .debug_line 0x0000000000013160 0x704 ./HW_Devices/iic.o .debug_line 0x0000000000013864 0xcdd ./HW_Devices/rs522.o .debug_line 0x0000000000014541 0xb62 ./HW_Devices/touch.o - .debug_line 0x00000000000150a3 0x85f ./SW_APPs/APP_IDcard.o - .debug_line 0x0000000000015902 0x11a6 ./SW_APPs/APP_blood.o - .debug_line 0x0000000000016aa8 0x7c4 ./SW_APPs/Main_APP.o - .debug_line 0x000000000001726c 0xc5f ./SW_APPs/windows.o + .debug_line 0x00000000000150a3 0x822 ./SW_APPs/APP_IDcard.o + .debug_line 0x00000000000158c5 0x11a6 ./SW_APPs/APP_blood.o + .debug_line 0x0000000000016a6b 0x7c4 ./SW_APPs/Main_APP.o + .debug_line 0x000000000001722f 0xc5f ./SW_APPs/windows.o -.debug_str 0x0000000000000000 0xa0fbf +.debug_str 0x0000000000000000 0xa0fd6 .debug_str 0x0000000000000000 0x956ca ./Core/Src/main.o 0x95c59 (size before relaxing) .debug_str 0x00000000000956ca 0x41e ./Core/Src/stm32f1xx_hal_msp.o @@ -5685,13 +5693,13 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id 0x959c4 (size before relaxing) .debug_str 0x000000000009fe27 0x288 ./HW_Devices/touch.o 0x9575a (size before relaxing) - .debug_str 0x00000000000a00af 0x9e ./SW_APPs/APP_IDcard.o - 0x95b12 (size before relaxing) - .debug_str 0x00000000000a014d 0xcba ./SW_APPs/APP_blood.o + .debug_str 0x00000000000a00af 0xb5 ./SW_APPs/APP_IDcard.o + 0x95b33 (size before relaxing) + .debug_str 0x00000000000a0164 0xcba ./SW_APPs/APP_blood.o 0x99859 (size before relaxing) - .debug_str 0x00000000000a0e07 0x98 ./SW_APPs/Main_APP.o + .debug_str 0x00000000000a0e1e 0x98 ./SW_APPs/Main_APP.o 0x95f1a (size before relaxing) - .debug_str 0x00000000000a0e9f 0x120 ./SW_APPs/windows.o + .debug_str 0x00000000000a0eb6 0x120 ./SW_APPs/windows.o 0x957ab (size before relaxing) .comment 0x0000000000000000 0x53 @@ -5722,7 +5730,7 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id .comment 0x0000000000000053 0x54 ./SW_APPs/Main_APP.o .comment 0x0000000000000053 0x54 ./SW_APPs/windows.o -.debug_frame 0x0000000000000000 0x63d4 +.debug_frame 0x0000000000000000 0x63cc .debug_frame 0x0000000000000000 0x10c ./Core/Src/main.o .debug_frame 0x000000000000010c 0x198 ./Core/Src/stm32f1xx_hal_msp.o .debug_frame 0x00000000000002a4 0x120 ./Core/Src/stm32f1xx_it.o @@ -5744,61 +5752,61 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id .debug_frame 0x00000000000047f4 0x58 ./HW_Devices/iic.o .debug_frame 0x000000000000484c 0x2bc ./HW_Devices/rs522.o .debug_frame 0x0000000000004b08 0x164 ./HW_Devices/touch.o - .debug_frame 0x0000000000004c6c 0x60 ./SW_APPs/APP_IDcard.o - .debug_frame 0x0000000000004ccc 0x260 ./SW_APPs/APP_blood.o - .debug_frame 0x0000000000004f2c 0x30 ./SW_APPs/Main_APP.o - .debug_frame 0x0000000000004f5c 0x1b0 ./SW_APPs/windows.o - .debug_frame 0x000000000000510c 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-errno.o) - .debug_frame 0x000000000000512c 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-init.o) - .debug_frame 0x0000000000005158 0x30 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-malloc.o) - .debug_frame 0x0000000000005188 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-memset.o) - .debug_frame 0x00000000000051a8 0x38 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-freer.o) - .debug_frame 0x00000000000051e0 0x30 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-mallocr.o) - .debug_frame 0x0000000000005210 0x94 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf_float.o) - .debug_frame 0x00000000000052a4 0x60 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf_i.o) - .debug_frame 0x0000000000005304 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-sbrkr.o) - .debug_frame 0x0000000000005330 0x6c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-sprintf.o) - .debug_frame 0x000000000000539c 0x6c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-dtoa.o) - .debug_frame 0x0000000000005408 0x40 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-localeconv.o) - .debug_frame 0x0000000000005448 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-memchr-stub.o) - .debug_frame 0x0000000000005470 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-memcpy-stub.o) - .debug_frame 0x0000000000005498 0x30 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mlock.o) - .debug_frame 0x00000000000054c8 0x254 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) - .debug_frame 0x000000000000571c 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-callocr.o) - .debug_frame 0x0000000000005748 0x90 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-svfprintf.o) - .debug_frame 0x00000000000057d8 0x5c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-reent.o) - .debug_frame 0x0000000000005834 0x40 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-assert.o) - .debug_frame 0x0000000000005874 0x64 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-fprintf.o) - .debug_frame 0x00000000000058d8 0x48 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-locale.o) - .debug_frame 0x0000000000005920 0xb0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lock.o) - .debug_frame 0x00000000000059d0 0x48 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mbtowc_r.o) - .debug_frame 0x0000000000005a18 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-memmove.o) - .debug_frame 0x0000000000005a40 0x3c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-reallocr.o) - .debug_frame 0x0000000000005a7c 0xac /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf.o) - .debug_frame 0x0000000000005b28 0x40 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-wbuf.o) - .debug_frame 0x0000000000005b68 0x3c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-wctomb_r.o) - .debug_frame 0x0000000000005ba4 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-wsetup.o) - .debug_frame 0x0000000000005bd0 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-abort.o) - .debug_frame 0x0000000000005bf8 0x5c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-fflush.o) - .debug_frame 0x0000000000005c54 0x14c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-findfp.o) - .debug_frame 0x0000000000005da0 0x54 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-fwalk.o) - .debug_frame 0x0000000000005df4 0x58 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-makebuf.o) - .debug_frame 0x0000000000005e4c 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-msizer.o) - .debug_frame 0x0000000000005e6c 0xcc /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-signal.o) - .debug_frame 0x0000000000005f38 0x3c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-signalr.o) - .debug_frame 0x0000000000005f74 0x88 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-stdio.o) - .debug_frame 0x0000000000005ffc 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-writer.o) - .debug_frame 0x0000000000006028 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-closer.o) - .debug_frame 0x0000000000006054 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-fstatr.o) - .debug_frame 0x0000000000006080 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-isattyr.o) - .debug_frame 0x00000000000060ac 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lseekr.o) - .debug_frame 0x00000000000060d8 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-readr.o) - .debug_frame 0x0000000000006104 0xac /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_addsubdf3.o) - .debug_frame 0x00000000000061b0 0x50 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_muldivdf3.o) - .debug_frame 0x0000000000006200 0xc4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_cmpdf2.o) - .debug_frame 0x00000000000062c4 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_unorddf2.o) - .debug_frame 0x00000000000062e4 0x24 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_fixdfsi.o) - .debug_frame 0x0000000000006308 0x24 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_truncdfsf2.o) - .debug_frame 0x000000000000632c 0x4c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_addsubsf3.o) - .debug_frame 0x0000000000006378 0x38 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_muldivsf3.o) - .debug_frame 0x00000000000063b0 0x24 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_fixsfsi.o) + .debug_frame 0x0000000000004c6c 0x58 ./SW_APPs/APP_IDcard.o + .debug_frame 0x0000000000004cc4 0x260 ./SW_APPs/APP_blood.o + .debug_frame 0x0000000000004f24 0x30 ./SW_APPs/Main_APP.o + .debug_frame 0x0000000000004f54 0x1b0 ./SW_APPs/windows.o + .debug_frame 0x0000000000005104 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-errno.o) + .debug_frame 0x0000000000005124 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-init.o) + .debug_frame 0x0000000000005150 0x30 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-malloc.o) + .debug_frame 0x0000000000005180 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-memset.o) + .debug_frame 0x00000000000051a0 0x38 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-freer.o) + .debug_frame 0x00000000000051d8 0x30 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-mallocr.o) + .debug_frame 0x0000000000005208 0x94 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf_float.o) + .debug_frame 0x000000000000529c 0x60 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf_i.o) + .debug_frame 0x00000000000052fc 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-sbrkr.o) + .debug_frame 0x0000000000005328 0x6c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-sprintf.o) + .debug_frame 0x0000000000005394 0x6c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-dtoa.o) + .debug_frame 0x0000000000005400 0x40 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-localeconv.o) + .debug_frame 0x0000000000005440 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-memchr-stub.o) + .debug_frame 0x0000000000005468 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-memcpy-stub.o) + .debug_frame 0x0000000000005490 0x30 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mlock.o) + .debug_frame 0x00000000000054c0 0x254 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mprec.o) + .debug_frame 0x0000000000005714 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-callocr.o) + .debug_frame 0x0000000000005740 0x90 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-svfprintf.o) + .debug_frame 0x00000000000057d0 0x5c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-reent.o) + .debug_frame 0x000000000000582c 0x40 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-assert.o) + .debug_frame 0x000000000000586c 0x64 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-fprintf.o) + .debug_frame 0x00000000000058d0 0x48 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-locale.o) + .debug_frame 0x0000000000005918 0xb0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lock.o) + .debug_frame 0x00000000000059c8 0x48 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-mbtowc_r.o) + .debug_frame 0x0000000000005a10 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-memmove.o) + .debug_frame 0x0000000000005a38 0x3c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-reallocr.o) + .debug_frame 0x0000000000005a74 0xac /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-vfprintf.o) + .debug_frame 0x0000000000005b20 0x40 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-wbuf.o) + .debug_frame 0x0000000000005b60 0x3c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-wctomb_r.o) + .debug_frame 0x0000000000005b9c 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-wsetup.o) + .debug_frame 0x0000000000005bc8 0x28 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-abort.o) + .debug_frame 0x0000000000005bf0 0x5c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-fflush.o) + .debug_frame 0x0000000000005c4c 0x14c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-findfp.o) + .debug_frame 0x0000000000005d98 0x54 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-fwalk.o) + .debug_frame 0x0000000000005dec 0x58 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-makebuf.o) + .debug_frame 0x0000000000005e44 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-nano-msizer.o) + .debug_frame 0x0000000000005e64 0xcc /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-signal.o) + .debug_frame 0x0000000000005f30 0x3c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-signalr.o) + .debug_frame 0x0000000000005f6c 0x88 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-stdio.o) + .debug_frame 0x0000000000005ff4 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-writer.o) + .debug_frame 0x0000000000006020 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-closer.o) + .debug_frame 0x000000000000604c 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-fstatr.o) + .debug_frame 0x0000000000006078 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-isattyr.o) + .debug_frame 0x00000000000060a4 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-lseekr.o) + .debug_frame 0x00000000000060d0 0x2c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libc_nano.a(lib_a-readr.o) + .debug_frame 0x00000000000060fc 0xac /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_addsubdf3.o) + .debug_frame 0x00000000000061a8 0x50 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_muldivdf3.o) + .debug_frame 0x00000000000061f8 0xc4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_cmpdf2.o) + .debug_frame 0x00000000000062bc 0x20 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_unorddf2.o) + .debug_frame 0x00000000000062dc 0x24 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_fixdfsi.o) + .debug_frame 0x0000000000006300 0x24 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_truncdfsf2.o) + .debug_frame 0x0000000000006324 0x4c /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_addsubsf3.o) + .debug_frame 0x0000000000006370 0x38 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_muldivsf3.o) + .debug_frame 0x00000000000063a8 0x24 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v7-m/nofp/libgcc.a(_arm_fixsfsi.o) diff --git a/SW_APPs/APP_IDcard.c b/SW_APPs/APP_IDcard.c index 16c98c7..30bf439 100644 --- a/SW_APPs/APP_IDcard.c +++ b/SW_APPs/APP_IDcard.c @@ -22,24 +22,55 @@ unsigned char s=0x08; char KEY[6]={0xff,0xff,0xff,0xff,0xff,0xff}; uint32_t card_number_D=0; +char fundcard,PA,sele,checkkey; + void APP_IDcard_loop() { - status = PcdRequest(PICC_REQALL,CT); - if(status==MI_OK) + fundcard = PcdRequest(PICC_REQALL,CT); + if(fundcard==MI_OK) { status=MI_ERR; - status = PcdAnticoll(SN); + PA = PcdAnticoll(SN); + if(PA==MI_OK) + { + sprintf(idcard_str,"CardId:%X%X",CT[0],CT[1]); + LCD_ShowString(idcard_window->x, idcard_window->y+16, idcard_str, 16, GREEN, RED); + sprintf(idcard_str,"CardId:%X%X%X%X",SN[0],SN[1],SN[2],SN[3]); + LCD_ShowString(idcard_window->x, idcard_window->y+32, idcard_str, 16, GREEN, RED); + + sele=PcdSelect(SN); + if(sele==MI_OK) + { + LCD_ShowString(idcard_window->x, idcard_window->y+48, "SELE OK", 16, GREEN, RED); + + checkkey=MI_ERR; + checkkey=PcdAuthState(0x61,0,KEY,SN); + if(checkkey==MI_OK) + { + LCD_ShowString(idcard_window->x, idcard_window->y+48+16, "KEY OK", 16, GREEN, RED); + //PcdRead(0,RFID); + } + checkkey=MI_ERR; + checkkey=PcdAuthState(0x61,32,KEY,SN); + if(checkkey==MI_OK) + { + LCD_ShowString(idcard_window->x, idcard_window->y+48+32, "KEY OK", 16, GREEN, RED); + //PcdRead(0,RFID); + } + } + + } } + /* if (status==MI_OK) { status=MI_ERR; card_number_D=(SN[2]<<16)+(SN[1]<<8)+(SN[0]); - PcdRead(0,RFID); sprintf(idcard_str,"CardId:%d",card_number_D); LCD_ShowString(idcard_window->x, idcard_window->y+16, idcard_str, 16, GREEN, RED); status=MI_ERR; - status =PcdAuthState(0,0,KEY,SN); + status =PcdAuthState(0x61,0,KEY,SN); } if(status==MI_OK) { @@ -52,7 +83,7 @@ void APP_IDcard_loop() sprintf(idcard_str,"%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x",RFID[0],RFID[1],RFID[2],RFID[3],RFID[4],RFID[5],RFID[6],RFID[7],RFID[8],RFID[9],RFID[10],RFID[11],RFID[12],RFID[13],RFID[14],RFID[15]); LCD_ShowString(idcard_window->x, idcard_window->y+32, idcard_str, 16, GREEN, RED); } - +*/ }