From d038cd8ee313996585dab3c0a3984f4f497ff09c Mon Sep 17 00:00:00 2001 From: Trevor Barnes Date: Tue, 8 Oct 2019 19:02:13 -0500 Subject: [PATCH] bit of code cleanup before submission --- .../org.eclipse.cdt.ui/global-build.log | 36 + .../RemoteSystemsTempFiles/.markers.snap | Bin 624 -> 640 bytes .../RemoteSystemsTempFiles/.syncinfo.snap | Bin 624 -> 640 bytes .../.root/.markers.snap | Bin 624 -> 640 bytes .../.safetable/org.eclipse.core.resources | Bin 17242 -> 17651 bytes .../org.eclipse.e4.workbench/workbench.xmi | 3747 +++++++++-------- lab3subroutines/src/led.s | 29 - lab3subroutines/src/main.s | 18 +- 8 files changed, 1918 insertions(+), 1912 deletions(-) diff --git a/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log b/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log index d4af2f8..e11f7f7 100644 --- a/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log +++ b/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log @@ -2131,3 +2131,39 @@ arm-none-eabi-size "lab3subroutines.elf" text data bss dec hex filename 1420 1080 1092 3592 e08 lab3subroutines.elf +18:57:54 **** Incremental Build of configuration Debug for project lab3subroutines **** +make all +Building file: ../src/led.s +Invoking: MCU GCC Assembler +C:\Users\barnestr\Documents\CE2801\workspace\lab3subroutines\Debug +arm-none-eabi-as -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -g -o "src/led.o" "../src/led.s" +Finished building: ../src/led.s + +Building file: ../src/main.s +Invoking: MCU GCC Assembler +C:\Users\barnestr\Documents\CE2801\workspace\lab3subroutines\Debug +arm-none-eabi-as -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -g -o "src/main.o" "../src/main.s" +Finished building: ../src/main.s + +Building target: lab3subroutines.elf +Invoking: MCU GCC Linker +arm-none-eabi-gcc -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -T"C:\Users\barnestr\Documents\CE2801\workspace\lab3subroutines\LinkerScript.ld" -Wl,-Map=output.map -Wl,--gc-sections -o "lab3subroutines.elf" @"objects.list" -lm +Finished building target: lab3subroutines.elf + +make --no-print-directory post-build +Generating binary and Printing size information: +arm-none-eabi-objcopy -O binary "lab3subroutines.elf" "lab3subroutines.bin" +arm-none-eabi-size "lab3subroutines.elf" + text data bss dec hex filename + 1372 1080 1092 3544 dd8 lab3subroutines.elf + +18:59:11 **** Incremental Build of configuration Debug for project lab3subroutines **** +make all +Building file: ../src/main.s +Invoking: MCU GCC Assembler +C:\Users\barnestr\Documents\CE2801\workspace\lab3subroutines\Debug +arm-none-eabi-as -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -g -o "src/main.o" "../src/main.s" +../src/main.s: Assembler messages: +../src/main.s:63: Error: invalid constant (270f) after fixup +src/subdir.mk:21: recipe for target 'src/main.o' failed +make: *** [src/main.o] Error 1 diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap index 7381145e9ee7f332d008b36fa66eb72a60f8d942..f191581ff01fc7cae23b03a12f89d05a3a76ec7f 100644 GIT binary patch delta 10 Rcmeys(!jc*fN7$D000&215E$` delta 7 OcmZo*{lK!JfC&H#R|1>> diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap index 7381145e9ee7f332d008b36fa66eb72a60f8d942..f191581ff01fc7cae23b03a12f89d05a3a76ec7f 100644 GIT binary patch delta 10 Rcmeys(!jc*fN7$D000&215E$` delta 7 OcmZo*{lK!JfC&H#R|1>> diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap index 7381145e9ee7f332d008b36fa66eb72a60f8d942..f191581ff01fc7cae23b03a12f89d05a3a76ec7f 100644 GIT binary patch delta 10 Rcmeys(!jc*fN7$D000&215E$` delta 7 OcmZo*{lK!JfC&H#R|1>> diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 249991d4181e21c209747e0daa0395ed259296ed..717f1d62ad93b99d480c57564cbafa937d646389 100644 GIT binary patch delta 22 dcmccB#`w9DaYK~z - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration ModelMigrationProcessor.001 - + @@ -11,9 +11,9 @@ topLevel - - - + + + persp.actionSet:org.eclipse.mylyn.doc.actionSet persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation @@ -70,35 +70,35 @@ persp.actionSet:org.eclipse.debug.ui.profileActionSet persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task - - + + noFocus - - - - + + + + - - - - - - - + + + + + + + - + Debug - - - - - + + + + + - + persp.actionSet:org.eclipse.mylyn.doc.actionSet persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation @@ -138,3012 +138,3013 @@ persp.viewSC:org.eclipse.pde.runtime.LogView persp.showIn:org.eclipse.egit.ui.RepositoriesView persp.perspSC:org.eclipse.wst.xml.ui.perspective - - - - - + + + + + org.eclipse.e4.primaryNavigationStack active - - + noFocus + + - - + + - - - - - - - - + + + + + + + + - - - + + + org.eclipse.e4.secondaryNavigationStack - - + + - + org.eclipse.e4.secondaryDataStack Debug - - - - - - - - - + + + + + + + + + - - - - + + + + - + View categoryTag:Help - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:Help - - + + org.eclipse.e4.primaryDataStack EditorStack - - + + Editor org.eclipse.cdt.ui.editor.asm.AsmEditor removeOnHide - + menuContribution:popup popup:#ASMEditorContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#ASMEditorRulerContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - - + + Editor org.eclipse.cdt.ui.editor.asm.AsmEditor removeOnHide - + menuContribution:popup popup:#ASMEditorContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#ASMEditorRulerContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + Editor org.eclipse.cdt.ui.editor.asm.AsmEditor removeOnHide - + menuContribution:popup popup:#ASMEditorContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#ASMEditorRulerContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - - + + Editor org.eclipse.cdt.ui.editor.asm.AsmEditor removeOnHide - + menuContribution:popup popup:#ASMEditorContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#ASMEditorRulerContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu - + menuContribution:popup popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu - + menuContribution:popup popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu - + - + View categoryTag:C/C++ - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.ui.views.ProblemView popup:org.eclipse.ui.ide.MarkersView - + menuContribution:popup popup:org.eclipse.ui.views.ProblemView popup:org.eclipse.ui.ide.MarkersView - + menuContribution:popup popup:org.eclipse.ui.views.ProblemView popup:org.eclipse.ui.ide.MarkersView - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTGlobalBuildConsole - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTBuildConsole - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTGlobalBuildConsole - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTBuildConsole - + menuContribution:popup popup:org.eclipse.debug.ui.ProcessConsoleType.#ContextMenu - + - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:#ASMOutlineContext - + menuContribution:popup popup:#ASMOutlineContext - + menuContribution:popup popup:#ASMOutlineContext - + menuContribution:popup popup:#ASMOutlineContext - + menuContribution:popup popup:#ASMOutlineContext - + - + View categoryTag:Make - + View categoryTag:Mylyn - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:GdbBasicCliConsole.#ContextMenu - + - + View categoryTag:Debug active - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.DebugView - + menuContribution:popup popup:org.eclipse.debug.ui.DebugView - + menuContribution:popup popup:org.eclipse.debug.ui.DebugView - + menuContribution:popup popup:org.eclipse.debug.ui.DebugView - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.BreakpointView - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.BreakpointView - + - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.RegisterView - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.ModuleView - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane - + - - + + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - - + + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - - + + Opaque - + Opaque - + Opaque - + Draggable - + toolbarSeparator - + - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + stretch SHOW_RESTORE_MENU - + Draggable HIDEABLE SHOW_RESTORE_MENU - - + + stretch - + Draggable - + Draggable - - + + TrimStack Draggable - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + platform:cocoa - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + platform:win32 - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + platform:cocoa - + platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + platform:cocoa - + platform:cocoa - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + platform:cocoa - - - - - - + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - + + platform:win32 - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor - + View categoryTag:Debug - + View categoryTag:C/C++ - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Make - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:General - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:Charts - + View categoryTag:Profiling - + View categoryTag:Profiling - + View categoryTag:Profiling - + View categoryTag:Maven - + View categoryTag:Maven - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Oomph - + View categoryTag:Connections - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:General - + View categoryTag:General - + View categoryTag:SVN - + View categoryTag:SVN - + View categoryTag:SVN - + View categoryTag:SVN - + View categoryTag:SVN - + View categoryTag:Team - + View categoryTag:Team - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:XML - + View categoryTag:XML - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lab3subroutines/src/led.s b/lab3subroutines/src/led.s index 6ea6f59..ec460aa 100644 --- a/lab3subroutines/src/led.s +++ b/lab3subroutines/src/led.s @@ -60,35 +60,6 @@ num_to_LED_init: # Branch back to link location bx lr -.global LED_test_loop - -LED_test_loop: - - push {r0,r1,r2,lr} - - bl num_to_LED_init - ldr r1, =GPIOB_BASE - -loop: - - ldr r2,[r1,#GPIO_ODR] - orr r2,r2,#0x0020 - str r2,[r1,#GPIO_ODR] - - mov r0, #0x3E8 - bl delay_ms - - ldr r2,[r1,#GPIO_ODR] - bic r2,r2,#0x0020 - str r2,[r1,#GPIO_ODR] - - mov r0, #0x3E8 - bl delay_ms - - b loop - - pop {r0,r1,r2,pc} - .global num_to_LED # Takes in a 10-bit value and displays it on the LEDs in binary # Input: diff --git a/lab3subroutines/src/main.s b/lab3subroutines/src/main.s index e582062..24eaef2 100644 --- a/lab3subroutines/src/main.s +++ b/lab3subroutines/src/main.s @@ -2,7 +2,9 @@ # Trevor Barnes # CE2801-031 # Lab 3: Subroutines -# Description: +# Description: The driver for Lab 3. Displays the binary ASCII +# value of the hardcoded number "1234", one character +# at a time every half second. .syntax unified .cpu cortex-m4 @@ -21,7 +23,7 @@ main_loop: mov r0, #1234 bl num_to_ASCII mov r1, r0 - # r1 is 4 character ASCII value + # r1 is a 4 character ASCII value mov r0, #500 # Display 1 ubfx r0, r1, #24, #8 @@ -45,11 +47,7 @@ main_loop: bl delay_ms b main_loop - -end: - b end .global num_to_ASCII - # Takes in a value from 0-9999 and converts it to ASCII # Input: # r0: Input binary value @@ -62,10 +60,10 @@ num_to_ASCII: cmp r0,#0 blt out_of_range - @ cmp r0,#9999 - @ bgt out_of_range + cmp r0,#9999 + bgt out_of_range - # Normal conversion behavior +# Normal conversion behavior mov r1, #16 lsl r0, #3 sub r1, #3 @@ -106,7 +104,6 @@ end_verify_nibbles: bne shift_cycle mov r3, #3 # Encode BCD numbers to ASCII - # Extract ones nibble ubfx r2, r0, #16, #4 # Insert ones nibble @@ -142,6 +139,7 @@ out_of_range: movt r1, #0x4572 end_ASCII: + # Return value in r0 mov r0, r1 pop {r1,r2,r3,lr} bx lr