aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-09-15 09:10:37 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-09-15 09:10:37 +0300
commit9afa8ab3999e44b7df2887d696d183b91fde578b (patch)
tree2fa64a6546cee82471035eb677068507446728d0 /Software/Embedded_SW
parent47a1a32bb5aaab88092615656a77eb8015653ce0 (diff)
downloadTango-9afa8ab3999e44b7df2887d696d183b91fde578b.tar.gz
Tango-9afa8ab3999e44b7df2887d696d183b91fde578b.zip
compilation clear
Diffstat (limited to 'Software/Embedded_SW')
-rw-r--r--Software/Embedded_SW/Embedded/.cproject3
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c12
2 files changed, 3 insertions, 12 deletions
diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject
index 515fa0cca..70317c590 100644
--- a/Software/Embedded_SW/Embedded/.cproject
+++ b/Software/Embedded_SW/Embedded/.cproject
@@ -169,9 +169,6 @@
<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.877121938" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.437055464"/>
</toolChain>
</folderInfo>
- <sourceEntries>
- <entry excluding="Modules/Stubs_Handler/Stub_OptLimitSwitch.c|Modules/Stubs_Handler/Stub_Cartridge.c|Modules/Stubs_Handler/Stub_FPGAReadBackReg.c|Modules/Stubs_Handler/Stub_HW_Version.c|Modules/Stubs_Handler/Stub_SpeedSensor.c|Modules/Stubs_Handler/Stub_SteperMotor.c|Modules/Stubs_Handler/Stub_TivaReg.c|Modules/Stubs_Handler/Stub_L6470.c|Drivers/I2C_Communication/Thermo_K|Drivers/Heater/ADS1220.c|Modules/Stubs_Handler/User_Leds.c|Modules/Stubs_Handler/temperature_sensor.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.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=""/>
- </sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c
index 33db0d045..c6f253556 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c
@@ -54,7 +54,6 @@
#include "stdlib.h"
#include "inc/hw_ints.h"
#include "inc/hw_memmap.h"
-#include "inc/hw_uart.h"
#include "inc/hw_gpio.h"
#include "inc/hw_pwm.h"
#include "inc/hw_types.h"
@@ -66,14 +65,11 @@
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/sysctl.h"
-#include "driverlib/uart.h"
#include "driverlib/udma.h"
#include "driverlib/pwm.h"
#include "driverlib/ssi.h"
#include "driverlib/systick.h"
#include "driverlib/adc.h"
-#include "utils/uartstdio.h"
-#include "utils/uartstdio.c"
#include <string.h>
@@ -83,8 +79,7 @@
// as the example is running.
//
//*****************************************************************************
-void
-InitConsole(void)
+/*void InitConsole(void)
{
//
// Enable GPIO port A which is used for UART0 pins.
@@ -120,7 +115,7 @@ InitConsole(void)
// Initialize the UART for console I/O.
//
UARTStdioConfig(0, 115200, 16000000);
-}
+}*/
int temperature_main(){
SysCtlClockSet(SYSCTL_SYSDIV_2_5|SYSCTL_USE_PLL|SYSCTL_OSC_MAIN|SYSCTL_XTAL_16MHZ);
@@ -235,8 +230,7 @@ int temperature_main(){
//
// Display the temperature value on the console.
//
- UARTprintf("Temperature = %3d*C or %3d*F\r", TempValueC,
- TempValueF);
+ //UARTprintf("Temperature = %3d*C or %3d*F\r", TempValueC, TempValueF);
//
// This function provides a means of generating a constant length