diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-12 09:46:30 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-12 09:46:30 +0300 |
| commit | 86b7dbca112046dea1d3dd7d2904440afc2acb7d (patch) | |
| tree | ea21b0a25869ade3cda4fc5705cb6e6fae622597 /Software/Embedded_SW | |
| parent | 46838f74850f7e26f942da41f240d402d199bebc (diff) | |
| download | Tango-86b7dbca112046dea1d3dd7d2904440afc2acb7d.tar.gz Tango-86b7dbca112046dea1d3dd7d2904440afc2acb7d.zip | |
Start Thermo_K+ blinking the activity led on heating
Diffstat (limited to 'Software/Embedded_SW')
6 files changed, 170 insertions, 45 deletions
diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject index 19f15e70d..a8adef838 100644 --- a/Software/Embedded_SW/Embedded/.cproject +++ b/Software/Embedded_SW/Embedded/.cproject @@ -32,16 +32,16 @@ <listOptionValue builtIn="false" value="PRODUCTS=com.ti.rtsc.TIRTOStivac:2.16.0.08;"/> <listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/> </option> - <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1146150501" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="16.9.2.LTS" valueType="string"/> + <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1146150501" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="16.9.2.LTS" valueType="string"/> <targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.targetPlatformDebug.2027292704" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.targetPlatformDebug"/> - <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.builderDebug.511066236" name="GNU Make.Debug" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="true" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.builderDebug"/> + <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.builderDebug.511066236" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="true" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.builderDebug"/> <tool id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.compilerDebug.1552867542" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.compilerDebug"> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.SILICON_VERSION.2092431293" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.SILICON_VERSION.7M4" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.CODE_STATE.290630393" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.CODE_STATE.16" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.ABI.1806714710" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.ABI.eabi" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.FLOAT_SUPPORT.1168739601" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.FLOAT_SUPPORT" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.FLOAT_SUPPORT.FPv4SPD16" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.GCC.1278462098" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.GCC" value="true" valueType="boolean"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEFINE.358337749" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEFINE" valueType="definedSymbols"> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.SILICON_VERSION.2092431293" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.SILICON_VERSION.7M4" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.CODE_STATE.290630393" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.CODE_STATE.16" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.ABI.1806714710" name="Application binary interface. (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.ABI.eabi" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.FLOAT_SUPPORT.1168739601" name="Specify floating point support (--float_support)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.FLOAT_SUPPORT" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.FLOAT_SUPPORT.FPv4SPD16" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.GCC.1278462098" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.GCC" value="true" valueType="boolean"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEFINE.358337749" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEFINE" valueType="definedSymbols"> <listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSTIVAC_SYMBOLS}"/> <listOptionValue builtIn="false" value="TARGET_IS_TM4C129_RA0"/> <listOptionValue builtIn="false" value="ccs="ccs""/> @@ -49,10 +49,10 @@ <listOptionValue builtIn="false" value="TIVAWARE"/> <listOptionValue builtIn="false" value="PART_TM4C129XNCZAD"/> </option> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.LITTLE_ENDIAN.1307385062" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_LEVEL.2023753885" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_LEVEL.off" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_FOR_SPEED.1241946699" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.INCLUDE_PATH.757500577" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.INCLUDE_PATH" valueType="includePath"> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.LITTLE_ENDIAN.1307385062" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_LEVEL.2023753885" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_LEVEL.off" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_FOR_SPEED.1241946699" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.INCLUDE_PATH.757500577" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.INCLUDE_PATH" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/Common/protobuf-c""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/Communication/PMR/Hardware""/> @@ -68,58 +68,58 @@ <listOptionValue builtIn="false" value=""${COM_TI_RTSC_TIRTOSTIVAC_INSTALL_DIR}/products/bios_6_45_01_29/packages/ti/sysbios/posix""/> <listOptionValue builtIn="false" value=""${COM_TI_RTSC_TIRTOSTIVAC_INSTALL_DIR}/products/tidrivers_tivac_2_16_00_08""/> </option> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEBUGGING_MODEL.193567415" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WARNING.871260834" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WARNING" valueType="stringList"> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEBUGGING_MODEL.193567415" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WARNING.871260834" name="Treat diagnostic <id> as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WARNING" valueType="stringList"> <listOptionValue builtIn="false" value="225"/> <listOptionValue builtIn="false" value="255"/> </option> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WRAP.951521584" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WRAP.off" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DISPLAY_ERROR_NUMBER.673976008" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.EMBEDDED_CONSTANTS.1849154369" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.EMBEDDED_CONSTANTS" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.EMBEDDED_CONSTANTS.off" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WRAP.951521584" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DIAG_WRAP.off" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DISPLAY_ERROR_NUMBER.673976008" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.EMBEDDED_CONSTANTS.1849154369" name="Specify whether constants can be embedded in code sections (--embedded_constants)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.EMBEDDED_CONSTANTS" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.EMBEDDED_CONSTANTS.off" valueType="enumerated"/> <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compiler.inputType__C_SRCS.2123688088" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compiler.inputType__C_SRCS"/> <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compiler.inputType__CPP_SRCS.1168316842" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compiler.inputType__CPP_SRCS"/> <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compiler.inputType__ASM_SRCS.2043449996" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compiler.inputType__ASM_SRCS"/> <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compiler.inputType__ASM2_SRCS.2126381590" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compiler.inputType__ASM2_SRCS"/> </tool> <tool id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.linkerDebug.2079256084" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.linkerDebug"> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.MAP_FILE.120231119" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.MAP_FILE" value=""${ProjName}.map"" valueType="string"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.STACK_SIZE.749099555" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.STACK_SIZE" value="4095" valueType="string"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.HEAP_SIZE.1468612153" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.HEAP_SIZE" value="0" valueType="string"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE.1395405377" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.LIBRARY.1984739640" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.LIBRARY" valueType="libs"> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.MAP_FILE.120231119" name="Link information (map) listed into <file> (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.MAP_FILE" value=""${ProjName}.map"" valueType="string"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.STACK_SIZE.749099555" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.STACK_SIZE" value="4095" valueType="string"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.HEAP_SIZE.1468612153" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.HEAP_SIZE" value="0" valueType="string"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE.1395405377" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.LIBRARY.1984739640" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.LIBRARY" valueType="libs"> <listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSTIVAC_LIBRARIES}"/> <listOptionValue builtIn="false" value="${TIVAWARE_DRIVERS}/grlib/ccs/Debug/grlib.lib"/> <listOptionValue builtIn="false" value="${TIVAWARE_DRIVERS}/driverlib/ccs/Debug/driverlib.lib"/> <listOptionValue builtIn="false" value="${TIVAWARE_DRIVERS}/usblib/ccs/Debug/usblib.lib"/> <listOptionValue builtIn="false" value="libc.a"/> </option> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.SEARCH_PATH.743397287" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.SEARCH_PATH" valueType="libPaths"> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.SEARCH_PATH.743397287" name="Add <dir> to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.SEARCH_PATH" valueType="libPaths"> <listOptionValue builtIn="false" value=""${COM_TI_RTSC_TIRTOSTIVAC_LIBRARY_PATH}""/> <listOptionValue builtIn="false" value=""${CG_TOOL_ROOT}""/> <listOptionValue builtIn="false" value=""${CG_TOOL_ROOT}/lib""/> </option> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.PRIORITY.1751490695" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.PRIORITY" value="true" valueType="boolean"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DISABLE_AUTO_RTS.1873624717" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DISABLE_AUTO_RTS" value="true" valueType="boolean"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DIAG_WRAP.2098441631" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DIAG_WRAP.off" valueType="enumerated"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DISPLAY_ERROR_NUMBER.478657536" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.XML_LINK_INFO.1836282046" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.XML_LINK_INFO" value=""${ProjName}_linkInfo.xml"" valueType="string"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.PRIORITY.1751490695" name="Search libraries in priority order (--priority, -priority)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.PRIORITY" value="true" valueType="boolean"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DISABLE_AUTO_RTS.1873624717" name="Disable automatic RTS selection (--disable_auto_rts)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DISABLE_AUTO_RTS" value="true" valueType="boolean"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DIAG_WRAP.2098441631" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DIAG_WRAP.off" valueType="enumerated"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DISPLAY_ERROR_NUMBER.478657536" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.XML_LINK_INFO.1836282046" name="Detailed link information data-base into <file> (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.XML_LINK_INFO" value=""${ProjName}_linkInfo.xml"" valueType="string"/> <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exeLinker.inputType__CMD_SRCS.201388490" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exeLinker.inputType__CMD_SRCS"/> <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exeLinker.inputType__CMD2_SRCS.446075773" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exeLinker.inputType__CMD2_SRCS"/> <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exeLinker.inputType__GEN_CMDS.1827876712" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exeLinker.inputType__GEN_CMDS"/> </tool> <tool id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.hex.2029334343" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.hex"/> <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.437055464" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool"> - <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.424241015" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList"> + <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.424241015" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList"> <listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSTIVAC_REPOS}"/> <listOptionValue builtIn="false" value="C:\ti\TivaWare_C_Series-2.1.2.111"/> <listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/> </option> - <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.807253953" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M4F" valueType="string"/> - <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.430090602" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.tiva:TM4C129XNCZAD" valueType="string"/> - <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1459563173" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.tiva:TM4C129XNCZAD" valueType="string"/> - <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.823393261" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/> - <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1230380573" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/> - <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1607406675" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value=""--code_state=16 --float_support=FPv4SPD16 -me" valueType="string"/> + <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.807253953" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M4F" valueType="string"/> + <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.430090602" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.tiva:TM4C129XNCZAD" valueType="string"/> + <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1459563173" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.tiva:TM4C129XNCZAD" valueType="string"/> + <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.823393261" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/> + <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1230380573" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/> + <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1607406675" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value=""--code_state=16 --float_support=FPv4SPD16 -me" valueType="string"/> </tool> </toolChain> </folderInfo> @@ -127,8 +127,9 @@ <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.DebugToolchain.627960570" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.DebugToolchain" unusedChildren=""> <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2115231387.1148465383" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.2115231387"/> <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1146150501.147373229" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1146150501"/> + <targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.targetPlatformDebug" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.targetPlatformDebug"/> <tool id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.compilerDebug.2049506076" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.exe.compilerDebug.1552867542"> - <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.INCLUDE_PATH.1954026719" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.INCLUDE_PATH" valueType="includePath"> + <option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.INCLUDE_PATH.1954026719" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.INCLUDE_PATH" valueType="includePath"> <listOptionValue builtIn="false" value=""${COM_TI_RTSC_TIRTOSTIVAC_INSTALL_DIR}/products/ndk_2_25_00_09/packages/ti/ndk/inc/bsd""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/Common/protobuf-c""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}""/> @@ -162,7 +163,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="Drivers/I2C_Communication/I2C_Switch|Drivers/I2C_Communication/Previous_Code|Drivers/I2C_Communication/Previous_Code/TestI2C|JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/L6470|Pin.c|ADCLogger.c|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/I2C_Communication/Previous_Code|Drivers/L6470|Pin.c|ADCLogger.c|Drivers/I2C_Communication/Previous_Code/TestI2C|Flashstore.c|Profile.c|Drivers/I2C_Communication/I2C_Switch" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -430,7 +431,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="Drivers/I2C_Communication/Previous_Code|Drivers/I2C_Communication/Previous_Code/TestI2C|JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/L6470|Pin.c|ADCLogger.c|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/I2C_Communication/Previous_Code|Drivers/L6470|Pin.c|ADCLogger.c|Drivers/I2C_Communication/Previous_Code/TestI2C|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c index 407fb3765..c36850b85 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c +++ b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c @@ -33,7 +33,7 @@ typedef struct bool Active; } GPIOIntPortMap; -bool HeaterActive = false; +uint32_t HeaterActive = 0; static GPIOIntPortMap portMap[MAX_HEATERS_NUM] = { @@ -81,10 +81,17 @@ uint32_t ActivateHeater (int HeaterId) // ACTIVITY_RED_LED_ON; // if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ3) // COMM_RED_LED_ON; - HeaterActive = true; + //--------------------------------------------------------------------------------------- + portMap[HeaterId].Active = true; + //--------------------------------------------------------------------------------------- + + HeaterActive |= 1 << HeaterId; + + //--------------------------------------------------------------------------------------- + return OK; } @@ -116,10 +123,12 @@ uint32_t DeActivateHeater (int HeaterId) // ACTIVITY_RED_LED_OFF; // if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ3) // COMM_RED_LED_OFF; - HeaterActive = false; + //HeaterActive = false; //--------------------------------------------------------------------------------------- portMap[HeaterId].Active = false; + HeaterActive &= ~(1 << HeaterId); + return OK; } diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.h b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.h index 75478fdb7..3cd9d09bd 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.h +++ b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.h @@ -10,5 +10,5 @@ bool GetHeaterState (int HeaterId); uint32_t HeaterSetTemperatureWithCallback (int HeaterId, uint32_t RequestedTemperature, callback_fptr callback); uint32_t HeaterBalanceLoadControlCBFunction(uint32_t IfIndex, uint32_t readValue); -extern bool HeaterActive; +extern uint32_t HeaterActive; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Thermo_K/MCP9600.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Thermo_K/MCP9600.c new file mode 100644 index 000000000..4c1c7f019 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Thermo_K/MCP9600.c @@ -0,0 +1,55 @@ +/* + * MCP9600.c + * + * Created on: Jul 11, 2018 + * Author: avi + */ + +//https://github.com/MikroElektronika/HEXIWEAR/blob/master/SW/Click%20Examples%20mikroC/examples/Thermo_K/HEXIWEAR_THERMO_K_Click.c + + +#include "MCP9600.h" + +char tmp_data[10]; +/* +float Read_Temperature() +{ + + float Temperature; + + + + tmp_data[0] = MCP9600_TH; // Thermocouple Temperature register + + + + I2C_Start(); // Issue I2C start signal + + I2C_Write( MCP9600_I2C_ADDR, tmp_data, 1, END_MODE_RESTART ); // Send byte (tmp_data[0]) + + Delay_us( 50 ); // delay 50 us + + I2C_Read( MCP9600_I2C_ADDR, tmp_data, 2, END_MODE_STOP ); // Read thermocouple temperature and store it in tmp_data + + + + if( (tmp_data[0] & 0x80) == 0x80 ) + + { // TA < 0°C + + tmp_data[0] = tmp_data[0] & 0x7F; // Clear SIGN + + Temperature = 1024 - ( tmp_data[0] * 16 + tmp_data[1] / 16 ); + + } + + else // TA > 0°C + + Temperature = ( tmp_data[0] * 16 + (float)tmp_data[1] / 16 ); // Temperature = Ambient Temperature (°C) + + + + return Temperature; // Return Thermocouple temperature data + +} +*/ diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Thermo_K/MCP9600.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Thermo_K/MCP9600.h new file mode 100644 index 000000000..c52c72a77 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Thermo_K/MCP9600.h @@ -0,0 +1,60 @@ +/* + * MCP9600.h + * + * Created on: Jul 11, 2018 + * Author: avi + */ + +#ifndef DRIVERS_I2C_COMMUNICATION_THERMO_K_MCP9600_H_ +#define DRIVERS_I2C_COMMUNICATION_THERMO_K_MCP9600_H_ + +// MCP9600 I2C address + +#define MCP9600_I2C_ADDR 0x60 + + + +// Register address + +#define MCP9600_TH 0x00 + +#define MCP9600_Td 0x01 + +#define MCP9600_TC 0x02 + +#define MCP9600_Raw_ADC_Data 0x03 + +#define MCP9600_Status 0x04 + +#define MCP9600_Sensor_Config 0x05 + +#define MCP9600_Device_Config 0x06 + +#define MCP9600_Alert1_Config 0x08 + +#define MCP9600_Alert2_Config 0x09 + +#define MCP9600_Alert3_Config 0x0A + +#define MCP9600_Alert4_Config 0x0B + +#define MCP9600_THYST1 0x0C + +#define MCP9600_THYST2 0x0D + +#define MCP9600_THYST3 0x0E + +#define MCP9600_THYST4 0x0F + +#define MCP9600_TALERT1 0x10 + +#define MCP9600_TALERT2 0x11 + +#define MCP9600_TALERT3 0x12 + +#define MCP9600_TALERT4 0x13 + +#define MCP9600_DEVICE_ID 0x20 + + +#endif /* DRIVERS_I2C_COMMUNICATION_THERMO_K_MCP9600_H_ */ diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 379a7bb48..35a139905 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -157,14 +157,14 @@ uint32_t ControlActivityLed( uint32_t Parameter1, uint32_t Parameter2) if (flag==true) { COMM_RED_LED_ON; - STATUS_GREEN_LED_ON;// Blink the green led on heating + ACTIVITY_RED_LED_OFF; // Heaters indication - all the Heaters OFF flag = false; } else { COMM_RED_LED_OFF; - if (HeaterActive == true)// Blink the green led on heating - STATUS_GREEN_LED_OFF; + if (HeaterActive > 0)// Blink the led on heating + ACTIVITY_RED_LED_ON;// Heaters indication - at least one of the Heaters is ON flag = true; } return OK; |
