From 9c7b21d83d31472b7088615eeb1b5470a524c52b Mon Sep 17 00:00:00 2001 From: maxluli Date: Fri, 14 Jun 2024 11:06:53 +0200 Subject: [PATCH] Cleaned the project a little --- .DS_Store | Bin 0 -> 6148 bytes Debug/MyProject.axf | Bin 406372 -> 406304 bytes Debug/MyProject.map | 16 ++++++++-------- Debug/MyProject_Debug.ld | 2 +- Debug/MyProject_Debug_library.ld | 2 +- Debug/MyProject_Debug_memory.ld | 2 +- Debug/src/main.o | Bin 146328 -> 146236 bytes src/GPIO.h | 3 +++ src/SPI.h | 1 + src/main.c | 2 +- 10 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5c778938411bea420fdc503782d25db44b13ba3d GIT binary patch literal 6148 zcmeHKO-lnY5PfMYws`5$ixU4p!GEyU?Ln|0uJ_sxsUO>2sJ7s3@BSEnpC^5jgu2`6 z#e#^;z|70e&PXai_c1#2yuFGSvpZb&V7c8SK-n4YEic$DU&jaYU3 zO$KD`b`awRBP>u}Klvn1sGWBwZuq6hWirpwJe$(bwZ{?qc*X_h$Z^kVV?4p)9Cyg@ zfP|homd@JG-q1mcA^Xi3e_Q%?r0-X1x$i?(A2M!6n{8Ly9IVxD;SxR0Hs&mP9Muey z>S$^*&+=&Mc;t-6)hP3_7G-h8dI{}-qwnK%%W=Q0)#sy%GN24713zFu_H9aY&!bvp zKp9X5Rt(7gV5x#pz`~>3I%wP#fY_kh3ET4XCOI}>6tM8fHx%Pji9XeYD~9pu^xF^@ z1uQ)JbeM4YFrjA?ZYaj}&idAc!$cm{Dg(+um4Ui{Y|HuI`~Lo4P0}Z2KpFT~446io z#9dA)oUI#^le5-Ruc;yuS9n~du;Gqk#>!E=Pjy1Sl?E{iSa_s|qCWzT1~tmSuQKof DH%ND! literal 0 HcmV?d00001 diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index 17b842cc0ee3a8cfed5b4381dbe8f8d35d191d3c..b49e7d4ad6fb03a3e856664f5d46d01e88a9f0ad 100755 GIT binary patch delta 804 zcmX|8Ur3Wt6hHTy=Q?ms_bul)x4EWHqjI@PkuGpWn5&R{*i>{mGlu3eD~W>8haexK za!{U^5x!VN5JkZd@}V;6r9ThaWB8zZ3VP_Nm+IV4>EV9o{{Ecbx%a!9MPs38%sJ%Q80 zO-l*%GWwRl17d2oq z?Dbt|-W;aorhGRTIF(7uO+xL+0K3MlGklo^9UyNu4IzNhbq2%*xoyn4^c4HXOYQ8V zjU+}w{zqwM(vlls+U(lkF3+OLy47CGWj)I#3~o@Y7ZV*tX6+>^(*H~e3E99iZ!#A7 zOPu8SQl(h$_R#a5!|HH}rfrz^(ONHdSMPo`$m}Weo|_JUnAu*Swmu981GXfKM`fOc zE>rNIRwr+leasv;nV)pO4}(orr2wwZAr?bBx155yHuX;%B>c~js=>S^Vad_-1iZ>;p3UFda6SfsaM Y=6@)DrHcNj?gtcX<*?Ndb+<~_Kfy|+)c^nh delta 778 zcmYk3T}YE*6vxkb=XqRhxw)a6PUqguX;gm9E<)!;f{CUSyV#tPH4UYY8POLBB7G2E z74D|f#R$8wF1n}?8i-vL1YJZDQMZC9T^NL2g;?i#)9{7!p6CDjKj-;4&+MvyWz|0u z!e6gUpK05=fp_EPblgMrtp258@X%22@&3Z;xg3mY>LV-%db;(vN7~HBQ+T%Ghs>s^XpO`n6qew9viuA z;Eg4t>wLJMlGPhRON#V*q37C2s#*`gq-e}f@?1Ze807c;bi!xOpAy(>9dM--;HWj{ z9Un?lEE;yE#OzRcF}f`y)HfugO{Il&T4a;&q$%1LE(R#?IwNMI+P)N2w(8c@D)_(d zfXv$6?Bk-{P_^qp+yD{&m?l3i^IDpEu(=Q$pij<{k~T-&(dy{&wpU17d2^JiJwXDS zeTN%@JoaPTPRfqTZr=}0MqD9hY?vP}_ g9=^~bW`=WG+RJ%C%Wu3a(!aM!!FTE1&WGEBzh4EN^8f$< diff --git a/Debug/MyProject.map b/Debug/MyProject.map index cc7d644..b5865e2 100644 --- a/Debug/MyProject.map +++ b/Debug/MyProject.map @@ -1054,27 +1054,27 @@ END GROUP OUTPUT(MyProject.axf elf32-littlearm) LOAD linker stubs -.debug_info 0x00000000 0x1dff +.debug_info 0x00000000 0x1dcd .debug_info 0x00000000 0x208 ./src/GPIO.o .debug_info 0x00000208 0xb2b ./src/SPI.o .debug_info 0x00000d33 0x29d ./src/cr_startup_lpc175x_6x.o .debug_info 0x00000fd0 0x40 ./src/crp.o .debug_info 0x00001010 0xc9 ./src/fonts.o .debug_info 0x000010d9 0xb5 ./src/init_clk.o - .debug_info 0x0000118e 0x76c ./src/main.o - .debug_info 0x000018fa 0x4a /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) - .debug_info 0x00001944 0x4bb /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) + .debug_info 0x0000118e 0x73a ./src/main.o + .debug_info 0x000018c8 0x4a /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) + .debug_info 0x00001912 0x4bb /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) -.debug_abbrev 0x00000000 0xbe7 +.debug_abbrev 0x00000000 0xbd4 .debug_abbrev 0x00000000 0x12b ./src/GPIO.o .debug_abbrev 0x0000012b 0x2c8 ./src/SPI.o .debug_abbrev 0x000003f3 0x14d ./src/cr_startup_lpc175x_6x.o .debug_abbrev 0x00000540 0x38 ./src/crp.o .debug_abbrev 0x00000578 0x73 ./src/fonts.o .debug_abbrev 0x000005eb 0x83 ./src/init_clk.o - .debug_abbrev 0x0000066e 0x273 ./src/main.o - .debug_abbrev 0x000008e1 0x4f /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) - .debug_abbrev 0x00000930 0x2b7 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) + .debug_abbrev 0x0000066e 0x260 ./src/main.o + .debug_abbrev 0x000008ce 0x4f /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) + .debug_abbrev 0x0000091d 0x2b7 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) .debug_aranges 0x00000000 0x348 .debug_aranges diff --git a/Debug/MyProject_Debug.ld b/Debug/MyProject_Debug.ld index 420fa3b..f417ff2 100644 --- a/Debug/MyProject_Debug.ld +++ b/Debug/MyProject_Debug.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from linkscript.ldt by FMCreateLinkLibraries * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 10:11:46 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 11:03:14 AM */ INCLUDE "MyProject_Debug_library.ld" diff --git a/Debug/MyProject_Debug_library.ld b/Debug/MyProject_Debug_library.ld index 9507ca2..b5a20cd 100644 --- a/Debug/MyProject_Debug_library.ld +++ b/Debug/MyProject_Debug_library.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from library.ldt by FMCreateLinkLibraries * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 10:11:46 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 11:03:14 AM */ GROUP ( diff --git a/Debug/MyProject_Debug_memory.ld b/Debug/MyProject_Debug_memory.ld index a36e4bd..4c9835d 100644 --- a/Debug/MyProject_Debug_memory.ld +++ b/Debug/MyProject_Debug_memory.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from memory.ldt by FMCreateLinkMemory * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 10:11:46 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 11:03:14 AM */ MEMORY diff --git a/Debug/src/main.o b/Debug/src/main.o index 28982a216b4387cb37e6f30ef7ed35b5ecc1f28c..38a965a7d7392235c000ce2824c946eda54e3bc1 100644 GIT binary patch delta 1500 zcmY+EZETZO6vxlGT_3xxn{?H!-PUz28=Z`ex7pfm=n!;vBvcKA5Qt7fq9eRag;fJt z-B?poW3tA{amf-;_&|t!5lM}~_!2~8G-|@)7e6e7Xfy~KR5F9&InQ%6+T`i){{QEk zd(XZ1$@AI`&$-_{Q?1xD9yuGqFSD+X3N_{HSqxbiFZ;%@&h?o0``ZA_GHa;|pk@H| z59*%S@hsrWT`K^fk3);VH_#8@uCoSh<^^N(Rxaz5CeS29%d(CjnWI_ zxEQz5iE$ij30BBF^_>;~e(aG%Q`%I2X+6semD{L)0+-`n8kxW_o~Nk^?Ar0RQ?X|Y zr%ZX~?1~|1-ZQ)x@ENzg6njyAaCU)nL(j2qw_r;9L(jADJIjnf%W2*x4tsLEMfuJ0 zgR_rQ*I~?bhkqDgHN=epjM;&CH$YRdMckl_O=)-2!L-Qsc{+6%H;2Asx3)s24~vesw)R6bvx#+^o$SmTE$_!R1L+_f{vX z(|!{GXz9lLg09+sEFacc{Qoq#e!Ch)3m1*TZ z<)|ko^ah8TCh$2Zgz%07W%slqZ$%DBl;x06tUwwXltkR`t)y z8^UG)i(fTqq+S^k1_3%$FBjgE4 z?J*n8hIwiOFv$HT z=!=ADveK_2e~p~*m5AZ76HYqetsL&w>YE%M;qQi2_d4Oi5ri{tyPBJMB+2WgW|2Qd zj@3u6i?yAt^J?v+U)aJ{3Z@v_X|14xh6OKCiD53@q<2$hi8-l`XkB!^l^?g6@=l%J9 zKR>?T&+a%T|8k6naC|6yF^t#y^X?tR>_R`5+wqmGcMyGf&$)jo0KiGr0032a03Pt| zd*KM+J9WB}Fct6CRsfsN-ey#B|8iD^h1z!)*KoSlq+c|y`+O%?s!gSjhK4YTUG)AC z4hH@Cdi0W&cJ^l+I;|#lmHf1s!xQiD9fue{3aE&v47QuD!?VR^?c)|IBY)igiLT}yXlJ8KV=E!i~>Ks1{?j+gPl zqGsnhXOnYV@%jL-YYaC8@*LDXiVuZ?Hpp|_ca3=SsP}eAy2O=@x zxHNdtXK(eNd5njRX2(ZyQ(yL*yO{K*lYC@U8^9LfQ^J>oM}>pJ6PoJ*CPjZJ{8TtA zyrs!~KZw33x_}RqzF)v%8fv7F6t)Ww3i~vh05YQA6MiE6QaGoX04UJMfp6f`Tmw)q z`cdH%!o7xRfRq$^HTl4dh<;aiLHLpI3r+63Df~z3$eXU}cyl$|c!Pv3Qh!>wSL$zS zrnzxUU(^DS7#|2P3TK4ZG*-^h)`pabCb0S_(N;l4VHU> z-7Ch$%XGSlpMF1mu5pQe)<}`7nQ?>S4CP;>=bKfv@~@(|nY_r;ru;A6(vsJYrT@EC O3NG=q?*HWL2>$_#pbsAa diff --git a/src/GPIO.h b/src/GPIO.h index aa4768d..9a54aa6 100644 --- a/src/GPIO.h +++ b/src/GPIO.h @@ -21,6 +21,9 @@ void InitTimer(); void InitAudio(); +void ClearTimer0(); + +void SetAudio(int value); #endif diff --git a/src/SPI.h b/src/SPI.h index cb45d00..3d0ff63 100644 --- a/src/SPI.h +++ b/src/SPI.h @@ -41,5 +41,6 @@ void Resize_Window(Rectangle area); void Refresh_Area(Rectangle area); void DrawPlayer(Player player, Rectangle areaToDraw); void DrawText(Point starting_point,char text[],Size charSize); +void Refresh_Player_Area(Rectangle area,Rectangle Hitbox); #endif /* SPI_H_ */ diff --git a/src/main.c b/src/main.c index 2fc6446..0b7bdf4 100644 --- a/src/main.c +++ b/src/main.c @@ -37,7 +37,7 @@ void TIMER0_IRQHandler(void){ //8000HZ smaple rate ClearTimer0(); audioValue ++; - if(audioValue >= 96000-1) + if(audioValue >= 886724-1) audioValue = 0; SetAudio(AllMyFellas_wav[audioValue]); }