diff --git a/labW5barnestr/.settings/language.settings.xml b/labW5barnestr/.settings/language.settings.xml
index 9842f6f..9aad8aa 100644
--- a/labW5barnestr/.settings/language.settings.xml
+++ b/labW5barnestr/.settings/language.settings.xml
@@ -6,7 +6,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
diff --git a/labW5barnestr/Debug/labW5barnestr.list b/labW5barnestr/Debug/labW5barnestr.list
index def13a4..506c4f7 100644
--- a/labW5barnestr/Debug/labW5barnestr.list
+++ b/labW5barnestr/Debug/labW5barnestr.list
@@ -27,27 +27,27 @@ Idx Name Size VMA LMA File off Algn
ALLOC
11 .ARM.attributes 00000030 00000000 00000000 00020cf4 2**0
CONTENTS, READONLY
- 12 .debug_info 00004349 00000000 00000000 00020d24 2**0
+ 12 .debug_info 00004337 00000000 00000000 00020d24 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS
- 13 .debug_abbrev 00000aec 00000000 00000000 0002506d 2**0
+ 13 .debug_abbrev 00000ad2 00000000 00000000 0002505b 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS
- 14 .debug_aranges 00000190 00000000 00000000 00025b60 2**3
+ 14 .debug_aranges 00000190 00000000 00000000 00025b30 2**3
CONTENTS, READONLY, DEBUGGING, OCTETS
- 15 .debug_ranges 00000128 00000000 00000000 00025cf0 2**3
+ 15 .debug_ranges 00000128 00000000 00000000 00025cc0 2**3
CONTENTS, READONLY, DEBUGGING, OCTETS
- 16 .debug_macro 0000349b 00000000 00000000 00025e18 2**0
+ 16 .debug_macro 000034de 00000000 00000000 00025de8 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS
- 17 .debug_line 00002748 00000000 00000000 000292b3 2**0
+ 17 .debug_line 00002751 00000000 00000000 000292c6 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS
- 18 .debug_str 0000a934 00000000 00000000 0002b9fb 2**0
+ 18 .debug_str 0000a932 00000000 00000000 0002ba17 2**0
CONTENTS, READONLY, DEBUGGING, OCTETS
- 19 .comment 00000053 00000000 00000000 0003632f 2**0
+ 19 .comment 00000053 00000000 00000000 00036349 2**0
CONTENTS, READONLY
- 20 .debug_frame 00001154 00000000 00000000 00036384 2**2
+ 20 .debug_frame 00001154 00000000 00000000 0003639c 2**2
CONTENTS, READONLY, DEBUGGING, OCTETS
- 21 .stab 0000006c 00000000 00000000 000374d8 2**2
+ 21 .stab 0000006c 00000000 00000000 000374f0 2**2
CONTENTS, READONLY, DEBUGGING
- 22 .stabstr 000000e3 00000000 00000000 00037544 2**0
+ 22 .stabstr 000000e3 00000000 00000000 0003755c 2**0
CONTENTS, READONLY, DEBUGGING
Disassembly of section .text:
diff --git a/labW5barnestr/Debug/makefile b/labW5barnestr/Debug/makefile
index e9702d4..e670f6e 100644
--- a/labW5barnestr/Debug/makefile
+++ b/labW5barnestr/Debug/makefile
@@ -59,8 +59,8 @@ all: main-build
main-build: labW5barnestr.elf secondary-outputs
# Tool invocations
-labW5barnestr.elf: $(OBJS) $(USER_OBJS) C:\Users\barnestr\Documents\CE2812-Workspace\labW5barnestr\STM32F446RETX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS)
- arm-none-eabi-gcc -o "labW5barnestr.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\barnestr\Documents\CE2812-Workspace\labW5barnestr\STM32F446RETX_FLASH.ld" --specs=nosys.specs -Wl,-Map="labW5barnestr.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -Wl,--end-group
+labW5barnestr.elf: $(OBJS) $(USER_OBJS) C:\Users\Trevor\Documents\CE2812-Workspace\labW5barnestr\STM32F446RETX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS)
+ arm-none-eabi-gcc -o "labW5barnestr.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\Trevor\Documents\CE2812-Workspace\labW5barnestr\STM32F446RETX_FLASH.ld" --specs=nosys.specs -Wl,-Map="labW5barnestr.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -Wl,--end-group
@echo 'Finished building target: $@'
@echo ' '
diff --git a/labW5barnestr/Src/main.c b/labW5barnestr/Src/main.c
index fce5e8a..3e94f66 100644
--- a/labW5barnestr/Src/main.c
+++ b/labW5barnestr/Src/main.c
@@ -11,6 +11,7 @@
#include
#include "uart_driver.h"
#include "memory.h"
+#include "led.h"
#include "delay.h"
#include "piezoSpeaker.h"
@@ -74,7 +75,7 @@ void songInfo() {
int main(void) {
init_usart2(57600, F_CPU);
piezo_init();
- // led_init();
+ led_init();
// Inititialize Imperial March Note Array
Note song1[137]={t1n1, t1n2, t1n3, t1n4, t1n5, t1n6, t1n7, t1n9, t1n10, t1n11, t1n12, t1n13, t1n14, t1n15,
t1n16, t1n17, t1n18, t1n19, t1n20, t1n21, t1n22, t1n23, t1n24, t1n25, t1n26, t1n27, t1n28, t1n29,
diff --git a/labW5barnestr/labW5barnestr Debug.launch b/labW5barnestr/labW5barnestr Debug.launch
index 19a8ec8..e0ac201 100644
--- a/labW5barnestr/labW5barnestr Debug.launch
+++ b/labW5barnestr/labW5barnestr Debug.launch
@@ -1,64 +1,65 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+