diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5c77893 Binary files /dev/null and b/.DS_Store differ diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index 17b842c..b49e7d4 100755 Binary files a/Debug/MyProject.axf and b/Debug/MyProject.axf differ 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 28982a2..38a965a 100644 Binary files a/Debug/src/main.o and b/Debug/src/main.o differ 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]); }