diff --git a/.config/.productview.dat b/.config/.productview.dat index b92bfb2..3f284e2 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 fa1894e..000bb06 100644 --- a/.config/xconfig_rtos/.buildtime +++ b/.config/xconfig_rtos/.buildtime @@ -1 +1 @@ -C:\Users\askillorin\Downloads\ECE3849-tirtos\ece3849_lab3_starter\.config\xconfig_rtos\.buildtime \ No newline at end of file +C:\Users\askillorin\Documents\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 b41f852..cef6439 100644 --- a/.config/xconfig_rtos/.xdcenv.mak +++ b/.config/xconfig_rtos/.xdcenv.mak @@ -1,7 +1,7 @@ # _XDCBUILDCOUNT = 0 ifneq (,$(findstring path,$(_USEXDCENV_))) -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 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/Documents/ece3849_lab3_starter/.config override XDCROOT = C:/ti/ccs1271/xdctools_3_32_00_06_core override XDCBUILDCFG = ./config.bld endif @@ -11,6 +11,6 @@ override XDCTARGETS = endif # ifeq (0,1) -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;.. +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/Documents/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 cd58367..c71b237 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/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\"" +--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/Documents/ece3849_lab3_starter/.config" -I"C:/ti/ccs1271/xdctools_3_32_00_06_core/packages" -I"C:/Users/askillorin/Documents/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/Documents/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 650d81b..8c17592 100644 --- a/.config/xconfig_rtos/compiler.opt.defs +++ b/.config/xconfig_rtos/compiler.opt.defs @@ -1 +1 @@ --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\"" +-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/Documents/ece3849_lab3_starter/.config" -I"C:/ti/ccs1271/xdctools_3_32_00_06_core/packages" -I"C:/Users/askillorin/Documents/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/Documents/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 48e38b1..c154791 100644 --- a/.config/xconfig_rtos/config.bld +++ b/.config/xconfig_rtos/config.bld @@ -16,7 +16,7 @@ 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/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; +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/Documents/ece3849_lab3_starter%22%20--include_path%3D%22C%3A/Users/askillorin/Documents/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/ccs1271/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS'; diff --git a/.config/xconfig_rtos/custom.mak b/.config/xconfig_rtos/custom.mak index 3cc4d60..8d1ab4e 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/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/.config/xconfig_rtos/\1\""' package/cfg/rtos_pem4f.xdl > $@ + $(SED) 's"^\"\(package/cfg/rtos_pem4fcfg.cmd\)\"$""\"C:/Users/askillorin/Documents/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 e8b88d9..e2d40d0 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/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg', + cfgScript: 'C:/Users/askillorin/Documents/ece3849_lab3_starter/rtos.cfg', profile: 'release', cfgHome: 'xconfig_rtos', }); @@ -40,8 +40,8 @@ else { } var thisObj = { - 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', + cfg: 'C:/Users/askillorin/Documents/ece3849_lab3_starter/rtos.cfg', + outputPath: 'C:/Users/askillorin/Documents/ece3849_lab3_starter/.config/xconfig_rtos', exeName: 'rtos' + suffix, exeIntName: 'rtos' + suffix.replace('.', '_'), targ: targ, diff --git a/.config/xconfig_rtos/package/cfg/rtos_pem4f.cfg b/.config/xconfig_rtos/package/cfg/rtos_pem4f.cfg index 6bca864..69d6bb2 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/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg", + cfgScript: "C%3A/Users/askillorin/Documents/ece3849_lab3_starter/rtos.cfg", cfgHome: "xconfig_rtos", cfgArgs: "null", cfgArgsEncoded: true, @@ -121,7 +121,7 @@ function _cfginit() { }, 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/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" + 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/Documents/ece3849_lab3_starter%22%20--include_path%3D%22C%3A/Users/askillorin/Documents/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: "20.2.7" }; @@ -179,7 +179,7 @@ function _userscript(script) { xdc.om.$$bind('$homepkg', home); - var cfgScript = "C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg"; + var cfgScript = "C:/Users/askillorin/Documents/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 9a414ab..8af196d 100644 --- a/.config/xconfig_rtos/package/cfg/rtos_pem4f.mak +++ b/.config/xconfig_rtos/package/cfg/rtos_pem4f.mak @@ -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/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 + $(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/Documents/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Documents/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/Documents/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Documents/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/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 + $(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/Documents/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Documents/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/Documents/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Documents/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 24a3208..df6bcba 100644 --- a/.config/xconfig_rtos/package/package.bld.xml +++ b/.config/xconfig_rtos/package/package.bld.xml @@ -7,7 +7,7 @@ - + @@ -44,7 +44,7 @@ isPartial="false" xCfgScript="package/cfg/rtos_pem4f.cfg" xCfgPrefix="package/cfg/rtos_pem4f" - cfgScript="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg" + cfgScript="C:/Users/askillorin/Documents/ece3849_lab3_starter/rtos.cfg" cfgArgs="null" /> @@ -56,7 +56,7 @@ profile="release" xCfgScript="package/cfg/rtos_pem4f.cfg" xCfgPrefix="package/cfg/rtos_pem4f" - cfgScript="C:/Users/askillorin/Downloads/ECE3849-tirtos/ece3849_lab3_starter/rtos.cfg" + cfgScript="C:/Users/askillorin/Documents/ece3849_lab3_starter/rtos.cfg" cfgArgs="null" /> diff --git a/.config/xconfig_rtos/package/xconfig_rtos.ccs b/.config/xconfig_rtos/package/xconfig_rtos.ccs index 3a7998a..b650eb9 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 e6d8d29..ccc7cbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -Debug/ \ No newline at end of file +Debug/ +/.metadata/ +.jxbrowser.userdata/ \ No newline at end of file diff --git a/RemoteSystemsTempFiles/.project b/RemoteSystemsTempFiles/.project new file mode 100644 index 0000000..7675629 --- /dev/null +++ b/RemoteSystemsTempFiles/.project @@ -0,0 +1,12 @@ + + + RemoteSystemsTempFiles + + + + + + + org.eclipse.rse.ui.remoteSystemsTempNature + + diff --git a/_kiss_fft_guts.h b/_kiss_fft_guts.h new file mode 100644 index 0000000..ba66144 --- /dev/null +++ b/_kiss_fft_guts.h @@ -0,0 +1,164 @@ +/* +Copyright (c) 2003-2010, Mark Borgerding + +All rights reserved. + +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 author nor the names of any 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. +*/ + +/* kiss_fft.h + defines kiss_fft_scalar as either short or a float type + and defines + typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */ +#include "kiss_fft.h" +#include + +#define MAXFACTORS 32 +/* e.g. an fft of length 128 has 4 factors + as far as kissfft is concerned + 4*4*4*2 + */ + +struct kiss_fft_state{ + int nfft; + int inverse; + int factors[2*MAXFACTORS]; + kiss_fft_cpx twiddles[1]; +}; + +/* + Explanation of macros dealing with complex math: + + C_MUL(m,a,b) : m = a*b + C_FIXDIV( c , div ) : if a fixed point impl., c /= div. noop otherwise + C_SUB( res, a,b) : res = a - b + C_SUBFROM( res , a) : res -= a + C_ADDTO( res , a) : res += a + * */ +#ifdef FIXED_POINT +#if (FIXED_POINT==32) +# define FRACBITS 31 +# define SAMPPROD int64_t +#define SAMP_MAX 2147483647 +#else +# define FRACBITS 15 +# define SAMPPROD int32_t +#define SAMP_MAX 32767 +#endif + +#define SAMP_MIN -SAMP_MAX + +#if defined(CHECK_OVERFLOW) +# define CHECK_OVERFLOW_OP(a,op,b) \ + if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \ + fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); } +#endif + + +# define smul(a,b) ( (SAMPPROD)(a)*(b) ) +# define sround( x ) (kiss_fft_scalar)( ( (x) + (1<<(FRACBITS-1)) ) >> FRACBITS ) + +# define S_MUL(a,b) sround( smul(a,b) ) + +# define C_MUL(m,a,b) \ + do{ (m).r = sround( smul((a).r,(b).r) - smul((a).i,(b).i) ); \ + (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0) + +# define DIVSCALAR(x,k) \ + (x) = sround( smul( x, SAMP_MAX/k ) ) + +# define C_FIXDIV(c,div) \ + do { DIVSCALAR( (c).r , div); \ + DIVSCALAR( (c).i , div); }while (0) + +# define C_MULBYSCALAR( c, s ) \ + do{ (c).r = sround( smul( (c).r , s ) ) ;\ + (c).i = sround( smul( (c).i , s ) ) ; }while(0) + +#else /* not FIXED_POINT*/ + +# define S_MUL(a,b) ( (a)*(b) ) +#define C_MUL(m,a,b) \ + do{ (m).r = (a).r*(b).r - (a).i*(b).i;\ + (m).i = (a).r*(b).i + (a).i*(b).r; }while(0) +# define C_FIXDIV(c,div) /* NOOP */ +# define C_MULBYSCALAR( c, s ) \ + do{ (c).r *= (s);\ + (c).i *= (s); }while(0) +#endif + +#ifndef CHECK_OVERFLOW_OP +# define CHECK_OVERFLOW_OP(a,op,b) /* noop */ +#endif + +#define C_ADD( res, a,b)\ + do { \ + CHECK_OVERFLOW_OP((a).r,+,(b).r)\ + CHECK_OVERFLOW_OP((a).i,+,(b).i)\ + (res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \ + }while(0) +#define C_SUB( res, a,b)\ + do { \ + CHECK_OVERFLOW_OP((a).r,-,(b).r)\ + CHECK_OVERFLOW_OP((a).i,-,(b).i)\ + (res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \ + }while(0) +#define C_ADDTO( res , a)\ + do { \ + CHECK_OVERFLOW_OP((res).r,+,(a).r)\ + CHECK_OVERFLOW_OP((res).i,+,(a).i)\ + (res).r += (a).r; (res).i += (a).i;\ + }while(0) + +#define C_SUBFROM( res , a)\ + do {\ + CHECK_OVERFLOW_OP((res).r,-,(a).r)\ + CHECK_OVERFLOW_OP((res).i,-,(a).i)\ + (res).r -= (a).r; (res).i -= (a).i; \ + }while(0) + + +#ifdef FIXED_POINT +# define KISS_FFT_COS(phase) floor(.5+SAMP_MAX * cos (phase)) +# define KISS_FFT_SIN(phase) floor(.5+SAMP_MAX * sin (phase)) +# define HALF_OF(x) ((x)>>1) +#elif defined(USE_SIMD) +# define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) ) +# define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) ) +# define HALF_OF(x) ((x)*_mm_set1_ps(.5)) +#else +# define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase) +# define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase) +# define HALF_OF(x) ((x)*.5) +#endif + +#define kf_cexp(x,phase) \ + do{ \ + (x)->r = KISS_FFT_COS(phase);\ + (x)->i = KISS_FFT_SIN(phase);\ + }while(0) + + +/* a debugging function */ +#define pcpx(c)\ + fprintf(stderr,"%g + %gi\n",(double)((c)->r),(double)((c)->i) ) + + +#ifdef KISS_FFT_USE_ALLOCA +// define this to allow use of alloca instead of malloc for temporary buffers +// Temporary buffers are used in two case: +// 1. FFT sizes that have "bad" factors. i.e. not 2,3 and 5 +// 2. "in-place" FFTs. Notice the quotes, since kissfft does not really do an in-place transform. +#include +#define KISS_FFT_TMP_ALLOC(nbytes) alloca(nbytes) +#define KISS_FFT_TMP_FREE(ptr) +#else +#define KISS_FFT_TMP_ALLOC(nbytes) KISS_FFT_MALLOC(nbytes) +#define KISS_FFT_TMP_FREE(ptr) KISS_FFT_FREE(ptr) +#endif diff --git a/kiss_fft.c b/kiss_fft.c new file mode 100644 index 0000000..465d6c9 --- /dev/null +++ b/kiss_fft.c @@ -0,0 +1,408 @@ +/* +Copyright (c) 2003-2010, Mark Borgerding + +All rights reserved. + +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 author nor the names of any 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. +*/ + + +#include "_kiss_fft_guts.h" +/* The guts header contains all the multiplication and addition macros that are defined for + fixed or floating point complex numbers. It also delares the kf_ internal functions. + */ + +static void kf_bfly2( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + int m + ) +{ + kiss_fft_cpx * Fout2; + kiss_fft_cpx * tw1 = st->twiddles; + kiss_fft_cpx t; + Fout2 = Fout + m; + do{ + C_FIXDIV(*Fout,2); C_FIXDIV(*Fout2,2); + + C_MUL (t, *Fout2 , *tw1); + tw1 += fstride; + C_SUB( *Fout2 , *Fout , t ); + C_ADDTO( *Fout , t ); + ++Fout2; + ++Fout; + }while (--m); +} + +static void kf_bfly4( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + const size_t m + ) +{ + kiss_fft_cpx *tw1,*tw2,*tw3; + kiss_fft_cpx scratch[6]; + size_t k=m; + const size_t m2=2*m; + const size_t m3=3*m; + + + tw3 = tw2 = tw1 = st->twiddles; + + do { + C_FIXDIV(*Fout,4); C_FIXDIV(Fout[m],4); C_FIXDIV(Fout[m2],4); C_FIXDIV(Fout[m3],4); + + C_MUL(scratch[0],Fout[m] , *tw1 ); + C_MUL(scratch[1],Fout[m2] , *tw2 ); + C_MUL(scratch[2],Fout[m3] , *tw3 ); + + C_SUB( scratch[5] , *Fout, scratch[1] ); + C_ADDTO(*Fout, scratch[1]); + C_ADD( scratch[3] , scratch[0] , scratch[2] ); + C_SUB( scratch[4] , scratch[0] , scratch[2] ); + C_SUB( Fout[m2], *Fout, scratch[3] ); + tw1 += fstride; + tw2 += fstride*2; + tw3 += fstride*3; + C_ADDTO( *Fout , scratch[3] ); + + if(st->inverse) { + Fout[m].r = scratch[5].r - scratch[4].i; + Fout[m].i = scratch[5].i + scratch[4].r; + Fout[m3].r = scratch[5].r + scratch[4].i; + Fout[m3].i = scratch[5].i - scratch[4].r; + }else{ + Fout[m].r = scratch[5].r + scratch[4].i; + Fout[m].i = scratch[5].i - scratch[4].r; + Fout[m3].r = scratch[5].r - scratch[4].i; + Fout[m3].i = scratch[5].i + scratch[4].r; + } + ++Fout; + }while(--k); +} + +static void kf_bfly3( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + size_t m + ) +{ + size_t k=m; + const size_t m2 = 2*m; + kiss_fft_cpx *tw1,*tw2; + kiss_fft_cpx scratch[5]; + kiss_fft_cpx epi3; + epi3 = st->twiddles[fstride*m]; + + tw1=tw2=st->twiddles; + + do{ + C_FIXDIV(*Fout,3); C_FIXDIV(Fout[m],3); C_FIXDIV(Fout[m2],3); + + C_MUL(scratch[1],Fout[m] , *tw1); + C_MUL(scratch[2],Fout[m2] , *tw2); + + C_ADD(scratch[3],scratch[1],scratch[2]); + C_SUB(scratch[0],scratch[1],scratch[2]); + tw1 += fstride; + tw2 += fstride*2; + + Fout[m].r = Fout->r - HALF_OF(scratch[3].r); + Fout[m].i = Fout->i - HALF_OF(scratch[3].i); + + C_MULBYSCALAR( scratch[0] , epi3.i ); + + C_ADDTO(*Fout,scratch[3]); + + Fout[m2].r = Fout[m].r + scratch[0].i; + Fout[m2].i = Fout[m].i - scratch[0].r; + + Fout[m].r -= scratch[0].i; + Fout[m].i += scratch[0].r; + + ++Fout; + }while(--k); +} + +static void kf_bfly5( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + int m + ) +{ + kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4; + int u; + kiss_fft_cpx scratch[13]; + kiss_fft_cpx * twiddles = st->twiddles; + kiss_fft_cpx *tw; + kiss_fft_cpx ya,yb; + ya = twiddles[fstride*m]; + yb = twiddles[fstride*2*m]; + + Fout0=Fout; + Fout1=Fout0+m; + Fout2=Fout0+2*m; + Fout3=Fout0+3*m; + Fout4=Fout0+4*m; + + tw=st->twiddles; + for ( u=0; ur += scratch[7].r + scratch[8].r; + Fout0->i += scratch[7].i + scratch[8].i; + + scratch[5].r = scratch[0].r + S_MUL(scratch[7].r,ya.r) + S_MUL(scratch[8].r,yb.r); + scratch[5].i = scratch[0].i + S_MUL(scratch[7].i,ya.r) + S_MUL(scratch[8].i,yb.r); + + scratch[6].r = S_MUL(scratch[10].i,ya.i) + S_MUL(scratch[9].i,yb.i); + scratch[6].i = -S_MUL(scratch[10].r,ya.i) - S_MUL(scratch[9].r,yb.i); + + C_SUB(*Fout1,scratch[5],scratch[6]); + C_ADD(*Fout4,scratch[5],scratch[6]); + + scratch[11].r = scratch[0].r + S_MUL(scratch[7].r,yb.r) + S_MUL(scratch[8].r,ya.r); + scratch[11].i = scratch[0].i + S_MUL(scratch[7].i,yb.r) + S_MUL(scratch[8].i,ya.r); + scratch[12].r = - S_MUL(scratch[10].i,yb.i) + S_MUL(scratch[9].i,ya.i); + scratch[12].i = S_MUL(scratch[10].r,yb.i) - S_MUL(scratch[9].r,ya.i); + + C_ADD(*Fout2,scratch[11],scratch[12]); + C_SUB(*Fout3,scratch[11],scratch[12]); + + ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4; + } +} + +/* perform the butterfly for one stage of a mixed radix FFT */ +static void kf_bfly_generic( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + int m, + int p + ) +{ + int u,k,q1,q; + kiss_fft_cpx * twiddles = st->twiddles; + kiss_fft_cpx t; + int Norig = st->nfft; + + kiss_fft_cpx * scratch = (kiss_fft_cpx*)KISS_FFT_TMP_ALLOC(sizeof(kiss_fft_cpx)*p); + + for ( u=0; u=Norig) twidx-=Norig; + C_MUL(t,scratch[q] , twiddles[twidx] ); + C_ADDTO( Fout[ k ] ,t); + } + k += m; + } + } + KISS_FFT_TMP_FREE(scratch); +} + +static +void kf_work( + kiss_fft_cpx * Fout, + const kiss_fft_cpx * f, + const size_t fstride, + int in_stride, + int * factors, + const kiss_fft_cfg st + ) +{ + kiss_fft_cpx * Fout_beg=Fout; + const int p=*factors++; /* the radix */ + const int m=*factors++; /* stage's fft length/p */ + const kiss_fft_cpx * Fout_end = Fout + p*m; + +#ifdef _OPENMP + // use openmp extensions at the + // top-level (not recursive) + if (fstride==1 && p<=5) + { + int k; + + // execute the p different work units in different threads +# pragma omp parallel for + for (k=0;k floor_sqrt) + p = n; /* no more factors, skip to end */ + } + n /= p; + *facbuf++ = p; + *facbuf++ = n; + } while (n > 1); +} + +/* + * + * User-callable function to allocate all necessary storage space for the fft. + * + * The return value is a contiguous block of memory, allocated with malloc. As such, + * It can be freed with free(), rather than a kiss_fft-specific function. + * */ +kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem ) +{ + kiss_fft_cfg st=NULL; + size_t memneeded = sizeof(struct kiss_fft_state) + + sizeof(kiss_fft_cpx)*(nfft-1); /* twiddle factors*/ + + if ( lenmem==NULL ) { + st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded ); + }else{ + if (mem != NULL && *lenmem >= memneeded) + st = (kiss_fft_cfg)mem; + *lenmem = memneeded; + } + if (st) { + int i; + st->nfft=nfft; + st->inverse = inverse_fft; + + for (i=0;iinverse) + phase *= -1; + kf_cexp(st->twiddles+i, phase ); + } + + kf_factor(nfft,st->factors); + } + return st; +} + + +void kiss_fft_stride(kiss_fft_cfg st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int in_stride) +{ + if (fin == fout) { + //NOTE: this is not really an in-place FFT algorithm. + //It just performs an out-of-place FFT into a temp buffer + kiss_fft_cpx * tmpbuf = (kiss_fft_cpx*)KISS_FFT_TMP_ALLOC( sizeof(kiss_fft_cpx)*st->nfft); + kf_work(tmpbuf,fin,1,in_stride, st->factors,st); + memcpy(fout,tmpbuf,sizeof(kiss_fft_cpx)*st->nfft); + KISS_FFT_TMP_FREE(tmpbuf); + }else{ + kf_work( fout, fin, 1,in_stride, st->factors,st ); + } +} + +void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) +{ + kiss_fft_stride(cfg,fin,fout,1); +} + + +void kiss_fft_cleanup(void) +{ + // nothing needed any more +} + +int kiss_fft_next_fast_size(int n) +{ + while(1) { + int m=n; + while ( (m%2) == 0 ) m/=2; + while ( (m%3) == 0 ) m/=3; + while ( (m%5) == 0 ) m/=5; + if (m<=1) + break; /* n is completely factorable by twos, threes, and fives */ + n++; + } + return n; +} diff --git a/kiss_fft.h b/kiss_fft.h new file mode 100644 index 0000000..64c50f4 --- /dev/null +++ b/kiss_fft.h @@ -0,0 +1,124 @@ +#ifndef KISS_FFT_H +#define KISS_FFT_H + +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* + ATTENTION! + If you would like a : + -- a utility that will handle the caching of fft objects + -- real-only (no imaginary time component ) FFT + -- a multi-dimensional FFT + -- a command-line utility to perform ffts + -- a command-line utility to perform fast-convolution filtering + + Then see kfc.h kiss_fftr.h kiss_fftnd.h fftutil.c kiss_fastfir.c + in the tools/ directory. +*/ + +#ifdef USE_SIMD +# include +# define kiss_fft_scalar __m128 +#define KISS_FFT_MALLOC(nbytes) _mm_malloc(nbytes,16) +#define KISS_FFT_FREE _mm_free +#else +#define KISS_FFT_MALLOC malloc +#define KISS_FFT_FREE free +#endif + + +#ifdef FIXED_POINT +#include +# if (FIXED_POINT == 32) +# define kiss_fft_scalar int32_t +# else +# define kiss_fft_scalar int16_t +# endif +#else +# ifndef kiss_fft_scalar +/* default is float */ +# define kiss_fft_scalar float +# endif +#endif + +typedef struct { + kiss_fft_scalar r; + kiss_fft_scalar i; +}kiss_fft_cpx; + +typedef struct kiss_fft_state* kiss_fft_cfg; + +/* + * kiss_fft_alloc + * + * Initialize a FFT (or IFFT) algorithm's cfg/state buffer. + * + * typical usage: kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL); + * + * The return value from fft_alloc is a cfg buffer used internally + * by the fft routine or NULL. + * + * If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc. + * The returned value should be free()d when done to avoid memory leaks. + * + * The state can be placed in a user supplied buffer 'mem': + * If lenmem is not NULL and mem is not NULL and *lenmem is large enough, + * then the function places the cfg in mem and the size used in *lenmem + * and returns mem. + * + * If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough), + * then the function returns NULL and places the minimum cfg + * buffer size in *lenmem. + * */ + +kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem); + +/* + * kiss_fft(cfg,in_out_buf) + * + * Perform an FFT on a complex input buffer. + * for a forward FFT, + * fin should be f[0] , f[1] , ... ,f[nfft-1] + * fout will be F[0] , F[1] , ... ,F[nfft-1] + * Note that each element is complex and can be accessed like + f[k].r and f[k].i + * */ +void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); + +/* + A more generic version of the above function. It reads its input from every Nth sample. + * */ +void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride); + +/* If kiss_fft_alloc allocated a buffer, it is one contiguous + buffer and can be simply free()d when no longer needed*/ +#define kiss_fft_free free + +/* + Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up + your compiler output to call this before you exit. +*/ +void kiss_fft_cleanup(void); + + +/* + * Returns the smallest integer k, such that k>=n and k has only "fast" factors (2,3,5) + */ +int kiss_fft_next_fast_size(int n); + +/* for real ffts, we need an even size */ +#define kiss_fftr_next_fast_size_real(n) \ + (kiss_fft_next_fast_size( ((n)+1)>>1)<<1) + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/makefile.libs b/src/makefile.libs index 86abb2c..e247312 100644 --- a/src/makefile.libs +++ b/src/makefile.libs @@ -1,6 +1,6 @@ # # This file was generated based on the configuration script: -# C:\Users\askillorin\Downloads\ECE3849-tirtos\ece3849_lab3_starter\rtos.cfg +# C:\Users\askillorin\Documents\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 @@ -14,7 +14,7 @@ # # 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 +# C:\Users\askillorin\Documents\ece3849_lab3_starter\src # GEN_SRC_DIR ?= ../src diff --git a/src/sysbios/BIOS.obj b/src/sysbios/BIOS.obj index b2684f9..98875ee 100644 Binary files a/src/sysbios/BIOS.obj and b/src/sysbios/BIOS.obj differ diff --git a/src/sysbios/m3_Hwi_asm.obj b/src/sysbios/m3_Hwi_asm.obj index 7b8a59f..4683f66 100644 Binary files a/src/sysbios/m3_Hwi_asm.obj 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 index b77a1c8..4e614d4 100644 Binary files a/src/sysbios/m3_Hwi_asm_switch.obj 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 index 02a9be2..f9370ce 100644 Binary files a/src/sysbios/m3_IntrinsicsSupport_asm.obj 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 index ccfa956..39801e7 100644 Binary files a/src/sysbios/m3_TaskSupport_asm.obj and b/src/sysbios/m3_TaskSupport_asm.obj differ diff --git a/src/sysbios/makefile b/src/sysbios/makefile index e77e596..81636b4 100644 --- a/src/sysbios/makefile +++ b/src/sysbios/makefile @@ -16,7 +16,7 @@ BIOS_INC = -I"C:/ti/ccs1271/tirtos_tivac_2_16_01_14/products/bios_6_45_02_31/pa 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" +INCS = $(BIOS_INC) $(TARGET_INC) --include_path="C:/Users/askillorin/Documents/ece3849_lab3_starter" --include_path="C:/Users/askillorin/Documents/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 diff --git a/src/sysbios/sysbios.aem4f b/src/sysbios/sysbios.aem4f index 57b4203..793a174 100644 Binary files a/src/sysbios/sysbios.aem4f and b/src/sysbios/sysbios.aem4f differ