diff --git a/.config/.productview.dat b/.config/.productview.dat
index 85a42e4..b92bfb2 100644
Binary files a/.config/.productview.dat and b/.config/.productview.dat differ
diff --git a/.config/xconfig_rtos/.buildtime b/.config/xconfig_rtos/.buildtime
index 21bbe8a..fa1894e 100644
--- a/.config/xconfig_rtos/.buildtime
+++ b/.config/xconfig_rtos/.buildtime
@@ -1 +1 @@
-C:\Users\gene\OneDrive - Worcester Polytechnic Institute (wpi.edu)\ECE3849\workspace_v9\ece3849_lab2_starter\.config\xconfig_rtos\.buildtime
\ No newline at end of file
+C:\Users\askillorin\Downloads\ECE3849-tirtos\ece3849_lab3_starter\.config\xconfig_rtos\.buildtime
\ No newline at end of file
diff --git a/.config/xconfig_rtos/.xdcenv.mak b/.config/xconfig_rtos/.xdcenv.mak
index a136486..b41f852 100644
--- a/.config/xconfig_rtos/.xdcenv.mak
+++ b/.config/xconfig_rtos/.xdcenv.mak
@@ -1,8 +1,8 @@
#
_XDCBUILDCOUNT = 0
ifneq (,$(findstring path,$(_USEXDCENV_)))
-override XDCPATH = C:/ti/tirtos_tivac_2_16_01_14/packages;C:/ti/tirtos_tivac_2_16_01_14/products/tidrivers_tivac_2_16_01_13/packages;C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages;C:/ti/tirtos_tivac_2_16_01_14/products/ndk_2_25_00_09/packages;C:/ti/tirtos_tivac_2_16_01_14/products/uia_2_00_05_50/packages;C:/ti/tirtos_tivac_2_16_01_14/products/ns_1_11_00_10/packages;C:/ti/ccs930/ccs/ccs_base;C:/Users/gene/ONEDRI~1.EDU/ECE3849/workspace_v9/ece3849_lab2_starter/.config
-override XDCROOT = C:/ti/xdctools_3_32_00_06_core
+override XDCPATH = C:/ti/ccs1271/tirtos_tivac_2_16_01_14/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/tidrivers_tivac_2_16_01_13/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/ndk_2_25_00_09/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/uia_2_00_05_50/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/ns_1_11_00_10/packages;C:/ti/ccs1271/ccs/ccs_base;C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config
+override XDCROOT = C:/ti/ccs1271/xdctools_3_32_00_06_core
override XDCBUILDCFG = ./config.bld
endif
ifneq (,$(findstring args,$(_USEXDCENV_)))
@@ -11,6 +11,6 @@ override XDCTARGETS =
endif
#
ifeq (0,1)
-PKGPATH = C:/ti/tirtos_tivac_2_16_01_14/packages;C:/ti/tirtos_tivac_2_16_01_14/products/tidrivers_tivac_2_16_01_13/packages;C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages;C:/ti/tirtos_tivac_2_16_01_14/products/ndk_2_25_00_09/packages;C:/ti/tirtos_tivac_2_16_01_14/products/uia_2_00_05_50/packages;C:/ti/tirtos_tivac_2_16_01_14/products/ns_1_11_00_10/packages;C:/ti/ccs930/ccs/ccs_base;C:/Users/gene/ONEDRI~1.EDU/ECE3849/workspace_v9/ece3849_lab2_starter/.config;C:/ti/xdctools_3_32_00_06_core/packages;..
+PKGPATH = C:/ti/ccs1271/tirtos_tivac_2_16_01_14/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/tidrivers_tivac_2_16_01_13/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/ndk_2_25_00_09/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/uia_2_00_05_50/packages;C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/ns_1_11_00_10/packages;C:/ti/ccs1271/ccs/ccs_base;C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config;C:/ti/ccs1271/xdctools_3_32_00_06_core/packages;..
HOSTOS = Windows
endif
diff --git a/.config/xconfig_rtos/compiler.opt b/.config/xconfig_rtos/compiler.opt
index 34acf0b..cd58367 100644
--- a/.config/xconfig_rtos/compiler.opt
+++ b/.config/xconfig_rtos/compiler.opt
@@ -1 +1 @@
---endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -I"C:/ti/tirtos_tivac_2_16_01_14/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/tidrivers_tivac_2_16_01_13/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/ndk_2_25_00_09/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/uia_2_00_05_50/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/ns_1_11_00_10/packages" -I"C:/ti/ccs930/ccs/ccs_base" -I"C:/Users/gene/ONEDRI~1.EDU/ECE3849/workspace_v9/ece3849_lab2_starter/.config" -I"C:/ti/xdctools_3_32_00_06_core/packages" -I"C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/.config/xconfig_rtos/.." -IC:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include/rts -IC:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include -Dxdc_target_types__="ti/targets/arm/elf/std.h" -Dxdc_target_name__=M4F -Dxdc_cfg__xheader__="\"C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/.config/xconfig_rtos/package/cfg/rtos_pem4f.h\""
+--endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/tidrivers_tivac_2_16_01_13/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/ndk_2_25_00_09/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/uia_2_00_05_50/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/ns_1_11_00_10/packages" -I"C:/ti/ccs1271/ccs/ccs_base" -I"C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config" -I"C:/ti/ccs1271/xdctools_3_32_00_06_core/packages" -I"C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config/xconfig_rtos/.." -IC:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include/rts -IC:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include -Dxdc_target_types__="ti/targets/arm/elf/std.h" -Dxdc_target_name__=M4F -Dxdc_cfg__xheader__="\"C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config/xconfig_rtos/package/cfg/rtos_pem4f.h\""
diff --git a/.config/xconfig_rtos/compiler.opt.defs b/.config/xconfig_rtos/compiler.opt.defs
index a9aa2e3..650d81b 100644
--- a/.config/xconfig_rtos/compiler.opt.defs
+++ b/.config/xconfig_rtos/compiler.opt.defs
@@ -1 +1 @@
--I"C:/ti/tirtos_tivac_2_16_01_14/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/tidrivers_tivac_2_16_01_13/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/ndk_2_25_00_09/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/uia_2_00_05_50/packages" -I"C:/ti/tirtos_tivac_2_16_01_14/products/ns_1_11_00_10/packages" -I"C:/ti/ccs930/ccs/ccs_base" -I"C:/Users/gene/ONEDRI~1.EDU/ECE3849/workspace_v9/ece3849_lab2_starter/.config" -I"C:/ti/xdctools_3_32_00_06_core/packages" -I"C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/.config/xconfig_rtos/.." -IC:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include/rts -IC:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include -Dxdc_target_types__="ti/targets/arm/elf/std.h" -Dxdc_target_name__=M4F -Dxdc_cfg__xheader__="\"C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/.config/xconfig_rtos/package/cfg/rtos_pem4f.h\""
+-I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/tidrivers_tivac_2_16_01_13/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/ndk_2_25_00_09/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/uia_2_00_05_50/packages" -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/ns_1_11_00_10/packages" -I"C:/ti/ccs1271/ccs/ccs_base" -I"C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config" -I"C:/ti/ccs1271/xdctools_3_32_00_06_core/packages" -I"C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config/xconfig_rtos/.." -IC:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include/rts -IC:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include -Dxdc_target_types__="ti/targets/arm/elf/std.h" -Dxdc_target_name__=M4F -Dxdc_cfg__xheader__="\"C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config/xconfig_rtos/package/cfg/rtos_pem4f.h\""
diff --git a/.config/xconfig_rtos/config.bld b/.config/xconfig_rtos/config.bld
index d8e65ab..48e38b1 100644
--- a/.config/xconfig_rtos/config.bld
+++ b/.config/xconfig_rtos/config.bld
@@ -16,9 +16,9 @@ if (!(target instanceof xdc.module("xdc.bld.ITarget").Module)) {
}
/* configuro was passed compiler options explicitly */
-target.ccOpts.prefix = unescape("-mv7M4%20--code_state%3D16%20--float_support%3DFPv4SPD16%20-me%20-O1%20--opt_for_speed%3D2%20--include_path%3D%22C%3A/Users/gene/OneDrive%20-%20Worcester%20Polytechnic%20Institute%20%28wpi.edu%29/ECE3849/workspace_v9/ece3849_lab2_starter%22%20--include_path%3D%22C%3A/Users/gene/OneDrive%20-%20Worcester%20Polytechnic%20Institute%20%28wpi.edu%29/ECE3849/workspace_v9/ece3849_lab2_starter%22%20--include_path%3D%22C%3A/ti/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b%22%20--include_path%3D%22C%3A/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix%22%20--include_path%3D%22C%3A/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include%22%20--define%3Dccs%3D%22ccs%22%20--define%3DPART_TM4C1294NCPDT%20--define%3Dccs%20--define%3DTIVAWARE%20-g%20--gcc%20--diag_warning%3D225%20--diag_warning%3D255%20--diag_wrap%3Doff%20--display_error_number%20--gen_func_subsections%3Don%20--abi%3Deabi%20%20%20") + target.ccOpts.prefix;
+target.ccOpts.prefix = unescape("-mv7M4%20--code_state%3D16%20--float_support%3DFPv4SPD16%20-me%20-O1%20--opt_for_speed%3D2%20--include_path%3D%22C%3A/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter%22%20--include_path%3D%22C%3A/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter%22%20--include_path%3D%22C%3A/ti/ccs1271/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b%22%20--include_path%3D%22C%3A/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix%22%20--include_path%3D%22C%3A/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include%22%20--define%3Dccs%3D%22ccs%22%20--define%3DPART_TM4C1294NCPDT%20--define%3Dccs%20--define%3DTIVAWARE%20-g%20--gcc%20--diag_warning%3D225%20--diag_warning%3D255%20--diag_wrap%3Doff%20--display_error_number%20--gen_func_subsections%3Don%20--abi%3Deabi%20%20%20") + target.ccOpts.prefix;
/* configuro was passed the target's rootDir explicitly */
-target.rootDir = 'C:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS';
+target.rootDir = 'C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS';
Build.targets = [target];
diff --git a/.config/xconfig_rtos/custom.mak b/.config/xconfig_rtos/custom.mak
index 352abc9..3cc4d60 100644
--- a/.config/xconfig_rtos/custom.mak
+++ b/.config/xconfig_rtos/custom.mak
@@ -7,5 +7,5 @@
# or equal to the generated config header
#
linker.cmd: package/cfg/rtos_pem4f.xdl
- $(SED) 's"^\"\(package/cfg/rtos_pem4fcfg.cmd\)\"$""\"C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/.config/xconfig_rtos/\1\""' package/cfg/rtos_pem4f.xdl > $@
+ $(SED) 's"^\"\(package/cfg/rtos_pem4fcfg.cmd\)\"$""\"C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config/xconfig_rtos/\1\""' package/cfg/rtos_pem4f.xdl > $@
-$(SETDATE) -r:max package/cfg/rtos_pem4f.h compiler.opt compiler.opt.defs
diff --git a/.config/xconfig_rtos/package.bld b/.config/xconfig_rtos/package.bld
index ab09c2a..e8b88d9 100644
--- a/.config/xconfig_rtos/package.bld
+++ b/.config/xconfig_rtos/package.bld
@@ -11,7 +11,7 @@ var makeAssembly = false;
var Executable = xdc.module('xdc.bld.Executable');
var exeOpts = new Executable.Attrs({
- cfgScript: 'C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/rtos.cfg',
+ cfgScript: 'C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg',
profile: 'release',
cfgHome: 'xconfig_rtos',
});
@@ -40,8 +40,8 @@ else {
}
var thisObj = {
- cfg: 'C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/rtos.cfg',
- outputPath: 'C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/.config/xconfig_rtos',
+ cfg: 'C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg',
+ outputPath: 'C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config/xconfig_rtos',
exeName: 'rtos' + suffix,
exeIntName: 'rtos' + suffix.replace('.', '_'),
targ: targ,
diff --git a/.config/xconfig_rtos/package.mak b/.config/xconfig_rtos/package.mak
index 81191a3..9d76d5b 100644
--- a/.config/xconfig_rtos/package.mak
+++ b/.config/xconfig_rtos/package.mak
@@ -15,90 +15,90 @@ XDCCFGDIR = package/cfg/
# in the event that some included BOM script changes.
#
ifneq (clean,$(MAKECMDGOALS))
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/utils.js:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/utils.js
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/xdc.tci:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/xdc.tci
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/template.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/template.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/om2.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/om2.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/xmlgen.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/xmlgen.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/xmlgen2.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/xmlgen2.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/Warnings.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/Warnings.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/IPackage.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/IPackage.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/package.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/package.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/global/Clock.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/global/Clock.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/global/Trace.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/global/Trace.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/bld.js:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/bld.js
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/BuildEnvironment.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/BuildEnvironment.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/PackageContents.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/PackageContents.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/_gen.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/_gen.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Library.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Library.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Executable.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Executable.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Repository.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Repository.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Configuration.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Configuration.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Script.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Script.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Manifest.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Manifest.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Utils.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/Utils.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget2.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget2.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget3.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget3.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/ITargetFilter.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/ITargetFilter.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/package.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/bld/package.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/utils.js:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/utils.js
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/xdc.tci:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/xdc.tci
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/template.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/template.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/om2.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/om2.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/xmlgen.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/xmlgen.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/xmlgen2.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/xmlgen2.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/Warnings.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/Warnings.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/IPackage.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/IPackage.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/package.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/package.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/global/Clock.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/global/Clock.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/global/Trace.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/global/Trace.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/bld.js:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/bld.js
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/BuildEnvironment.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/BuildEnvironment.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/PackageContents.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/PackageContents.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/_gen.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/_gen.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Library.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Library.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Executable.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Executable.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Repository.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Repository.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Configuration.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Configuration.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Script.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Script.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Manifest.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Manifest.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Utils.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/Utils.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget2.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget2.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget3.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/ITarget3.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/ITargetFilter.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/ITargetFilter.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/package.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/bld/package.xs
package.mak: config.bld
-C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/ITarget.xs:
-package.mak: C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/ITarget.xs
-C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/C28_large.xs:
-package.mak: C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/C28_large.xs
-C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/C28_float.xs:
-package.mak: C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/C28_float.xs
-C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/package.xs:
-package.mak: C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/package.xs
-C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/IArm.xs:
-package.mak: C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/IArm.xs
-C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/package.xs:
-package.mak: C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/package.xs
+C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/ITarget.xs:
+package.mak: C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/ITarget.xs
+C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/C28_large.xs:
+package.mak: C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/C28_large.xs
+C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/C28_float.xs:
+package.mak: C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/C28_float.xs
+C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/package.xs:
+package.mak: C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/package.xs
+C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/IArm.xs:
+package.mak: C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/IArm.xs
+C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/package.xs:
+package.mak: C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/package.xs
package.mak: package.bld
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/compiler.opt.xdt:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/compiler.opt.xdt
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/io/File.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/io/File.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/io/package.xs:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/io/package.xs
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/compiler.defs.xdt:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/compiler.defs.xdt
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/custom.mak.exe.xdt:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/custom.mak.exe.xdt
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/package.xs.xdt:
-package.mak: C:/ti/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/package.xs.xdt
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/compiler.opt.xdt:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/compiler.opt.xdt
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/io/File.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/io/File.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/io/package.xs:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/io/package.xs
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/compiler.defs.xdt:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/compiler.defs.xdt
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/custom.mak.exe.xdt:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/custom.mak.exe.xdt
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/package.xs.xdt:
+package.mak: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/tools/configuro/template/package.xs.xdt
endif
-ti.targets.arm.elf.M4F.rootDir ?= C:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS
-ti.targets.arm.elf.packageBase ?= C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/
+ti.targets.arm.elf.M4F.rootDir ?= C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS
+ti.targets.arm.elf.packageBase ?= C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/
.PRECIOUS: $(XDCCFGDIR)/%.oem4f
.PHONY: all,em4f .dlls,em4f .executables,em4f test,em4f
all,em4f: .executables,em4f
diff --git a/.config/xconfig_rtos/package/cfg/rtos.xem4f.mak b/.config/xconfig_rtos/package/cfg/rtos.xem4f.mak
index 88cc070..b7c7ec6 100644
--- a/.config/xconfig_rtos/package/cfg/rtos.xem4f.mak
+++ b/.config/xconfig_rtos/package/cfg/rtos.xem4f.mak
@@ -3,7 +3,7 @@
# package.bld. Any modifications to this file will be
# overwritten whenever makefiles are re-generated.
#
-# target compatibility key = ti.targets.arm.elf.M4F{1,0,18.12,5
+# target compatibility key = ti.targets.arm.elf.M4F{1,0,20.2,7
#
rtos.xem4f: package/cfg/rtos.xem4f.mak
diff --git a/.config/xconfig_rtos/package/cfg/rtos_pem4f.cfg b/.config/xconfig_rtos/package/cfg/rtos_pem4f.cfg
index ed201c0..6bca864 100644
--- a/.config/xconfig_rtos/package/cfg/rtos_pem4f.cfg
+++ b/.config/xconfig_rtos/package/cfg/rtos_pem4f.cfg
@@ -76,7 +76,7 @@ function _cfginit() {
/* initialize prog attrs from build model */
var build = {
profile: "release",
- cfgScript: "C%3A/Users/gene/OneDrive%20-%20Worcester%20Polytechnic%20Institute%20%28wpi.edu%29/ECE3849/workspace_v9/ece3849_lab2_starter/rtos.cfg",
+ cfgScript: "C%3A/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg",
cfgHome: "xconfig_rtos",
cfgArgs: "null",
cfgArgsEncoded: true,
@@ -100,7 +100,7 @@ function _cfginit() {
platforms: [
"ti.platforms.tiva%3ATM4C1294NCPDT%3A1"
],
- version: "ti.targets.arm.elf.M4F%7B1%2C0%2C18.12%2C5",
+ version: "ti.targets.arm.elf.M4F%7B1%2C0%2C20.2%2C7",
extensions: {
".sem4fe": {
suf: ".sem4fe",
@@ -119,11 +119,11 @@ function _cfginit() {
typ: "asm"
}
},
- rootDir: "C%3A/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS",
+ rootDir: "C%3A/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS",
ccOpts: {
- prefix: "-mv7M4%20--code_state%3D16%20--float_support%3DFPv4SPD16%20-me%20-O1%20--opt_for_speed%3D2%20--include_path%3D%22C%3A/Users/gene/OneDrive%20-%20Worcester%20Polytechnic%20Institute%20%28wpi.edu%29/ECE3849/workspace_v9/ece3849_lab2_starter%22%20--include_path%3D%22C%3A/Users/gene/OneDrive%20-%20Worcester%20Polytechnic%20Institute%20%28wpi.edu%29/ECE3849/workspace_v9/ece3849_lab2_starter%22%20--include_path%3D%22C%3A/ti/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b%22%20--include_path%3D%22C%3A/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix%22%20--include_path%3D%22C%3A/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include%22%20--define%3Dccs%3D%22ccs%22%20--define%3DPART_TM4C1294NCPDT%20--define%3Dccs%20--define%3DTIVAWARE%20-g%20--gcc%20--diag_warning%3D225%20--diag_warning%3D255%20--diag_wrap%3Doff%20--display_error_number%20--gen_func_subsections%3Don%20--abi%3Deabi%20%20%20-qq%20-pdsw225"
+ prefix: "-mv7M4%20--code_state%3D16%20--float_support%3DFPv4SPD16%20-me%20-O1%20--opt_for_speed%3D2%20--include_path%3D%22C%3A/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter%22%20--include_path%3D%22C%3A/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter%22%20--include_path%3D%22C%3A/ti/ccs1271/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b%22%20--include_path%3D%22C%3A/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix%22%20--include_path%3D%22C%3A/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include%22%20--define%3Dccs%3D%22ccs%22%20--define%3DPART_TM4C1294NCPDT%20--define%3Dccs%20--define%3DTIVAWARE%20-g%20--gcc%20--diag_warning%3D225%20--diag_warning%3D255%20--diag_wrap%3Doff%20--display_error_number%20--gen_func_subsections%3Don%20--abi%3Deabi%20%20%20-qq%20-pdsw225"
},
- rawVersion: "18.12.5"
+ rawVersion: "20.2.7"
};
_runescape(targChange);
_applyChanges(build.target, targChange);
@@ -179,7 +179,7 @@ function _userscript(script) {
xdc.om.$$bind('$homepkg', home);
- var cfgScript = "C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/rtos.cfg";
+ var cfgScript = "C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg";
if (!script) {
utils.loadCapsule(cfgScript, false, spath);
}
diff --git a/.config/xconfig_rtos/package/cfg/rtos_pem4f.mak b/.config/xconfig_rtos/package/cfg/rtos_pem4f.mak
index a43d4d7..9a414ab 100644
--- a/.config/xconfig_rtos/package/cfg/rtos_pem4f.mak
+++ b/.config/xconfig_rtos/package/cfg/rtos_pem4f.mak
@@ -3,7 +3,7 @@
# package.bld. Any modifications to this file will be
# overwritten whenever makefiles are re-generated.
#
-# target compatibility key = ti.targets.arm.elf.M4F{1,0,18.12,5
+# target compatibility key = ti.targets.arm.elf.M4F{1,0,20.2,7
#
ifeq (,$(MK_NOGENDEPS))
-include package/cfg/rtos_pem4f.oem4f.dep
@@ -15,8 +15,8 @@ package/cfg/rtos_pem4f.oem4f: package/cfg/rtos_pem4f.c package/cfg/rtos_pem4f.ma
@$(RM) $@.dep
$(RM) $@
@$(MSG) clem4f $< ...
- $(ti.targets.arm.elf.M4F.rootDir)/bin/armcl -c -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -O1 --opt_for_speed=2 --include_path="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter" --include_path="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter" --include_path="C:/ti/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include" --define=ccs="ccs" --define=PART_TM4C1294NCPDT --define=ccs --define=TIVAWARE -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --gen_func_subsections=on --abi=eabi -qq -pdsw225 -ms --fp_mode=strict --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -eo.oem4f -ea.sem4f -Dxdc_cfg__xheader__='"xconfig_rtos/package/cfg/rtos_pem4f.h"' -Dxdc_target_name__=M4F -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_release -Dxdc_bld__vers_1_0_18_12_5 -O2 $(XDCINCS) -I$(ti.targets.arm.elf.M4F.rootDir)/include/rts -I$(ti.targets.arm.elf.M4F.rootDir)/include -fs=./package/cfg -fr=./package/cfg -fc $<
- $(MKDEP) -a $@.dep -p package/cfg -s oem4f $< -C -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -O1 --opt_for_speed=2 --include_path="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter" --include_path="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter" --include_path="C:/ti/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include" --define=ccs="ccs" --define=PART_TM4C1294NCPDT --define=ccs --define=TIVAWARE -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --gen_func_subsections=on --abi=eabi -qq -pdsw225 -ms --fp_mode=strict --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -eo.oem4f -ea.sem4f -Dxdc_cfg__xheader__='"xconfig_rtos/package/cfg/rtos_pem4f.h"' -Dxdc_target_name__=M4F -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_release -Dxdc_bld__vers_1_0_18_12_5 -O2 $(XDCINCS) -I$(ti.targets.arm.elf.M4F.rootDir)/include/rts -I$(ti.targets.arm.elf.M4F.rootDir)/include -fs=./package/cfg -fr=./package/cfg
+ $(ti.targets.arm.elf.M4F.rootDir)/bin/armcl -c -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -O1 --opt_for_speed=2 --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include" --define=ccs="ccs" --define=PART_TM4C1294NCPDT --define=ccs --define=TIVAWARE -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --gen_func_subsections=on --abi=eabi -qq -pdsw225 -ms --fp_mode=strict --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -eo.oem4f -ea.sem4f -Dxdc_cfg__xheader__='"xconfig_rtos/package/cfg/rtos_pem4f.h"' -Dxdc_target_name__=M4F -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_release -Dxdc_bld__vers_1_0_20_2_7 -O2 $(XDCINCS) -I$(ti.targets.arm.elf.M4F.rootDir)/include/rts -I$(ti.targets.arm.elf.M4F.rootDir)/include -fs=./package/cfg -fr=./package/cfg -fc $<
+ $(MKDEP) -a $@.dep -p package/cfg -s oem4f $< -C -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -O1 --opt_for_speed=2 --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include" --define=ccs="ccs" --define=PART_TM4C1294NCPDT --define=ccs --define=TIVAWARE -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --gen_func_subsections=on --abi=eabi -qq -pdsw225 -ms --fp_mode=strict --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -eo.oem4f -ea.sem4f -Dxdc_cfg__xheader__='"xconfig_rtos/package/cfg/rtos_pem4f.h"' -Dxdc_target_name__=M4F -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_release -Dxdc_bld__vers_1_0_20_2_7 -O2 $(XDCINCS) -I$(ti.targets.arm.elf.M4F.rootDir)/include/rts -I$(ti.targets.arm.elf.M4F.rootDir)/include -fs=./package/cfg -fr=./package/cfg
-@$(FIXDEP) $@.dep $@.dep
package/cfg/rtos_pem4f.oem4f: export C_DIR=
@@ -28,8 +28,8 @@ package/cfg/rtos_pem4f.sem4f: package/cfg/rtos_pem4f.c package/cfg/rtos_pem4f.ma
@$(RM) $@.dep
$(RM) $@
@$(MSG) clem4f -n $< ...
- $(ti.targets.arm.elf.M4F.rootDir)/bin/armcl -c -n -s --symdebug:none -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -O1 --opt_for_speed=2 --include_path="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter" --include_path="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter" --include_path="C:/ti/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include" --define=ccs="ccs" --define=PART_TM4C1294NCPDT --define=ccs --define=TIVAWARE -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --gen_func_subsections=on --abi=eabi -qq -pdsw225 --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -eo.oem4f -ea.sem4f -Dxdc_cfg__xheader__='"xconfig_rtos/package/cfg/rtos_pem4f.h"' -Dxdc_target_name__=M4F -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_release -Dxdc_bld__vers_1_0_18_12_5 -O2 $(XDCINCS) -I$(ti.targets.arm.elf.M4F.rootDir)/include/rts -I$(ti.targets.arm.elf.M4F.rootDir)/include -fs=./package/cfg -fr=./package/cfg -fc $<
- $(MKDEP) -a $@.dep -p package/cfg -s oem4f $< -C -n -s --symdebug:none -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -O1 --opt_for_speed=2 --include_path="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter" --include_path="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter" --include_path="C:/ti/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs930/ccs/tools/compiler/ti-cgt-arm_18.12.5.LTS/include" --define=ccs="ccs" --define=PART_TM4C1294NCPDT --define=ccs --define=TIVAWARE -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --gen_func_subsections=on --abi=eabi -qq -pdsw225 --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -eo.oem4f -ea.sem4f -Dxdc_cfg__xheader__='"xconfig_rtos/package/cfg/rtos_pem4f.h"' -Dxdc_target_name__=M4F -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_release -Dxdc_bld__vers_1_0_18_12_5 -O2 $(XDCINCS) -I$(ti.targets.arm.elf.M4F.rootDir)/include/rts -I$(ti.targets.arm.elf.M4F.rootDir)/include -fs=./package/cfg -fr=./package/cfg
+ $(ti.targets.arm.elf.M4F.rootDir)/bin/armcl -c -n -s --symdebug:none -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -O1 --opt_for_speed=2 --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include" --define=ccs="ccs" --define=PART_TM4C1294NCPDT --define=ccs --define=TIVAWARE -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --gen_func_subsections=on --abi=eabi -qq -pdsw225 --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -eo.oem4f -ea.sem4f -Dxdc_cfg__xheader__='"xconfig_rtos/package/cfg/rtos_pem4f.h"' -Dxdc_target_name__=M4F -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_release -Dxdc_bld__vers_1_0_20_2_7 -O2 $(XDCINCS) -I$(ti.targets.arm.elf.M4F.rootDir)/include/rts -I$(ti.targets.arm.elf.M4F.rootDir)/include -fs=./package/cfg -fr=./package/cfg -fc $<
+ $(MKDEP) -a $@.dep -p package/cfg -s oem4f $< -C -n -s --symdebug:none -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -O1 --opt_for_speed=2 --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include" --define=ccs="ccs" --define=PART_TM4C1294NCPDT --define=ccs --define=TIVAWARE -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --gen_func_subsections=on --abi=eabi -qq -pdsw225 --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -eo.oem4f -ea.sem4f -Dxdc_cfg__xheader__='"xconfig_rtos/package/cfg/rtos_pem4f.h"' -Dxdc_target_name__=M4F -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_release -Dxdc_bld__vers_1_0_20_2_7 -O2 $(XDCINCS) -I$(ti.targets.arm.elf.M4F.rootDir)/include/rts -I$(ti.targets.arm.elf.M4F.rootDir)/include -fs=./package/cfg -fr=./package/cfg
-@$(FIXDEP) $@.dep $@.dep
package/cfg/rtos_pem4f.sem4f: export C_DIR=
diff --git a/.config/xconfig_rtos/package/package.bld.xml b/.config/xconfig_rtos/package/package.bld.xml
index 914fdb8..24a3208 100644
--- a/.config/xconfig_rtos/package/package.bld.xml
+++ b/.config/xconfig_rtos/package/package.bld.xml
@@ -7,7 +7,7 @@
-
+
@@ -20,12 +20,12 @@
@@ -56,7 +56,7 @@
profile="release"
xCfgScript="package/cfg/rtos_pem4f.cfg"
xCfgPrefix="package/cfg/rtos_pem4f"
- cfgScript="C:/Users/gene/OneDrive - Worcester Polytechnic Institute (wpi.edu)/ECE3849/workspace_v9/ece3849_lab2_starter/rtos.cfg"
+ cfgScript="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg"
cfgArgs="null"
/>
diff --git a/.config/xconfig_rtos/package/package.xdc.dep b/.config/xconfig_rtos/package/package.xdc.dep
index 6788ac9..fd05452 100644
--- a/.config/xconfig_rtos/package/package.xdc.dep
+++ b/.config/xconfig_rtos/package/package.xdc.dep
@@ -30,24 +30,24 @@ xdc/IPackage.xdc:
vpath xdc/IPackage.xdc $(XPKGVPATH)
ifneq (clean,$(MAKECMDGOALS))
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/shelf/java/ecj.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/shelf/java/ecj.jar
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/intern/gen/java/package.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/intern/gen/java/package.jar
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/intern/cmd/java/package.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/intern/cmd/java/package.jar
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/shelf/java/js.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/shelf/java/js.jar
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/global/java/package.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/global/java/package.jar
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/shelf/java/antlr.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/shelf/java/antlr.jar
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/intern/xsr/java/package.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/intern/xsr/java/package.jar
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/shelf/java/tar.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/shelf/java/tar.jar
-C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/spec/java/package.jar:
-package/package.xdc.inc: C:/ti/xdctools_3_32_00_06_core/packages/xdc/services/spec/java/package.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/shelf/java/antlr.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/shelf/java/antlr.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/global/java/package.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/global/java/package.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/shelf/java/ecj.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/shelf/java/ecj.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/shelf/java/js.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/shelf/java/js.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/intern/xsr/java/package.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/intern/xsr/java/package.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/intern/gen/java/package.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/intern/gen/java/package.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/spec/java/package.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/spec/java/package.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/intern/cmd/java/package.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/services/intern/cmd/java/package.jar
+C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/shelf/java/tar.jar:
+package/package.xdc.inc: C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/xdc/shelf/java/tar.jar
endif
# goals for files generated during schema generation but unspecified by schema's pattern rule
diff --git a/.config/xconfig_rtos/package/xconfig_rtos.ccs b/.config/xconfig_rtos/package/xconfig_rtos.ccs
index bb61e60..3a7998a 100644
Binary files a/.config/xconfig_rtos/package/xconfig_rtos.ccs and b/.config/xconfig_rtos/package/xconfig_rtos.ccs differ
diff --git a/.gitignore b/.gitignore
index 3df573f..e6d8d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Debug/
+Debug/
\ No newline at end of file
diff --git a/.launches/ece3849_lab3_starter.launch b/.launches/ece3849_lab3_starter.launch
new file mode 100644
index 0000000..093131b
--- /dev/null
+++ b/.launches/ece3849_lab3_starter.launch
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..7c051cc
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//Debug/makefile=UTF-8
+encoding//Debug/objects.mk=UTF-8
+encoding//Debug/sources.mk=UTF-8
+encoding//Debug/subdir_rules.mk=UTF-8
+encoding//Debug/subdir_vars.mk=UTF-8
diff --git a/main.c b/main.c
index 9360803..71e9e0b 100644
--- a/main.c
+++ b/main.c
@@ -14,73 +14,47 @@
#include
#include
+#include "driverlib/fpu.h"
+#include "driverlib/sysctl.h"
#include "driverlib/interrupt.h"
+#include "driverlib/timer.h"
+#include "Crystalfontz128x128_ST7735.h"
+#include
+#include "grlib/grlib.h"
+#include
+#include
+#include "inc/hw_memmap.h"
+#include "driverlib/gpio.h"
+#include "driverlib/pwm.h"
+#include "driverlib/pin_map.h"
+#include "sampling.h"
+#include "buttons.h"
+#define PWM_FREQUENCY 20000 // PWM frequency = 20 kHz
uint32_t gSystemClock = 120000000; // [Hz] system clock frequency
-
-#define PWM_FREQUENCY 20000 // PWM frequency = 20 kHz
-
-uint32_t gSystemClock; // [Hz] system clock frequency
-volatile uint32_t gTime = 0; // time in hundredths of a second
-volatile uint8_t refresh = 1;
-
-// assumming square lcd
-#define HEIGHT LCD_VERTICAL_MAX
-#define WIDTH LCD_HORIZONTAL_MAX
-#define PIXELS_PER_DIV 20
-
-#define VIN_RANGE 3.3 // volts
-#define ADC_BITS 12
-#define ADC_OFFSET 30
-
-#define VOLTAGE_SCALES 5
-const char * const gVoltageScaleStr[VOLTAGE_SCALES] = {
-"100 mV", "200 mV", "500 mV", " 1 V", " 2 V"
-};
-
-const float gVoltageScale[VOLTAGE_SCALES] = {
- 0.1, 0.2, 0.5, 1., 2.
-};
-
-#define TIME_SCALES 6
-const char * const gTimeScaleStr[TIME_SCALES] = {
-"100 ms", "50 ms", "20 ms", " 10 ms", "50 us", "20 us"
-};
-
-const uint64_t gTImeScale[TIME_SCALES] = {
- 100 * 1000 / PIXELS_PER_DIV,
- 50 * 1000 / PIXELS_PER_DIV,
- 20 * 1000 / PIXELS_PER_DIV,
- 10 * 1000 / PIXELS_PER_DIV,
- 50 / PIXELS_PER_DIV,
- 20 / PIXELS_PER_DIV,
-};
-
-int Trigger(bool rising) // search for edge trigger
-{
- int x = gADCBufferIndex - (WIDTH / 2); // half screen width
- int x_stop = x - ADC_BUFFER_SIZE/2;
- for (; x > x_stop; x--) {
- if (rising) {
- if ( gADCBuffer[ADC_BUFFER_WRAP(x)] >= ADC_OFFSET &&
- gADCBuffer[ADC_BUFFER_WRAP(x-1)] < ADC_OFFSET) {
- break;
- }
- } else { // falling edge trigger
- if ( gADCBuffer[ADC_BUFFER_WRAP(x)] <= ADC_OFFSET &&
- gADCBuffer[ADC_BUFFER_WRAP(x-1)] > ADC_OFFSET) {
- break;
- }
- }
- }
- if (x == x_stop) // for loop ran to the end
- x = gADCBufferIndex - (WIDTH / 2); // reset x back to how it was initialized
- return x;
+// start a pwm test signal
+void start_signal() {
+ // configure M0PWM2, at GPIO PF2, BoosterPack 1 header C1 pin 2
+ SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOF);
+ GPIOPinTypePWM(GPIO_PORTF_BASE, GPIO_PIN_2);
+ GPIOPinConfigure(GPIO_PF2_M0PWM2);
+ GPIOPadConfigSet(GPIO_PORTF_BASE, GPIO_PIN_2, GPIO_STRENGTH_2MA,
+ GPIO_PIN_TYPE_STD);
+ // configure the PWM0 peripheral, gen 1, outputs 2 and 3
+ SysCtlPeripheralEnable(SYSCTL_PERIPH_PWM0);
+ // use system clock without division
+ PWMClockSet(PWM0_BASE, PWM_SYSCLK_DIV_1);
+ PWMGenConfigure(PWM0_BASE, PWM_GEN_1,
+ PWM_GEN_MODE_DOWN | PWM_GEN_MODE_NO_SYNC);
+ PWMGenPeriodSet(PWM0_BASE, PWM_GEN_1,
+ roundf((float)gSystemClock / PWM_FREQUENCY));
+ PWMPulseWidthSet(PWM0_BASE, PWM_OUT_2,
+ roundf((float)gSystemClock / PWM_FREQUENCY * 0.4f));
+ PWMOutputState(PWM0_BASE, PWM_OUT_2_BIT, true);
+ PWMGenEnable(PWM0_BASE, PWM_GEN_1);
}
-
-
/*
* ======== main ========
*/
@@ -89,6 +63,8 @@ int main(void)
IntMasterDisable();
// hardware initialization goes here
+ start_signal();
+ start_sampler();
/* Start BIOS */
BIOS_start();
@@ -104,114 +80,3 @@ void task0_func(UArg arg1, UArg arg2)
// do nothing
}
}
-
-void draw(tContext &sContext) {
- // handle buttons
- Button button = (Button) 0;
- while (fifo_get(&button)) {
- switch (button) {
- case S1: // toggle edge
- trigger_mode++;
- trigger_mode %= 3;
- break;
- case S2: // draw
- refresh = !refresh;
- break;
- case Up: // next scale
- voltage_scale = (voltage_scale + 1) % VOLTAGE_SCALES;
- break;
- case Down: // previous scale
- voltage_scale = (voltage_scale + VOLTAGE_SCALES - 1) % VOLTAGE_SCALES;
- break;
- case Right: // next scale
- time_scale = (time_scale + 1) % TIME_SCALES;
- set_frequency(gTImeScale[time_scale]);
- break;
- case Left: // previous scale
- time_scale = (time_scale + TIME_SCALES - 1) % TIME_SCALES;
- set_frequency(gTImeScale[time_scale]);
- break;
- }
- }
-
- GrContextForegroundSet(&sContext, ClrBlack);
- GrRectFill(&sContext, &rectFullScreen); // fill screen with black
-
- GrContextForegroundSet(&sContext, ClrBlue);
-
- // draw gridlines from the center out
- uint8_t xy_pos;
- for (xy_pos = HEIGHT/2; xy_pos < HEIGHT; xy_pos += PIXELS_PER_DIV) {
- GrLineDrawV(&sContext, xy_pos, 0, 128); // right
- GrLineDrawV(&sContext, HEIGHT - xy_pos, 0, 128); // left
-
- GrLineDrawH(&sContext, 0, 128, xy_pos); // down
- GrLineDrawH(&sContext, 0, 128, HEIGHT - xy_pos); // up
- }
-
-
- // info
- GrContextForegroundSet(&sContext, ClrWheat);
- GrStringDraw(&sContext, gVoltageScaleStr[voltage_scale], /*length*/ -1, /*x*/ 0, /*y*/ 0, /*opaque*/ false);
- GrStringDraw(&sContext, gTimeScaleStr[time_scale], /*length*/ -1, /*x*/ 60, /*y*/ 0, /*opaque*/ false);
- snprintf(str, sizeof(str), "CPU Load %.1f%%", usage_percent);
- GrStringDraw(&sContext, str, /*length*/ -1, /*x*/ 0, /*y*/ HEIGHT - 10, /*opaque*/ false);
-
- switch (trigger_mode) {
- case 1:
- GrStringDraw(&sContext, "^", /*length*/ -1, /*x*/ WIDTH - 10, /*y*/ 0, /*opaque*/ false);
- break;
- case 0:
- GrStringDraw(&sContext, "v", /*length*/ -1, /*x*/ WIDTH - 10, /*y*/ 0, /*opaque*/ false);
- break;
- case 2:
- GrStringDraw(&sContext, "-", /*length*/ -1, /*x*/ WIDTH - 10, /*y*/ 0, /*opaque*/ false);
- break;
- }
-
- // display graph
- #define LOCAL_BUF_LEN 128
- uint16_t local_adc_buffer[LOCAL_BUF_LEN]; // copy of adc buffer
- int32_t adc_current_index;
- int32_t j;
- if (refresh) {
- int trigger;
- if (trigger_mode == 2) {
- trigger = gADCBufferIndex - (WIDTH / 2); // show latest if trigger disabled
- } else {
- trigger = Trigger(trigger_mode);
- }
-
- adc_current_index = trigger - (WIDTH / 2);
- for (j=0; j(b))?(a):(b))
- #define CONSTRAIN(x) MAX(MIN(HEIGHT - 1, x), 0)
- #define TRANSPOSE(x) CONSTRAIN((HEIGHT/2) - (int)roundf(fScale * ((int)x - ADC_OFFSET)))
- uint32_t upper,lower, current, last;
-
- if (j==0) {
- upper = TRANSPOSE(local_adc_buffer[j]);
- lower = upper;
- last = upper;
- } else {
- current = TRANSPOSE(local_adc_buffer[j]);
-
- upper = MAX(current, last);
- lower = MIN(current, last);
-
- last = current;
- }
-
- GrLineDrawV(&sContext, j, lower, upper);
- }
-}
diff --git a/rtos.cfg b/rtos.cfg
index 93ede6e..e82c8df 100644
--- a/rtos.cfg
+++ b/rtos.cfg
@@ -540,3 +540,7 @@ var task0Params = new Task.Params();
task0Params.instance.name = "task0";
task0Params.priority = 1;
Program.global.task0 = Task.create("&task0_func", task0Params);
+var m3Hwi0Params = new m3Hwi.Params();
+m3Hwi0Params.instance.name = "m3Hwi0";
+m3Hwi0Params.priority = 0;
+Program.global.m3Hwi0 = m3Hwi.create(62, "&ADC_ISR", m3Hwi0Params);
diff --git a/sampling.c b/sampling.c
index 2a0d432..3407ada 100644
--- a/sampling.c
+++ b/sampling.c
@@ -66,9 +66,6 @@ void start_sampler() {
ADCSequenceEnable(ADC1_BASE, 0);
// enable sequence 0 interrupt in the ADC1 peripheral
ADCIntEnable(ADC1_BASE, 0); // INT_ADC1SS0
- IntPrioritySet(INT_ADC1SS0, 0); // set ADC1 sequence 0 interrupt priority
- // enable ADC1 sequence 0 interrupt in int. controller
- IntEnable(INT_ADC1SS0);
}
void set_frequency(uint64_t microseconds) {
@@ -91,4 +88,4 @@ void set_frequency(uint64_t microseconds) {
ADCSequenceDisable(ADC1_BASE, 0);
ADCSequenceConfigure(ADC1_BASE, 0, ADC_TRIGGER_TIMER, 0);
ADCSequenceEnable(ADC1_BASE, 0);
-}
\ No newline at end of file
+}
diff --git a/src/makefile.libs b/src/makefile.libs
new file mode 100644
index 0000000..86abb2c
--- /dev/null
+++ b/src/makefile.libs
@@ -0,0 +1,62 @@
+#
+# This file was generated based on the configuration script:
+# C:\Users\askillorin\Downloads\ECE3849-tirtos\ece3849_lab3_starter\rtos.cfg
+#
+# This makefile may be included in other makefiles that need to build
+# the libraries containing the compiled source files generated as
+# part of the configuration step.
+
+#
+# ======== GEN_SRC_DIR =========
+# The path to the sources generated during configuration
+#
+# This path must be either absolute or relative to the build directory.
+#
+# The absolute path to the generated source directory (at the time the
+# sources were generated) is:
+# C:\Users\askillorin\Downloads\ECE3849-tirtos\ece3849_lab3_starter\src
+#
+GEN_SRC_DIR ?= ../src
+
+ifeq (,$(wildcard $(GEN_SRC_DIR)))
+$(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
+endif
+
+#
+# ======== .force ========
+# The .force goal is used to force the build of any goal that names it as
+# a prerequisite
+#
+.PHONY: .force
+
+#
+# ======== library macros ========
+#
+sysbios_SRC = $(GEN_SRC_DIR)/sysbios
+sysbios_LIB = $(GEN_SRC_DIR)/sysbios/sysbios.aem4f
+
+#
+# ======== dependencies ========
+#
+all: $(sysbios_LIB)
+clean: .sysbios_clean
+
+
+# ======== convenient build goals ========
+.PHONY: sysbios
+sysbios: $(GEN_SRC_DIR)/sysbios/sysbios.aem4f
+
+# CDT managed make executables depend on $(OBJS)
+OBJS += $(sysbios_LIB)
+
+#
+# ======== rules ========
+#
+$(sysbios_LIB): .force
+ @echo making $@ ...
+ @$(MAKE) -C $(sysbios_SRC)
+
+.sysbios_clean:
+ @echo cleaning $(sysbios_SRC) ...
+ -@$(MAKE) --no-print-directory -C $(sysbios_SRC) clean
+
diff --git a/src/sysbios/BIOS.obj b/src/sysbios/BIOS.obj
new file mode 100644
index 0000000..b2684f9
Binary files /dev/null and b/src/sysbios/BIOS.obj differ
diff --git a/src/sysbios/m3_Hwi_asm.obj b/src/sysbios/m3_Hwi_asm.obj
new file mode 100644
index 0000000..7b8a59f
Binary files /dev/null and b/src/sysbios/m3_Hwi_asm.obj differ
diff --git a/src/sysbios/m3_Hwi_asm_switch.obj b/src/sysbios/m3_Hwi_asm_switch.obj
new file mode 100644
index 0000000..b77a1c8
Binary files /dev/null and b/src/sysbios/m3_Hwi_asm_switch.obj differ
diff --git a/src/sysbios/m3_IntrinsicsSupport_asm.obj b/src/sysbios/m3_IntrinsicsSupport_asm.obj
new file mode 100644
index 0000000..02a9be2
Binary files /dev/null and b/src/sysbios/m3_IntrinsicsSupport_asm.obj differ
diff --git a/src/sysbios/m3_TaskSupport_asm.obj b/src/sysbios/m3_TaskSupport_asm.obj
new file mode 100644
index 0000000..ccfa956
Binary files /dev/null and b/src/sysbios/m3_TaskSupport_asm.obj differ
diff --git a/src/sysbios/makefile b/src/sysbios/makefile
new file mode 100644
index 0000000..e77e596
--- /dev/null
+++ b/src/sysbios/makefile
@@ -0,0 +1,90 @@
+
+XOPTS = -I"C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M4F
+
+vpath % C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/sysbios/
+vpath %.c C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/
+
+CCOPTS = --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -q -ms --opt_for_speed=2 --program_level_compile -o3 -g --optimize_with_debug -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_knl_Clock_stopCheckNext__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U
+
+XDC_ROOT = C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/
+
+BIOS_ROOT = C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/ti/sysbios/
+
+BIOS_DEFS = -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_knl_Swi_numPriorities__D=16 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=16 -Dti_sysbios_knl_Task_checkStackFlag__D=TRUE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Task_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_PERIODIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=FALSE -Dxdc_runtime_Log_DISABLE_ALL
+
+BIOS_INC = -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/"
+
+TARGET_INC = -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/packages/"
+
+INCS = $(BIOS_INC) $(TARGET_INC) --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include"
+
+CC = C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include
+ASM = C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include
+AR = C:/ti/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armar rq
+
+DEL = C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/../bin/rm -f
+CP = C:/ti/ccs1271/xdctools_3_32_00_06_core/packages/../bin/cp -f
+
+define RM
+ $(if $(wildcard $1),$(DEL) $1,:)
+endef
+
+define ASSEMBLE
+ @echo asmem4f $< ...
+ @$(ASM) $(BIOS_DEFS) $(XOPTS) $(INCS) $<
+endef
+
+all: sysbios.aem4f
+
+m3_Hwi_asm.obj: family/arm/m3/Hwi_asm.sv7M makefile
+ @-$(call RM, $@)
+ $(ASSEMBLE) --output_file=m3_Hwi_asm.obj
+
+m3_Hwi_asm_switch.obj: family/arm/m3/Hwi_asm_switch.sv7M makefile
+ @-$(call RM, $@)
+ $(ASSEMBLE) --output_file=m3_Hwi_asm_switch.obj
+
+m3_IntrinsicsSupport_asm.obj: family/arm/m3/IntrinsicsSupport_asm.sv7M makefile
+ @-$(call RM, $@)
+ $(ASSEMBLE) --output_file=m3_IntrinsicsSupport_asm.obj
+
+m3_TaskSupport_asm.obj: family/arm/m3/TaskSupport_asm.sv7M makefile
+ @-$(call RM, $@)
+ $(ASSEMBLE) --output_file=m3_TaskSupport_asm.obj
+
+
+BIOS.obj: BIOS.c knl/Clock.c knl/Idle.c knl/Intrinsics.c knl/Event.c knl/Mailbox.c knl/Queue.c knl/Semaphore.c knl/Swi.c knl/Swi_andn.c knl/Task.c family/arm/m3/Hwi.c family/arm/m3/TaskSupport.c family/arm/lm4/TimestampProvider.c family/arm/lm4/Timer.c hal/Hwi.c hal/Hwi_stack.c hal/Hwi_startup.c gates/GateHwi.c gates/GateMutex.c heaps/HeapMem.c makefile
+ @-$(call RM, $@)
+ @echo clem4f $< ...
+ @$(CC) $(BIOS_DEFS) $(XOPTS) $(INCS) \
+ $(BIOS_ROOT)BIOS.c \
+ $(BIOS_ROOT)knl/Clock.c \
+ $(BIOS_ROOT)knl/Idle.c \
+ $(BIOS_ROOT)knl/Intrinsics.c \
+ $(BIOS_ROOT)knl/Event.c \
+ $(BIOS_ROOT)knl/Mailbox.c \
+ $(BIOS_ROOT)knl/Queue.c \
+ $(BIOS_ROOT)knl/Semaphore.c \
+ $(BIOS_ROOT)knl/Swi.c \
+ $(BIOS_ROOT)knl/Swi_andn.c \
+ $(BIOS_ROOT)knl/Task.c \
+ $(BIOS_ROOT)family/arm/m3/Hwi.c \
+ $(BIOS_ROOT)family/arm/m3/TaskSupport.c \
+ $(BIOS_ROOT)family/arm/lm4/TimestampProvider.c \
+ $(BIOS_ROOT)family/arm/lm4/Timer.c \
+ $(BIOS_ROOT)hal/Hwi.c \
+ $(BIOS_ROOT)hal/Hwi_stack.c \
+ $(BIOS_ROOT)hal/Hwi_startup.c \
+ $(BIOS_ROOT)gates/GateHwi.c \
+ $(BIOS_ROOT)gates/GateMutex.c \
+ $(BIOS_ROOT)heaps/HeapMem.c \
+
+sysbios.aem4f: BIOS.obj m3_Hwi_asm.obj m3_Hwi_asm_switch.obj m3_IntrinsicsSupport_asm.obj m3_TaskSupport_asm.obj
+ @-$(call RM, $@)
+ @echo arem4f $^ ...
+ @$(AR) $@ $^
+
+
+clean:
+ @$(DEL) ..\makefile.libs
+ @-$(call RM, *)
diff --git a/src/sysbios/sysbios.aem4f b/src/sysbios/sysbios.aem4f
new file mode 100644
index 0000000..57b4203
Binary files /dev/null and b/src/sysbios/sysbios.aem4f differ
diff --git a/sysctl_pll.c b/sysctl_pll.c
new file mode 100644
index 0000000..d42264b
--- /dev/null
+++ b/sysctl_pll.c
@@ -0,0 +1,115 @@
+//*****************************************************************************
+//
+// sysctl.c - Driver for the system controller.
+//
+// Copyright (c) 2005-2015 Texas Instruments Incorporated. All rights reserved.
+// Software License Agreement
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the
+// distribution.
+//
+// Neither the name of Texas Instruments Incorporated nor the names of
+// its contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Excerpt exporting the normally static function _SysCtlFrequencyGet.
+//
+//*****************************************************************************
+
+#include
+#include
+#include "inc/hw_ints.h"
+#include "inc/hw_nvic.h"
+#include "inc/hw_sysctl.h"
+#include "inc/hw_types.h"
+#include "inc/hw_flash.h"
+#include "driverlib/cpu.h"
+#include "driverlib/debug.h"
+#include "driverlib/interrupt.h"
+#include "driverlib/sysctl.h"
+
+//*****************************************************************************
+//
+// Calculate the system frequency from the register settings base on the
+// oscillator input.
+//
+//*****************************************************************************
+uint32_t SysCtlFrequencyGet(uint32_t ui32Xtal)
+{
+ uint32_t ui32Result;
+ uint_fast16_t ui16F1, ui16F2;
+ uint_fast16_t ui16PInt, ui16PFract;
+ uint_fast8_t ui8Q, ui8N;
+
+ //
+ // Extract all of the values from the hardware registers.
+ //
+ ui16PFract = ((HWREG(SYSCTL_PLLFREQ0) & SYSCTL_PLLFREQ0_MFRAC_M) >>
+ SYSCTL_PLLFREQ0_MFRAC_S);
+ ui16PInt = HWREG(SYSCTL_PLLFREQ0) & SYSCTL_PLLFREQ0_MINT_M;
+ ui8Q = (((HWREG(SYSCTL_PLLFREQ1) & SYSCTL_PLLFREQ1_Q_M) >>
+ SYSCTL_PLLFREQ1_Q_S) + 1);
+ ui8N = (((HWREG(SYSCTL_PLLFREQ1) & SYSCTL_PLLFREQ1_N_M) >>
+ SYSCTL_PLLFREQ1_N_S) + 1);
+
+ //
+ // Divide the crystal value by N.
+ //
+ ui32Xtal /= (uint32_t)ui8N;
+
+ //
+ // Calculate the multiplier for bits 9:5.
+ //
+ ui16F1 = ui16PFract / 32;
+
+ //
+ // Calculate the multiplier for bits 4:0.
+ //
+ ui16F2 = ui16PFract - (ui16F1 * 32);
+
+ //
+ // Get the integer portion.
+ //
+ ui32Result = ui32Xtal * (uint32_t)ui16PInt;
+
+ //
+ // Add first fractional bits portion(9:0).
+ //
+ ui32Result += (ui32Xtal * (uint32_t)ui16F1) / 32;
+
+ //
+ // Add the second fractional bits portion(4:0).
+ //
+ ui32Result += (ui32Xtal * (uint32_t)ui16F2) / 1024;
+
+ //
+ // Divide the result by Q.
+ //
+ ui32Result = ui32Result / (uint32_t)ui8Q;
+
+ //
+ // Return the resulting PLL frequency.
+ //
+ return(ui32Result);
+}
diff --git a/sysctl_pll.h b/sysctl_pll.h
new file mode 100644
index 0000000..68dccae
--- /dev/null
+++ b/sysctl_pll.h
@@ -0,0 +1,45 @@
+//*****************************************************************************
+//
+// sysctl.h - Prototypes for the system control driver.
+//
+// Copyright (c) 2005-2015 Texas Instruments Incorporated. All rights reserved.
+// Software License Agreement
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the
+// distribution.
+//
+// Neither the name of Texas Instruments Incorporated nor the names of
+// its contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Excerpt exporting the normally static function _SysCtlFrequencyGet.
+//
+//*****************************************************************************
+
+#ifndef SYSCTL_PLL_H_
+#define SYSCTL_PLL_H_
+
+uint32_t SysCtlFrequencyGet(uint32_t ui32Xtal);
+
+#endif /* SYSCTL_PLL_H_ */